propagate from branch 'im.pidgin.pidgin' (head aacaa228480c4129f2a8b1ef2a70285027b542c0)cpw.qulogic.cairo

            to branch 'im.pidgin.cpw.qulogic.cairo' (head ef2d03910e90840774c4b0adb727c1302ae3ae77)

346 files changed, 45770 insertions, 22988 deletions

diff --git a/AUTHORS b/AUTHORS
index dccdb13a2d..3ee56b384b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
 Sean Egan - Developer
 Casey Harkins - Developer
+Ivan Komarov - Developer
 Gary 'grim' Kramlich - Developer
 Richard 'rlaager' Laager - Developer
 Sulabh 'sulabh_m' Mahajan - Developer
diff --git a/COPYRIGHT b/COPYRIGHT
index 269c37d94c..602e492739 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -18,6 +18,7 @@ control system to see from where it came and who has modified it.
 Copyright (C) 1998-2009 by the following:
 
 Saleem Abdulrasool
+Jakub Adam
 Dave Ahlswede
 Manuel Amador
 Matt Amato
@@ -65,6 +66,7 @@ Paolo Borelli
 Julien Bossart
 Craig Boston
 Chris Boyle
+Stanislav Brabec
 Derrick J Brashear
 Mauro Sérgio Ferreira Brasil
 Luke Bratch
@@ -74,6 +76,7 @@ Jonathan Brossard
 Jeffery Brown
 Philip Brown
 Dan Bruce
+Guillaume Brunerie
 Norbert Buchmuller
 Johannes Buchner
 Sean Burke
@@ -82,6 +85,7 @@ Trevor Caira
 Andrea Canciani
 Damien Carbery
 Michael Carlson
+Rodrigo Tobar Carrizo
 Keegan Carruthers-Smith
 Ludovico Cavedon
 Steve Cavilia
@@ -260,6 +264,7 @@ Gary Kramlich
 Jan Kratochvil
 Andrej Krivul�ík
 Patrik Kullman
+Sangeeta Kumari
 Tuomas Kuosmanen
 Tero Kuusela
 Richard Laager
@@ -330,6 +335,7 @@ Benjamin Moody
 John Moody
 Tim Mooney
 Sergio Moretto
+Keith Moyer
 Andrei Mozzhuhin
 Christian Muise
 MXit Lifestyle (Pty) Ltd.
diff --git a/ChangeLog b/ChangeLog
index d194906a96..32888f5f0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,140 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.4 (MM/DD/YYYY):
+version 2.7.6 (??/??/????):
+	MSN:
+	* Added support for MSNP16, including Multiple Points of Presence (MPOP)
+	  which allows multiple simultaneous sign-ins.
+	* Added extended capabilities support (none implemented).
+	* Merged the work done on the Google SoC (major rewrite of SLP code)
+	* Reworked the data transfer architecture.
+	  (http://developer.pidgin.im/wiki/SlpArchitecture)
+	* Lots of little changes.
+
+	XMPP:
+	* Avoid a double-free in the Google Relay (V/V) code.
+	* Avoid double error message when failing a file transfer. (#12757)
+
+version 2.7.5 (10/31/2010):
+	General:
+	* Added Verisign Class 3 Public CA - G2 root CA.
+
+	Pidgin:
+	* Properly differentiate between bn and bn_IN in the Translation
+	  Information dialog.
+
+	AIM and/or ICQ:
+	* Display the "Authorize buddy?" minidialog when the requestor has an
+	  empty nickname. (#12810)
+	* New ICQ accounts default to proper ICQ servers.  Old accounts using one
+	  of the old default servers will be silently migrated to use the proper
+	  servers.
+	* ICQ accounts using clientLogin now use the correct ICQ servers.  This is
+	  separate from the server settings mentioned above.
+	* '<' should no longer cause ICQ status messages to be truncated in some
+	  locations. (#11964, #12593)
+	* Fix sending messages to chat rooms. (#12768)
+
+	Bonjour:
+	* Don't crash when attempting to log into a Bonjour account and init
+	  failed.
+
+	Windows-Specific Changes:
+	* Quote the path stored in the registry when the "run at startup" option
+	  in the Windows Pidgin Options plugin is used. (#12781)
+
+version 2.7.4 (10/20/2010):
 	General:
 	* Fix search path for Tk when compiling on Debian Squeeze. (#12465)
+	* purple-remote now expects and produces UTF-8. (Guillaume Brunerie)
+	  (#12049)
+	* Add Deutsche Telekom, Thawte Primary, and Go Daddy Class 2 root CAs
+	  (#12667, #12668, and #12594)
+	* Fix CVE-2010-3711 by properly validating return values from the
+	  purple_base64_decode() function before using them.
+	* Fix two local crash bugs by properly validating return values from the
+	  purple_base16_decode() function before using them.
+
+	libpurple:
+	* Fall back to an ordinary request if a UI does not support showing a
+	  request with an icon.  Fixes receiving MSN file transfer requests
+	  including a thumbnail in Finch. (#12561)
+	* Fix an invalid memory access when removing UPnP mappings that could
+	  cause sporadic crashes, most notably when MSN Direct Connections are
+	  enabled. (#12387)
+	* Add a sentence to the certificate warning for expired certificates
+	  suggesting the user check their computer's date and time. (#12654)
+
+	Pidgin:
+	* Add support for the Gadu-Gadu protocol in the gevolution plugin to
+	  provide Evolution integration with contacts with GG IDs. (#10709)
+	* Remap the "Set User Mood" shortcut to Control-D, which does not
+	  conflict with the previous shortcut for Get Buddy Info on the
+	  selected buddy.
+	* Add a plugin action menu (under Tools) for the Voice and Video
+	  Settings plugin.
+	* Use GRegex for the debug window where available. This brings regex
+	  filtering to the debug window on Windows. (Eion Robb) (#12601)
+	* Add Google Chrome to the list of possible browsers on non-Windows
+	  systems.
+	* Add Chromium to the list of possible browsers on non-Windows systems.
+	* The "Manual" browser option is now stored as a string.  It is no
+	  longer necessary to specify a full path to the browser command.
+	  (Rodrigo Tobar Carrizo) (#12024)
+	* The Send To menu can now be used if the active account in the
+	  conversation becomes disabled or inactive. (Keith Moyer) (#12471)
+	* xdg-open is now the default browser for new users on non-Windows
+	  platforms. (Stanislav Brabec) (#12505)
+	* The "Authorize buddy?" mini-dialog now shows the nickname of
+	  the buddy requesting authorization as well as the icon of
+	  the IM protocol he is using. (#5038)
+
+	Finch:
+	* Add support for drop-down account options (like the SILC cipher
+	  and HMAC options or the QQ protocol version).
+
+	XMPP:
+	* Unify the connection security-related settings into one dropdown.
+	* Fix a crash when multiple accounts are simultaneously performing
+	  SASL authentication when built with Cyrus SASL support.  (thanks
+	  to Jan Kaluza) (#11560)
+	* Restore the ability to connect to XMPP servers that do not offer
+	  Stream ID. (#12331)
+	* Added support for using Google's relay servers when making voice and
+	  video calls to Google clients.
+	* Fix detecting file transfer proxies advertised by the server.
+	* Advertise support for Google Talk's JID Domain Discovery extension
+	  in all cases again (changed in 2.7.0), not just when the domain
+	  is "gmail.com" or "googlemail.com" (it's also needed for Google
+	  Talk used for accounts on arbitrary domains not using Google Apps
+	  for Your Domain). (#a14153)
+	* Improved handling of adding oneself to your buddy list when using
+	  Non-SASL (legacy) authentication. (#12499)
+	* Generate a connection error instead of just stalling when the
+	  _xmppconnect TXT record returns results, but none of them result
+	  in a valid BOSH URI. (#a14367, #12744)
+
+	AIM and ICQ:
+	* Add support for managing Visible/Invisible lists. (#10967)
+	* Fix a problem with receiving HTML messages from
+	  QIP/Miranda/Trillian. (#12044)
+	* Hopefully fixed all encoding-related problems, both
+	  for sending and receiving messages. (#10833 and the like)
+	* Fix a problem with receiving messages from pyicqt. (#12284)
+	* Don't set a custom status text when going Invisible to avoid
+	  being detected as Invisible. (#10633)
+
+	Yahoo/Yahoo JAPAN:
+	* Stop doing unnecessary lookups of certain alias information.  This
+	  solves deadlocks when a given Yahoo account has a ridiculously large
+	  (>500 buddies) list and may improve login speed for those on slow
+	  connections. (#12532)
+	* Fix sending SMS messages.  The lookup host changed on us.  (Thanks to
+	  todo) (#12688).
+	* Improvements for some file transfer scenarios, but not all.
+
+	Windows:
+	* Bonjour support now requires Apple Bonjour Print Services version
+	  2.0.0 or newer (http://support.apple.com/kb/dl999).
 
 version 2.7.3 (08/10/2010):
 	General:
diff --git a/ChangeLog.API b/ChangeLog.API
index a6ca13ce38..a03e5376d4 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,6 +1,19 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.4 (MM/DD/YYYY):
+version 2.7.6 (??/??/????):
+
+version 2.7.5 (10/31/2010):
+	* No changes
+
+version 2.7.4 (10/20/2010):
+	Perl:
+		Added:
+		* Purple::BuddyList::Chat::get_components
+
+		Changed:
+		* Purple::BuddyList::Chat::new now works properly.  Thanks
+		  to Rafael in devel@conference.pidgin.im for reporting and
+		  testing.
 
 version 2.7.3 (08/10/2010):
 	libpurple:
diff --git a/NEWS b/NEWS
index a31cbcb3dc..5a4fc9c62d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,26 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.7.6 (??/??/????):
+	Jorge: In this release I have merged two branches where I have spent
+	most of my time in the last months, the MSNP16 and SLP-rewrite.  I 
+	hope you all will enjoy the hability to be connected on multiple
+	instances at the same time. I also hope that the SLP rewrite
+	fix a lot of old bugs that we have in the tracker. I am really 
+	happy with this rewrite because there was untoched code from almost
+	5 years ago. I hope you like this release!
+
+2.7.5 (10/31/2010):
+	John: A bugfix release for all of you!  This time we fixed a bunch of
+	bugs ranging from annoying regressions to long-standing bugs we didn't
+	realize until now were bugs.  Enjoy!
+
+2.7.4 (10/20/2010):
+	John: This release came at this particular time due to some security
+	issues Daniel discovered for us when investigating a bug.  There are
+	a ton of other changes, including some partial Yahoo file transfer
+	fixes and a bunch of other little things.  Enjoy!
+
 2.7.3 (08/10/2010):
 	Mark: Lots of little incremental[1] bug fixes and enhancements in this
 	release.
diff --git a/configure.ac b/configure.ac
index 76187238a6..6c52b2ab37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_PREREQ([2.50])
 m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
-m4_define([purple_micro_version], [4])
+m4_define([purple_micro_version], [6])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@ m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suf
 m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [8])
-m4_define([gnt_micro_version], [1])
+m4_define([gnt_micro_version], [3])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -299,7 +299,7 @@ if test x$enable_i18n = xyes; then
 		;;
 	esac
 
-	ALL_LINGUAS="af am ar az be@latin bg bn bn_IN bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+	ALL_LINGUAS="af am ar az be@latin bg bn bn_IN bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mai mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
 	AM_GLIB_GNU_GETTEXT
 
 	dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
index 81c7fea28a..90a3af0872 100644
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -624,6 +624,8 @@ Pidgin's active developers are:
 .br
   Casey Harkins (developer)
 .br
+  Ivan Komarov
+.br
   Gary 'grim' Kramlich (developer)
 .br
   Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR>
@@ -662,8 +664,6 @@ Pidgin's active developers are:
 
 Our crazy patch writers include:
 .br
-  Paul Aurich
-.br
   Marcus 'malu' Lundblad
 .br
   Dennis 'EvilDennisR' Ristuccia
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
index 4f94cfa6e6..fd4913f00d 100644
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -236,7 +236,8 @@ save_account_cb(AccountEditDialog *dialog)
 			}
 			else if (type == PURPLE_PREF_STRING_LIST)
 			{
-				/* TODO: */
+				gchar *value = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(entry));
+				purple_account_set_string(account, setting, value);
 			}
 			else
 			{
@@ -430,8 +431,26 @@ add_protocol_options(AccountEditDialog *dialog)
 
 			if (type == PURPLE_PREF_STRING_LIST)
 			{
-				/* TODO: Use a combobox */
-				/*       Don't forget to append the widget to prpl_entries */
+				GntWidget *combo = gnt_combo_box_new();
+				GList *opt_iter = purple_account_option_get_list(option);
+				const char *dv = purple_account_option_get_default_list_value(option);
+				const char *active = dv;
+
+				if (account)
+					active = purple_account_get_string(account,
+						purple_account_option_get_setting(option), dv);
+
+				gnt_box_add_widget(GNT_BOX(box), combo);
+				dialog->prpl_entries = g_list_append(dialog->prpl_entries, combo);
+
+				for ( ; opt_iter; opt_iter = opt_iter->next)
+				{
+					PurpleKeyValuePair *kvp = opt_iter->data;
+					gnt_combo_box_add_data(GNT_COMBO_BOX(combo), kvp->value, kvp->key);
+
+					if (g_str_equal(kvp->value, active))
+						gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), kvp->value);
+				}
 			}
 			else
 			{
diff --git a/finch/gntft.c b/finch/gntft.c
index b54714520f..a587a491c6 100644
--- a/finch/gntft.c
+++ b/finch/gntft.c
@@ -383,12 +383,10 @@ finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer)
 		return;
 	}
 
-	data = FINCHXFER(xfer);
-
 	update_title_progress();
 
 	if (purple_xfer_is_canceled(xfer))
-		status = _("Canceled");
+		status = _("Cancelled");
 	else
 		status = _("Failed");
 
@@ -402,7 +400,7 @@ finch_xfer_dialog_update_xfer(PurpleXfer *xfer)
 	char *size_str, *remaining_str;
 	time_t current_time;
 	char prog_str[5];
-	double kb_sent, kb_rem;
+	double kb_sent;
 	double kbps = 0.0;
 	time_t elapsed, now;
 	char *kbsec;
@@ -412,7 +410,6 @@ finch_xfer_dialog_update_xfer(PurpleXfer *xfer)
 		now = time(NULL);
 
 	kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0;
-	kb_rem  = purple_xfer_get_bytes_remaining(xfer) / 1024.0;
 	elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0);
 	kbps    = (elapsed > 0 ? (kb_sent / elapsed) : 0);
 
diff --git a/finch/gntft.h b/finch/gntft.h
index 50cb8562b4..75e69d0bba 100644
--- a/finch/gntft.h
+++ b/finch/gntft.h
@@ -72,9 +72,9 @@ void finch_xfer_dialog_add_xfer(PurpleXfer *xfer);
 void finch_xfer_dialog_remove_xfer(PurpleXfer *xfer);
 
 /**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
  *
- * @param xfer   The file transfer that was canceled.
+ * @param xfer   The file transfer that was cancelled.
  */
 void finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer);
 
diff --git a/finch/libgnt/gntentry.c b/finch/libgnt/gntentry.c
index 767a5fb951..29db9a61c2 100644
--- a/finch/libgnt/gntentry.c
+++ b/finch/libgnt/gntentry.c
@@ -481,7 +481,6 @@ history_search(GntBindable *bind, GList *null)
 	GntEntry *entry = GNT_ENTRY(bind);
 	GList *iter;
 	const char *current;
-	int len;
 	
 	if (entry->history->prev && entry->search->needle)
 		current = entry->search->needle;
@@ -491,8 +490,6 @@ history_search(GntBindable *bind, GList *null)
 	if (!entry->histlength || !entry->history->next || !*current)
 		return FALSE;
 
-	len = g_utf8_strlen(current, -1);
-
 	for (iter = entry->history->next; iter; iter = iter->next) {
 		const char *str = iter->data;
 		/* A more utf8-friendly version of strstr would have been better, but
diff --git a/libpurple/account.c b/libpurple/account.c
index d69326f2de..7b717780b6 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -508,8 +508,46 @@ migrate_yahoo_japan(PurpleAccount *account)
 		purple_account_remove_setting(account, "xferjp_host");
 
 	}
+}
+
+static void
+migrate_icq_server(PurpleAccount *account)
+{
+	/* Migrate the login server setting for ICQ accounts.  See
+	 * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+	 * for details on the change. */
+
+	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+		const char *tmp = purple_account_get_string(account, "server", NULL);
+
+		/* Non-secure server */
+		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+				purple_strequal(tmp, "login.oscar.aol.com"))
+			purple_account_set_string(account, "server", "login.icq.com");
+
+		/* Secure server */
+		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+			purple_account_set_string(account, "server", "slogin.icq.com");
+	}
+}
+
+static void
+migrate_xmpp_encryption(PurpleAccount *account)
+{
+	/* When this is removed, nuke the "old_ssl" and "require_tls" settings */
+	if (g_str_equal(purple_account_get_protocol_id(account), "prpl-jabber")) {
+		const char *sec = purple_account_get_string(account, "connection_security", "");
 
-	return;
+		if (g_str_equal("", sec)) {
+			const char *val = "require_tls";
+			if (purple_account_get_bool(account, "old_ssl", FALSE))
+				val = "old_ssl";
+			else if (!purple_account_get_bool(account, "require_tls", TRUE))
+				val = "opportunistic_tls";
+
+			purple_account_set_string(account, "connection_security", val);
+		}
+	}
 }
 
 static void
@@ -579,6 +617,12 @@ parse_settings(xmlnode *node, PurpleAccount *account)
 	/* we do this here because we need access to account settings to determine
 	 * if we can/should migrate an old Yahoo! JAPAN account */
 	migrate_yahoo_japan(account);
+	/* we do this here because we need access to account settings to determine
+	 * if we can/should migrate an ICQ account's server setting */
+	migrate_icq_server(account);
+	/* we do this here because we need to do it before the user views the
+	 * Edit Account dialog. */
+	migrate_xmpp_encryption(account);
 }
 
 static GList *
@@ -1129,7 +1173,7 @@ request_password_ok_cb(PurpleAccount *account, PurpleRequestFields *fields)
 static void
 request_password_cancel_cb(PurpleAccount *account, PurpleRequestFields *fields)
 {
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
diff --git a/libpurple/certificate.c b/libpurple/certificate.c
index ff6337bd93..3169ee5963 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -104,7 +104,8 @@ invalidity_reason_to_string(PurpleCertificateInvalidityFlags flag)
 			break;
 		case PURPLE_CERTIFICATE_EXPIRED:
 			return _("The certificate has expired and should not be "
-			         "considered valid.");
+			         "considered valid.  Check that your computer's date "
+			         "and time are accurate.");
 			break;
 		case PURPLE_CERTIFICATE_NAME_MISMATCH:
 			/* Translators: "domain" refers to a DNS domain (e.g. talk.google.com) */
diff --git a/libpurple/connection.c b/libpurple/connection.c
index 5f7e52c240..9e0055fb17 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -135,7 +135,7 @@ _purple_connection_new(PurpleAccount *account, gboolean regist, const char *pass
 			!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
 			!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
 		{
-			purple_debug_error("connection", "Can not connect to account %s without "
+			purple_debug_error("connection", "Cannot connect to account %s without "
 							 "a password.\n", purple_account_get_username(account));
 			return;
 		}
@@ -210,7 +210,7 @@ _purple_connection_new_unregister(PurpleAccount *account, const char *password,
 		!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
 		!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
 	{
-		purple_debug_error("connection", "Can not connect to account %s without "
+		purple_debug_error("connection", "Cannot connect to account %s without "
 						   "a password.\n", purple_account_get_username(account));
 		return;
 	}
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
index 3292abb9e4..291b9e156e 100644
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -1124,7 +1124,6 @@ void
 purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout)
 {
 	PurpleConversation *conv;
-	const char *name;
 
 	g_return_if_fail(im != NULL);
 
@@ -1132,7 +1131,6 @@ purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout)
 		purple_conv_im_stop_typing_timeout(im);
 
 	conv = purple_conv_im_get_conversation(im);
-	name = purple_conversation_get_name(conv);
 
 	im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv);
 }
@@ -1520,7 +1518,6 @@ purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *messag
 	PurpleAccount *account;
 	PurpleConversation *conv;
 	PurpleConnection *gc;
-	PurplePluginProtocolInfo *prpl_info;
 
 	g_return_if_fail(chat != NULL);
 	g_return_if_fail(who != NULL);
@@ -1529,7 +1526,6 @@ purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *messag
 	conv      = purple_conv_chat_get_conversation(chat);
 	gc        = purple_conversation_get_gc(conv);
 	account   = purple_connection_get_account(gc);
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
 
 	/* Don't display this if the person who wrote it is ignored. */
 	if (purple_conv_chat_is_user_ignored(chat, who))
diff --git a/libpurple/desktopitem.c b/libpurple/desktopitem.c
index df0a5b5920..d7f6d39d2d 100644
--- a/libpurple/desktopitem.c
+++ b/libpurple/desktopitem.c
@@ -330,7 +330,7 @@ my_fgets (char *buf, gsize bufsize, FILE *df)
 	if (c == EOF && pos == 0)
 		return NULL;
 
-	buf[pos++] = '\0';
+	buf[pos] = '\0';
 
 	return buf;
 }
diff --git a/libpurple/dnssrv.c b/libpurple/dnssrv.c
index 1e011c0fc4..2b70ba3841 100644
--- a/libpurple/dnssrv.c
+++ b/libpurple/dnssrv.c
@@ -534,7 +534,7 @@ res_main_thread_cb(gpointer data)
 	PurpleSrvResponse *srvres = NULL;
 	PurpleSrvQueryData *query_data = data;
 	if(query_data->error_message != NULL) {
-		purple_debug_error("dnssrv", query_data->error_message);
+		purple_debug_error("dnssrv", "%s", query_data->error_message);
 		if (query_data->type == DNS_TYPE_SRV) {
 			if (query_data->cb.srv)
 				query_data->cb.srv(srvres, 0, query_data->extradata);
diff --git a/libpurple/ft.c b/libpurple/ft.c
index 3828b464a6..eed2a81b79 100644
--- a/libpurple/ft.c
+++ b/libpurple/ft.c
@@ -752,6 +752,7 @@ purple_xfer_get_status(const PurpleXfer *xfer)
 	return xfer->status;
 }
 
+/* FIXME: Rename with cancelled for 3.0.0. */
 gboolean
 purple_xfer_is_canceled(const PurpleXfer *xfer)
 {
@@ -1290,6 +1291,11 @@ begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 	PurpleXferType type = purple_xfer_get_type(xfer);
 	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);
 
+	if (xfer->start_time != 0) {
+		purple_debug_error("xfer", "Transfer is being started multiple times\n");
+		g_return_if_reached();
+	}
+
 	if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
 		xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
 		                        type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
diff --git a/libpurple/ft.h b/libpurple/ft.h
index fc1209b199..216eda78a6 100644
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -58,8 +58,8 @@ typedef enum
 	PURPLE_XFER_STATUS_ACCEPTED,      /**< Receive accepted, but destination file not selected yet */
 	PURPLE_XFER_STATUS_STARTED,       /**< purple_xfer_start has been called. */
 	PURPLE_XFER_STATUS_DONE,          /**< The xfer completed successfully. */
-	PURPLE_XFER_STATUS_CANCEL_LOCAL,  /**< The xfer was canceled by us. */
-	PURPLE_XFER_STATUS_CANCEL_REMOTE  /**< The xfer was canceled by the other end, or we couldn't connect. */
+	PURPLE_XFER_STATUS_CANCEL_LOCAL,  /**< The xfer was cancelled by us. */
+	PURPLE_XFER_STATUS_CANCEL_REMOTE  /**< The xfer was cancelled by the other end, or we couldn't connect. */
 } PurpleXferStatusType;
 
 /**
@@ -304,11 +304,12 @@ const char *purple_xfer_get_remote_user(const PurpleXfer *xfer);
 PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer);
 
 /**
- * Returns true if the file transfer was canceled.
+ * Returns true if the file transfer was cancelled.
  *
  * @param xfer The file transfer.
  *
- * @return Whether or not the transfer was canceled.
+ * @return Whether or not the transfer was cancelled.
+ * FIXME: This should be renamed using cancelled for 3.0.0.
  */
 gboolean purple_xfer_is_canceled(const PurpleXfer *xfer);
 
diff --git a/libpurple/media.c b/libpurple/media.c
index 0bf35ca310..8234a89982 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -515,7 +515,8 @@ purple_media_add_session(PurpleMedia *media, PurpleMediaSession *session)
 
 	if (!media->priv->sessions) {
 		purple_debug_info("media", "Creating hash table for sessions\n");
-		media->priv->sessions = g_hash_table_new(g_str_hash, g_str_equal);
+		media->priv->sessions = g_hash_table_new_full(g_str_hash, g_str_equal,
+		                                              g_free, NULL);
 	}
 	g_hash_table_insert(media->priv->sessions, g_strdup(session->id), session);
 }
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index 477c81df12..6b0b3e99b3 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -208,11 +208,7 @@ purple_media_backend_fs2_dispose(GObject *obj)
 	}
 
 	if (priv->participants) {
-		GList *participants =
-				g_hash_table_get_values(priv->participants);
-		for (; participants; participants = g_list_delete_link(
-				participants, participants))
-			g_object_unref(participants->data);
+		g_hash_table_destroy(priv->participants);
 		priv->participants = NULL;
 	}
 
@@ -1425,7 +1421,8 @@ create_session(PurpleMediaBackendFs2 *self, const gchar *sess_id,
 	if (!priv->sessions) {
 		purple_debug_info("backend-fs2",
 				"Creating hash table for sessions\n");
-		priv->sessions = g_hash_table_new(g_str_hash, g_str_equal);
+		priv->sessions = g_hash_table_new_full(g_str_hash, g_str_equal,
+		                                       g_free, NULL);
 	}
 
 	g_hash_table_insert(priv->sessions, g_strdup(session->id), session);
@@ -1461,7 +1458,7 @@ create_participant(PurpleMediaBackendFs2 *self, const gchar *name)
 		purple_debug_info("backend-fs2",
 				"Creating hash table for participants\n");
 		priv->participants = g_hash_table_new_full(g_str_hash,
-				g_str_equal, g_free, NULL);
+				g_str_equal, g_free, g_object_unref);
 	}
 
 	g_hash_table_insert(priv->participants, g_strdup(name), participant);
@@ -1564,6 +1561,30 @@ src_pad_added_cb(FsStream *fsstream, GstPad *srcpad,
 			(GSourceFunc)src_pad_added_cb_cb, stream);
 }
 
+static GValueArray *
+append_relay_info(GValueArray *relay_info, const gchar *ip, gint port,
+	const gchar *username, const gchar *password, const gchar *type)
+{
+	GValue value;
+	GstStructure *turn_setup = gst_structure_new("relay-info",
+				"ip", G_TYPE_STRING, ip, 
+				"port", G_TYPE_UINT, port,
+				"username", G_TYPE_STRING, username,
+				"password", G_TYPE_STRING, password,
+	            "relay-type", G_TYPE_STRING, type,
+				NULL);
+
+	if (turn_setup) {
+		memset(&value, 0, sizeof(GValue));
+		g_value_init(&value, GST_TYPE_STRUCTURE);
+		gst_value_set_structure(&value, turn_setup);
+		relay_info = g_value_array_append(relay_info, &value);
+		gst_structure_free(turn_setup);
+	}
+
+	return relay_info;
+}
+                        
 static gboolean
 create_stream(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who,
@@ -1584,6 +1605,18 @@ create_stream(PurpleMediaBackendFs2 *self,
 	PurpleMediaBackendFs2Session *session;
 	PurpleMediaBackendFs2Stream *stream;
 	FsParticipant *participant;
+	/* check if the prpl has already specified a relay-info
+	  we need to do this to allow them to override when using non-standard
+	  TURN modes, like Google f.ex. */
+	gboolean got_turn_from_prpl = FALSE;
+	int i;
+
+	for (i = 0 ; i < num_params ; i++) {
+		if (purple_strequal(params[i].name, "relay-info")) {
+			got_turn_from_prpl = TRUE;
+			break;
+		}
+	}
 
 	memcpy(_params, params, sizeof(GParameter) * num_params);
 
@@ -1603,34 +1636,24 @@ create_stream(PurpleMediaBackendFs2 *self,
 		++_num_params;
 	}
 
-	if (turn_ip && !strcmp("nice", transmitter)) {
+	if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) {
 		GValueArray *relay_info = g_value_array_new(0);
-		GValue value;
-		gint turn_port = purple_prefs_get_int(
-				"/purple/network/turn_port");
+		gint port;
 		const gchar *username =	purple_prefs_get_string(
 				"/purple/network/turn_username");
 		const gchar *password = purple_prefs_get_string(
 				"/purple/network/turn_password");
-		GstStructure *turn_setup = gst_structure_new("relay-info",
-				"ip", G_TYPE_STRING, turn_ip, 
-				"port", G_TYPE_UINT, turn_port,
-				"username", G_TYPE_STRING, username,
-				"password", G_TYPE_STRING, password,
-				NULL);
 
-		if (!turn_setup) {
-			purple_debug_error("backend-fs2",
-					"Error creating relay info structure");
-			return FALSE;
+		/* UDP */
+		port = purple_prefs_get_int("/purple/network/turn_port");
+		if (port > 0) {
+			relay_info = append_relay_info(relay_info, turn_ip, port, username,
+				password, "udp");
 		}
 
-		memset(&value, 0, sizeof(GValue));
-		g_value_init(&value, GST_TYPE_STRUCTURE);
-		gst_value_set_structure(&value, turn_setup);
-		relay_info = g_value_array_append(relay_info, &value);
-		gst_structure_free(turn_setup);
-
+		/* should add TCP and perhaps TLS relaying options when these are
+		 supported by libnice using non-google mode */
+		
 		purple_debug_info("backend-fs2",
 			"Setting relay-info on new stream\n");
 		_params[_num_params].name = "relay-info";
@@ -1837,15 +1860,12 @@ static GList *
 purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self,
 		const gchar *sess_id)
 {
-	PurpleMediaBackendFs2Private *priv;
 	PurpleMediaBackendFs2Session *session;
 	GList *fscodecs;
 	GList *codecs;
 
 	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
 
-	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
-
 	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
 
 	if (session == NULL)
@@ -2014,13 +2034,10 @@ purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who, double level)
 {
 #ifdef USE_VV
-	PurpleMediaBackendFs2Private *priv;
 	GList *streams;
 
 	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
 
-	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
-
 	purple_prefs_set_int("/purple/media/audio/volume/output", level);
 
 	streams = get_streams(self, sess_id, who);
diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c
index 532f11d3dd..9eb68eca62 100644
--- a/libpurple/media/codec.c
+++ b/libpurple/media/codec.c
@@ -83,9 +83,11 @@ purple_media_codec_finalize(GObject *info)
 			PURPLE_MEDIA_CODEC_GET_PRIVATE(info);
 	g_free(priv->encoding_name);
 	for (; priv->optional_params; priv->optional_params =
-			g_list_delete_link(priv->optional_params,
-			priv->optional_params)) {
-		g_free(priv->optional_params->data);
+			g_list_delete_link(priv->optional_params, priv->optional_params)) {
+		PurpleKeyValuePair *param = priv->optional_params->data;
+		g_free(param->key);
+		g_free(param->value);
+		g_free(param);
 	}
 }
 
@@ -302,10 +304,10 @@ purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
 
 	g_free(param->key);
 	g_free(param->value);
-	g_free(param);
 
 	priv->optional_params =
 			g_list_remove(priv->optional_params, param);
+	g_free(param);
 }
 
 PurpleKeyValuePair *
diff --git a/libpurple/media/codec.h b/libpurple/media/codec.h
index 771bb62d22..9262698c49 100644
--- a/libpurple/media/codec.h
+++ b/libpurple/media/codec.h
@@ -121,7 +121,8 @@ guint purple_media_codec_get_channels(PurpleMediaCodec *codec);
  *
  * @param The codec to get the optional parameters from.
  *
- * @return The list of optional parameters.
+ * @return The list of optional parameters. The list is owned by the codec and
+ *         should not be freed.
  *
  * @since 2.6.0
  */
diff --git a/libpurple/network.c b/libpurple/network.c
index 0ceff6509f..ee1458f7ea 100644
--- a/libpurple/network.c
+++ b/libpurple/network.c
@@ -693,7 +693,7 @@ static gboolean wpurple_network_change_thread_cb(gpointer data)
 
 static gboolean _print_debug_msg(gpointer data) {
 	gchar *msg = data;
-	purple_debug_warning("network", msg);
+	purple_debug_warning("network", "%s", msg);
 	g_free(msg);
 	return FALSE;
 }
@@ -1077,12 +1077,10 @@ purple_network_remove_port_mapping(gint fd)
 
 	if (protocol) {
 		purple_network_upnp_mapping_remove(&port, protocol, NULL);
-		g_hash_table_remove(upnp_port_mappings, protocol);
 	} else {
 		protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port);
 		if (protocol) {
 			purple_network_nat_pmp_mapping_remove(&port, protocol, NULL);
-			g_hash_table_remove(nat_pmp_port_mappings, protocol);
 		}
 	}
 }
diff --git a/libpurple/network.h b/libpurple/network.h
index 942ebd5fa4..f836d88520 100644
--- a/libpurple/network.h
+++ b/libpurple/network.h
@@ -239,7 +239,7 @@ PurpleNetworkListenData *purple_network_listen_range_family(
  * by passing in the return value from either purple_network_listen()
  * or purple_network_listen_range().
  *
- * @param listen_data This listener attempt will be canceled and
+ * @param listen_data This listener attempt will be cancelled and
  *        the struct will be freed.
  */
 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data);
diff --git a/libpurple/ntlm.c b/libpurple/ntlm.c
index 0610a81354..2453b49b46 100644
--- a/libpurple/ntlm.c
+++ b/libpurple/ntlm.c
@@ -152,9 +152,14 @@ purple_ntlm_parse_type2(const gchar *type2, guint32 *flags)
 	static guint8 nonce[8];
 
 	tmsg = (struct type2_message*)purple_base64_decode(type2, &retlen);
-	memcpy(nonce, tmsg->nonce, 8);
-	if (flags != NULL)
-		*flags = GUINT16_FROM_LE(tmsg->flags);
+	if (tmsg != NULL && retlen >= (sizeof(struct type2_message) - 1)) {
+		memcpy(nonce, tmsg->nonce, 8);
+		if (flags != NULL)
+			*flags = GUINT16_FROM_LE(tmsg->flags);
+	} else {
+		purple_debug_error("ntlm", "Unable to parse type2 message - returning empty nonce.\n");
+		memset(nonce, 0, 8);
+	}
 	g_free(tmsg);
 
 	return nonce;
diff --git a/libpurple/plugins/idle.c b/libpurple/plugins/idle.c
index 8d3c72e9ca..5d6cf72131 100644
--- a/libpurple/plugins/idle.c
+++ b/libpurple/plugins/idle.c
@@ -104,15 +104,11 @@ idle_all_action_ok(void *ignored, PurpleRequestFields *fields)
 	PurpleAccount *acct = NULL;
 	GList *list, *iter;
 	int tm = purple_request_fields_get_integer(fields, "mins");
-	const char *prpl_id = NULL;
 
 	list = purple_accounts_get_all_active();
 	for(iter = list; iter; iter = iter->next) {
 		acct = (PurpleAccount *)(iter->data);
 
-		if(acct)
-			prpl_id = purple_account_get_protocol_id(acct);
-
 		if(acct && idleable_filter(acct)) {
 			purple_debug_misc("idle", "Idling %s.\n",
 					purple_account_get_username(acct));
diff --git a/libpurple/plugins/perl/common/BuddyList.xs b/libpurple/plugins/perl/common/BuddyList.xs
index 0f68d872a7..65f10184f0 100644
--- a/libpurple/plugins/perl/common/BuddyList.xs
+++ b/libpurple/plugins/perl/common/BuddyList.xs
@@ -2,6 +2,13 @@
 #include "module.h"
 #include "../perl-handlers.h"
 
+static void
+chat_components_foreach(gpointer key, gpointer value, gpointer user_data)
+{
+	HV *hv = user_data;
+	hv_store(hv, key, strlen(key), newSVpv(value, 0), 0);
+}
+
 MODULE = Purple::BuddyList  PACKAGE = Purple  PREFIX = purple_
 PROTOTYPES: ENABLE
 
@@ -331,6 +338,19 @@ const char *
 purple_chat_get_name(chat)
 	Purple::BuddyList::Chat chat
 
+HV *
+purple_chat_get_components(chat)
+	Purple::BuddyList::Chat chat
+INIT:
+	HV * t_HV;
+	GHashTable * t_GHash;
+CODE:
+	t_GHash = purple_chat_get_components(chat);
+	RETVAL = t_HV = newHV();
+	g_hash_table_foreach(t_GHash, chat_components_foreach, t_HV);
+OUTPUT:
+	RETVAL
+
 Purple::BuddyList::Chat
 purple_chat_new(account, alias, components)
 	Purple::Account account
@@ -345,14 +365,14 @@ INIT:
 	char *t_key, *t_value;
 CODE:
 	t_HV =  (HV *)SvRV(components);
-	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
+	t_GHash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
 	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
 		t_key = hv_iterkey(t_HE, &len);
 		t_SV = *hv_fetch(t_HV, t_key, len, 0);
 		t_value = SvPVutf8_nolen(t_SV);
 
-		g_hash_table_insert(t_GHash, t_key, t_value);
+		g_hash_table_insert(t_GHash, g_strdup(t_key), g_strdup(t_value));
 	}
 
 	RETVAL = purple_chat_new(account, alias, t_GHash);
diff --git a/libpurple/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs
index 4fe496f746..13e2aefcbf 100644
--- a/libpurple/plugins/perl/common/Server.xs
+++ b/libpurple/plugins/perl/common/Server.xs
@@ -144,6 +144,7 @@ CODE:
 		g_hash_table_insert(t_GHash, t_key, t_value);
 	}
 	serv_join_chat(conn, t_GHash);
+	g_hash_table_destroy(t_GHash);
 
 void 
 serv_move_buddy(buddy, group1, group2)
diff --git a/libpurple/plugins/perl/common/Util.xs b/libpurple/plugins/perl/common/Util.xs
index 4ef2fec056..b339cc75af 100644
--- a/libpurple/plugins/perl/common/Util.xs
+++ b/libpurple/plugins/perl/common/Util.xs
@@ -238,7 +238,7 @@ purple_base16_decode(str)
 	guchar *ret;
 	CODE:
 		ret = purple_base16_decode(str, &len);
-		if(len) {
+		if(ret && len > 0) {
 			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
@@ -256,7 +256,7 @@ purple_base64_decode(str)
 	guchar *ret;
 	CODE:
 		ret = purple_base64_decode(str, &len);
-		if(len) {
+		if(ret && len > 0) {
 			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
index 5e64015a4c..2992d4dc15 100644
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -592,12 +592,12 @@ ft_send_start_cb(PurpleXfer *xfer, gpointer data) {
 
 static void
 ft_recv_cancel_cb(PurpleXfer *xfer, gpointer data) {
-	purple_debug_misc("signals test", "file receive canceled\n");
+	purple_debug_misc("signals test", "file receive cancelled\n");
 }
 
 static void
 ft_send_cancel_cb(PurpleXfer *xfer, gpointer data) {
-	purple_debug_misc("signals test", "file send canceled\n");
+	purple_debug_misc("signals test", "file send cancelled\n");
 }
 
 static void
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
index 5ef0c07c08..f02d2d18da 100644
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -506,7 +506,6 @@ pref_full_name(struct purple_pref *pref)
 		return g_strdup("/");
 
 	name = g_string_new(pref->name);
-	parent = pref->parent;
 
 	for(parent = pref->parent; parent && parent->name; parent = parent->parent) {
 		name = g_string_prepend_c(name, '/');
diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index cb5163a82e..b9291be0a4 100644
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -46,7 +46,14 @@
 
 static char *default_firstname;
 static char *default_lastname;
-static char *default_hostname;
+
+const char *
+bonjour_get_jid(PurpleAccount *account)
+{
+	PurpleConnection *conn = purple_account_get_connection(account);
+	BonjourData *bd = conn->proto_data;
+	return bd->jid;
+}
 
 static void
 bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
@@ -182,6 +189,8 @@ bonjour_close(PurpleConnection *connection)
 		purple_xfer_cancel_local(bd->xfer_lists->data);
 	}
 
+	if (bd != NULL)
+		g_free(bd->jid);
 	g_free(bd);
 	connection->proto_data = NULL;
 }
@@ -206,18 +215,12 @@ bonjour_set_status(PurpleAccount *account, PurpleStatus *status)
 {
 	PurpleConnection *gc;
 	BonjourData *bd;
-	gboolean disconnected;
-	PurpleStatusType *type;
-	int primitive;
 	PurplePresence *presence;
 	const char *message, *bonjour_status;
 	gchar *stripped;
 
 	gc = purple_account_get_connection(account);
 	bd = gc->proto_data;
-	disconnected = purple_account_is_disconnected(account);
-	type = purple_status_get_type(status);
-	primitive = purple_status_type_get_primitive(type);
 	presence = purple_account_get_presence(account);
 
 	message = purple_status_get_attr_string(status, "message");
@@ -395,7 +398,8 @@ bonjour_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboole
 		purple_notify_user_info_add_pair(user_info, _("XMPP Account"), bb->jid);
 }
 
-static void bonjour_do_group_change(PurpleBuddy *buddy, const char *new_group) {
+static void
+bonjour_do_group_change(PurpleBuddy *buddy, const char *new_group) {
 	PurpleBlistNodeFlags oldflags;
 
 	if (buddy == NULL)
@@ -451,7 +455,6 @@ plugin_unload(PurplePlugin *plugin)
 
 	g_free(default_firstname);
 	g_free(default_lastname);
-	g_free(default_hostname);
 
 	return TRUE;
 }
@@ -572,7 +575,8 @@ static PurplePluginInfo info =
 };
 
 #ifdef WIN32
-static gboolean _set_default_name_cb(gpointer data) {
+static gboolean
+_set_default_name_cb(gpointer data) {
 	gchar *fullname = data;
 	const char *splitpoint;
 	GList *tmp = prpl_info.protocol_options;
@@ -609,7 +613,8 @@ static gboolean _set_default_name_cb(gpointer data) {
 	return FALSE;
 }
 
-static gpointer _win32_name_lookup_thread(gpointer data) {
+static gpointer
+_win32_name_lookup_thread(gpointer data) {
 	gchar *fullname = NULL;
 	wchar_t username[UNLEN + 1];
 	DWORD dwLenUsername = UNLEN + 1;
@@ -713,24 +718,15 @@ initialize_default_account_values(void)
 	}
 
 	g_free(conv);
-
-	/* Try to figure out a good host name to use */
-	/* TODO: Avoid 'localhost,' if possible */
-	default_hostname = g_strdup(purple_get_host_name());
 }
 
 static void
 init_plugin(PurplePlugin *plugin)
 {
-	PurpleAccountUserSplit *split;
 	PurpleAccountOption *option;
 
 	initialize_default_account_values();
 
-	/* Creating the user splits */
-	split = purple_account_user_split_new(_("Hostname"), default_hostname, '@');
-	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
-
 	/* Creating the options for the protocol */
 	option = purple_account_option_int_new(_("Local Port"), "port", BONJOUR_DEFAULT_PORT);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
diff --git a/libpurple/protocols/bonjour/bonjour.h b/libpurple/protocols/bonjour/bonjour.h
index 88ab647e47..93cdb49083 100644
--- a/libpurple/protocols/bonjour/bonjour.h
+++ b/libpurple/protocols/bonjour/bonjour.h
@@ -45,6 +45,12 @@ typedef struct _BonjourData
 	BonjourDnsSd *dns_sd_data;
 	BonjourJabber *jabber_data;
 	GSList *xfer_lists;
+	gchar *jid;
 } BonjourData;
 
+/**
+ *  This will always be username@machinename
+ */
+const char *bonjour_get_jid(PurpleAccount *account);
+
 #endif /* _BONJOUR_H_ */
diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index d045cc62d6..63e2d16251 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -53,11 +53,12 @@ xep_ft_si_reject(BonjourData *bd, const char *id, const char *to, const char *er
 	g_return_if_fail(error_code != NULL);
 	g_return_if_fail(error_type != NULL);
 
-	if(!to || !id)
+	if(!to || !id) {
+		purple_debug_info("bonjour", "xep file transfer stream initialization error.\n");
 		return;
+	}
 
-	purple_debug_info("bonjour", "xep file transfer stream initialization error.\n");
-	iq = xep_iq_new(bd, XEP_IQ_ERROR, to, purple_account_get_username(bd->jabber_data->account), id);
+	iq = xep_iq_new(bd, XEP_IQ_ERROR, to, bonjour_get_jid(bd->jabber_data->account), id);
 	if(iq == NULL)
 		return;
 
@@ -195,7 +196,7 @@ xep_ft_si_offer(PurpleXfer *xfer, const gchar *to)
 	/* Assign stream id. */
 	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);
+	iq = xep_iq_new(xf->data, XEP_IQ_SET, to, bonjour_get_jid(bd->jabber_data->account), xf->iq_id);
 	if(iq == NULL)
 		return;
 
@@ -255,7 +256,7 @@ xep_ft_si_result(PurpleXfer *xfer, char *to)
 	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->iq_id);
+	iq = xep_iq_new(bd, XEP_IQ_RESULT, to, bonjour_get_jid(bd->jabber_data->account), xf->iq_id);
 	if(iq == NULL)
 		return;
 
@@ -763,7 +764,7 @@ bonjour_bytestreams_listen(int sock, gpointer data)
 
 	bd = xf->data;
 
-	iq = xep_iq_new(bd, XEP_IQ_SET, xfer->who, purple_account_get_username(bd->jabber_data->account), xf->sid);
+	iq = xep_iq_new(bd, XEP_IQ_SET, xfer->who, bonjour_get_jid(bd->jabber_data->account), xf->sid);
 
 	query = xmlnode_new_child(iq->node, "query");
 	xmlnode_set_namespace(query, "http://jabber.org/protocol/bytestreams");
@@ -835,7 +836,7 @@ bonjour_bytestreams_connect_cb(gpointer data, gint source, const gchar *error_me
 	/* Here, start the file transfer.*/
 
 	/* Notify Initiator of Connection */
-	iq = xep_iq_new(bd, XEP_IQ_RESULT, xfer->who, purple_account_get_username(bd->jabber_data->account), xf->iq_id);
+	iq = xep_iq_new(bd, XEP_IQ_RESULT, xfer->who, bonjour_get_jid(bd->jabber_data->account), xf->iq_id);
 	q_node = xmlnode_new_child(iq->node, "query");
 	xmlnode_set_namespace(q_node, "http://jabber.org/protocol/bytestreams");
 	tmp_node = xmlnode_new_child(q_node, "streamhost-used");
@@ -868,7 +869,7 @@ bonjour_bytestreams_connect(PurpleXfer *xfer, PurpleBuddy *pb)
 	name = purple_buddy_get_name(pb);
 	account = purple_buddy_get_account(pb);
 
-	p = g_strdup_printf("%s%s%s", xf->sid, name, purple_account_get_username(account));
+	p = g_strdup_printf("%s%s%s", xf->sid, name, bonjour_get_jid(account));
 	purple_cipher_digest_region("sha1", (guchar *)p, strlen(p),
 				    sizeof(hashval), hashval, NULL);
 	g_free(p);
diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.c b/libpurple/protocols/bonjour/dns_sd_proxy.c
index 7342df7143..f1189063ed 100644
--- a/libpurple/protocols/bonjour/dns_sd_proxy.c
+++ b/libpurple/protocols/bonjour/dns_sd_proxy.c
@@ -1,181 +1,191 @@
-/*

- *

- * Purple is the legal property of its developers, whose names are too numerous

- * to list here.  Please refer to the COPYRIGHT file distributed with this

- * source distribution.

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Library General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.

- */

-

-#include "win32dep.h"

-#include "dns_sd_proxy.h"

-

-#ifndef LINK_DNS_SD_DIRECTLY

-static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,

-		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-	const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);

-static int (DNSSD_API* _DNSServiceConstructFullName)(char *fullName, const char *service, const char *regtype, const char *domain);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceProcessResult)(DNSServiceRef sdRef);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceQueryRecord)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-	const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);

-static void (DNSSD_API* _DNSServiceRefDeallocate)(DNSServiceRef sdRef);

-static int (DNSSD_API* _DNSServiceRefSockFD)(DNSServiceRef sdRef);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceRegister)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-	const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,

-	const void *txtRecord, DNSServiceRegisterReply callBack, void *context);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceResolve)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,

-	const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceRemoveRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceUpdateRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,

-	uint16_t rdlen, const void *rdata, uint32_t ttl);

-static void (DNSSD_API* _TXTRecordCreate)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);

-static void (DNSSD_API* _TXTRecordDeallocate)(TXTRecordRef *txtRecord);

-static const void * (DNSSD_API* _TXTRecordGetBytesPtr)(const TXTRecordRef *txtRecord);

-static int16_t (DNSSD_API* _TXTRecordGetLength)(const TXTRecordRef *txtRecord);

-static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);

-static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);

-#endif

-

-gboolean dns_sd_available(void) {

-#ifndef LINK_DNS_SD_DIRECTLY

-	static gboolean initialized = FALSE;

-	static gboolean loaded = FALSE;

-

-	if (!initialized) {

-		initialized = TRUE;

-		if ((_DNSServiceAddRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceAddRecord"))

-				&& (_DNSServiceBrowse = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceBrowse"))

-				&& (_DNSServiceConstructFullName = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceConstructFullName"))

-				&& (_DNSServiceProcessResult = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceProcessResult"))

-				&& (_DNSServiceQueryRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceQueryRecord"))

-				&& (_DNSServiceRefDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefDeallocate"))

-				&& (_DNSServiceRefSockFD = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefSockFD"))

-				&& (_DNSServiceRegister = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRegister"))

-				&& (_DNSServiceResolve = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceResolve"))

-				&& (_DNSServiceRemoveRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRemoveRecord"))

-				&& (_DNSServiceUpdateRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceUpdateRecord"))

-				&& (_TXTRecordCreate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordCreate"))

-				&& (_TXTRecordDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordDeallocate"))

-				&& (_TXTRecordGetBytesPtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetBytesPtr"))

-				&& (_TXTRecordGetLength = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetLength"))

-				&& (_TXTRecordGetValuePtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetValuePtr"))

-				&& (_TXTRecordSetValue = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordSetValue"))) {

-			loaded = TRUE;

-		}

-	}

-	return loaded;

-#else

-	return TRUE;

-#endif

-}

-

-#ifndef LINK_DNS_SD_DIRECTLY

-

-DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,

-		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {

-	g_return_val_if_fail(_DNSServiceAddRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceAddRecord)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-		const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceBrowse != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceBrowse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);

-}

-

-int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain) {

-	g_return_val_if_fail(_DNSServiceConstructFullName != NULL, 0);

-	return (_DNSServiceConstructFullName)(fullName, service, regtype, domain);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef) {

-	g_return_val_if_fail(_DNSServiceProcessResult != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceProcessResult)(sdRef);

-}

-

-

-DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-		const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceQueryRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceQueryRecord)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context);

-}

-

-void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef) {

-	g_return_if_fail(_DNSServiceRefDeallocate != NULL);

-	(_DNSServiceRefDeallocate)(sdRef);

-}

-

-int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef) {

-	g_return_val_if_fail(_DNSServiceRefSockFD != NULL, -1);

-	return (_DNSServiceRefSockFD)(sdRef);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-		const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,

-		const void *txtRecord, DNSServiceRegisterReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceRegister != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceRegister)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,

-		const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceResolve != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceResolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags) {

-	g_return_val_if_fail(_DNSServiceRemoveRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceRemoveRecord)(sdRef, RecordRef, flags);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,

-		uint16_t rdlen, const void *rdata, uint32_t ttl) {

-	g_return_val_if_fail(_DNSServiceUpdateRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceUpdateRecord)(sdRef, RecordRef, flags, rdlen, rdata, ttl);

-}

-

-void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer) {

-	g_return_if_fail(_TXTRecordCreate != NULL);

-	(_TXTRecordCreate)(txtRecord, bufferLen, buffer);

-}

-

-void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord) {

-	g_return_if_fail(_TXTRecordDeallocate != NULL);

-	(_TXTRecordDeallocate)(txtRecord);

-}

-

-const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) {

-	g_return_val_if_fail(_TXTRecordGetBytesPtr != NULL, NULL);

-	return (_TXTRecordGetBytesPtr)(txtRecord);

-}

-

-uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord) {

-	g_return_val_if_fail(_TXTRecordGetLength != NULL, 0);

-	return (_TXTRecordGetLength)(txtRecord);

-}

-

-const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen) {

-	g_return_val_if_fail(_TXTRecordGetValuePtr != NULL, NULL);

-	return (_TXTRecordGetValuePtr)(txtLen, txtRecord, key, valueLen);

-}

-

-DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value) {

-	g_return_val_if_fail(_TXTRecordSetValue != NULL, kDNSServiceErr_Unknown);

-	return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);

-}

-

-#endif /*LINK_DNS_SD_DIRECTLY*/

-

+/*
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+
+#include "win32dep.h"
+#include "dns_sd_proxy.h"
+
+#ifndef LINK_DNS_SD_DIRECTLY
+static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);
+static int (DNSSD_API* _DNSServiceConstructFullName)(char *fullName, const char *service, const char *regtype, const char *domain);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceGetAddrInfo)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceProcessResult)(DNSServiceRef sdRef);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceQueryRecord)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);
+static void (DNSSD_API* _DNSServiceRefDeallocate)(DNSServiceRef sdRef);
+static int (DNSSD_API* _DNSServiceRefSockFD)(DNSServiceRef sdRef);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceRegister)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+	const void *txtRecord, DNSServiceRegisterReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceResolve)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+	const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceRemoveRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceUpdateRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+	uint16_t rdlen, const void *rdata, uint32_t ttl);
+static void (DNSSD_API* _TXTRecordCreate)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);
+static void (DNSSD_API* _TXTRecordDeallocate)(TXTRecordRef *txtRecord);
+static const void * (DNSSD_API* _TXTRecordGetBytesPtr)(const TXTRecordRef *txtRecord);
+static int16_t (DNSSD_API* _TXTRecordGetLength)(const TXTRecordRef *txtRecord);
+static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
+static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
+
+#endif
+
+gboolean dns_sd_available(void) {
+#ifndef LINK_DNS_SD_DIRECTLY
+	static gboolean initialized = FALSE;
+	static gboolean loaded = FALSE;
+
+	if (!initialized) {
+		initialized = TRUE;
+		if ((_DNSServiceAddRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceAddRecord"))
+				&& (_DNSServiceBrowse = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceBrowse"))
+				&& (_DNSServiceConstructFullName = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceConstructFullName"))
+				&& (_DNSServiceGetAddrInfo = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceGetAddrInfo"))
+				&& (_DNSServiceProcessResult = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceProcessResult"))
+				&& (_DNSServiceQueryRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceQueryRecord"))
+				&& (_DNSServiceRefDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefDeallocate"))
+				&& (_DNSServiceRefSockFD = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefSockFD"))
+				&& (_DNSServiceRegister = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRegister"))
+				&& (_DNSServiceResolve = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceResolve"))
+				&& (_DNSServiceRemoveRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRemoveRecord"))
+				&& (_DNSServiceUpdateRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceUpdateRecord"))
+				&& (_TXTRecordCreate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordCreate"))
+				&& (_TXTRecordDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordDeallocate"))
+				&& (_TXTRecordGetBytesPtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetBytesPtr"))
+				&& (_TXTRecordGetLength = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetLength"))
+				&& (_TXTRecordGetValuePtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetValuePtr"))
+				&& (_TXTRecordSetValue = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordSetValue"))) {
+			loaded = TRUE;
+		}
+	}
+	return loaded;
+#else
+	return TRUE;
+#endif
+}
+
+#ifndef LINK_DNS_SD_DIRECTLY
+
+DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {
+	g_return_val_if_fail(_DNSServiceAddRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceAddRecord)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceBrowse != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceBrowse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);
+}
+
+int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain) {
+	g_return_val_if_fail(_DNSServiceConstructFullName != NULL, 0);
+	return (_DNSServiceConstructFullName)(fullName, service, regtype, domain);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceGetAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceGetAddrInfo != NULL, 0);
+	return (_DNSServiceGetAddrInfo)(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef) {
+	g_return_val_if_fail(_DNSServiceProcessResult != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceProcessResult)(sdRef);
+}
+
+
+DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceQueryRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceQueryRecord)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context);
+}
+
+void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef) {
+	g_return_if_fail(_DNSServiceRefDeallocate != NULL);
+	(_DNSServiceRefDeallocate)(sdRef);
+}
+
+int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef) {
+	g_return_val_if_fail(_DNSServiceRefSockFD != NULL, -1);
+	return (_DNSServiceRefSockFD)(sdRef);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+		const void *txtRecord, DNSServiceRegisterReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceRegister != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceRegister)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+		const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceResolve != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceResolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags) {
+	g_return_val_if_fail(_DNSServiceRemoveRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceRemoveRecord)(sdRef, RecordRef, flags);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+		uint16_t rdlen, const void *rdata, uint32_t ttl) {
+	g_return_val_if_fail(_DNSServiceUpdateRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceUpdateRecord)(sdRef, RecordRef, flags, rdlen, rdata, ttl);
+}
+
+void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer) {
+	g_return_if_fail(_TXTRecordCreate != NULL);
+	(_TXTRecordCreate)(txtRecord, bufferLen, buffer);
+}
+
+void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord) {
+	g_return_if_fail(_TXTRecordDeallocate != NULL);
+	(_TXTRecordDeallocate)(txtRecord);
+}
+
+const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) {
+	g_return_val_if_fail(_TXTRecordGetBytesPtr != NULL, NULL);
+	return (_TXTRecordGetBytesPtr)(txtRecord);
+}
+
+uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord) {
+	g_return_val_if_fail(_TXTRecordGetLength != NULL, 0);
+	return (_TXTRecordGetLength)(txtRecord);
+}
+
+const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen) {
+	g_return_val_if_fail(_TXTRecordGetValuePtr != NULL, NULL);
+	return (_TXTRecordGetValuePtr)(txtLen, txtRecord, key, valueLen);
+}
+
+DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value) {
+	g_return_val_if_fail(_TXTRecordSetValue != NULL, kDNSServiceErr_Unknown);
+	return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);
+}
+
+#endif /*LINK_DNS_SD_DIRECTLY*/
+
diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.h b/libpurple/protocols/bonjour/dns_sd_proxy.h
index 28f98874ce..27df91baa1 100644
--- a/libpurple/protocols/bonjour/dns_sd_proxy.h
+++ b/libpurple/protocols/bonjour/dns_sd_proxy.h
@@ -51,6 +51,11 @@ int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, co
 #define DNSServiceConstructFullName(fullName, service, regtype, domain) \
 	_wpurple_DNSServiceConstructFullName(fullName, service, regtype, domain)
 
+DNSServiceErrorType _wpurple_DNSServiceGetAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context);
+#define DNSServiceGetAddrInfo(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context) \
+	_wpurple_DNSServiceGetAddrInfo(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context)
+
 DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef);
 #define DNSServiceProcessResult(sdRef) \
 	_wpurple_DNSServiceProcessResult(sdRef);
diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index 7b5496faef..9ec3b49125 100644
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -425,7 +425,7 @@ _client_socket_handler(gpointer data, gint socket, PurpleInputCondition conditio
 			bonjour_jabber_close_conversation(bconv);
 			if (bconv->pb != NULL) {
 				BonjourBuddy *bb = purple_buddy_get_protocol_data(bconv->pb);
-				
+
 				if(bb != NULL)
 					bb->conversation = NULL;
 			}
@@ -534,7 +534,7 @@ static gboolean bonjour_jabber_send_stream_init(BonjourJabberConversation *bconv
 	if (bname == NULL)
 		bname = "";
 
-	stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(bconv->account), bname);
+	stream_start = g_strdup_printf(DOCTYPE, bonjour_get_jid(bconv->account), bname);
 	len = strlen(stream_start);
 
 	bconv->sent_stream_start = PARTIALLY_SENT;
@@ -774,6 +774,10 @@ bonjour_jabber_start(BonjourJabber *jdata)
 #ifdef PF_INET6
 	if (jdata->socket6 != -1) {
 		struct sockaddr_in6 addr6;
+#ifdef IPV6_V6ONLY
+		int on = 1;
+		setsockopt(jdata->socket6, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
+#endif
 	        memset(&addr6, 0, sizeof(addr6));
 		addr6.sin6_family = AF_INET6;
 		addr6.sin6_port = htons(jdata->port);
@@ -1044,7 +1048,7 @@ bonjour_jabber_send_message(BonjourJabber *jdata, const gchar *to, const gchar *
 
 	message_node = xmlnode_new("message");
 	xmlnode_set_attrib(message_node, "to", bb->name);
-	xmlnode_set_attrib(message_node, "from", purple_account_get_username(jdata->account));
+	xmlnode_set_attrib(message_node, "from", bonjour_get_jid(jdata->account));
 	xmlnode_set_attrib(message_node, "type", "chat");
 
 	/* Enclose the message from the UI within a "font" node */
@@ -1259,7 +1263,7 @@ check_if_blocked(PurpleBuddy *pb)
 
 	for(l = acc->deny; l != NULL; l = l->next) {
 		const gchar *name = purple_buddy_get_name(pb);
-		const gchar *username = purple_account_get_username(acc);
+		const gchar *username = bonjour_get_jid(acc);
 
 		if(!purple_utf8_strcasecmp(name, (char *)l->data)) {
 			purple_debug_info("bonjour", "%s has been blocked by %s.\n", name, username);
diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c
index 83d094ad82..c402e056de 100644
--- a/libpurple/protocols/bonjour/mdns_avahi.c
+++ b/libpurple/protocols/bonjour/mdns_avahi.c
@@ -188,12 +188,14 @@ _resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtoco
 					bb->ips = g_slist_remove(bb->ips, rd->ip);
 					g_free((gchar *) rd->ip);
 				}
-				rd->ip = g_strdup(ip);
 				/* IPv6 goes at the front of the list and IPv4 at the end so that we "prefer" IPv6, if present */
-				if (protocol == AVAHI_PROTO_INET6)
+				if (protocol == AVAHI_PROTO_INET6) {
+					rd->ip = g_strdup_printf("%s%%%d", ip, interface);
 					bb->ips = g_slist_prepend(bb->ips, (gchar *) rd->ip);
-				else
+				} else {
+					rd->ip = g_strdup(ip);
 					bb->ips = g_slist_append(bb->ips, (gchar *) rd->ip);
+				}
 			}
 
 			bb->port_p2pj = port;
@@ -250,7 +252,7 @@ _browser_callback(AvahiServiceBrowser *b, AvahiIfIndex interface,
 			/* A new peer has joined the network and uses iChat bonjour */
 			purple_debug_info("bonjour", "_browser_callback - new service\n");
 			/* Make sure it isn't us */
-			if (purple_utf8_strcasecmp(name, account->username) != 0) {
+			if (purple_utf8_strcasecmp(name, bonjour_get_jid(account)) != 0) {
 				if (!avahi_service_resolver_new(avahi_service_browser_get_client(b),
 						interface, protocol, name, type, domain, protocol,
 						0, _resolver_callback, account)) {
@@ -419,6 +421,8 @@ gboolean _mdns_init_session(BonjourDnsSd *data) {
 
 	data->mdns_impl_data = idata;
 
+	bonjour_dns_sd_set_jid(data->account, avahi_client_get_host_name(idata->client));
+
 	return TRUE;
 }
 
@@ -452,14 +456,14 @@ gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) {
 			publish_result = avahi_entry_group_add_service_strlst(
 				idata->group, AVAHI_IF_UNSPEC,
 				AVAHI_PROTO_UNSPEC, 0,
-				purple_account_get_username(data->account),
+				bonjour_get_jid(data->account),
 				LINK_LOCAL_RECORD_NAME, NULL, NULL, data->port_p2pj, lst);
 			break;
 		case PUBLISH_UPDATE:
 			publish_result = avahi_entry_group_update_service_txt_strlst(
 				idata->group, AVAHI_IF_UNSPEC,
 				AVAHI_PROTO_UNSPEC, 0,
-				purple_account_get_username(data->account),
+				bonjour_get_jid(data->account),
 				LINK_LOCAL_RECORD_NAME, NULL, lst);
 			break;
 	}
@@ -533,7 +537,7 @@ gboolean _mdns_set_buddy_icon_data(BonjourDnsSd *data, gconstpointer avatar_data
 		}
 
 		svc_name = g_strdup_printf("%s." LINK_LOCAL_RECORD_NAME "local",
-				purple_account_get_username(data->account));
+				bonjour_get_jid(data->account));
 
 		ret = avahi_entry_group_add_record(idata->buddy_icon_group, AVAHI_IF_UNSPEC,
 			AVAHI_PROTO_UNSPEC, flags, svc_name,
diff --git a/libpurple/protocols/bonjour/mdns_common.c b/libpurple/protocols/bonjour/mdns_common.c
index 53bcd7296e..9319e36160 100644
--- a/libpurple/protocols/bonjour/mdns_common.c
+++ b/libpurple/protocols/bonjour/mdns_common.c
@@ -252,3 +252,36 @@ gboolean bonjour_dns_sd_start(BonjourDnsSd *data) {
 void bonjour_dns_sd_stop(BonjourDnsSd *data) {
 	_mdns_stop(data);
 }
+
+void
+bonjour_dns_sd_set_jid(PurpleAccount *account, const char *hostname)
+{
+	PurpleConnection *conn = purple_account_get_connection(account);
+	BonjourData *bd = conn->proto_data;
+	const char *tmp, *account_name = purple_account_get_username(account);
+
+	/* Previously we allowed the hostname part of the jid to be set
+	 * explicitly when it should always be the current hostname.
+	 * That is what this is intended to deal with.
+	 */
+	if ((tmp = strchr(account_name, '@'))
+	    && strstr(tmp, hostname) == (tmp + 1)
+	    && *((tmp + 1) + strlen(hostname)) == '\0')
+		bd->jid = g_strdup(account_name);
+	else {
+		const char *tmp2;
+		GString *str = g_string_new("");
+		/* Escape an '@' in the account name */
+		tmp = account_name;
+		while ((tmp2 = strchr(tmp, '@')) != NULL) {
+			g_string_append_len(str, tmp, tmp2 - tmp);
+			g_string_append(str, "\\40");
+			tmp = tmp2 + 1;
+		}
+		g_string_append(str, tmp);
+		g_string_append_c(str, '@');
+		g_string_append(str, hostname);
+
+		bd->jid = g_string_free(str, FALSE);
+	}
+}
diff --git a/libpurple/protocols/bonjour/mdns_common.h b/libpurple/protocols/bonjour/mdns_common.h
index 45a3bc0d9f..3d86185077 100644
--- a/libpurple/protocols/bonjour/mdns_common.h
+++ b/libpurple/protocols/bonjour/mdns_common.h
@@ -57,4 +57,6 @@ gboolean bonjour_dns_sd_start(BonjourDnsSd *data);
  */
 void bonjour_dns_sd_stop(BonjourDnsSd *data);
 
+void bonjour_dns_sd_set_jid(PurpleAccount *account, const char *hostname);
+
 #endif
diff --git a/libpurple/protocols/bonjour/mdns_win32.c b/libpurple/protocols/bonjour/mdns_win32.c
index 7b0bfe1c69..9f1798cf43 100644
--- a/libpurple/protocols/bonjour/mdns_win32.c
+++ b/libpurple/protocols/bonjour/mdns_win32.c
@@ -25,8 +25,8 @@
 #include "buddy.h"
 #include "mdns_interface.h"
 #include "dns_sd_proxy.h"
-#include "dnsquery.h"
 #include "mdns_common.h"
+#include "bonjour.h"
 
 static GSList *pending_buddies = NULL;
 
@@ -65,7 +65,6 @@ typedef struct _ResolveCallbackArgs {
 	BonjourBuddy *bb;
 	Win32SvcResolverData *res_data;
 	gchar *full_service_name;
-	PurpleDnsQueryData *dns_query;
 } ResolveCallbackArgs;
 
 
@@ -135,7 +134,7 @@ _mdns_record_query_callback(DNSServiceRef DNSServiceRef, DNSServiceFlags flags,
 {
 
 	if (errorCode != kDNSServiceErr_NoError) {
-		purple_debug_error("bonjour", "record query - callback error.\n");
+		purple_debug_error("bonjour", "record query - callback error (%d).\n", errorCode);
 		/* TODO: Probably should remove the buddy when this happens */
 	} else if (flags & kDNSServiceFlagsAdd) {
 		if (rrtype == kDNSServiceType_TXT) {
@@ -161,14 +160,22 @@ _mdns_record_query_callback(DNSServiceRef DNSServiceRef, DNSServiceFlags flags,
 	}
 }
 
-static void
-_mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_message)
+static void DNSSD_API
+_mdns_resolve_host_callback(DNSServiceRef sdRef, DNSServiceFlags flags,
+	uint32_t interfaceIndex, DNSServiceErrorType errorCode,
+	const char *hostname, const struct sockaddr *address,
+	uint32_t ttl, void *context)
 {
-	ResolveCallbackArgs *args = (ResolveCallbackArgs*) data;
+	ResolveCallbackArgs *args = (ResolveCallbackArgs*) context;
 	Win32BuddyImplData *idata = args->bb->mdns_impl_data;
 	gboolean delete_buddy = FALSE;
 	PurpleBuddy *pb = NULL;
 
+	purple_input_remove(args->resolver_query->input_handler);
+	DNSServiceRefDeallocate(args->resolver_query->sdRef);
+	g_free(args->resolver_query);
+	args->resolver_query = NULL;
+
 	if ((pb = purple_find_buddy(args->account, args->res_data->name))) {
 		if (pb->proto_data != args->bb) {
 			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record.",
@@ -181,12 +188,10 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 		goto cleanup;
 	}
 
-	if (!hosts || !hosts->data) {
-		purple_debug_error("bonjour", "host resolution - callback error.\n");
+	if (errorCode != kDNSServiceErr_NoError) {
+		purple_debug_error("bonjour", "host resolution - callback error (%d).\n", errorCode);
 		delete_buddy = TRUE;
 	} else {
-		struct sockaddr_in *addr = g_slist_nth_data(hosts, 1);
-		DNSServiceErrorType errorCode;
 		DNSServiceRef txt_query_sr;
 
 		/* finally, set up the continuous txt record watcher, and add the buddy to purple */
@@ -194,7 +199,7 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 				kDNSServiceInterfaceIndexAny, args->full_service_name, kDNSServiceType_TXT,
 				kDNSServiceClass_IN, _mdns_record_query_callback, args->bb);
 		if (errorCode == kDNSServiceErr_NoError) {
-			const char *ip = inet_ntoa(addr->sin_addr);
+			const char *ip = inet_ntoa(((struct sockaddr_in *) address)->sin_addr);
 
 			purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", args->bb->name, ip, args->bb->port_p2pj);
 
@@ -218,13 +223,6 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 
 	cleanup:
 
-	/* free the hosts list*/
-	while (hosts != NULL) {
-		hosts = g_slist_remove(hosts, hosts->data);
-		g_free(hosts->data);
-		hosts = g_slist_remove(hosts, hosts->data);
-	}
-
 	if (delete_buddy) {
 		idata->resolvers = g_slist_remove(idata->resolvers, args->res_data);
 		_cleanup_resolver_data(args->res_data);
@@ -259,17 +257,20 @@ _mdns_service_resolve_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint3
 	/* remove the input fd and destroy the service ref */
 	purple_input_remove(args->resolver_query->input_handler);
 	DNSServiceRefDeallocate(args->resolver_query->sdRef);
-	g_free(args->resolver_query);
-	args->resolver_query = NULL;
 
 	if (errorCode != kDNSServiceErr_NoError)
-		purple_debug_error("bonjour", "service resolver - callback error.\n");
+		purple_debug_error("bonjour", "service resolver - callback error. (%d)\n", errorCode);
 	else {
+		DNSServiceRef getaddrinfo_sr;
 		/* set more arguments, and start the host resolver */
-
-		if ((args->dns_query =
-				purple_dnsquery_a(hosttarget, port, _mdns_resolve_host_callback, args)) != NULL) {
-
+		errorCode = DNSServiceGetAddrInfo(&getaddrinfo_sr, 0, interfaceIndex,
+			kDNSServiceProtocol_IPv4, hosttarget, _mdns_resolve_host_callback, args);
+		if (errorCode != kDNSServiceErr_NoError)
+			purple_debug_error("bonjour", "service resolver - host resolution failed.\n");
+		else {
+			args->resolver_query->sdRef = getaddrinfo_sr;
+			args->resolver_query->input_handler = purple_input_add(DNSServiceRefSockFD(getaddrinfo_sr),
+				PURPLE_INPUT_READ, _mdns_handle_event, args->resolver_query);
 			args->full_service_name = g_strdup(fullname);
 
 			/* TODO: Should this be per resolver? */
@@ -277,12 +278,14 @@ _mdns_service_resolve_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint3
 
 			/* We don't want to hit the cleanup code */
 			return;
-		} else
-			purple_debug_error("bonjour", "service resolver - host resolution failed.\n");
+		}
 	}
 
 	/* If we get this far, clean up */
 
+	g_free(args->resolver_query);
+	args->resolver_query = NULL;
+
 	idata->resolvers = g_slist_remove(idata->resolvers, args->res_data);
 	_cleanup_resolver_data(args->res_data);
 
@@ -324,7 +327,7 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 		purple_debug_error("bonjour", "service browser - callback error (%d)\n", errorCode);
 	else if (flags & kDNSServiceFlagsAdd) {
 		/* A presence service instance has been discovered... check it isn't us! */
-		if (purple_utf8_strcasecmp(serviceName, account->username) != 0) {
+		if (purple_utf8_strcasecmp(serviceName, bonjour_get_jid(account)) != 0) {
 			DNSServiceErrorType resErrorCode;
 			/* OK, lets go ahead and resolve it to add to the buddy list */
 			ResolveCallbackArgs *args = g_new0(ResolveCallbackArgs, 1);
@@ -334,7 +337,7 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 							  serviceName, interfaceIndex, regtype ? regtype : "",
 							  replyDomain ? replyDomain : "");
 
-			resErrorCode = DNSServiceResolve(&resolver_sr, 0, 0, serviceName, regtype,
+			resErrorCode = DNSServiceResolve(&resolver_sr, 0, interfaceIndex, serviceName, regtype,
 					replyDomain, _mdns_service_resolve_callback, args);
 			if (resErrorCode == kDNSServiceErr_NoError) {
 				GSList *tmp = pending_buddies;
@@ -452,6 +455,9 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 
 gboolean _mdns_init_session(BonjourDnsSd *data) {
 	data->mdns_impl_data = g_new0(Win32SessionImplData, 1);
+
+	bonjour_dns_sd_set_jid(data->account, purple_get_host_name());
+
 	return TRUE;
 }
 
@@ -483,7 +489,8 @@ gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) {
 		switch (type) {
 			case PUBLISH_START:
 				purple_debug_info("bonjour", "Registering presence on port %d\n", data->port_p2pj);
-				errorCode = DNSServiceRegister(&presence_sr, 0, 0, purple_account_get_username(data->account), LINK_LOCAL_RECORD_NAME,
+				errorCode = DNSServiceRegister(&presence_sr, kDNSServiceInterfaceIndexAny,
+					0, bonjour_get_jid(data->account), LINK_LOCAL_RECORD_NAME,
 					NULL, NULL, htons(data->port_p2pj), TXTRecordGetLength(&dns_data), TXTRecordGetBytesPtr(&dns_data),
 					_mdns_service_register_callback, NULL);
 				break;
@@ -522,8 +529,9 @@ gboolean _mdns_browse(BonjourDnsSd *data) {
 
 	g_return_val_if_fail(idata != NULL, FALSE);
 
-	errorCode = DNSServiceBrowse(&browser_sr, 0, 0, LINK_LOCAL_RECORD_NAME, NULL,
-		_mdns_service_browse_callback, data->account);
+	errorCode = DNSServiceBrowse(&browser_sr, 0, kDNSServiceInterfaceIndexAny,
+			LINK_LOCAL_RECORD_NAME, NULL,_mdns_service_browse_callback,
+			data->account);
 	if (errorCode == kDNSServiceErr_NoError) {
 		idata->browser_query = g_new(DnsSDServiceRefHandlerData, 1);
 		idata->browser_query->sdRef = browser_sr;
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
index ff88986a82..f376b71d21 100644
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -26,8 +26,20 @@ JABBERSOURCES = \
 			  data.h \
 			  disco.c \
 			  disco.h \
-			  google.c \
-			  google.h \
+			  google/gmail.c \
+			  google/gmail.h \
+			  google/google.c \
+			  google/google.h \
+			  google/google_presence.c \
+			  google/google_presence.h \
+			  google/google_roster.c \
+			  google/google_roster.h \
+			  google/google_session.c \
+			  google/google_session.h \
+			  google/jingleinfo.c \
+			  google/jingleinfo.h \
+			  google/relay.c \
+			  google/relay.h \
 			  ibb.c \
 			  ibb.h \
 			  iq.c \
@@ -98,7 +110,10 @@ else
 st =
 pkg_LTLIBRARIES      = libjabber.la libxmpp.la
 libjabber_la_SOURCES = $(JABBERSOURCES)
-libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)
+libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
+	$(FARSIGHT_LIBS) \
+	$(GSTREAMER_LIBS) \
+	$(GSTINTERFACES_LIBS)
 
 libxmpp_la_SOURCES = libxmpp.c
 libxmpp_la_LIBADD = libjabber.la
@@ -111,4 +126,7 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(IDN_CFLAGS) \
-	$(LIBXML_CFLAGS)
+	$(LIBXML_CFLAGS) \
+	$(FARSIGHT_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(GSTINTERFACES_CFLAGS)
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
index c648d42fd4..4e9f9f9db6 100644
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -55,7 +55,13 @@ C_SRC =	\
 			chat.c \
 			data.c \
 			disco.c \
-			google.c \
+			google/gmail.c \
+			google/google.c \
+			google/google_presence.c \
+			google/google_roster.c \
+			google/google_session.c \
+			google/jingleinfo.c \
+			google/relay.c \
 			ibb.c \
 			iq.c \
 			jabber.c \
diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c
index 41b65a79c2..214f5dfdef 100644
--- a/libpurple/protocols/jabber/adhoccommands.c
+++ b/libpurple/protocols/jabber/adhoccommands.c
@@ -125,7 +125,8 @@ static void do_adhoc_action_cb(JabberStream *js, xmlnode *result, const char *ac
 	xmlnode_set_attrib(command,"node",actionInfo->node);
 
 	/* cancel is handled differently on ad-hoc commands than regular forms */
-	if(!strcmp(xmlnode_get_namespace(result),"jabber:x:data") && !strcmp(xmlnode_get_attrib(result, "type"),"cancel")) {
+	if (purple_strequal(xmlnode_get_namespace(result), "jabber:x:data") &&
+			purple_strequal(xmlnode_get_attrib(result, "type"), "cancel")) {
 		xmlnode_set_attrib(command,"action","cancel");
 	} else {
 		if(actionhandle)
diff --git a/libpurple/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c
index 933ff4711b..dfabe4fb0d 100644
--- a/libpurple/protocols/jabber/auth.c
+++ b/libpurple/protocols/jabber/auth.c
@@ -123,7 +123,7 @@ auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 	if (!PURPLE_CONNECTION_IS_VALID(gc))
 		return;
 
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE);
 }
 #endif
@@ -251,7 +251,8 @@ static void auth_old_cb(JabberStream *js, const char *from,
 		g_free(msg);
 	} else if (type == JABBER_IQ_RESULT) {
 		query = xmlnode_get_child(packet, "query");
-		if(js->stream_id && xmlnode_get_child(query, "digest")) {
+		if (js->stream_id && *js->stream_id &&
+				xmlnode_get_child(query, "digest")) {
 			char *s, *hash;
 
 			iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:auth");
@@ -269,8 +270,10 @@ static void auth_old_cb(JabberStream *js, const char *from,
 			g_free(s);
 			jabber_iq_set_callback(iq, auth_old_result_cb, NULL);
 			jabber_iq_send(iq);
-
-		} else if(js->stream_id && (x = xmlnode_get_child(query, "crammd5"))) {
+		} else if ((x = xmlnode_get_child(query, "crammd5"))) {
+			/* For future reference, this appears to be a custom OS X extension
+			 * to non-SASL authentication.
+			 */
 			const char *challenge;
 			gchar digest[33];
 			PurpleCipherContext *hmac;
@@ -340,7 +343,8 @@ void jabber_auth_start_old(JabberStream *js)
 	 * is requiring SSL/TLS, we need to enforce it.
 	 */
 	if (!jabber_stream_is_ssl(js) &&
-			purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+			g_str_equal("require_tls",
+				purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
 		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
 			_("You require encryption, but it is not available on this server."));
@@ -498,20 +502,30 @@ static gint compare_mech(gconstpointer a, gconstpointer b)
 	return 0;
 }
 
+void jabber_auth_add_mech(JabberSaslMech *mech)
+{
+	auth_mechs = g_slist_insert_sorted(auth_mechs, mech, compare_mech);
+}
+
+void jabber_auth_remove_mech(JabberSaslMech *mech)
+{
+	auth_mechs = g_slist_remove(auth_mechs, mech);
+}
+
 void jabber_auth_init(void)
 {
 	JabberSaslMech **tmp;
 	gint count, i;
 
-	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_plain_mech(), compare_mech);
-	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_digest_md5_mech(), compare_mech);
+	jabber_auth_add_mech(jabber_auth_get_plain_mech());
+	jabber_auth_add_mech(jabber_auth_get_digest_md5_mech());
 #ifdef HAVE_CYRUS_SASL
-	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_cyrus_mech(), compare_mech);
+	jabber_auth_add_mech(jabber_auth_get_cyrus_mech());
 #endif
 
 	tmp = jabber_auth_get_scram_mechs(&count);
 	for (i = 0; i < count; ++i)
-		auth_mechs = g_slist_insert_sorted(auth_mechs, tmp[i], compare_mech);
+		jabber_auth_add_mech(tmp[i]);
 }
 
 void jabber_auth_uninit(void)
diff --git a/libpurple/protocols/jabber/auth.h b/libpurple/protocols/jabber/auth.h
index f798c51bbc..b226fb5733 100644
--- a/libpurple/protocols/jabber/auth.h
+++ b/libpurple/protocols/jabber/auth.h
@@ -58,6 +58,9 @@ JabberSaslMech **jabber_auth_get_scram_mechs(gint *count);
 JabberSaslMech *jabber_auth_get_cyrus_mech(void);
 #endif
 
+void jabber_auth_add_mech(JabberSaslMech *);
+void jabber_auth_remove_mech(JabberSaslMech *);
+
 void jabber_auth_init(void);
 void jabber_auth_uninit(void);
 
diff --git a/libpurple/protocols/jabber/auth_cyrus.c b/libpurple/protocols/jabber/auth_cyrus.c
index 6a808836f8..ceb22ed1f9 100644
--- a/libpurple/protocols/jabber/auth_cyrus.c
+++ b/libpurple/protocols/jabber/auth_cyrus.c
@@ -94,7 +94,6 @@ static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secr
 	PurpleAccount *account;
 	const char *pw;
 	size_t len;
-	static sasl_secret_t *x = NULL;
 
 	account = purple_connection_get_account(js->gc);
 	pw = purple_account_get_password(account);
@@ -104,15 +103,15 @@ static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secr
 
 	len = strlen(pw);
 	/* Not an off-by-one because sasl_secret_t defines char data[1] */
-	x = (sasl_secret_t *) realloc(x, sizeof(sasl_secret_t) + len);
-
-	if (!x)
+	/* TODO: This can probably be moved to glib's allocator */
+	js->sasl_secret = malloc(sizeof(sasl_secret_t) + len);
+	if (!js->sasl_secret)
 		return SASL_NOMEM;
 
-	x->len = len;
-	strcpy((char*)x->data, pw);
+	js->sasl_secret->len = len;
+	strcpy((char*)js->sasl_secret->data, pw);
 
-	*secret = x;
+	*secret = js->sasl_secret;
 	return SASL_OK;
 }
 
@@ -177,7 +176,7 @@ auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 	account = purple_connection_get_account(gc);
 	js = purple_connection_get_protocol_data(gc);
 
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
@@ -322,11 +321,8 @@ jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
 		xmlnode_set_namespace(auth, NS_XMPP_SASL);
 		xmlnode_set_attrib(auth, "mechanism", js->current_mech);
 
-		if (g_str_equal(js->user->domain, "gmail.com") ||
-				g_str_equal(js->user->domain, "googlemail.com")) {
-			xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
-			xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
-		}
+		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
+		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
 
 		if (clientout) {
 			if (coutlen == 0) {
diff --git a/libpurple/protocols/jabber/auth_digest_md5.c b/libpurple/protocols/jabber/auth_digest_md5.c
index 0effe4a48f..401debd900 100644
--- a/libpurple/protocols/jabber/auth_digest_md5.c
+++ b/libpurple/protocols/jabber/auth_digest_md5.c
@@ -182,7 +182,9 @@ digest_md5_handle_challenge(JabberStream *js, xmlnode *packet,
 
 	dec_in = (char *)purple_base64_decode(enc_in, NULL);
 	purple_debug_misc("jabber", "decoded challenge (%"
-			G_GSIZE_FORMAT "): %s\n", strlen(dec_in), dec_in);
+			G_GSIZE_FORMAT "): %s\n",
+			dec_in != NULL ? strlen(dec_in) : 0,
+			dec_in != NULL  ? dec_in : "(null)");
 
 	parts = parse_challenge(dec_in);
 
diff --git a/libpurple/protocols/jabber/auth_plain.c b/libpurple/protocols/jabber/auth_plain.c
index b05fba732f..402b0c285a 100644
--- a/libpurple/protocols/jabber/auth_plain.c
+++ b/libpurple/protocols/jabber/auth_plain.c
@@ -40,11 +40,8 @@ static xmlnode *finish_plaintext_authentication(JabberStream *js)
 	auth = xmlnode_new("auth");
 	xmlnode_set_namespace(auth, NS_XMPP_SASL);
 
-	if (g_str_equal(js->user->domain, "gmail.com") ||
-			g_str_equal(js->user->domain, "googlemail.com")) {
-		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
-		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
-	}
+	xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
+	xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
 
 	response = g_string_new("");
 	response = g_string_append_c(response, '\0');
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 85b8eefee4..0266f8d2d1 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -38,7 +38,7 @@
 #include "xdata.h"
 #include "pep.h"
 #include "adhoccommands.h"
-#include "google.h"
+#include "google/google.h"
 
 typedef struct {
 	long idle_seconds;
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 6150c67db9..6692a11e04 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -30,7 +30,9 @@
 #include "adhoccommands.h"
 #include "buddy.h"
 #include "disco.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/gmail.h"
+#include "google/jingleinfo.h"
 #include "iq.h"
 #include "jabber.h"
 #include "jingle/jingle.h"
@@ -256,7 +258,7 @@ static void jabber_disco_info_cb(JabberStream *js, const char *from,
 				} else if(!strcmp(category, "directory") && !strcmp(type, "user")) {
 					/* we found a JUD */
 					js->user_directories = g_list_prepend(js->user_directories, g_strdup(from));
-				} else if(!strcmp(category, "proxy") && !strcmp(type, NS_BYTESTREAMS)) {
+				} else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) {
 					/* This is a bytestream proxy */
 					JabberIq *iq;
 					JabberBytestreamsStreamhost *sh;
@@ -597,7 +599,7 @@ jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
 	for(child = xmlnode_get_child(query, "item"); child;
 			child = xmlnode_get_next_twin(child)) {
 		JabberIq *iq;
-		const char *jid, *node;
+		const char *jid;
 
 		if(!(jid = xmlnode_get_attrib(child, "jid")))
 			continue;
diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c
deleted file mode 100644
index 1d843fe701..0000000000
--- a/libpurple/protocols/jabber/google.c
+++ /dev/null
@@ -1,1429 +0,0 @@
-/**
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#include "internal.h"
-#include "debug.h"
-#include "mediamanager.h"
-#include "util.h"
-#include "privacy.h"
-#include "dnsquery.h"
-#include "network.h"
-
-#include "buddy.h"
-#include "google.h"
-#include "jabber.h"
-#include "presence.h"
-#include "roster.h"
-#include "iq.h"
-#include "chat.h"
-
-#include "jingle/jingle.h"
-
-#ifdef USE_VV
-
-typedef struct {
-	char *id;
-	char *initiator;
-} GoogleSessionId;
-
-typedef enum {
-	UNINIT,
-	SENT_INITIATE,
-	RECEIVED_INITIATE,
-	IN_PRORESS,
-	TERMINATED
-} GoogleSessionState;
-
-typedef struct {
-	GoogleSessionId id;
-	GoogleSessionState state;
-	PurpleMedia *media;
-	JabberStream *js;
-	char *remote_jid;
-	gboolean video;
-} GoogleSession;
-
-static gboolean
-google_session_id_equal(gconstpointer a, gconstpointer b)
-{
-	GoogleSessionId *c = (GoogleSessionId*)a;
-	GoogleSessionId *d = (GoogleSessionId*)b;
-
-	return !strcmp(c->id, d->id) && !strcmp(c->initiator, d->initiator);
-}
-
-static void
-google_session_destroy(GoogleSession *session)
-{
-	g_free(session->id.id);
-	g_free(session->id.initiator);
-	g_free(session->remote_jid);
-	g_free(session);
-}
-
-static xmlnode *
-google_session_create_xmlnode(GoogleSession *session, const char *type)
-{
-	xmlnode *node = xmlnode_new("session");
-	xmlnode_set_namespace(node, NS_GOOGLE_SESSION);
-	xmlnode_set_attrib(node, "id", session->id.id);
-	xmlnode_set_attrib(node, "initiator", session->id.initiator);
-	xmlnode_set_attrib(node, "type", type);
-	return node;
-}
-
-static void
-google_session_send_candidates(PurpleMedia *media, gchar *session_id,
-		gchar *participant, GoogleSession *session)
-{
-	GList *candidates = purple_media_get_local_candidates(
-			session->media, session_id, session->remote_jid), *iter;
-	PurpleMediaCandidate *transport;
-	gboolean video = FALSE;
-
-	if (!strcmp(session_id, "google-video"))
-		video = TRUE;
-
-	for (iter = candidates; iter; iter = iter->next) {
-		JabberIq *iq;
-		gchar *ip, *port, *username, *password;
-		gchar pref[16];
-		PurpleMediaCandidateType type;
-		xmlnode *sess;
-		xmlnode *candidate;
-		guint component_id;
-		transport = PURPLE_MEDIA_CANDIDATE(iter->data);
-		component_id = purple_media_candidate_get_component_id(
-				transport);
-
-		iq = jabber_iq_new(session->js, JABBER_IQ_SET);
-		sess = google_session_create_xmlnode(session, "candidates");
-		xmlnode_insert_child(iq->node, sess);
-		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
-
-		candidate = xmlnode_new("candidate");
-
-		ip = purple_media_candidate_get_ip(transport);
-		port = g_strdup_printf("%d",
-				purple_media_candidate_get_port(transport));
-		g_ascii_dtostr(pref, 16,
-			purple_media_candidate_get_priority(transport) / 1000.0);
-		username = purple_media_candidate_get_username(transport);
-		password = purple_media_candidate_get_password(transport);
-		type = purple_media_candidate_get_candidate_type(transport);
-
-		xmlnode_set_attrib(candidate, "address", ip);
-		xmlnode_set_attrib(candidate, "port", port);
-		xmlnode_set_attrib(candidate, "name",
-				component_id == PURPLE_MEDIA_COMPONENT_RTP ?
-				video ? "video_rtp" : "rtp" :
-				component_id == PURPLE_MEDIA_COMPONENT_RTCP ?
-				video ? "video_rtcp" : "rtcp" : "none");
-		xmlnode_set_attrib(candidate, "username", username);
-		/*
-		 * As of this writing, Farsight 2 in Google compatibility
-		 * mode doesn't provide a password. The Gmail client
-		 * requires this to be set.
-		 */
-		xmlnode_set_attrib(candidate, "password",
-				password != NULL ? password : "");
-		xmlnode_set_attrib(candidate, "preference", pref);
-		xmlnode_set_attrib(candidate, "protocol",
-				purple_media_candidate_get_protocol(transport)
-				== PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ?
-				"udp" : "tcp");
-		xmlnode_set_attrib(candidate, "type", type ==
-				PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" :
-						      type ==
-				PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" :
-					       	      type ==
-				PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
-				NULL);
-		xmlnode_set_attrib(candidate, "generation", "0");
-		xmlnode_set_attrib(candidate, "network", "0");
-		xmlnode_insert_child(sess, candidate);
-
-		g_free(ip);
-		g_free(port);
-		g_free(username);
-		g_free(password);
-
-		jabber_iq_send(iq);
-	}
-	purple_media_candidate_list_free(candidates);
-}
-
-static void
-google_session_ready(GoogleSession *session)
-{
-	PurpleMedia *media = session->media;
-	if (purple_media_codecs_ready(media, NULL) &&
-			purple_media_candidates_prepared(media, NULL, NULL)) {
-		gchar *me = g_strdup_printf("%s@%s/%s",
-				session->js->user->node,
-				session->js->user->domain,
-				session->js->user->resource);
-		JabberIq *iq;
-		xmlnode *sess, *desc, *payload;
-		GList *codecs, *iter;
-		gboolean is_initiator = !strcmp(session->id.initiator, me);
-
-		if (!is_initiator &&
-				!purple_media_accepted(media, NULL, NULL)) {
-			g_free(me);
-			return;
-		}
-
-		iq = jabber_iq_new(session->js, JABBER_IQ_SET);
-
-		if (is_initiator) {
-			xmlnode_set_attrib(iq->node, "to", session->remote_jid);
-			xmlnode_set_attrib(iq->node, "from", session->id.initiator);
-			sess = google_session_create_xmlnode(session, "initiate");
-		} else {
-			google_session_send_candidates(session->media,
-					"google-voice", session->remote_jid,
-					session);
-			google_session_send_candidates(session->media,
-					"google-video", session->remote_jid,
-					session);
-			xmlnode_set_attrib(iq->node, "to", session->remote_jid);
-			xmlnode_set_attrib(iq->node, "from", me);
-			sess = google_session_create_xmlnode(session, "accept");
-		}
-		xmlnode_insert_child(iq->node, sess);
-		desc = xmlnode_new_child(sess, "description");
-		if (session->video)
-			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_VIDEO);
-		else
-			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_PHONE);
-
-		codecs = purple_media_get_codecs(media, "google-video");
-
-		for (iter = codecs; iter; iter = g_list_next(iter)) {
-			PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
-			gchar *id = g_strdup_printf("%d",
-					purple_media_codec_get_id(codec));
-			gchar *encoding_name =
-					purple_media_codec_get_encoding_name(codec);
-			payload = xmlnode_new_child(desc, "payload-type");
-			xmlnode_set_attrib(payload, "id", id);
-			xmlnode_set_attrib(payload, "name", encoding_name);
-			xmlnode_set_attrib(payload, "width", "320");
-			xmlnode_set_attrib(payload, "height", "200");
-			xmlnode_set_attrib(payload, "framerate", "30");
-			g_free(encoding_name);
-			g_free(id);
-		}
-		purple_media_codec_list_free(codecs);
-
-		codecs = purple_media_get_codecs(media, "google-voice");
-
-		for (iter = codecs; iter; iter = g_list_next(iter)) {
-			PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
-			gchar *id = g_strdup_printf("%d",
-					purple_media_codec_get_id(codec));
-			gchar *encoding_name =
-					purple_media_codec_get_encoding_name(codec);
-			gchar *clock_rate = g_strdup_printf("%d",
-					purple_media_codec_get_clock_rate(codec));
-			payload = xmlnode_new_child(desc, "payload-type");
-			if (session->video)
-				xmlnode_set_namespace(payload, NS_GOOGLE_SESSION_PHONE);
-			xmlnode_set_attrib(payload, "id", id);
-			/*
-			 * Hack to make Gmail accept speex as the codec.
-			 * It shouldn't have to be case sensitive.
-			 */
-			if (purple_strequal(encoding_name, "SPEEX"))
-				xmlnode_set_attrib(payload, "name", "speex");
-			else
-				xmlnode_set_attrib(payload, "name", encoding_name);
-			xmlnode_set_attrib(payload, "clockrate", clock_rate);
-			g_free(clock_rate);
-			g_free(encoding_name);
-			g_free(id);
-		}
-		purple_media_codec_list_free(codecs);
-
-		jabber_iq_send(iq);
-
-		if (is_initiator) {
-			google_session_send_candidates(session->media,
-					"google-voice", session->remote_jid,
-					session);
-			google_session_send_candidates(session->media,
-					"google-video", session->remote_jid,
-					session);
-		}
-
-		g_signal_handlers_disconnect_by_func(G_OBJECT(session->media),
-				G_CALLBACK(google_session_ready), session);
-	}
-}
-
-static void
-google_session_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
-		gchar *sid, gchar *name, GoogleSession *session)
-{
-	if (sid == NULL && name == NULL) {
-		if (state == PURPLE_MEDIA_STATE_END) {
-			google_session_destroy(session);
-		}
-	}
-}
-
-static void
-google_session_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
-		gchar *sid, gchar *name, gboolean local,
-		GoogleSession *session)
-{
-	if (sid != NULL || name != NULL)
-		return;
-
-	if (type == PURPLE_MEDIA_INFO_HANGUP) {
-		xmlnode *sess;
-		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
-
-		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
-		sess = google_session_create_xmlnode(session, "terminate");
-		xmlnode_insert_child(iq->node, sess);
-
-		jabber_iq_send(iq);
-	} else if (type == PURPLE_MEDIA_INFO_REJECT) {
-		xmlnode *sess;
-		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
-
-		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
-		sess = google_session_create_xmlnode(session, "reject");
-		xmlnode_insert_child(iq->node, sess);
-
-		jabber_iq_send(iq);
-	} else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
-		google_session_ready(session);
-	}
-}
-
-static GParameter *
-jabber_google_session_get_params(JabberStream *js, guint *num)
-{
-	guint num_params;
-	GParameter *params = jingle_get_params(js, &num_params);
-	GParameter *new_params = g_new0(GParameter, num_params + 1);
-
-	memcpy(new_params, params, sizeof(GParameter) * num_params);
-
-	purple_debug_info("jabber", "setting Google jingle compatibility param\n");
-	new_params[num_params].name = "compatibility-mode";
-	g_value_init(&new_params[num_params].value, G_TYPE_UINT);
-	g_value_set_uint(&new_params[num_params].value, 1); /* NICE_COMPATIBILITY_GOOGLE */
-
-	g_free(params);
-	*num = num_params + 1;
-	return new_params;
-}
-
-
-gboolean
-jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
-{
-	GoogleSession *session;
-	JabberBuddy *jb;
-	JabberBuddyResource *jbr;
-	gchar *jid;
-	GParameter *params;
-	guint num_params;
-
-	/* construct JID to send to */
-	jb = jabber_buddy_find(js, who, FALSE);
-	if (!jb) {
-		purple_debug_error("jingle-rtp",
-				"Could not find Jabber buddy\n");
-		return FALSE;
-	}
-	jbr = jabber_buddy_find_resource(jb, NULL);
-	if (!jbr) {
-		purple_debug_error("jingle-rtp",
-				"Could not find buddy's resource\n");
-	}
-
-	if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
-		jid = g_strdup_printf("%s/%s", who, jbr->name);
-	} else {
-		jid = g_strdup(who);
-	}
-
-	session = g_new0(GoogleSession, 1);
-	session->id.id = jabber_get_next_id(js);
-	session->id.initiator = g_strdup_printf("%s@%s/%s", js->user->node,
-			js->user->domain, js->user->resource);
-	session->state = SENT_INITIATE;
-	session->js = js;
-	session->remote_jid = jid;
-
-	if (type & PURPLE_MEDIA_VIDEO)
-		session->video = TRUE;
-
-	session->media = purple_media_manager_create_media(
-			purple_media_manager_get(),
-			purple_connection_get_account(js->gc),
-			"fsrtpconference", session->remote_jid, TRUE);
-
-	purple_media_set_prpl_data(session->media, session);
-
-	g_signal_connect_swapped(G_OBJECT(session->media),
-			"candidates-prepared",
-			G_CALLBACK(google_session_ready), session);
-	g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
-			G_CALLBACK(google_session_ready), session);
-	g_signal_connect(G_OBJECT(session->media), "state-changed",
-			G_CALLBACK(google_session_state_changed_cb), session);
-	g_signal_connect(G_OBJECT(session->media), "stream-info",
-			G_CALLBACK(google_session_stream_info_cb), session);
-
-	params = jabber_google_session_get_params(js, &num_params);
-
-	if (purple_media_add_stream(session->media, "google-voice",
-			session->remote_jid, PURPLE_MEDIA_AUDIO,
-			TRUE, "nice", num_params, params) == FALSE ||
-			(session->video && purple_media_add_stream(
-			session->media, "google-video",
-			session->remote_jid, PURPLE_MEDIA_VIDEO,
-			TRUE, "nice", num_params, params) == FALSE)) {
-		purple_media_error(session->media, "Error adding stream.");
-		purple_media_end(session->media, NULL, NULL);
-		g_free(params);
-		return FALSE;
-	}
-
-	g_free(params);
-
-	return (session->media != NULL) ? TRUE : FALSE;
-}
-
-static gboolean
-google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
-{
-	JabberIq *result;
-	GList *codecs = NULL, *video_codecs = NULL;
-	xmlnode *desc_element, *codec_element;
-	PurpleMediaCodec *codec;
-	const char *xmlns;
-	GParameter *params;
-	guint num_params;
-
-	if (session->state != UNINIT) {
-		purple_debug_error("jabber", "Received initiate for active session.\n");
-		return FALSE;
-	}
-
-	desc_element = xmlnode_get_child(sess, "description");
-	xmlns = xmlnode_get_namespace(desc_element);
-
-	if (purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
-		session->video = FALSE;
-	else if (purple_strequal(xmlns, NS_GOOGLE_SESSION_VIDEO))
-		session->video = TRUE;
-	else {
-		purple_debug_error("jabber", "Received initiate with "
-				"invalid namespace %s.\n", xmlns);
-		return FALSE;
-	}
-
-	session->media = purple_media_manager_create_media(
-			purple_media_manager_get(),
-			purple_connection_get_account(js->gc),
-			"fsrtpconference", session->remote_jid, FALSE);
-
-	purple_media_set_prpl_data(session->media, session);
-
-	g_signal_connect_swapped(G_OBJECT(session->media),
-			"candidates-prepared",
-			G_CALLBACK(google_session_ready), session);
-	g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
-			G_CALLBACK(google_session_ready), session);
-	g_signal_connect(G_OBJECT(session->media), "state-changed",
-			G_CALLBACK(google_session_state_changed_cb), session);
-	g_signal_connect(G_OBJECT(session->media), "stream-info",
-			G_CALLBACK(google_session_stream_info_cb), session);
-
-	params = jabber_google_session_get_params(js, &num_params);
-
-	if (purple_media_add_stream(session->media, "google-voice",
-			session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE,
-			"nice", num_params, params) == FALSE ||
-			(session->video && purple_media_add_stream(
-			session->media, "google-video",
-			session->remote_jid, PURPLE_MEDIA_VIDEO,
-			FALSE, "nice", num_params, params) == FALSE)) {
-		purple_media_error(session->media, "Error adding stream.");
-		purple_media_stream_info(session->media,
-				PURPLE_MEDIA_INFO_REJECT, NULL, NULL, TRUE);
-		g_free(params);
-		return FALSE;
-	}
-
-	g_free(params);
-
-	for (codec_element = xmlnode_get_child(desc_element, "payload-type");
-	     codec_element; codec_element = codec_element->next) {
-		const char *id, *encoding_name,  *clock_rate,
-				*width, *height, *framerate;
-		gboolean video;
-		if (codec_element->name &&
-				strcmp(codec_element->name, "payload-type"))
-			continue;
-
-		xmlns = xmlnode_get_namespace(codec_element);
-		encoding_name = xmlnode_get_attrib(codec_element, "name");
-		id = xmlnode_get_attrib(codec_element, "id");
-
-		if (!session->video ||
-				(xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_PHONE))) {
-			clock_rate = xmlnode_get_attrib(
-					codec_element, "clockrate");
-			video = FALSE;
-		} else {
-			width = xmlnode_get_attrib(codec_element, "width");
-			height = xmlnode_get_attrib(codec_element, "height");
-			framerate = xmlnode_get_attrib(
-					codec_element, "framerate");
-			clock_rate = "90000";
-			video = TRUE;
-		}
-
-		if (id) {
-			codec = purple_media_codec_new(atoi(id), encoding_name,
-					video ?	PURPLE_MEDIA_VIDEO :
-					PURPLE_MEDIA_AUDIO,
-					clock_rate ? atoi(clock_rate) : 0);
-			if (video)
-				video_codecs = g_list_append(
-						video_codecs, codec);
-			else
-				codecs = g_list_append(codecs, codec);
-		}
-	}
-
-	if (codecs)
-		purple_media_set_remote_codecs(session->media, "google-voice",
-				session->remote_jid, codecs);
-	if (video_codecs)
-		purple_media_set_remote_codecs(session->media, "google-video",
-				session->remote_jid, video_codecs);
-
-	purple_media_codec_list_free(codecs);
-	purple_media_codec_list_free(video_codecs);
-
-	result = jabber_iq_new(js, JABBER_IQ_RESULT);
-	jabber_iq_set_id(result, iq_id);
-	xmlnode_set_attrib(result->node, "to", session->remote_jid);
-	jabber_iq_send(result);
-
-	return TRUE;
-}
-
-static void
-google_session_handle_candidates(JabberStream  *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
-{
-	JabberIq *result;
-	GList *list = NULL, *video_list = NULL;
-	xmlnode *cand;
-	static int name = 0;
-	char n[4];
-
-	for (cand = xmlnode_get_child(sess, "candidate"); cand;
-			cand = xmlnode_get_next_twin(cand)) {
-		PurpleMediaCandidate *info;
-		const gchar *cname = xmlnode_get_attrib(cand, "name");
-		const gchar *type = xmlnode_get_attrib(cand, "type");
-		const gchar *protocol = xmlnode_get_attrib(cand, "protocol");
-		const gchar *address = xmlnode_get_attrib(cand, "address");
-		const gchar *port = xmlnode_get_attrib(cand, "port");
-		guint component_id;
-
-		if (cname && type && address && port) {
-			PurpleMediaCandidateType candidate_type;
-
-			g_snprintf(n, sizeof(n), "S%d", name++);
-
-			if (g_str_equal(type, "local"))
-				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
-			else if (g_str_equal(type, "stun"))
-				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX;
-			else if (g_str_equal(type, "relay"))
-				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_RELAY;
-			else
-				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
-
-			if (purple_strequal(cname, "rtcp") ||
-					purple_strequal(cname, "video_rtcp"))
-				component_id = PURPLE_MEDIA_COMPONENT_RTCP;
-			else
-				component_id = PURPLE_MEDIA_COMPONENT_RTP;
-
-			info = purple_media_candidate_new(n, component_id,
-					candidate_type,
-					purple_strequal(protocol, "udp") ?
-							PURPLE_MEDIA_NETWORK_PROTOCOL_UDP :
-							PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
-					address,
-					atoi(port));
-			g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
-					"password", xmlnode_get_attrib(cand, "password"), NULL);
-			if (!strncmp(cname, "video_", 6))
-				video_list = g_list_append(video_list, info);
-			else
-				list = g_list_append(list, info);
-		}
-	}
-
-	if (list)
-		purple_media_add_remote_candidates(
-				session->media, "google-voice",
-				session->remote_jid, list);
-	if (video_list)
-		purple_media_add_remote_candidates(
-				session->media, "google-video",
-				session->remote_jid, video_list);
-	purple_media_candidate_list_free(list);
-	purple_media_candidate_list_free(video_list);
-
-	result = jabber_iq_new(js, JABBER_IQ_RESULT);
-	jabber_iq_set_id(result, iq_id);
-	xmlnode_set_attrib(result->node, "to", session->remote_jid);
-	jabber_iq_send(result);
-}
-
-static void
-google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
-{
-	xmlnode *desc_element = xmlnode_get_child(sess, "description");
-	xmlnode *codec_element = xmlnode_get_child(
-			desc_element, "payload-type");
-	GList *codecs = NULL, *video_codecs = NULL;
-	JabberIq *result = NULL;
-	const gchar *xmlns = xmlnode_get_namespace(desc_element);
-	gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_VIDEO));
-
-	for (; codec_element; codec_element = codec_element->next) {
-		const gchar *xmlns, *encoding_name, *id,
-				*clock_rate, *width, *height, *framerate;
-		gboolean video_codec = FALSE;
-
-		if (!purple_strequal(codec_element->name, "payload-type"))
-			continue;
-
-		xmlns = xmlnode_get_namespace(codec_element);
-		encoding_name =	xmlnode_get_attrib(codec_element, "name");
-		id = xmlnode_get_attrib(codec_element, "id");
-
-		if (!video || purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
-			clock_rate = xmlnode_get_attrib(
-					codec_element, "clockrate");
-		else {
-			clock_rate = "90000";
-			width = xmlnode_get_attrib(codec_element, "width");
-			height = xmlnode_get_attrib(codec_element, "height");
-			framerate = xmlnode_get_attrib(
-					codec_element, "framerate");
-			video_codec = TRUE;
-		}
-
-		if (id && encoding_name) {
-			PurpleMediaCodec *codec = purple_media_codec_new(
-					atoi(id), encoding_name,
-					video_codec ? PURPLE_MEDIA_VIDEO :
-					PURPLE_MEDIA_AUDIO,
-					clock_rate ? atoi(clock_rate) : 0);
-			if (video_codec)
-				video_codecs = g_list_append(
-						video_codecs, codec);
-			else
-				codecs = g_list_append(codecs, codec);
-		}
-	}
-
-	if (codecs)
-		purple_media_set_remote_codecs(session->media, "google-voice",
-				session->remote_jid, codecs);
-	if (video_codecs)
-		purple_media_set_remote_codecs(session->media, "google-video",
-				session->remote_jid, video_codecs);
-
-	purple_media_stream_info(session->media, PURPLE_MEDIA_INFO_ACCEPT,
-			NULL, NULL, FALSE);
-
-	result = jabber_iq_new(js, JABBER_IQ_RESULT);
-	jabber_iq_set_id(result, iq_id);
-	xmlnode_set_attrib(result->node, "to", session->remote_jid);
-	jabber_iq_send(result);
-}
-
-static void
-google_session_handle_reject(JabberStream *js, GoogleSession *session, xmlnode *sess)
-{
-	purple_media_end(session->media, NULL, NULL);
-}
-
-static void
-google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *sess)
-{
-	purple_media_end(session->media, NULL, NULL);
-}
-
-static void
-google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
-{
-	const char *type = xmlnode_get_attrib(sess, "type");
-
-	if (!strcmp(type, "initiate")) {
-		google_session_handle_initiate(js, session, sess, iq_id);
-	} else if (!strcmp(type, "accept")) {
-		google_session_handle_accept(js, session, sess, iq_id);
-	} else if (!strcmp(type, "reject")) {
-		google_session_handle_reject(js, session, sess);
-	} else if (!strcmp(type, "terminate")) {
-		google_session_handle_terminate(js, session, sess);
-	} else if (!strcmp(type, "candidates")) {
-		google_session_handle_candidates(js, session, sess, iq_id);
-	}
-}
-
-void
-jabber_google_session_parse(JabberStream *js, const char *from,
-                            JabberIqType type, const char *iq_id,
-                            xmlnode *session_node)
-{
-	GoogleSession *session = NULL;
-	GoogleSessionId id;
-
-	xmlnode *desc_node;
-
-	GList *iter = NULL;
-
-	if (type != JABBER_IQ_SET)
-		return;
-
-	id.id = (gchar*)xmlnode_get_attrib(session_node, "id");
-	if (!id.id)
-		return;
-
-	id.initiator = (gchar*)xmlnode_get_attrib(session_node, "initiator");
-	if (!id.initiator)
-		return;
-
-	iter = purple_media_manager_get_media_by_account(
-			purple_media_manager_get(),
-			purple_connection_get_account(js->gc));
-	for (; iter; iter = g_list_delete_link(iter, iter)) {
-		GoogleSession *gsession =
-				purple_media_get_prpl_data(iter->data);
-		if (google_session_id_equal(&(gsession->id), &id)) {
-			session = gsession;
-			break;
-		}
-	}
-	if (iter != NULL) {
-		g_list_free(iter);
-	}
-
-	if (session) {
-		google_session_parse_iq(js, session, session_node, iq_id);
-		return;
-	}
-
-	/* If the session doesn't exist, this has to be an initiate message */
-	if (strcmp(xmlnode_get_attrib(session_node, "type"), "initiate"))
-		return;
-	desc_node = xmlnode_get_child(session_node, "description");
-	if (!desc_node)
-		return;
-	session = g_new0(GoogleSession, 1);
-	session->id.id = g_strdup(id.id);
-	session->id.initiator = g_strdup(id.initiator);
-	session->state = UNINIT;
-	session->js = js;
-	session->remote_jid = g_strdup(session->id.initiator);
-
-	google_session_handle_initiate(js, session, session_node, iq_id);
-}
-#endif /* USE_VV */
-
-static void
-jabber_gmail_parse(JabberStream *js, const char *from,
-                   JabberIqType type, const char *id,
-                   xmlnode *packet, gpointer nul)
-{
-	xmlnode *child;
-	xmlnode *message;
-	const char *to, *url;
-	const char *in_str;
-	char *to_name;
-
-	int i, count = 1, returned_count;
-
-	const char **tos, **froms, **urls;
-	char **subjects;
-
-	if (type == JABBER_IQ_ERROR)
-		return;
-
-	child = xmlnode_get_child(packet, "mailbox");
-	if (!child)
-		return;
-
-	in_str = xmlnode_get_attrib(child, "total-matched");
-	if (in_str && *in_str)
-		count = atoi(in_str);
-
-	/* If Gmail doesn't tell us who the mail is to, let's use our JID */
-	to = xmlnode_get_attrib(packet, "to");
-
-	message = xmlnode_get_child(child, "mail-thread-info");
-
-	if (count == 0 || !message) {
-		if (count > 0) {
-			char *bare_jid = jabber_get_bare_jid(to);
-			const char *default_tos[2] = { bare_jid };
-
-			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, default_tos, NULL, NULL, NULL);
-			g_free(bare_jid);
-		} else {
-			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, NULL, NULL, NULL, NULL);
-		}
-
-		return;
-	}
-
-	/* Loop once to see how many messages were returned so we can allocate arrays
-	 * accordingly */
-	for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
-
-	froms    = g_new0(const char* , returned_count + 1);
-	tos      = g_new0(const char* , returned_count + 1);
-	subjects = g_new0(char* , returned_count + 1);
-	urls     = g_new0(const char* , returned_count + 1);
-
-	to = xmlnode_get_attrib(packet, "to");
-	to_name = jabber_get_bare_jid(to);
-	url = xmlnode_get_attrib(child, "url");
-	if (!url || !*url)
-		url = "http://www.gmail.com";
-
-	message= xmlnode_get_child(child, "mail-thread-info");
-	for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
-		xmlnode *sender_node, *subject_node;
-		const char *from, *tid;
-		char *subject;
-
-		subject_node = xmlnode_get_child(message, "subject");
-		sender_node  = xmlnode_get_child(message, "senders");
-		sender_node  = xmlnode_get_child(sender_node, "sender");
-
-		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
-		       !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
-			sender_node = xmlnode_get_next_twin(sender_node);
-
-		if (!sender_node) {
-			i--;
-			continue;
-		}
-
-		from = xmlnode_get_attrib(sender_node, "name");
-		if (!from || !*from)
-			from = xmlnode_get_attrib(sender_node, "address");
-		subject = xmlnode_get_data(subject_node);
-		/*
-		 * url = xmlnode_get_attrib(message, "url");
-		 */
-		tos[i] = (to_name != NULL ?  to_name : "");
-		froms[i] = (from != NULL ?  from : "");
-		subjects[i] = (subject != NULL ? subject : g_strdup(""));
-		urls[i] = url;
-
-		tid = xmlnode_get_attrib(message, "tid");
-		if (tid &&
-		    (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
-			g_free(js->gmail_last_tid);
-			js->gmail_last_tid = g_strdup(tid);
-		}
-	}
-
-	if (i>0)
-		purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
-				urls, NULL, NULL);
-
-	g_free(to_name);
-	g_free(tos);
-	g_free(froms);
-	for (i = 0; i < returned_count; i++)
-		g_free(subjects[i]);
-	g_free(subjects);
-	g_free(urls);
-
-	in_str = xmlnode_get_attrib(child, "result-time");
-	if (in_str && *in_str) {
-		g_free(js->gmail_last_time);
-		js->gmail_last_time = g_strdup(in_str);
-	}
-}
-
-void
-jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
-                  const char *id, xmlnode *new_mail)
-{
-	xmlnode *query;
-	JabberIq *iq;
-
-	/* bail if the user isn't interested */
-	if (!purple_account_get_check_mail(js->gc->account))
-		return;
-
-	/* Is this an initial incoming mail notification? If so, send a request for more info */
-	if (type != JABBER_IQ_SET)
-		return;
-
-	/* Acknowledge the notification */
-	iq = jabber_iq_new(js, JABBER_IQ_RESULT);
-	if (from)
-		xmlnode_set_attrib(iq->node, "to", from);
-	xmlnode_set_attrib(iq->node, "id", id);
-	jabber_iq_send(iq);
-
-	purple_debug_misc("jabber",
-		   "Got new mail notification. Sending request for more info\n");
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
-	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
-	query = xmlnode_get_child(iq->node, "query");
-
-	if (js->gmail_last_time)
-		xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time);
-	if (js->gmail_last_tid)
-		xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid);
-
-	jabber_iq_send(iq);
-	return;
-}
-
-void jabber_gmail_init(JabberStream *js) {
-	JabberIq *iq;
-	xmlnode *usersetting, *mailnotifications;
-
-	if (!purple_account_get_check_mail(purple_connection_get_account(js->gc)))
-		return;
-
-	/*
-	 * Quoting http://code.google.com/apis/talk/jep_extensions/usersettings.html:
-	 * To ensure better compatibility with other clients, rather than
-	 * setting this value to "false" to turn off notifications, it is
-	 * recommended that a client set this to "true" and filter incoming
-	 * email notifications itself.
-	 */
-	iq = jabber_iq_new(js, JABBER_IQ_SET);
-	usersetting = xmlnode_new_child(iq->node, "usersetting");
-	xmlnode_set_namespace(usersetting, "google:setting");
-	mailnotifications = xmlnode_new_child(usersetting, "mailnotifications");
-	xmlnode_set_attrib(mailnotifications, "value", "true");
-	jabber_iq_send(iq);
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
-	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
-	jabber_iq_send(iq);
-}
-
-void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
-{
-	PurpleAccount *account = purple_connection_get_account(js->gc);
-	GSList *list = account->deny;
-	const char *jid = xmlnode_get_attrib(item, "jid");
-	char *jid_norm = (char *)jabber_normalize(account, jid);
-
-	while (list) {
-		if (!strcmp(jid_norm, (char*)list->data)) {
-			xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-			xmlnode_set_attrib(query, "gr:ext", "2");
-			xmlnode_set_attrib(item, "gr:t", "B");
-			return;
-		}
-		list = list->next;
-	}
-}
-
-gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
-{
-	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *jid = xmlnode_get_attrib(item, "jid");
-	gboolean on_block_list = FALSE;
-
-	char *jid_norm;
-
-	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", NS_GOOGLE_ROSTER);
-	const char *subscription = xmlnode_get_attrib(item, "subscription");
-	const char *ask = xmlnode_get_attrib(item, "ask");
-
-	if ((!subscription || !strcmp(subscription, "none")) && !ask) {
-		/* The Google Talk servers will automatically add people from your Gmail address book
-		 * with subscription=none. If we see someone with subscription=none, ignore them.
-		 */
-		return FALSE;
-	}
-
- 	jid_norm = g_strdup(jabber_normalize(account, jid));
-
-	on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
-	                                            (GCompareFunc)strcmp);
-
-	if (grt && (*grt == 'H' || *grt == 'h')) {
-		/* Hidden; don't show this buddy. */
-		GSList *buddies = purple_find_buddies(account, jid_norm);
-		if (buddies)
-			purple_debug_info("jabber", "Removing %s from local buddy list\n",
-			                  jid_norm);
-
-		for ( ; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
-			purple_blist_remove_buddy(buddies->data);
-		}
-
-		g_free(jid_norm);
-		return FALSE;
-	}
-
-	if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
-		purple_debug_info("jabber", "Blocking %s\n", jid_norm);
-		purple_privacy_deny_add(account, jid_norm, TRUE);
-	} else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){
-		purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
-		purple_privacy_deny_remove(account, jid_norm, TRUE);
-	}
-
-	g_free(jid_norm);
-	return TRUE;
-}
-
-void jabber_google_roster_add_deny(JabberStream *js, const char *who)
-{
-	PurpleAccount *account;
-	GSList *buddies;
-	JabberIq *iq;
-	xmlnode *query;
-	xmlnode *item;
-	xmlnode *group;
-	PurpleBuddy *b;
-	JabberBuddy *jb;
-	const char *balias;
-
-	jb = jabber_buddy_find(js, who, TRUE);
-
-	account = purple_connection_get_account(js->gc);
-	buddies = purple_find_buddies(account, who);
-	if(!buddies)
-		return;
-
-	b = buddies->data;
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-
-	while(buddies) {
-		PurpleGroup *g;
-
-		b = buddies->data;
-		g = purple_buddy_get_group(b);
-
-		group = xmlnode_new_child(item, "group");
-		xmlnode_insert_data(group, purple_group_get_name(g), -1);
-
-		buddies = buddies->next;
-	}
-
-	balias = purple_buddy_get_local_buddy_alias(b);
-	xmlnode_set_attrib(item, "jid", who);
-	xmlnode_set_attrib(item, "name", balias ? balias : "");
-	xmlnode_set_attrib(item, "gr:t", "B");
-	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-	xmlnode_set_attrib(query, "gr:ext", "2");
-
-	jabber_iq_send(iq);
-
-	/* Synthesize a sign-off */
-	if (jb) {
-		JabberBuddyResource *jbr;
-		GList *l = jb->resources;
-		while (l) {
-			jbr = l->data;
-			if (jbr && jbr->name)
-			{
-				purple_debug_misc("jabber", "Removing resource %s\n", jbr->name);
-				jabber_buddy_remove_resource(jb, jbr->name);
-			}
-			l = l->next;
-		}
-	}
-
-	purple_prpl_got_user_status(account, who, "offline", NULL);
-}
-
-void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
-{
-	GSList *buddies;
-	JabberIq *iq;
-	xmlnode *query;
-	xmlnode *item;
-	xmlnode *group;
-	PurpleBuddy *b;
-	const char *balias;
-
-	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
-	if(!buddies)
-		return;
-
-	b = buddies->data;
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-
-	while(buddies) {
-		PurpleGroup *g;
-
-		b = buddies->data;
-		g = purple_buddy_get_group(b);
-
-		group = xmlnode_new_child(item, "group");
-		xmlnode_insert_data(group, purple_group_get_name(g), -1);
-
-		buddies = buddies->next;
-	}
-
-	balias = purple_buddy_get_local_buddy_alias(b);
-	xmlnode_set_attrib(item, "jid", who);
-	xmlnode_set_attrib(item, "name", balias ? balias : "");
-	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-	xmlnode_set_attrib(query, "gr:ext", "2");
-
-	jabber_iq_send(iq);
-
-	/* See if he's online */
-	jabber_presence_subscription_set(js, who, "probe");
-}
-
-/* This does two passes on the string. The first pass goes through
- * and determine if all the structured text is properly balanced, and
- * how many instances of each there is. The second pass goes and converts
- * everything to HTML, depending on what's figured out by the first pass.
- * It will short circuit once it knows it has no more replacements to make
- */
-char *jabber_google_format_to_html(const char *text)
-{
-	const char *p;
-
-	/* The start of the screen may be consdiered a space for this purpose */
-	gboolean preceding_space = TRUE;
-
-	gboolean in_bold = FALSE, in_italic = FALSE;
-	gboolean in_tag = FALSE;
-
-	gint bold_count = 0, italic_count = 0;
-
-	GString *str;
-
-	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
-		gunichar c = g_utf8_get_char(p);
-		if (c == '*' && !in_tag) {
-			if (in_bold && (g_unichar_isspace(*(p+1)) ||
-					*(p+1) == '\0' ||
-					*(p+1) == '<')) {
-				bold_count++;
-				in_bold = FALSE;
-			} else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
-				bold_count++;
-				in_bold = TRUE;
-			}
-			preceding_space = TRUE;
-		} else if (c == '_' && !in_tag) {
-			if (in_italic && (g_unichar_isspace(*(p+1)) ||
-					*(p+1) == '\0' ||
-					*(p+1) == '<')) {
-				italic_count++;
-				in_italic = FALSE;
-			} else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
-				italic_count++;
-				in_italic = TRUE;
-			}
-			preceding_space = TRUE;
-		} else if (c == '<' && !in_tag) {
-			in_tag = TRUE;
-		} else if (c == '>' && in_tag) {
-			in_tag = FALSE;
-		} else if (!in_tag) {
-			if (g_unichar_isspace(c))
-				preceding_space = TRUE;
-			else
-				preceding_space = FALSE;
-		}
-	}
-
-	str  = g_string_new(NULL);
-	in_bold = in_italic = in_tag = FALSE;
-	preceding_space = TRUE;
-
-	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
-		gunichar c = g_utf8_get_char(p);
-
-		if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
-			g_string_append(str, p);
-			return g_string_free(str, FALSE);
-		}
-
-
-		if (c == '*' && !in_tag) {
-			if (in_bold &&
-			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
-				str = g_string_append(str, "</b>");
-				in_bold = FALSE;
-				bold_count--;
-			} else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
-				str = g_string_append(str, "<b>");
-				bold_count--;
-				in_bold = TRUE;
-			} else {
-				str = g_string_append_unichar(str, c);
-			}
-			preceding_space = TRUE;
-		} else if (c == '_' && !in_tag) {
-			if (in_italic &&
-			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
-				str = g_string_append(str, "</i>");
-				italic_count--;
-				in_italic = FALSE;
-			} else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
-				str = g_string_append(str, "<i>");
-				italic_count--;
-				in_italic = TRUE;
-			} else {
-				str = g_string_append_unichar(str, c);
-			}
-			preceding_space = TRUE;
-		} else if (c == '<' && !in_tag) {
-			str = g_string_append_unichar(str, c);
-			in_tag = TRUE;
-		} else if (c == '>' && in_tag) {
-			str = g_string_append_unichar(str, c);
-			in_tag = FALSE;
-		} else if (!in_tag) {
-			str = g_string_append_unichar(str, c);
-			if (g_unichar_isspace(c))
-				preceding_space = TRUE;
-			else
-				preceding_space = FALSE;
-		} else {
-			str = g_string_append_unichar(str, c);
-		}
-	}
-	return g_string_free(str, FALSE);
-}
-
-void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
-{
-	if (!js->googletalk)
-		return;
-	if (jbr->status && purple_str_has_prefix(jbr->status, "♫ ")) {
-		purple_prpl_got_user_status(js->gc->account, user, "tune",
-					    PURPLE_TUNE_TITLE, jbr->status + strlen("♫ "), NULL);
-		g_free(jbr->status);
-		jbr->status = NULL;
-	} else {
-		purple_prpl_got_user_status_deactive(js->gc->account, user, "tune");
-	}
-}
-
-char *jabber_google_presence_outgoing(PurpleStatus *tune)
-{
-	const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
-	return attr ? g_strdup_printf("♫ %s", attr) : g_strdup("");
-}
-
-static void
-jabber_google_stun_lookup_cb(GSList *hosts, gpointer data,
-	const char *error_message)
-{
-	JabberStream *js = (JabberStream *) data;
-
-	if (error_message) {
-		purple_debug_error("jabber", "Google STUN lookup failed: %s\n",
-			error_message);
-		g_slist_free(hosts);
-		js->stun_query = NULL;
-		return;
-	}
-
-	if (hosts && g_slist_next(hosts)) {
-		struct sockaddr *addr = g_slist_next(hosts)->data;
-		char dst[INET6_ADDRSTRLEN];
-		int port;
-
-		if (addr->sa_family == AF_INET6) {
-			inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
-				dst, sizeof(dst));
-			port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
-		} else {
-			inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
-				dst, sizeof(dst));
-			port = ntohs(((struct sockaddr_in *) addr)->sin_port);
-		}
-
-		if (js->stun_ip)
-			g_free(js->stun_ip);
-		js->stun_ip = g_strdup(dst);
-		js->stun_port = port;
-
-		purple_debug_info("jabber", "set Google STUN IP/port address: "
-		                  "%s:%d\n", dst, port);
-
-		/* unmark ongoing query */
-		js->stun_query = NULL;
-	}
-
-	while (hosts != NULL) {
-		hosts = g_slist_delete_link(hosts, hosts);
-		/* Free the address */
-		g_free(hosts->data);
-		hosts = g_slist_delete_link(hosts, hosts);
-	}
-}
-
-static void
-jabber_google_jingle_info_common(JabberStream *js, const char *from,
-                                 JabberIqType type, xmlnode *query)
-{
-	const xmlnode *stun = xmlnode_get_child(query, "stun");
-	gchar *my_bare_jid;
-
-	/*
-	 * Make sure that random people aren't sending us STUN servers. Per
-	 * http://code.google.com/apis/talk/jep_extensions/jingleinfo.html, these
-	 * stanzas are stamped from our bare JID.
-	 */
-	if (from) {
-		my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-		if (!purple_strequal(from, my_bare_jid)) {
-			purple_debug_warning("jabber", "got google:jingleinfo with invalid from (%s)\n",
-			                  from);
-			g_free(my_bare_jid);
-			return;
-		}
-
-		g_free(my_bare_jid);
-	}
-
-	if (type == JABBER_IQ_ERROR || type == JABBER_IQ_GET)
-		return;
-
-	purple_debug_info("jabber", "got google:jingleinfo\n");
-
-	if (stun) {
-		xmlnode *server = xmlnode_get_child(stun, "server");
-
-		if (server) {
-			const gchar *host = xmlnode_get_attrib(server, "host");
-			const gchar *udp = xmlnode_get_attrib(server, "udp");
-
-			if (host && udp) {
-				int port = atoi(udp);
-				/* if there, would already be an ongoing query,
-				 cancel it */
-				if (js->stun_query)
-					purple_dnsquery_destroy(js->stun_query);
-
-				js->stun_query = purple_dnsquery_a(host, port,
-					jabber_google_stun_lookup_cb, js);
-			}
-		}
-	}
-	/* should perhaps handle relays later on, or maybe wait until
-	 Google supports a common standard... */
-}
-
-static void
-jabber_google_jingle_info_cb(JabberStream *js, const char *from,
-                             JabberIqType type, const char *id,
-                             xmlnode *packet, gpointer data)
-{
-	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
-			NS_GOOGLE_JINGLE_INFO);
-
-	if (query)
-		jabber_google_jingle_info_common(js, from, type, query);
-	else
-		purple_debug_warning("jabber", "Got invalid google:jingleinfo\n");
-}
-
-void
-jabber_google_handle_jingle_info(JabberStream *js, const char *from,
-                                 JabberIqType type, const char *id,
-                                 xmlnode *child)
-{
-	jabber_google_jingle_info_common(js, from, type, child);
-}
-
-void
-jabber_google_send_jingle_info(JabberStream *js)
-{
-	JabberIq *jingle_info =
-		jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_JINGLE_INFO);
-
-	jabber_iq_set_callback(jingle_info, jabber_google_jingle_info_cb,
-		NULL);
-	purple_debug_info("jabber", "sending google:jingleinfo query\n");
-	jabber_iq_send(jingle_info);
-}
-
-void google_buddy_node_chat(PurpleBlistNode *node, gpointer data)
-{
-	PurpleBuddy *buddy;
-	PurpleConnection *gc;
-	JabberStream *js;
-	JabberChat *chat;
-	gchar *room;
-	gchar *uuid = purple_uuid_random();
-
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = PURPLE_BUDDY(node);
-	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	g_return_if_fail(gc != NULL);
-	js = purple_connection_get_protocol_data(gc);
-
-	room = g_strdup_printf("private-chat-%s", uuid);	
-	chat = jabber_join_chat(js, room, GOOGLE_GROUPCHAT_SERVER, js->user->node,
-	                        NULL, NULL);
-	if (chat) {
-		chat->muc = TRUE;
-		jabber_chat_invite(gc, chat->id, "", purple_buddy_get_name(buddy));
-	}
-
-	g_free(room);
-	g_free(uuid);
-}
diff --git a/libpurple/protocols/jabber/google/gmail.c b/libpurple/protocols/jabber/google/gmail.c
new file mode 100644
index 0000000000..5f86b8efac
--- /dev/null
+++ b/libpurple/protocols/jabber/google/gmail.c
@@ -0,0 +1,207 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+#include "jabber.h"
+#include "gmail.h"
+
+static void
+jabber_gmail_parse(JabberStream *js, const char *from,
+                   JabberIqType type, const char *id,
+                   xmlnode *packet, gpointer nul)
+{
+	xmlnode *child;
+	xmlnode *message;
+	const char *to, *url;
+	const char *in_str;
+	char *to_name;
+
+	int i, count = 1, returned_count;
+
+	const char **tos, **froms, **urls;
+	char **subjects;
+
+	if (type == JABBER_IQ_ERROR)
+		return;
+
+	child = xmlnode_get_child(packet, "mailbox");
+	if (!child)
+		return;
+
+	in_str = xmlnode_get_attrib(child, "total-matched");
+	if (in_str && *in_str)
+		count = atoi(in_str);
+
+	/* If Gmail doesn't tell us who the mail is to, let's use our JID */
+	to = xmlnode_get_attrib(packet, "to");
+
+	message = xmlnode_get_child(child, "mail-thread-info");
+
+	if (count == 0 || !message) {
+		if (count > 0) {
+			char *bare_jid = jabber_get_bare_jid(to);
+			const char *default_tos[2] = { bare_jid };
+
+			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, default_tos, NULL, NULL, NULL);
+			g_free(bare_jid);
+		} else {
+			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, NULL, NULL, NULL, NULL);
+		}
+
+		return;
+	}
+
+	/* Loop once to see how many messages were returned so we can allocate arrays
+	 * accordingly */
+	for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
+
+	froms    = g_new0(const char* , returned_count + 1);
+	tos      = g_new0(const char* , returned_count + 1);
+	subjects = g_new0(char* , returned_count + 1);
+	urls     = g_new0(const char* , returned_count + 1);
+
+	to = xmlnode_get_attrib(packet, "to");
+	to_name = jabber_get_bare_jid(to);
+	url = xmlnode_get_attrib(child, "url");
+	if (!url || !*url)
+		url = "http://www.gmail.com";
+
+	message= xmlnode_get_child(child, "mail-thread-info");
+	for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
+		xmlnode *sender_node, *subject_node;
+		const char *from, *tid;
+		char *subject;
+
+		subject_node = xmlnode_get_child(message, "subject");
+		sender_node  = xmlnode_get_child(message, "senders");
+		sender_node  = xmlnode_get_child(sender_node, "sender");
+
+		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
+		       !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
+			sender_node = xmlnode_get_next_twin(sender_node);
+
+		if (!sender_node) {
+			i--;
+			continue;
+		}
+
+		from = xmlnode_get_attrib(sender_node, "name");
+		if (!from || !*from)
+			from = xmlnode_get_attrib(sender_node, "address");
+		subject = xmlnode_get_data(subject_node);
+		/*
+		 * url = xmlnode_get_attrib(message, "url");
+		 */
+		tos[i] = (to_name != NULL ?  to_name : "");
+		froms[i] = (from != NULL ?  from : "");
+		subjects[i] = (subject != NULL ? subject : g_strdup(""));
+		urls[i] = url;
+
+		tid = xmlnode_get_attrib(message, "tid");
+		if (tid &&
+		    (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
+			g_free(js->gmail_last_tid);
+			js->gmail_last_tid = g_strdup(tid);
+		}
+	}
+
+	if (i>0)
+		purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
+				urls, NULL, NULL);
+
+	g_free(to_name);
+	g_free(tos);
+	g_free(froms);
+	for (i = 0; i < returned_count; i++)
+		g_free(subjects[i]);
+	g_free(subjects);
+	g_free(urls);
+
+	in_str = xmlnode_get_attrib(child, "result-time");
+	if (in_str && *in_str) {
+		g_free(js->gmail_last_time);
+		js->gmail_last_time = g_strdup(in_str);
+	}
+}
+
+void
+jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
+                  const char *id, xmlnode *new_mail)
+{
+	xmlnode *query;
+	JabberIq *iq;
+
+	/* bail if the user isn't interested */
+	if (!purple_account_get_check_mail(js->gc->account))
+		return;
+
+	/* Is this an initial incoming mail notification? If so, send a request for more info */
+	if (type != JABBER_IQ_SET)
+		return;
+
+	/* Acknowledge the notification */
+	iq = jabber_iq_new(js, JABBER_IQ_RESULT);
+	if (from)
+		xmlnode_set_attrib(iq->node, "to", from);
+	xmlnode_set_attrib(iq->node, "id", id);
+	jabber_iq_send(iq);
+
+	purple_debug_misc("jabber",
+		   "Got new mail notification. Sending request for more info\n");
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
+	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
+	query = xmlnode_get_child(iq->node, "query");
+
+	if (js->gmail_last_time)
+		xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time);
+	if (js->gmail_last_tid)
+		xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid);
+
+	jabber_iq_send(iq);
+	return;
+}
+
+void jabber_gmail_init(JabberStream *js) {
+	JabberIq *iq;
+	xmlnode *usersetting, *mailnotifications;
+
+	if (!purple_account_get_check_mail(purple_connection_get_account(js->gc)))
+		return;
+
+	/*
+	 * Quoting http://code.google.com/apis/talk/jep_extensions/usersettings.html:
+	 * To ensure better compatibility with other clients, rather than
+	 * setting this value to "false" to turn off notifications, it is
+	 * recommended that a client set this to "true" and filter incoming
+	 * email notifications itself.
+	 */
+	iq = jabber_iq_new(js, JABBER_IQ_SET);
+	usersetting = xmlnode_new_child(iq->node, "usersetting");
+	xmlnode_set_namespace(usersetting, "google:setting");
+	mailnotifications = xmlnode_new_child(usersetting, "mailnotifications");
+	xmlnode_set_attrib(mailnotifications, "value", "true");
+	jabber_iq_send(iq);
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
+	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
+	jabber_iq_send(iq);
+}
diff --git a/libpurple/protocols/msn/dialog.h b/libpurple/protocols/jabber/google/gmail.h
index 2fc9b23ada..2058802ea2 100644
--- a/libpurple/protocols/msn/dialog.h
+++ b/libpurple/protocols/jabber/google/gmail.h
@@ -1,8 +1,4 @@
 /**
- * @file dialog.h Dialog functions
- *
- * purple
- *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
@@ -21,10 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef MSN_DIALOG_H
-#define MSN_DIALOG_H
 
-void msn_show_sync_issue(MsnSession *session, const char *passport,
-						 const char *group_name);
+#ifndef PURPLE_JABBER_GOOGLE_GMAIL_H_
+#define PURPLE_JABBER_GOOGLE_GMAIL_H_
+
+#include "jabber.h"
+
+void jabber_gmail_init(JabberStream *js);
+void jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
+                       const char *id, xmlnode *new_mail);
 
-#endif /* MSN_DIALOG_H */
+#endif /* PURPLE_JABBER_GOOGLE_GMAIL_H_ */
diff --git a/libpurple/protocols/jabber/google/google.c b/libpurple/protocols/jabber/google/google.c
new file mode 100644
index 0000000000..b4336d9d2a
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google.c
@@ -0,0 +1,172 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+
+#include "google.h"
+#include "jabber.h"
+#include "chat.h"
+
+/* This does two passes on the string. The first pass goes through
+ * and determine if all the structured text is properly balanced, and
+ * how many instances of each there is. The second pass goes and converts
+ * everything to HTML, depending on what's figured out by the first pass.
+ * It will short circuit once it knows it has no more replacements to make
+ */
+char *jabber_google_format_to_html(const char *text)
+{
+	const char *p;
+
+	/* The start of the screen may be consdiered a space for this purpose */
+	gboolean preceding_space = TRUE;
+
+	gboolean in_bold = FALSE, in_italic = FALSE;
+	gboolean in_tag = FALSE;
+
+	gint bold_count = 0, italic_count = 0;
+
+	GString *str;
+
+	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
+		gunichar c = g_utf8_get_char(p);
+		if (c == '*' && !in_tag) {
+			if (in_bold && (g_unichar_isspace(*(p+1)) ||
+					*(p+1) == '\0' ||
+					*(p+1) == '<')) {
+				bold_count++;
+				in_bold = FALSE;
+			} else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
+				bold_count++;
+				in_bold = TRUE;
+			}
+			preceding_space = TRUE;
+		} else if (c == '_' && !in_tag) {
+			if (in_italic && (g_unichar_isspace(*(p+1)) ||
+					*(p+1) == '\0' ||
+					*(p+1) == '<')) {
+				italic_count++;
+				in_italic = FALSE;
+			} else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
+				italic_count++;
+				in_italic = TRUE;
+			}
+			preceding_space = TRUE;
+		} else if (c == '<' && !in_tag) {
+			in_tag = TRUE;
+		} else if (c == '>' && in_tag) {
+			in_tag = FALSE;
+		} else if (!in_tag) {
+			if (g_unichar_isspace(c))
+				preceding_space = TRUE;
+			else
+				preceding_space = FALSE;
+		}
+	}
+
+	str  = g_string_new(NULL);
+	in_bold = in_italic = in_tag = FALSE;
+	preceding_space = TRUE;
+
+	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
+		gunichar c = g_utf8_get_char(p);
+
+		if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
+			g_string_append(str, p);
+			return g_string_free(str, FALSE);
+		}
+
+
+		if (c == '*' && !in_tag) {
+			if (in_bold &&
+			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
+				str = g_string_append(str, "</b>");
+				in_bold = FALSE;
+				bold_count--;
+			} else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
+				str = g_string_append(str, "<b>");
+				bold_count--;
+				in_bold = TRUE;
+			} else {
+				str = g_string_append_unichar(str, c);
+			}
+			preceding_space = TRUE;
+		} else if (c == '_' && !in_tag) {
+			if (in_italic &&
+			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
+				str = g_string_append(str, "</i>");
+				italic_count--;
+				in_italic = FALSE;
+			} else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
+				str = g_string_append(str, "<i>");
+				italic_count--;
+				in_italic = TRUE;
+			} else {
+				str = g_string_append_unichar(str, c);
+			}
+			preceding_space = TRUE;
+		} else if (c == '<' && !in_tag) {
+			str = g_string_append_unichar(str, c);
+			in_tag = TRUE;
+		} else if (c == '>' && in_tag) {
+			str = g_string_append_unichar(str, c);
+			in_tag = FALSE;
+		} else if (!in_tag) {
+			str = g_string_append_unichar(str, c);
+			if (g_unichar_isspace(c))
+				preceding_space = TRUE;
+			else
+				preceding_space = FALSE;
+		} else {
+			str = g_string_append_unichar(str, c);
+		}
+	}
+	return g_string_free(str, FALSE);
+}
+
+
+
+void google_buddy_node_chat(PurpleBlistNode *node, gpointer data)
+{
+	PurpleBuddy *buddy;
+	PurpleConnection *gc;
+	JabberStream *js;
+	JabberChat *chat;
+	gchar *room;
+	gchar *uuid = purple_uuid_random();
+
+	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
+
+	buddy = PURPLE_BUDDY(node);
+	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+	g_return_if_fail(gc != NULL);
+	js = purple_connection_get_protocol_data(gc);
+
+	room = g_strdup_printf("private-chat-%s", uuid);	
+	chat = jabber_join_chat(js, room, GOOGLE_GROUPCHAT_SERVER, js->user->node,
+	                        NULL, NULL);
+	if (chat) {
+		chat->muc = TRUE;
+		jabber_chat_invite(gc, chat->id, "", purple_buddy_get_name(buddy));
+	}
+
+	g_free(room);
+	g_free(uuid);
+}
diff --git a/libpurple/protocols/msn/sync.h b/libpurple/protocols/jabber/google/google.h
index 12ca1cc963..3f6a80361e 100644
--- a/libpurple/protocols/msn/sync.h
+++ b/libpurple/protocols/jabber/google/google.h
@@ -1,8 +1,4 @@
 /**
- * @file sync.h MSN list synchronization functions
- *
- * purple
- *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
@@ -21,37 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef MSN_SYNC_H
-#define MSN_SYNC_H
-
-typedef struct _MsnSync MsnSync;
 
-#include "session.h"
-#include "table.h"
-#include "user.h"
+#ifndef PURPLE_JABBER_GOOGLE_H_
+#define PURPLE_JABBER_GOOGLE_H_
 
-struct _MsnSync
-{
-	MsnSession *session;
-	MsnTable *cbs_table;
+/* This is a place for Google Talk-specific XMPP extensions to live
+ * such that they don't intermingle with code for the XMPP RFCs and XEPs :) */
 
-	/*
-	 * TODO: What is the intended purpose of old_cbs_table?  Nothing
-	 *       sets it and it is only read in two places.
-	 */
-	MsnTable *old_cbs_table;
+#include "jabber.h"
 
-	int num_users;
-	int total_users;
-	int num_groups;
-	int total_groups;
-	MsnUser *last_user;
-};
+#define GOOGLE_GROUPCHAT_SERVER "groupchat.google.com"
 
-void msn_sync_init(void);
-void msn_sync_end(void);
+char *jabber_google_format_to_html(const char *text);
 
-MsnSync *msn_sync_new(MsnSession *session);
-void msn_sync_destroy(MsnSync *sync);
+void google_buddy_node_chat(PurpleBlistNode *node, gpointer data);
 
-#endif /* MSN_SYNC_H */
+#endif   /* PURPLE_JABBER_GOOGLE_H_ */
diff --git a/libpurple/protocols/jabber/google/google_presence.c b/libpurple/protocols/jabber/google/google_presence.c
new file mode 100644
index 0000000000..c5ec55d946
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_presence.c
@@ -0,0 +1,43 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+#include "google_presence.h"
+
+void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
+{
+	if (!js->googletalk)
+		return;
+	if (jbr->status && purple_str_has_prefix(jbr->status, "♫ ")) {
+		purple_prpl_got_user_status(js->gc->account, user, "tune",
+					    PURPLE_TUNE_TITLE, jbr->status + strlen("♫ "), NULL);
+		g_free(jbr->status);
+		jbr->status = NULL;
+	} else {
+		purple_prpl_got_user_status_deactive(js->gc->account, user, "tune");
+	}
+}
+
+char *jabber_google_presence_outgoing(PurpleStatus *tune)
+{
+	const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
+	return attr ? g_strdup_printf("♫ %s", attr) : g_strdup("");
+}
diff --git a/libpurple/protocols/jabber/google/google_presence.h b/libpurple/protocols/jabber/google/google_presence.h
new file mode 100644
index 0000000000..4cf9dc347f
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_presence.h
@@ -0,0 +1,32 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_GOOGLE_PRESENCE_H_
+#define PURPLE_JABBER_GOOGLE_PRESENCE_H_
+
+#include "jabber.h"
+#include "buddy.h"
+#include "status.h"
+
+void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
+char *jabber_google_presence_outgoing(PurpleStatus *tune);
+
+
+#endif /* PURPLE_JABBER_GOOGLE_PRESENCE_H_ */
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/google_roster.c b/libpurple/protocols/jabber/google/google_roster.c
new file mode 100644
index 0000000000..cca6320f14
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_roster.c
@@ -0,0 +1,206 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "google_roster.h"
+#include "jabber.h"
+#include "presence.h"
+#include "debug.h"
+#include "xmlnode.h"
+
+void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
+{
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	GSList *list = account->deny;
+	const char *jid = xmlnode_get_attrib(item, "jid");
+	char *jid_norm = (char *)jabber_normalize(account, jid);
+
+	while (list) {
+		if (!strcmp(jid_norm, (char*)list->data)) {
+			xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+			xmlnode_set_attrib(query, "gr:ext", "2");
+			xmlnode_set_attrib(item, "gr:t", "B");
+			return;
+		}
+		list = list->next;
+	}
+}
+
+gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
+{
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	const char *jid = xmlnode_get_attrib(item, "jid");
+	gboolean on_block_list = FALSE;
+
+	char *jid_norm;
+
+	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", NS_GOOGLE_ROSTER);
+	const char *subscription = xmlnode_get_attrib(item, "subscription");
+	const char *ask = xmlnode_get_attrib(item, "ask");
+
+	if ((!subscription || !strcmp(subscription, "none")) && !ask) {
+		/* The Google Talk servers will automatically add people from your Gmail address book
+		 * with subscription=none. If we see someone with subscription=none, ignore them.
+		 */
+		return FALSE;
+	}
+
+ 	jid_norm = g_strdup(jabber_normalize(account, jid));
+
+	on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
+	                                            (GCompareFunc)strcmp);
+
+	if (grt && (*grt == 'H' || *grt == 'h')) {
+		/* Hidden; don't show this buddy. */
+		GSList *buddies = purple_find_buddies(account, jid_norm);
+		if (buddies)
+			purple_debug_info("jabber", "Removing %s from local buddy list\n",
+			                  jid_norm);
+
+		for ( ; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
+			purple_blist_remove_buddy(buddies->data);
+		}
+
+		g_free(jid_norm);
+		return FALSE;
+	}
+
+	if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
+		purple_debug_info("jabber", "Blocking %s\n", jid_norm);
+		purple_privacy_deny_add(account, jid_norm, TRUE);
+	} else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){
+		purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
+		purple_privacy_deny_remove(account, jid_norm, TRUE);
+	}
+
+	g_free(jid_norm);
+	return TRUE;
+}
+
+void jabber_google_roster_add_deny(JabberStream *js, const char *who)
+{
+	PurpleAccount *account;
+	GSList *buddies;
+	JabberIq *iq;
+	xmlnode *query;
+	xmlnode *item;
+	xmlnode *group;
+	PurpleBuddy *b;
+	JabberBuddy *jb;
+	const char *balias;
+
+	jb = jabber_buddy_find(js, who, TRUE);
+
+	account = purple_connection_get_account(js->gc);
+	buddies = purple_find_buddies(account, who);
+	if(!buddies)
+		return;
+
+	b = buddies->data;
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
+
+	query = xmlnode_get_child(iq->node, "query");
+	item = xmlnode_new_child(query, "item");
+
+	while(buddies) {
+		PurpleGroup *g;
+
+		b = buddies->data;
+		g = purple_buddy_get_group(b);
+
+		group = xmlnode_new_child(item, "group");
+		xmlnode_insert_data(group, purple_group_get_name(g), -1);
+
+		buddies = buddies->next;
+	}
+
+	balias = purple_buddy_get_local_buddy_alias(b);
+	xmlnode_set_attrib(item, "jid", who);
+	xmlnode_set_attrib(item, "name", balias ? balias : "");
+	xmlnode_set_attrib(item, "gr:t", "B");
+	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+	xmlnode_set_attrib(query, "gr:ext", "2");
+
+	jabber_iq_send(iq);
+
+	/* Synthesize a sign-off */
+	if (jb) {
+		JabberBuddyResource *jbr;
+		GList *l = jb->resources;
+		while (l) {
+			jbr = l->data;
+			if (jbr && jbr->name)
+			{
+				purple_debug_misc("jabber", "Removing resource %s\n", jbr->name);
+				jabber_buddy_remove_resource(jb, jbr->name);
+			}
+			l = l->next;
+		}
+	}
+
+	purple_prpl_got_user_status(account, who, "offline", NULL);
+}
+
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
+{
+	GSList *buddies;
+	JabberIq *iq;
+	xmlnode *query;
+	xmlnode *item;
+	xmlnode *group;
+	PurpleBuddy *b;
+	const char *balias;
+
+	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
+	if(!buddies)
+		return;
+
+	b = buddies->data;
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
+
+	query = xmlnode_get_child(iq->node, "query");
+	item = xmlnode_new_child(query, "item");
+
+	while(buddies) {
+		PurpleGroup *g;
+
+		b = buddies->data;
+		g = purple_buddy_get_group(b);
+
+		group = xmlnode_new_child(item, "group");
+		xmlnode_insert_data(group, purple_group_get_name(g), -1);
+
+		buddies = buddies->next;
+	}
+
+	balias = purple_buddy_get_local_buddy_alias(b);
+	xmlnode_set_attrib(item, "jid", who);
+	xmlnode_set_attrib(item, "name", balias ? balias : "");
+	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+	xmlnode_set_attrib(query, "gr:ext", "2");
+
+	jabber_iq_send(iq);
+
+	/* See if he's online */
+	jabber_presence_subscription_set(js, who, "probe");
+}
+
diff --git a/libpurple/protocols/jabber/google.h b/libpurple/protocols/jabber/google/google_roster.h
index 3439fbf927..34f6fa5d8c 100644
--- a/libpurple/protocols/jabber/google.h
+++ b/libpurple/protocols/jabber/google/google_roster.h
@@ -18,20 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef PURPLE_JABBER_GOOGLE_H_
-#define PURPLE_JABBER_GOOGLE_H_
-
-/* This is a place for Google Talk-specific XMPP extensions to live
- * such that they don't intermingle with code for the XMPP RFCs and XEPs :) */
+#ifndef PURPLE_JABBER_GOOGLE_ROSTER_H_
+#define PURPLE_JABBER_GOOGLE_ROSTER_H_
 
 #include "jabber.h"
 
-#define GOOGLE_GROUPCHAT_SERVER "groupchat.google.com"
-
-void jabber_gmail_init(JabberStream *js);
-void jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
-                       const char *id, xmlnode *new_mail);
-
 void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item);
 
 /* Returns FALSE if this should short-circuit processing of this roster item, or TRUE
@@ -39,22 +30,8 @@ void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *it
  */
 gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item);
 
-void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
-char *jabber_google_presence_outgoing(PurpleStatus *tune);
-
 void jabber_google_roster_add_deny(JabberStream *js, const char *who);
 void jabber_google_roster_rem_deny(JabberStream *js, const char *who);
 
-char *jabber_google_format_to_html(const char *text);
-
-gboolean jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type);
-void jabber_google_session_parse(JabberStream *js, const char *from, JabberIqType type, const char *iq, xmlnode *session);
-
-void jabber_google_handle_jingle_info(JabberStream *js, const char *from,
-                                      JabberIqType type, const char *id,
-                                      xmlnode *child);
-void jabber_google_send_jingle_info(JabberStream *js);
-
-void google_buddy_node_chat(PurpleBlistNode *node, gpointer data);
 
-#endif   /* PURPLE_JABBER_GOOGLE_H_ */
+#endif /* PURPLE_JABBER_GOOGLE_ROSTER_H_ */
diff --git a/libpurple/protocols/jabber/google/google_session.c b/libpurple/protocols/jabber/google/google_session.c
new file mode 100644
index 0000000000..0b0b1cce63
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_session.c
@@ -0,0 +1,866 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+#include "google_session.h"
+#include "relay.h"
+
+#include "jingle/jingle.h"
+
+#ifdef USE_VV
+
+typedef struct {
+	PurpleMedia *media;
+	gboolean video;
+	GList *remote_audio_candidates; /* list of PurpleMediaCandidate */
+	GList *remote_video_candidates; /* list of PurpleMediaCandidate */
+	gboolean added_streams;		/* this indicates if the streams have been
+	 							   to media (ie. after getting relay credentials */
+} GoogleAVSessionData;
+
+static gboolean
+google_session_id_equal(gconstpointer a, gconstpointer b)
+{
+	GoogleSessionId *c = (GoogleSessionId*)a;
+	GoogleSessionId *d = (GoogleSessionId*)b;
+
+	return !strcmp(c->id, d->id) && !strcmp(c->initiator, d->initiator);
+}
+
+static void
+google_session_destroy(GoogleSession *session)
+{
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	g_free(session->id.id);
+	g_free(session->id.initiator);
+	g_free(session->remote_jid);
+
+	if (session_data->remote_audio_candidates)
+		purple_media_candidate_list_free(session_data->remote_audio_candidates);
+
+	if (session_data->remote_video_candidates)
+		purple_media_candidate_list_free(session_data->remote_video_candidates);
+
+	if (session->description)
+		xmlnode_free(session->description);
+	
+	g_free(session->session_data);
+	g_free(session);
+}
+
+static xmlnode *
+google_session_create_xmlnode(GoogleSession *session, const char *type)
+{
+	xmlnode *node = xmlnode_new("session");
+	xmlnode_set_namespace(node, NS_GOOGLE_SESSION);
+	xmlnode_set_attrib(node, "id", session->id.id);
+	xmlnode_set_attrib(node, "initiator", session->id.initiator);
+	xmlnode_set_attrib(node, "type", type);
+	return node;
+}
+
+static void
+google_session_send_candidates(PurpleMedia *media, gchar *session_id,
+		gchar *participant, GoogleSession *session)
+{
+	PurpleMedia *session_media =
+		((GoogleAVSessionData *) session->session_data)->media;
+	GList *candidates =
+		purple_media_get_local_candidates(session_media, session_id,
+		    session->remote_jid);
+	GList *iter;
+	PurpleMediaCandidate *transport;
+	gboolean video = FALSE;
+
+	if (!strcmp(session_id, "google-video"))
+		video = TRUE;
+
+	for (iter = candidates; iter; iter = iter->next) {
+		JabberIq *iq;
+		gchar *ip, *port, *username, *password;
+		gchar pref[16];
+		PurpleMediaCandidateType type;
+		xmlnode *sess;
+		xmlnode *candidate;
+		guint component_id;
+		transport = PURPLE_MEDIA_CANDIDATE(iter->data);
+		component_id = purple_media_candidate_get_component_id(
+				transport);
+
+		iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+		sess = google_session_create_xmlnode(session, "candidates");
+		xmlnode_insert_child(iq->node, sess);
+		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+
+		candidate = xmlnode_new("candidate");
+
+		ip = purple_media_candidate_get_ip(transport);
+		port = g_strdup_printf("%d",
+				purple_media_candidate_get_port(transport));
+		g_ascii_dtostr(pref, 16,
+			purple_media_candidate_get_priority(transport) / 1000.0);
+		username = purple_media_candidate_get_username(transport);
+		password = purple_media_candidate_get_password(transport);
+		type = purple_media_candidate_get_candidate_type(transport);
+
+		xmlnode_set_attrib(candidate, "address", ip);
+		xmlnode_set_attrib(candidate, "port", port);
+		xmlnode_set_attrib(candidate, "name",
+				component_id == PURPLE_MEDIA_COMPONENT_RTP ?
+				video ? "video_rtp" : "rtp" :
+				component_id == PURPLE_MEDIA_COMPONENT_RTCP ?
+				video ? "video_rtcp" : "rtcp" : "none");
+		xmlnode_set_attrib(candidate, "username", username);
+		/*
+		 * As of this writing, Farsight 2 in Google compatibility
+		 * mode doesn't provide a password. The Gmail client
+		 * requires this to be set.
+		 */
+		xmlnode_set_attrib(candidate, "password",
+				password != NULL ? password : "");
+		xmlnode_set_attrib(candidate, "preference", pref);
+		xmlnode_set_attrib(candidate, "protocol",
+				purple_media_candidate_get_protocol(transport)
+				== PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ?
+				"udp" : "tcp");
+		xmlnode_set_attrib(candidate, "type", type ==
+				PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" :
+						      type ==
+				PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" :
+					       	      type ==
+				PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
+				NULL);
+		xmlnode_set_attrib(candidate, "generation", "0");
+		xmlnode_set_attrib(candidate, "network", "0");
+		xmlnode_insert_child(sess, candidate);
+
+		g_free(ip);
+		g_free(port);
+		g_free(username);
+		g_free(password);
+
+		jabber_iq_send(iq);
+	}
+	purple_media_candidate_list_free(candidates);
+}
+
+static void
+google_session_ready(GoogleSession *session)
+{
+	PurpleMedia *media =
+		((GoogleAVSessionData *)session->session_data)->media;
+	gboolean video =
+		((GoogleAVSessionData *)session->session_data)->video;
+	if (purple_media_codecs_ready(media, NULL) &&
+			purple_media_candidates_prepared(media, NULL, NULL)) {
+		gchar *me = g_strdup_printf("%s@%s/%s",
+				session->js->user->node,
+				session->js->user->domain,
+				session->js->user->resource);
+		JabberIq *iq;
+		xmlnode *sess, *desc, *payload;
+		GList *codecs, *iter;
+		gboolean is_initiator = !strcmp(session->id.initiator, me);
+
+		if (!is_initiator &&
+				!purple_media_accepted(media, NULL, NULL)) {
+			g_free(me);
+			return;
+		}
+
+		iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+		if (is_initiator) {
+			xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+			xmlnode_set_attrib(iq->node, "from", session->id.initiator);
+			sess = google_session_create_xmlnode(session, "initiate");
+		} else {
+			google_session_send_candidates(media,
+					"google-voice", session->remote_jid,
+					session);
+			google_session_send_candidates(media,
+					"google-video", session->remote_jid,
+					session);
+			xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+			xmlnode_set_attrib(iq->node, "from", me);
+			sess = google_session_create_xmlnode(session, "accept");
+		}
+		xmlnode_insert_child(iq->node, sess);
+		desc = xmlnode_new_child(sess, "description");
+		if (video)
+			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_VIDEO);
+		else
+			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_PHONE);
+
+		codecs = purple_media_get_codecs(media, "google-video");
+
+		for (iter = codecs; iter; iter = g_list_next(iter)) {
+			PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
+			gchar *id = g_strdup_printf("%d",
+					purple_media_codec_get_id(codec));
+			gchar *encoding_name =
+					purple_media_codec_get_encoding_name(codec);
+			payload = xmlnode_new_child(desc, "payload-type");
+			xmlnode_set_attrib(payload, "id", id);
+			xmlnode_set_attrib(payload, "name", encoding_name);
+			xmlnode_set_attrib(payload, "width", "320");
+			xmlnode_set_attrib(payload, "height", "200");
+			xmlnode_set_attrib(payload, "framerate", "30");
+			g_free(encoding_name);
+			g_free(id);
+		}
+		purple_media_codec_list_free(codecs);
+
+		codecs = purple_media_get_codecs(media, "google-voice");
+
+		for (iter = codecs; iter; iter = g_list_next(iter)) {
+			PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
+			gchar *id = g_strdup_printf("%d",
+					purple_media_codec_get_id(codec));
+			gchar *encoding_name =
+					purple_media_codec_get_encoding_name(codec);
+			gchar *clock_rate = g_strdup_printf("%d",
+					purple_media_codec_get_clock_rate(codec));
+			payload = xmlnode_new_child(desc, "payload-type");
+			if (video)
+				xmlnode_set_namespace(payload, NS_GOOGLE_SESSION_PHONE);
+			xmlnode_set_attrib(payload, "id", id);
+			/*
+			 * Hack to make Gmail accept speex as the codec.
+			 * It shouldn't have to be case sensitive.
+			 */
+			if (purple_strequal(encoding_name, "SPEEX"))
+				xmlnode_set_attrib(payload, "name", "speex");
+			else
+				xmlnode_set_attrib(payload, "name", encoding_name);
+			xmlnode_set_attrib(payload, "clockrate", clock_rate);
+			g_free(clock_rate);
+			g_free(encoding_name);
+			g_free(id);
+		}
+		purple_media_codec_list_free(codecs);
+
+		jabber_iq_send(iq);
+
+		if (is_initiator) {
+			google_session_send_candidates(media,
+					"google-voice", session->remote_jid,
+					session);
+			google_session_send_candidates(media,
+					"google-video", session->remote_jid,
+					session);
+		}
+
+		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
+				G_CALLBACK(google_session_ready), session);
+	}
+}
+
+static void
+google_session_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, GoogleSession *session)
+{
+	if (sid == NULL && name == NULL) {
+		if (state == PURPLE_MEDIA_STATE_END) {
+			google_session_destroy(session);
+		}
+	}
+}
+
+static void
+google_session_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local,
+		GoogleSession *session)
+{
+	if (sid != NULL || name != NULL)
+		return;
+
+	if (type == PURPLE_MEDIA_INFO_HANGUP) {
+		xmlnode *sess;
+		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+		sess = google_session_create_xmlnode(session, "terminate");
+		xmlnode_insert_child(iq->node, sess);
+
+		jabber_iq_send(iq);
+	} else if (type == PURPLE_MEDIA_INFO_REJECT) {
+		xmlnode *sess;
+		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+		sess = google_session_create_xmlnode(session, "reject");
+		xmlnode_insert_child(iq->node, sess);
+
+		jabber_iq_send(iq);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
+		google_session_ready(session);
+	}
+}
+
+static GParameter *
+jabber_google_session_get_params(JabberStream *js, const gchar *relay_ip,
+	guint16 relay_udp, guint16 relay_tcp, guint16 relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password, guint *num)
+{
+	guint num_params;
+	GParameter *params =
+		jingle_get_params(js, relay_ip, relay_udp, relay_tcp, relay_ssltcp,
+	    	relay_username, relay_password, &num_params);
+	GParameter *new_params = g_new0(GParameter, num_params + 1);
+
+	memcpy(new_params, params, sizeof(GParameter) * num_params);
+
+	purple_debug_info("jabber", "setting Google jingle compatibility param\n");
+	new_params[num_params].name = "compatibility-mode";
+	g_value_init(&new_params[num_params].value, G_TYPE_UINT);
+	g_value_set_uint(&new_params[num_params].value, 1); /* NICE_COMPATIBILITY_GOOGLE */
+
+	g_free(params);
+	*num = num_params + 1;
+	return new_params;
+}
+
+
+static void
+jabber_google_relay_response_session_initiate_cb(GoogleSession *session,
+    const gchar *relay_ip, guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password)
+{
+	GParameter *params;
+	guint num_params;
+	JabberStream *js = session->js;
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+
+	session_data->media = purple_media_manager_create_media(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc),
+			"fsrtpconference", session->remote_jid, TRUE);
+
+	purple_media_set_prpl_data(session_data->media, session);
+
+	g_signal_connect_swapped(G_OBJECT(session_data->media),
+			"candidates-prepared",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session_data->media), "codecs-changed",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect(G_OBJECT(session_data->media), "state-changed",
+			G_CALLBACK(google_session_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(session_data->media), "stream-info",
+			G_CALLBACK(google_session_stream_info_cb), session);
+
+	params =
+		jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp,
+			relay_ssltcp, relay_username, relay_password, &num_params);
+
+	if (purple_media_add_stream(session_data->media, "google-voice",
+			session->remote_jid, PURPLE_MEDIA_AUDIO,
+			TRUE, "nice", num_params, params) == FALSE ||
+			(session_data->video && purple_media_add_stream(
+			session_data->media, "google-video",
+			session->remote_jid, PURPLE_MEDIA_VIDEO,
+			TRUE, "nice", num_params, params) == FALSE)) {
+		purple_media_error(session_data->media, "Error adding stream.");
+		purple_media_end(session_data->media, NULL, NULL);
+	} else {
+		session_data->added_streams = TRUE;
+	}
+
+	g_free(params);
+}
+
+
+gboolean
+jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
+{
+	GoogleSession *session;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	gchar *jid;
+	GoogleAVSessionData *session_data = NULL;
+
+	/* construct JID to send to */
+	jb = jabber_buddy_find(js, who, FALSE);
+	if (!jb) {
+		purple_debug_error("jingle-rtp",
+				"Could not find Jabber buddy\n");
+		return FALSE;
+	}
+	jbr = jabber_buddy_find_resource(jb, NULL);
+	if (!jbr) {
+		purple_debug_error("jingle-rtp",
+				"Could not find buddy's resource\n");
+	}
+
+	if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
+		jid = g_strdup_printf("%s/%s", who, jbr->name);
+	} else {
+		jid = g_strdup(who);
+	}
+
+	session = g_new0(GoogleSession, 1);
+	session->id.id = jabber_get_next_id(js);
+	session->id.initiator = g_strdup_printf("%s@%s/%s", js->user->node,
+			js->user->domain, js->user->resource);
+	session->state = SENT_INITIATE;
+	session->js = js;
+	session->remote_jid = jid;
+	session_data = g_new0(GoogleAVSessionData, 1);
+	session->session_data = session_data;
+	
+	if (type & PURPLE_MEDIA_VIDEO)
+		session_data->video = TRUE;
+
+	/* if we got a relay token and relay host in google:jingleinfo, issue an
+	 HTTP request to get that data */
+	if (js->google_relay_host && js->google_relay_token) {
+		jabber_google_do_relay_request(js, session,
+			jabber_google_relay_response_session_initiate_cb);
+	} else {
+		jabber_google_relay_response_session_initiate_cb(session, NULL, 0, 0, 0,
+			NULL, NULL);
+	}
+	
+	/* we don't actually know yet wether it succeeded... maybe this is very
+	 wrong... */
+	return TRUE;
+}
+
+static void
+jabber_google_relay_response_session_handle_initiate_cb(GoogleSession *session,
+    const gchar *relay_ip, guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password)
+{
+	GParameter *params;
+	guint num_params;
+	JabberStream *js = session->js;
+	xmlnode *codec_element;
+	const gchar *xmlns;
+	PurpleMediaCodec *codec;
+	GList *video_codecs = NULL;
+	GList *codecs = NULL;
+	JabberIq *result;
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+
+	params =
+		jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp, 
+	    	relay_ssltcp, relay_username, relay_password, &num_params);
+
+	if (purple_media_add_stream(session_data->media, "google-voice",
+			session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE,
+			"nice", num_params, params) == FALSE ||
+			(session_data->video && purple_media_add_stream(
+			session_data->media, "google-video",
+			session->remote_jid, PURPLE_MEDIA_VIDEO,
+			FALSE, "nice", num_params, params) == FALSE)) {
+		purple_media_error(session_data->media, "Error adding stream.");
+		purple_media_stream_info(session_data->media,
+				PURPLE_MEDIA_INFO_REJECT, NULL, NULL, TRUE);
+	} else {
+		/* successfully added stream(s) */
+		session_data->added_streams = TRUE;
+
+		if (session_data->remote_audio_candidates) {
+			purple_media_add_remote_candidates(session_data->media,
+				"google-voice", session->remote_jid, 
+			    session_data->remote_audio_candidates);
+			purple_media_candidate_list_free(session_data->remote_audio_candidates);
+			session_data->remote_audio_candidates = NULL;
+		}
+		if (session_data->remote_video_candidates) {
+			purple_media_add_remote_candidates(session_data->media,
+				"google-video", session->remote_jid, 
+			    session_data->remote_video_candidates);
+			purple_media_candidate_list_free(session_data->remote_video_candidates);
+			session_data->remote_video_candidates = NULL;
+		}
+	}
+		
+	g_free(params);
+
+	for (codec_element = xmlnode_get_child(session->description, "payload-type");
+	     codec_element; codec_element = codec_element->next) {
+		const char *id, *encoding_name,  *clock_rate,
+				*width, *height, *framerate;
+		gboolean video;
+		if (codec_element->name &&
+				strcmp(codec_element->name, "payload-type"))
+			continue;
+
+		xmlns = xmlnode_get_namespace(codec_element);
+		encoding_name = xmlnode_get_attrib(codec_element, "name");
+		id = xmlnode_get_attrib(codec_element, "id");
+
+		if (!session_data->video ||
+				(xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_PHONE))) {
+			clock_rate = xmlnode_get_attrib(
+					codec_element, "clockrate");
+			video = FALSE;
+		} else {
+			width = xmlnode_get_attrib(codec_element, "width");
+			height = xmlnode_get_attrib(codec_element, "height");
+			framerate = xmlnode_get_attrib(
+					codec_element, "framerate");
+			clock_rate = "90000";
+			video = TRUE;
+		}
+
+		if (id) {
+			codec = purple_media_codec_new(atoi(id), encoding_name,
+					video ?	PURPLE_MEDIA_VIDEO :
+					PURPLE_MEDIA_AUDIO,
+					clock_rate ? atoi(clock_rate) : 0);
+			if (video)
+				video_codecs = g_list_append(
+						video_codecs, codec);
+			else
+				codecs = g_list_append(codecs, codec);
+		}
+	}
+
+	if (codecs)
+		purple_media_set_remote_codecs(session_data->media, "google-voice",
+				session->remote_jid, codecs);
+	if (video_codecs)
+		purple_media_set_remote_codecs(session_data->media, "google-video",
+				session->remote_jid, video_codecs);
+
+	purple_media_codec_list_free(codecs);
+	purple_media_codec_list_free(video_codecs);
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, session->iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+}
+
+static gboolean
+google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	const gchar *xmlns;
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	
+	if (session->state != UNINIT) {
+		purple_debug_error("jabber", "Received initiate for active session.\n");
+		return FALSE;
+	}
+
+	session->description = xmlnode_copy(xmlnode_get_child(sess, "description"));
+	xmlns = xmlnode_get_namespace(session->description);
+
+	if (purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
+		session_data->video = FALSE;
+	else if (purple_strequal(xmlns, NS_GOOGLE_SESSION_VIDEO))
+		session_data->video = TRUE;
+	else {
+		purple_debug_error("jabber", "Received initiate with "
+				"invalid namespace %s.\n", xmlns);
+		return FALSE;
+	}
+
+	session_data->media = purple_media_manager_create_media(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc),
+			"fsrtpconference", session->remote_jid, FALSE);
+
+	purple_media_set_prpl_data(session_data->media, session);
+
+	g_signal_connect_swapped(G_OBJECT(session_data->media),
+			"candidates-prepared",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session_data->media), "codecs-changed",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect(G_OBJECT(session_data->media), "state-changed",
+			G_CALLBACK(google_session_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(session_data->media), "stream-info",
+			G_CALLBACK(google_session_stream_info_cb), session);
+
+	session->iq_id = g_strdup(iq_id);
+	
+	if (js->google_relay_host && js->google_relay_token) {
+		jabber_google_do_relay_request(js, session, 
+			jabber_google_relay_response_session_handle_initiate_cb);
+	} else {
+		jabber_google_relay_response_session_handle_initiate_cb(session, NULL,
+			0, 0, 0, NULL, NULL);
+	}
+
+	return TRUE;
+}
+
+
+static void
+google_session_handle_candidates(JabberStream  *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	JabberIq *result;
+	GList *list = NULL, *video_list = NULL;
+	xmlnode *cand;
+	static int name = 0;
+	char n[4];
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	
+	for (cand = xmlnode_get_child(sess, "candidate"); cand;
+			cand = xmlnode_get_next_twin(cand)) {
+		PurpleMediaCandidate *info;
+		const gchar *cname = xmlnode_get_attrib(cand, "name");
+		const gchar *type = xmlnode_get_attrib(cand, "type");
+		const gchar *protocol = xmlnode_get_attrib(cand, "protocol");
+		const gchar *address = xmlnode_get_attrib(cand, "address");
+		const gchar *port = xmlnode_get_attrib(cand, "port");
+		const gchar *preference = xmlnode_get_attrib(cand, "preference");
+		guint component_id;
+
+		if (cname && type && address && port) {
+			PurpleMediaCandidateType candidate_type;
+			guint prio = preference ? g_ascii_strtod(preference, NULL) * 1000 : 0;
+			
+			g_snprintf(n, sizeof(n), "S%d", name++);
+			
+			if (g_str_equal(type, "local"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+			else if (g_str_equal(type, "stun"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX;
+			else if (g_str_equal(type, "relay"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_RELAY;
+			else
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+
+			if (purple_strequal(cname, "rtcp") ||
+					purple_strequal(cname, "video_rtcp"))
+				component_id = PURPLE_MEDIA_COMPONENT_RTCP;
+			else
+				component_id = PURPLE_MEDIA_COMPONENT_RTP;
+
+			info = purple_media_candidate_new(n, component_id,
+					candidate_type,
+					purple_strequal(protocol, "udp") ?
+							PURPLE_MEDIA_NETWORK_PROTOCOL_UDP :
+							PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+					address,
+					atoi(port));
+			g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
+					"password", xmlnode_get_attrib(cand, "password"),
+			        "priority", prio, NULL);
+			if (!strncmp(cname, "video_", 6)) {
+				if (session_data->added_streams) {
+					video_list = g_list_append(video_list, info);
+				} else {
+					session_data->remote_video_candidates =
+						g_list_append(session_data->remote_video_candidates,
+							info);
+				}
+			} else {
+				if (session_data->added_streams) {
+					list = g_list_append(list, info);
+				} else {
+					session_data->remote_audio_candidates =
+						g_list_append(session_data->remote_audio_candidates,
+							info);
+				}
+			}
+		}
+	}
+
+	if (list) {
+		purple_media_add_remote_candidates(session_data->media, "google-voice",
+			session->remote_jid, list);
+		purple_media_candidate_list_free(list);
+	}
+	if (video_list) {
+		purple_media_add_remote_candidates(session_data->media, "google-video",
+			session->remote_jid, video_list);
+		purple_media_candidate_list_free(video_list);
+	}
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+}
+
+static void
+google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	xmlnode *desc_element = xmlnode_get_child(sess, "description");
+	xmlnode *codec_element = xmlnode_get_child(
+			desc_element, "payload-type");
+	GList *codecs = NULL, *video_codecs = NULL;
+	JabberIq *result = NULL;
+	const gchar *xmlns = xmlnode_get_namespace(desc_element);
+	gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_VIDEO));
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	
+	for (; codec_element; codec_element = codec_element->next) {
+		const gchar *xmlns, *encoding_name, *id,
+				*clock_rate, *width, *height, *framerate;
+		gboolean video_codec = FALSE;
+
+		if (!purple_strequal(codec_element->name, "payload-type"))
+			continue;
+
+		xmlns = xmlnode_get_namespace(codec_element);
+		encoding_name =	xmlnode_get_attrib(codec_element, "name");
+		id = xmlnode_get_attrib(codec_element, "id");
+
+		if (!video || purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
+			clock_rate = xmlnode_get_attrib(
+					codec_element, "clockrate");
+		else {
+			clock_rate = "90000";
+			width = xmlnode_get_attrib(codec_element, "width");
+			height = xmlnode_get_attrib(codec_element, "height");
+			framerate = xmlnode_get_attrib(
+					codec_element, "framerate");
+			video_codec = TRUE;
+		}
+
+		if (id && encoding_name) {
+			PurpleMediaCodec *codec = purple_media_codec_new(
+					atoi(id), encoding_name,
+					video_codec ? PURPLE_MEDIA_VIDEO :
+					PURPLE_MEDIA_AUDIO,
+					clock_rate ? atoi(clock_rate) : 0);
+			if (video_codec)
+				video_codecs = g_list_append(
+						video_codecs, codec);
+			else
+				codecs = g_list_append(codecs, codec);
+		}
+	}
+
+	if (codecs)
+		purple_media_set_remote_codecs(session_data->media, "google-voice",
+				session->remote_jid, codecs);
+	if (video_codecs)
+		purple_media_set_remote_codecs(session_data->media, "google-video",
+				session->remote_jid, video_codecs);
+
+	purple_media_stream_info(session_data->media, PURPLE_MEDIA_INFO_ACCEPT,
+			NULL, NULL, FALSE);
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+}
+
+static void
+google_session_handle_reject(JabberStream *js, GoogleSession *session, xmlnode *sess)
+{
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	purple_media_end(session_data->media, NULL, NULL);
+}
+
+static void
+google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *sess)
+{
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	purple_media_end(session_data->media, NULL, NULL);
+}
+
+static void
+google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	const char *type = xmlnode_get_attrib(sess, "type");
+
+	if (!strcmp(type, "initiate")) {
+		google_session_handle_initiate(js, session, sess, iq_id);
+	} else if (!strcmp(type, "accept")) {
+		google_session_handle_accept(js, session, sess, iq_id);
+	} else if (!strcmp(type, "reject")) {
+		google_session_handle_reject(js, session, sess);
+	} else if (!strcmp(type, "terminate")) {
+		google_session_handle_terminate(js, session, sess);
+	} else if (!strcmp(type, "candidates")) {
+		google_session_handle_candidates(js, session, sess, iq_id);
+	}
+}
+
+void
+jabber_google_session_parse(JabberStream *js, const char *from,
+                            JabberIqType type, const char *iq_id,
+                            xmlnode *session_node)
+{
+	GoogleSession *session = NULL;
+	GoogleSessionId id;
+
+	xmlnode *desc_node;
+
+	GList *iter = NULL;
+
+	if (type != JABBER_IQ_SET)
+		return;
+
+	id.id = (gchar*)xmlnode_get_attrib(session_node, "id");
+	if (!id.id)
+		return;
+
+	id.initiator = (gchar*)xmlnode_get_attrib(session_node, "initiator");
+	if (!id.initiator)
+		return;
+
+	iter = purple_media_manager_get_media_by_account(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc));
+	for (; iter; iter = g_list_delete_link(iter, iter)) {
+		GoogleSession *gsession =
+				purple_media_get_prpl_data(iter->data);
+		if (google_session_id_equal(&(gsession->id), &id)) {
+			session = gsession;
+			break;
+		}
+	}
+	if (iter != NULL) {
+		g_list_free(iter);
+	}
+
+	if (session) {
+		google_session_parse_iq(js, session, session_node, iq_id);
+		return;
+	}
+
+	/* If the session doesn't exist, this has to be an initiate message */
+	if (strcmp(xmlnode_get_attrib(session_node, "type"), "initiate"))
+		return;
+	desc_node = xmlnode_get_child(session_node, "description");
+	if (!desc_node)
+		return;
+	session = g_new0(GoogleSession, 1);
+	session->id.id = g_strdup(id.id);
+	session->id.initiator = g_strdup(id.initiator);
+	session->state = UNINIT;
+	session->js = js;
+	session->remote_jid = g_strdup(session->id.initiator);
+	session->session_data = g_new0(GoogleAVSessionData, 1);
+
+	google_session_handle_initiate(js, session, session_node, iq_id);
+}
+#endif /* USE_VV */
+
+
diff --git a/libpurple/protocols/jabber/google/google_session.h b/libpurple/protocols/jabber/google/google_session.h
new file mode 100644
index 0000000000..756ddf2fd3
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_session.h
@@ -0,0 +1,56 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_GOOGLE_SESSION_H_
+#define PURPLE_JABBER_GOOGLE_SESSION_H_
+
+#include "jabber.h"
+
+typedef struct {
+	char *id;
+	char *initiator;
+} GoogleSessionId;
+
+typedef enum {
+	UNINIT,
+	SENT_INITIATE,
+	RECEIVED_INITIATE,
+	IN_PRORESS,
+	TERMINATED
+} GoogleSessionState;
+
+typedef struct {
+	GoogleSessionId id;
+	GoogleSessionState state;
+	JabberStream *js;
+	char *remote_jid;
+	char *iq_id;
+	xmlnode *description;		/* store incoming description through
+	 								relay credential fetching */
+	gpointer session_data;
+} GoogleSession;
+
+gboolean jabber_google_session_initiate(JabberStream *js, const gchar *who,
+    PurpleMediaSessionType type);
+
+void jabber_google_session_parse(JabberStream *js, const char *from,
+    JabberIqType type, const char *iq, xmlnode *session);
+
+#endif /* PURPLE_JABBER_GOOGLE_SESSION_H_ */
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/jingleinfo.c b/libpurple/protocols/jabber/google/jingleinfo.c
new file mode 100644
index 0000000000..70ca49c24f
--- /dev/null
+++ b/libpurple/protocols/jabber/google/jingleinfo.c
@@ -0,0 +1,174 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+#include "jingleinfo.h"
+
+static void
+jabber_google_stun_lookup_cb(GSList *hosts, gpointer data,
+	const char *error_message)
+{
+	JabberStream *js = (JabberStream *) data;
+
+	if (error_message) {
+		purple_debug_error("jabber", "Google STUN lookup failed: %s\n",
+			error_message);
+		g_slist_free(hosts);
+		js->stun_query = NULL;
+		return;
+	}
+
+	if (hosts && g_slist_next(hosts)) {
+		struct sockaddr *addr = g_slist_next(hosts)->data;
+		char dst[INET6_ADDRSTRLEN];
+		int port;
+
+		if (addr->sa_family == AF_INET6) {
+			inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
+				dst, sizeof(dst));
+			port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
+		} else {
+			inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
+				dst, sizeof(dst));
+			port = ntohs(((struct sockaddr_in *) addr)->sin_port);
+		}
+
+		if (js->stun_ip)
+			g_free(js->stun_ip);
+		js->stun_ip = g_strdup(dst);
+		js->stun_port = port;
+
+		purple_debug_info("jabber", "set Google STUN IP/port address: "
+		                  "%s:%d\n", dst, port);
+
+		/* unmark ongoing query */
+		js->stun_query = NULL;
+	}
+
+	while (hosts != NULL) {
+		hosts = g_slist_delete_link(hosts, hosts);
+		/* Free the address */
+		g_free(hosts->data);
+		hosts = g_slist_delete_link(hosts, hosts);
+	}
+}
+
+static void
+jabber_google_jingle_info_common(JabberStream *js, const char *from,
+                                 JabberIqType type, xmlnode *query)
+{
+	const xmlnode *stun = xmlnode_get_child(query, "stun");
+	const xmlnode *relay = xmlnode_get_child(query, "relay");
+	gchar *my_bare_jid;
+
+	/*
+	 * Make sure that random people aren't sending us STUN servers. Per
+	 * http://code.google.com/apis/talk/jep_extensions/jingleinfo.html, these
+	 * stanzas are stamped from our bare JID.
+	 */
+	if (from) {
+		my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
+		if (!purple_strequal(from, my_bare_jid)) {
+			purple_debug_warning("jabber", "got google:jingleinfo with invalid from (%s)\n",
+			                  from);
+			g_free(my_bare_jid);
+			return;
+		}
+
+		g_free(my_bare_jid);
+	}
+
+	if (type == JABBER_IQ_ERROR || type == JABBER_IQ_GET)
+		return;
+
+	purple_debug_info("jabber", "got google:jingleinfo\n");
+
+	if (stun) {
+		xmlnode *server = xmlnode_get_child(stun, "server");
+
+		if (server) {
+			const gchar *host = xmlnode_get_attrib(server, "host");
+			const gchar *udp = xmlnode_get_attrib(server, "udp");
+
+			if (host && udp) {
+				int port = atoi(udp);
+				/* if there, would already be an ongoing query,
+				 cancel it */
+				if (js->stun_query)
+					purple_dnsquery_destroy(js->stun_query);
+
+				js->stun_query = purple_dnsquery_a(host, port,
+					jabber_google_stun_lookup_cb, js);
+			}
+		}
+	}
+
+	if (relay) {
+		xmlnode *token = xmlnode_get_child(relay, "token");
+		xmlnode *server = xmlnode_get_child(relay, "server");
+		
+		if (token) {
+			gchar *relay_token = xmlnode_get_data(token);
+
+			/* we let js own the string returned from xmlnode_get_data */
+			js->google_relay_token = relay_token;
+		}
+
+		if (server) {
+			js->google_relay_host = 
+				g_strdup(xmlnode_get_attrib(server, "host"));
+		}
+	}
+}
+
+static void
+jabber_google_jingle_info_cb(JabberStream *js, const char *from,
+                             JabberIqType type, const char *id,
+                             xmlnode *packet, gpointer data)
+{
+	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
+			NS_GOOGLE_JINGLE_INFO);
+
+	if (query)
+		jabber_google_jingle_info_common(js, from, type, query);
+	else
+		purple_debug_warning("jabber", "Got invalid google:jingleinfo\n");
+}
+
+void
+jabber_google_handle_jingle_info(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *child)
+{
+	jabber_google_jingle_info_common(js, from, type, child);
+}
+
+void
+jabber_google_send_jingle_info(JabberStream *js)
+{
+	JabberIq *jingle_info =
+		jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_JINGLE_INFO);
+
+	jabber_iq_set_callback(jingle_info, jabber_google_jingle_info_cb,
+		NULL);
+	purple_debug_info("jabber", "sending google:jingleinfo query\n");
+	jabber_iq_send(jingle_info);
+}
diff --git a/libpurple/protocols/jabber/google/jingleinfo.h b/libpurple/protocols/jabber/google/jingleinfo.h
new file mode 100644
index 0000000000..e5f4da232b
--- /dev/null
+++ b/libpurple/protocols/jabber/google/jingleinfo.h
@@ -0,0 +1,32 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_GOOGLE_ROSTER_H_
+#define PURPLE_JABBER_GOOGLE_ROSTER_H_
+
+#include "jabber.h"
+
+void jabber_google_handle_jingle_info(JabberStream *js, const char *from,
+                                      JabberIqType type, const char *id,
+                                      xmlnode *child);
+void jabber_google_send_jingle_info(JabberStream *js);
+
+
+#endif /* PURPLE_JABBER_GOOGLE_ROSTER_H_ */
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/relay.c b/libpurple/protocols/jabber/google/relay.c
new file mode 100644
index 0000000000..79cf456eba
--- /dev/null
+++ b/libpurple/protocols/jabber/google/relay.c
@@ -0,0 +1,151 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+
+#include "relay.h"
+
+typedef struct {
+	GoogleSession *session;
+	JabberGoogleRelayCallback *cb;
+} JabberGoogleRelayCallbackData;
+
+static void
+jabber_google_relay_parse_response(const gchar *response, gchar **ip,
+	guint *udp, guint *tcp, guint *ssltcp, gchar **username, gchar **password)
+{
+	gchar **lines = g_strsplit(response, "\n", -1);
+	int i = 0;
+
+	for (; lines[i] ; i++) {
+		gchar *line = lines[i];
+		gchar **parts = g_strsplit(line, "=", 2);
+		
+		if (parts[0] && parts[1]) {
+			if (purple_strequal(parts[0], "relay.ip")) {
+				*ip = g_strdup(parts[1]);
+			} else if (purple_strequal(parts[0], "relay.udp_port")) {
+				*udp = atoi(parts[1]);
+			} else if (purple_strequal(parts[0], "relay.tcp_port")) {
+				*tcp = atoi(parts[1]);
+			} else if (purple_strequal(parts[0], "relay.ssltcp_port")) {
+				*ssltcp = atoi(parts[1]);
+			} else if (purple_strequal(parts[0], "username")) {
+				*username = g_strdup(parts[1]);
+			} else if (purple_strequal(parts[0], "password")) {
+				*password = g_strdup(parts[1]);
+			}
+		}
+		g_strfreev(parts);
+	}
+
+	g_strfreev(lines);
+}
+
+static void
+jabber_google_relay_remove_url_data(JabberStream *js, 
+	PurpleUtilFetchUrlData *url_data)
+{
+	GList *iter = js->google_relay_requests;
+
+	while (iter) {
+		if (iter->data == url_data) {
+			js->google_relay_requests =
+				g_list_delete_link(js->google_relay_requests, iter);
+			break;
+		}
+	}
+}
+
+static void
+jabber_google_relay_fetch_cb(PurpleUtilFetchUrlData *url_data, 
+	gpointer user_data, const gchar *url_text, gsize len, 
+	const gchar *error_message)
+{
+	JabberGoogleRelayCallbackData *data =
+		(JabberGoogleRelayCallbackData *) user_data;
+	GoogleSession *session = data->session;
+	JabberStream *js = session->js;
+	JabberGoogleRelayCallback *cb = data->cb;
+	gchar *relay_ip = NULL;
+	guint relay_udp = 0;
+	guint relay_tcp = 0;
+	guint relay_ssltcp = 0;
+	gchar *relay_username = NULL;
+	gchar *relay_password = NULL;
+
+	g_free(data);
+	
+	if (url_data) {
+		jabber_google_relay_remove_url_data(js, url_data);
+	}
+
+	purple_debug_info("jabber", "got response on HTTP request to relay server\n");
+
+	if (url_text && len > 0) {
+		purple_debug_info("jabber", "got Google relay request response:\n%s\n",
+			url_text);
+		jabber_google_relay_parse_response(url_text, &relay_ip, &relay_udp,
+			&relay_tcp, &relay_ssltcp, &relay_username, &relay_password);
+	}
+
+	if (cb)
+		cb(session, relay_ip, relay_udp, relay_tcp, relay_ssltcp,
+		   relay_username, relay_password);
+
+	g_free(relay_ip);
+	g_free(relay_username);
+	g_free(relay_password);
+}
+
+void
+jabber_google_do_relay_request(JabberStream *js, GoogleSession *session,
+	JabberGoogleRelayCallback cb)
+{
+	PurpleUtilFetchUrlData *url_data = NULL;
+	gchar *url = g_strdup_printf("http://%s", js->google_relay_host);
+	/* yes, the relay token is included twice as different request headers,
+	   this is apparently needed to make Google's relay servers work... */
+	gchar *request =
+		g_strdup_printf("GET /create_session HTTP/1.0\r\n"
+			            "Host: %s\r\n"
+						"X-Talk-Google-Relay-Auth: %s\r\n"
+						"X-Google-Relay-Auth: %s\r\n\r\n", 
+			js->google_relay_host, js->google_relay_token, js->google_relay_token);
+	JabberGoogleRelayCallbackData *data = g_new0(JabberGoogleRelayCallbackData, 1);
+
+	data->session = session;
+	data->cb = cb;
+	purple_debug_info("jabber", 
+		"sending Google relay request %s to %s\n", request, url); 
+	url_data = 
+		purple_util_fetch_url_request(url, FALSE, NULL, FALSE, request, FALSE,
+			jabber_google_relay_fetch_cb, data);
+	if (url_data) {
+		js->google_relay_requests =
+			g_list_prepend(js->google_relay_requests, url_data);
+	} else {
+		purple_debug_error("jabber", "unable to create Google relay request\n");
+		jabber_google_relay_fetch_cb(NULL, data, NULL, 0, NULL);
+	}
+	g_free(url);
+	g_free(request);
+}
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/relay.h b/libpurple/protocols/jabber/google/relay.h
new file mode 100644
index 0000000000..d1032c09fe
--- /dev/null
+++ b/libpurple/protocols/jabber/google/relay.h
@@ -0,0 +1,33 @@
+/**
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef JABBER_GOOGLE_RELAY
+#define JABBER_GOOGLE_RELAY
+
+#include "google_session.h"
+
+typedef void (JabberGoogleRelayCallback)(GoogleSession *session, const gchar *ip,
+    guint udp_port, guint tcp_port, guint tls_port,
+    const gchar *username, const gchar *password);
+
+void jabber_google_do_relay_request(JabberStream *js, GoogleSession *session,
+	JabberGoogleRelayCallback cb);
+
+#endif /* JABBER_GOOGLE_RELAY */
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
index 4d1f14cf81..6cd591b1d4 100644
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -28,7 +28,10 @@
 
 #include "buddy.h"
 #include "disco.h"
-#include "google.h"
+#include "google/gmail.h"
+#include "google/google.h"
+#include "google/jingleinfo.h"
+#include "google/google_session.h"
 #include "iq.h"
 #include "jingle/jingle.h"
 #include "oob.h"
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 7cd23f35bc..c07a2951d4 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -51,7 +51,9 @@
 #include "chat.h"
 #include "data.h"
 #include "disco.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_roster.h"
+#include "google/google_session.h"
 #include "ibb.h"
 #include "iq.h"
 #include "jutil.h"
@@ -218,11 +220,30 @@ jabber_process_starttls(JabberStream *js, xmlnode *packet)
 
 	account = purple_connection_get_account(js->gc);
 
+#if 0
+	/*
+	 * This code DOES NOT EXIST, will never be enabled by default, and
+	 * will never ever be supported (by me).
+	 * It's literally *only* for developer testing.
+	 */
+	{
+		const gchar *connection_security = purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS);
+		if (!g_str_equal(connection_security, "none") &&
+				purple_ssl_is_supported()) {
+			jabber_send_raw(js,
+					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
+			return TRUE;
+		}
+	}
+#else
 	if(purple_ssl_is_supported()) {
 		jabber_send_raw(js,
 				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
 		return TRUE;
+	} else { 
+		purple_debug_warning("jabber", "No libpurple TLS/SSL support found.");
 	}
+#endif
 
 	starttls = xmlnode_get_child(packet, "starttls");
 	if(xmlnode_get_child(starttls, "required")) {
@@ -232,7 +253,7 @@ jabber_process_starttls(JabberStream *js, xmlnode *packet)
 		return TRUE;
 	}
 
-	if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+	if (g_str_equal("require_tls", purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
 		purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("You require encryption, but no TLS/SSL support was found."));
@@ -244,12 +265,16 @@ jabber_process_starttls(JabberStream *js, xmlnode *packet)
 
 void jabber_stream_features_parse(JabberStream *js, xmlnode *packet)
 {
-	if(xmlnode_get_child(packet, "starttls")) {
-		if(jabber_process_starttls(js, packet)) {
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	const char *connection_security =
+		purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS);
+
+	if (xmlnode_get_child(packet, "starttls")) {
+		if (jabber_process_starttls(js, packet)) {
 			jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION);
 			return;
 		}
-	} else if(purple_account_get_bool(js->gc->account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS) && !jabber_stream_is_ssl(js)) {
+	} else if (g_str_equal(connection_security, "require_tls") && !jabber_stream_is_ssl(js)) {
 		purple_connection_error_reason(js->gc,
 			 PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
 			_("You require encryption, but it is not available on this server."));
@@ -737,18 +762,10 @@ static void
 txt_resolved_cb(GList *responses, gpointer data)
 {
 	JabberStream *js = data;
+	gboolean found = FALSE;
 
 	js->srv_query_data = NULL;
 
-	if (responses == NULL) {
-		purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
-				  "methods after failing to connect directly.\n");
-		purple_connection_error_reason(js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect"));
-		return;
-	}
-
 	while (responses) {
 		PurpleTxtResponse *resp = responses->data;
 		gchar **token;
@@ -765,9 +782,17 @@ txt_resolved_cb(GList *responses, gpointer data)
 	}
 
 	if (js->bosh) {
+		found = TRUE;
 		jabber_bosh_connection_connect(js->bosh);
-	} else {
-		purple_debug_info("jabber","Didn't find an alternative connection method.\n");
+	}
+
+	if (!found) {
+		purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
+				  "methods after failing to connect directly.\n");
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Unable to connect"));
+		return;
 	}
 
 	if (responses) {
@@ -943,6 +968,11 @@ jabber_stream_new(PurpleAccount *account)
 	js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, (GDestroyNotify)jabber_buddy_free);
 
+	/* This is overridden during binding, but we need it here
+	 * in case the server only does legacy non-sasl auth!.
+	 */
+	purple_connection_set_display_name(gc, user);
+
 	js->user_jb = jabber_buddy_find(js, user, TRUE);
 	g_free(user);
 	if (!js->user_jb) {
@@ -972,6 +1002,9 @@ jabber_stream_new(PurpleAccount *account)
 	js->stun_ip = NULL;
 	js->stun_port = 0;
 	js->stun_query = NULL;
+	js->google_relay_token = NULL;
+	js->google_relay_host = NULL;
+	js->google_relay_requests = NULL;
 
 	/* if we are idle, set idle-ness on the stream (this could happen if we get
 		disconnected and the reconnects while being idle. I don't think it makes
@@ -1014,7 +1047,7 @@ jabber_stream_connect(JabberStream *js)
 	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain);
 
 	/* if they've got old-ssl mode going, we probably want to ignore SRV lookups */
-	if(purple_account_get_bool(account, "old_ssl", FALSE)) {
+	if (g_str_equal("old_ssl", purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
 		if(purple_ssl_is_supported()) {
 			js->gsc = purple_ssl_connect(account, js->certificate_CN,
 					purple_account_get_int(account, "port", 5223),
@@ -1631,6 +1664,8 @@ void jabber_close(PurpleConnection *gc)
 	if(js->sasl_mechs)
 		g_string_free(js->sasl_mechs, TRUE);
 	g_free(js->sasl_cb);
+	/* Note: _not_ g_free.  See auth_cyrus.c:jabber_sasl_cb_secret */
+	free(js->sasl_secret);
 #endif
 	g_free(js->serverFQDN);
 	while(js->commands) {
@@ -1673,6 +1708,21 @@ void jabber_close(PurpleConnection *gc)
 		js->stun_query = NULL;
 	}
 
+	/* remove Google relay-related stuff */
+	g_free(js->google_relay_token);
+	g_free(js->google_relay_host);
+	if (js->google_relay_requests) {
+		while (js->google_relay_requests) {
+			PurpleUtilFetchUrlData *url_data =
+				(PurpleUtilFetchUrlData *) js->google_relay_requests->data;
+			purple_util_fetch_url_cancel(url_data);
+			g_free(url_data);
+			js->google_relay_requests = 
+				g_list_delete_link(js->google_relay_requests, 
+					js->google_relay_requests);
+		}
+	}
+
 	g_free(js);
 
 	gc->proto_data = NULL;
@@ -2615,13 +2665,19 @@ char *jabber_parse_error(JabberStream *js,
 	if(reason != NULL) { *reason = x; }
 
 	if((error = xmlnode_get_child(packet, "error"))) {
+		xmlnode *t = xmlnode_get_child_with_namespace(error, "text", NS_XMPP_STANZAS);
+		if (t)
+			cdata = xmlnode_get_data(t);
+#if 0
 		cdata = xmlnode_get_data(error);
+#endif
 		code = xmlnode_get_attrib(error, "code");
 
 		/* Stanza errors */
 		if(xmlnode_get_child(error, "bad-request")) {
 			text = _("Bad Request");
 		} else if(xmlnode_get_child(error, "conflict")) {
+			SET_REASON(PURPLE_CONNECTION_ERROR_NAME_IN_USE);
 			text = _("Conflict");
 		} else if(xmlnode_get_child(error, "feature-not-implemented")) {
 			text = _("Feature Not Implemented");
@@ -3229,9 +3285,9 @@ jabber_initiate_media(PurpleAccount *account, const char *who,
 		g_free(resource);
 
 		if (type & PURPLE_MEDIA_AUDIO &&
-				!jabber_resource_has_capability(jbr,
-				JINGLE_APP_RTP_SUPPORT_AUDIO) &&
-				jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
+			!jabber_resource_has_capability(jbr,
+			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+			jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
 			return jabber_google_session_initiate(js, who, type);
 		else
 			return jingle_rtp_initiate_media(js, who, type);
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 94ce1eaa4f..74a31d8972 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -80,7 +80,7 @@ typedef struct _JabberStream JabberStream;
 
 #define CAPS0115_NODE "http://pidgin.im/"
 
-#define JABBER_DEFAULT_REQUIRE_TLS    TRUE
+#define JABBER_DEFAULT_REQUIRE_TLS    "require_starttls"
 #define JABBER_DEFAULT_FT_PROXIES     "proxy.eu.jabber.org"
 
 /* Index into attention_types list */
@@ -206,6 +206,7 @@ struct _JabberStream
 #ifdef HAVE_CYRUS_SASL
 	sasl_conn_t *sasl;
 	sasl_callback_t *sasl_cb;
+	sasl_secret_t *sasl_secret;
 	const char *current_mech;
 	int auth_fail_count;
 
@@ -275,7 +276,12 @@ struct _JabberStream
 	gchar *stun_ip;
 	int stun_port;
 	PurpleDnsQueryData *stun_query;
-	/* later add stuff to handle TURN relays... */
+
+	/* stuff for Google's relay handling */
+	gchar *google_relay_token;
+	gchar *google_relay_host;
+	GList *google_relay_requests; /* the HTTP requests to get */
+												/* relay info */
 };
 
 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
@@ -332,11 +338,25 @@ char *jabber_get_next_id(JabberStream *js);
  */
 char *jabber_parse_error(JabberStream *js, xmlnode *packet, PurpleConnectionError *reason);
 
-void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
+/**
+ * Add a feature to the list of features advertised via disco#info.  If you
+ * call this while accounts are connected, Bad Things(TM) will happen because
+ * the Entity Caps hash will be out-of-date (which should be fixed :/)
+ *
+ * @param namespace The namespace of the feature
+ * @param cb        A callback determining whether or not this feature
+ *                  will advertised; may be NULL.
+ */
+void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb);
 void jabber_remove_feature(const gchar *namespace);
 
-/** Adds an identity to this jabber library instance. For list of valid values visit the
- *	website of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ).
+/** Adds an identity to this jabber library instance. For list of valid values
+ * visit the website of the XMPP Registrar
+ * (http://www.xmpp.org/registrar/disco-categories.html#client).
+ *
+ * Like with jabber_add_feature, if you call this while accounts are connected,
+ * Bad Things will happen.
+ *
  *  @param category the category of the identity.
  *  @param type the type of the identity.
  *  @param language the language localization of the name. Can be NULL.
diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c
index d445bdecb6..f106797fff 100644
--- a/libpurple/protocols/jabber/jingle/jingle.c
+++ b/libpurple/protocols/jabber/jingle/jingle.c
@@ -35,6 +35,9 @@
 #include "rtp.h"
 
 #include <string.h>
+#ifdef USE_VV
+#include <gst/gst.h>
+#endif
 
 GType
 jingle_get_type(const gchar *type)
@@ -431,32 +434,91 @@ jingle_terminate_sessions(JabberStream *js)
 				jingle_terminate_sessions_gh, NULL);
 }
 
+#ifdef USE_VV
+static GValueArray *
+jingle_create_relay_info(const gchar *ip, guint port, const gchar *username,
+	const gchar *password, const gchar *relay_type, GValueArray *relay_info)
+{
+	GValue value;
+	GstStructure *turn_setup = gst_structure_new("relay-info",
+		"ip", G_TYPE_STRING, ip, 
+		"port", G_TYPE_UINT, port,
+		"username", G_TYPE_STRING, username,
+		"password", G_TYPE_STRING, password,
+		"relay-type", G_TYPE_STRING, relay_type,
+		NULL);
+	purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n", 
+		turn_setup);
+	if (turn_setup) {
+		memset(&value, 0, sizeof(GValue));
+		g_value_init(&value, GST_TYPE_STRUCTURE);
+		gst_value_set_structure(&value, turn_setup);
+		relay_info = g_value_array_append(relay_info, &value);
+		gst_structure_free(turn_setup);
+	}
+	return relay_info;
+}
+
 GParameter *
-jingle_get_params(JabberStream *js, guint *num)
+jingle_get_params(JabberStream *js, const gchar *relay_ip, guint relay_udp,
+	guint relay_tcp, guint relay_ssltcp, const gchar *relay_username,
+    const gchar *relay_password, guint *num)
 {
 	/* don't set a STUN server if one is set globally in prefs, in that case
 	 this will be handled in media.c */
 	gboolean has_account_stun = js->stun_ip && !purple_network_get_stun_ip();
-	guint num_params = has_account_stun ? 2 : 0;
+	guint num_params = has_account_stun ?
+		(relay_ip ? 3 : 2) : (relay_ip ? 1 : 0);
 	GParameter *params = NULL;
-
+	int next_index = 0;
+	
 	if (num_params > 0) {
 		params = g_new0(GParameter, num_params);
 
-		purple_debug_info("jabber",
-			"setting param stun-ip for stream using auto-discovered IP: %s\n",
-			js->stun_ip);
-		params[0].name = "stun-ip";
-		g_value_init(&params[0].value, G_TYPE_STRING);
-		g_value_set_string(&params[0].value, js->stun_ip);
-		purple_debug_info("jabber", 
-			"setting param stun-port for stream using auto-discovered port: %d\n",
-			js->stun_port);
-		params[1].name = "stun-port";
-		g_value_init(&params[1].value, G_TYPE_UINT);
-		g_value_set_uint(&params[1].value, js->stun_port);
+		if (has_account_stun) {
+			purple_debug_info("jabber", 
+				"setting param stun-ip for stream using Google auto-config: %s\n",
+				js->stun_ip);
+			params[next_index].name = "stun-ip";
+			g_value_init(&params[next_index].value, G_TYPE_STRING);
+			g_value_set_string(&params[next_index].value, js->stun_ip);
+			purple_debug_info("jabber", 
+				"setting param stun-port for stream using Google auto-config: %d\n",
+				js->stun_port);
+			next_index++;
+			params[next_index].name = "stun-port";
+			g_value_init(&params[next_index].value, G_TYPE_UINT);
+			g_value_set_uint(&params[next_index].value, js->stun_port);
+			next_index++;
+		}
+	
+		if (relay_ip) {
+			GValueArray *relay_info = g_value_array_new(0);
+
+			if (relay_udp) {
+				relay_info = 
+					jingle_create_relay_info(relay_ip, relay_udp, relay_username,
+						relay_password, "udp", relay_info);
+			}
+			if (relay_tcp) {
+				relay_info = 
+					jingle_create_relay_info(relay_ip, relay_tcp, relay_username,
+						relay_password, "tcp", relay_info);
+			}
+			if (relay_ssltcp) {
+				relay_info = 
+					jingle_create_relay_info(relay_ip, relay_ssltcp, relay_username,
+						relay_password, "tls", relay_info);
+			}
+			params[next_index].name = "relay-info";
+			g_value_init(&params[next_index].value, G_TYPE_VALUE_ARRAY);
+			g_value_set_boxed(&params[next_index].value, relay_info);
+			g_value_array_free(relay_info);
+		}
 	}
 
 	*num = num_params;
 	return params;
 }
+#endif
+
diff --git a/libpurple/protocols/jabber/jingle/jingle.h b/libpurple/protocols/jabber/jingle/jingle.h
index 7ccdc55fe2..3813529f8d 100644
--- a/libpurple/protocols/jabber/jingle/jingle.h
+++ b/libpurple/protocols/jabber/jingle/jingle.h
@@ -78,9 +78,13 @@ void jingle_parse(JabberStream *js, const char *from, JabberIqType type,
 
 void jingle_terminate_sessions(JabberStream *js);
 
+#ifdef USE_VV
 /* create a GParam array given autoconfigured STUN (and later perhaps TURN).
 	if google_talk is TRUE, set compatability mode to GOOGLE_TALK */
-GParameter *jingle_get_params(JabberStream *js, guint *num_params);
+GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip,
+	guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password, guint *num_params);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/libpurple/protocols/jabber/jingle/rtp.c b/libpurple/protocols/jabber/jingle/rtp.c
index 7350e1c32a..4de0bcad99 100644
--- a/libpurple/protocols/jabber/jingle/rtp.c
+++ b/libpurple/protocols/jabber/jingle/rtp.c
@@ -611,7 +611,8 @@ jingle_rtp_init_media(JingleContent *content)
 				: PURPLE_MEDIA_RECV_VIDEO;
 
 	params = 
-		jingle_get_params(jingle_session_get_js(session), &num_params);
+		jingle_get_params(jingle_session_get_js(session), NULL, 0, 0, 0,
+			NULL, NULL, &num_params);
 
 	creator = jingle_content_get_creator(content);
 	if (!strcmp(creator, "initiator"))
diff --git a/libpurple/protocols/jabber/jingle/transport.c b/libpurple/protocols/jabber/jingle/transport.c
index 1a465bbb2a..3f0c5a6aa0 100644
--- a/libpurple/protocols/jabber/jingle/transport.c
+++ b/libpurple/protocols/jabber/jingle/transport.c
@@ -108,11 +108,8 @@ jingle_transport_finalize (GObject *transport)
 static void
 jingle_transport_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-	JingleTransport *transport;
 	g_return_if_fail(JINGLE_IS_TRANSPORT(object));
 
-	transport = JINGLE_TRANSPORT(object);
-
 	switch (prop_id) {
 		default:	
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -123,10 +120,7 @@ jingle_transport_set_property (GObject *object, guint prop_id, const GValue *val
 static void
 jingle_transport_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	JingleTransport *transport;
 	g_return_if_fail(JINGLE_IS_TRANSPORT(object));
-	
-	transport = JINGLE_TRANSPORT(object);
 
 	switch (prop_id) {
 		default:	
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index 73e425cbbe..17bbd019e4 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -41,7 +41,7 @@
 #include "si.h"
 #include "message.h"
 #include "presence.h"
-#include "google.h"
+#include "google/google.h"
 #include "pep.h"
 #include "usermood.h"
 #include "usertune.h"
@@ -253,6 +253,7 @@ init_plugin(PurplePlugin *plugin)
 {
 	PurpleAccountUserSplit *split;
 	PurpleAccountOption *option;
+	GList *encryption_values = NULL;
 
 	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
 	split = purple_account_user_split_new(_("Domain"), NULL, '@');
@@ -263,13 +264,26 @@ init_plugin(PurplePlugin *plugin)
 	purple_account_user_split_set_reverse(split, FALSE);
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
-	option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", JABBER_DEFAULT_REQUIRE_TLS);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
+#define ADD_VALUE(list, desc, v) { \
+	PurpleKeyValuePair *kvp = g_new0(PurpleKeyValuePair, 1); \
+	kvp->key = g_strdup((desc)); \
+	kvp->value = g_strdup((v)); \
+	list = g_list_prepend(list, kvp); \
+}
+
+	ADD_VALUE(encryption_values, _("Require encryption"), "require_tls");
+	ADD_VALUE(encryption_values, _("Use encryption if available"), "opportunistic_tls");
+	ADD_VALUE(encryption_values, _("Use old-style SSL"), "old_ssl");
+#if 0
+	ADD_VALUE(encryption_values, "None", "none");
+#endif
+	encryption_values = g_list_reverse(encryption_values);
+
+#undef ADD_VALUE
 
-	option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE);
+	option = purple_account_option_list_new(_("Connection security"), "connection_security", encryption_values);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
+						   option);
 
 	option = purple_account_option_bool_new(
 						_("Allow plaintext auth over unencrypted streams"),
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
index 981260a13d..db68b6e784 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -30,7 +30,7 @@
 #include "buddy.h"
 #include "chat.h"
 #include "data.h"
-#include "google.h"
+#include "google/google.h"
 #include "message.h"
 #include "xmlnode.h"
 #include "pep.h"
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 63c2213291..430d17ac7e 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -185,7 +185,7 @@ static void jabber_oob_xfer_recv_denied(PurpleXfer *xfer) {
 	jabber_oob_xfer_recv_error(xfer, "406");
 }
 
-static void jabber_oob_xfer_recv_canceled(PurpleXfer *xfer) {
+static void jabber_oob_xfer_recv_cancelled(PurpleXfer *xfer) {
 	jabber_oob_xfer_recv_error(xfer, "404");
 }
 
@@ -233,7 +233,7 @@ void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type,
 		purple_xfer_set_init_fnc(xfer,   jabber_oob_xfer_init);
 		purple_xfer_set_end_fnc(xfer,    jabber_oob_xfer_end);
 		purple_xfer_set_request_denied_fnc(xfer, jabber_oob_xfer_recv_denied);
-		purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_canceled);
+		purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_cancelled);
 		purple_xfer_set_read_fnc(xfer,   jabber_oob_xfer_read);
 		purple_xfer_set_start_fnc(xfer,  jabber_oob_xfer_start);
 
diff --git a/libpurple/protocols/jabber/parser.c b/libpurple/protocols/jabber/parser.c
index 2c0dae610f..4fd0e4014d 100644
--- a/libpurple/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
@@ -93,10 +93,25 @@ jabber_parser_element_start_libxml(void *user_data,
 			}
 		}
 
-		if (js->stream_id == NULL)
+		if (js->stream_id == NULL) {
+#if 0
+			/* This was underspecified in rfc3920 as only being a SHOULD, so
+			 * we cannot rely on it.  See #12331 and Oracle's server.
+			 */
 			purple_connection_error_reason(js->gc,
 					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
 					_("XMPP stream missing ID"));
+#else
+			/* Instead, let's make up a placeholder stream ID, which we need
+			 * to do because we flag on it being NULL as a special case
+			 * in this parsing code.
+			 */
+			js->stream_id = g_strdup("");
+			purple_debug_info("jabber", "Server failed to specify a stream "
+			                  "ID (underspecified in rfc3920, but intended "
+			                  "to be a MUST; digest legacy auth may fail.\n"); 
+#endif
+		}
 	} else {
 
 		if(js->current)
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index 3c84c7e151..a0b744f8ff 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -34,7 +34,8 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_presence.h"
 #include "presence.h"
 #include "iq.h"
 #include "jutil.h"
@@ -994,12 +995,14 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 	}
 
 	for (child = packet->child; child; child = child->next) {
+		const char *xmlns;
 		char *key;
 		JabberPresenceHandler *pih;
 		if (child->type != XMLNODE_TYPE_TAG)
 			continue;
 
-		key = g_strdup_printf("%s %s", child->name, xmlnode_get_namespace(child));
+		xmlns = xmlnode_get_namespace(child);
+		key = g_strdup_printf("%s %s", child->name, xmlns ? xmlns : "");
 		pih = g_hash_table_lookup(presence_handlers, key);
 		g_free(key);
 		if (pih)
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index 5fe56165a7..b5acb7cf35 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -27,7 +27,8 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_roster.h"
 #include "presence.h"
 #include "roster.h"
 #include "iq.h"
@@ -76,12 +77,9 @@ static void roster_request_cb(JabberStream *js, const char *from,
 
 void jabber_roster_request(JabberStream *js)
 {
-	PurpleAccount *account;
 	JabberIq *iq;
 	xmlnode *query;
 
-	account = purple_connection_get_account(js->gc);
-
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
 	query = xmlnode_get_child(iq->node, "query");
 
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index 8c56118be5..7bb8f275ea 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -983,14 +983,8 @@ static void
 jabber_si_xfer_ibb_error_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberStream *js = jabber_ibb_session_get_js(sess);
-	PurpleConnection *gc = js->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
 
 	purple_debug_error("jabber", "an error occurred during IBB file transfer\n");
-	purple_xfer_error(purple_xfer_get_type(xfer), account,
-		jabber_ibb_session_get_who(sess),
-			_("An error occurred on the in-band bytestream transfer\n"));
 	purple_xfer_cancel_remote(xfer);
 }
 
@@ -998,14 +992,9 @@ static void
 jabber_si_xfer_ibb_closed_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberStream *js = jabber_ibb_session_get_js(sess);
-	PurpleConnection *gc = js->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
 
 	purple_debug_info("jabber", "the remote user closed the transfer\n");
 	if (purple_xfer_get_bytes_remaining(xfer) > 0) {
-		purple_xfer_error(purple_xfer_get_type(xfer), account,
-			jabber_ibb_session_get_who(sess), _("Transfer was closed."));
 		purple_xfer_cancel_remote(xfer);
 	} else {
 		purple_xfer_set_completed(xfer, TRUE);
@@ -1137,18 +1126,12 @@ static void
 jabber_si_xfer_ibb_opened_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberStream *js = jabber_ibb_session_get_js(sess);
-	PurpleConnection *gc = js->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
 
 	if (jabber_ibb_session_get_state(sess) == JABBER_IBB_SESSION_OPENED) {
 		purple_xfer_start(xfer, -1, NULL, 0);
 		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* error */
-		purple_xfer_error(purple_xfer_get_type(xfer), account,
-			jabber_ibb_session_get_who(sess),
-			_("Failed to open in-band bytestream"));
 		purple_xfer_end(xfer);
 	}
 }
@@ -1666,12 +1649,8 @@ PurpleXfer *jabber_si_new_xfer(PurpleConnection *gc, const char *who)
 
 void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file)
 {
-	JabberStream *js;
-
 	PurpleXfer *xfer;
 
-	js = gc->proto_data;
-
 	xfer = jabber_si_new_xfer(gc, who);
 
 	if (file)
diff --git a/libpurple/protocols/msn/Makefile.am b/libpurple/protocols/msn/Makefile.am
index f911d5b2f3..dcde2f0a80 100644
--- a/libpurple/protocols/msn/Makefile.am
+++ b/libpurple/protocols/msn/Makefile.am
@@ -12,8 +12,6 @@ MSNSOURCES = \
 	command.h \
 	contact.c\
 	contact.h\
-	dialog.c \
-	dialog.h \
 	directconn.c \
 	directconn.h \
 	error.c \
@@ -36,6 +34,8 @@ MSNSOURCES = \
 	object.h \
 	oim.c\
 	oim.h\
+	p2p.c \
+	p2p.h \
 	page.c \
 	page.h \
 	servconn.c \
@@ -50,14 +50,16 @@ MSNSOURCES = \
 	slplink.h \
 	slpmsg.c \
 	slpmsg.h \
+	slpmsg_part.c \
+	slpmsg_part.h \
 	soap.c \
 	soap.h \
 	state.c \
 	state.h \
+	sbconn.c \
+	sbconn.h \
 	switchboard.c \
 	switchboard.h \
-	sync.c \
-	sync.h \
 	table.c \
 	table.h \
 	transaction.c \
@@ -66,6 +68,8 @@ MSNSOURCES = \
 	user.h \
 	userlist.c \
 	userlist.h \
+	xfer.c \
+	xfer.h \
 	msnutils.c \
 	msnutils.h
 
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
index fe75c1cb68..c27855ad13 100644
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -40,7 +40,6 @@ LIB_PATHS +=		-L$(GTK_TOP)/lib \
 C_SRC =			cmdproc.c \
 			command.c \
 			contact.c\
-			dialog.c \
 			directconn.c \
 			error.c \
 			group.c \
@@ -52,6 +51,7 @@ C_SRC =			cmdproc.c \
 			notification.c \
 			object.c \
 			oim.c\
+			p2p.c \
 			page.c \
 			servconn.c \
 			session.c \
@@ -59,14 +59,16 @@ C_SRC =			cmdproc.c \
 			slpcall.c \
 			slplink.c \
 			slpmsg.c \
+			slpmsg_part.c \
 			soap.c\
 			state.c \
+			sbconn.c \
 			switchboard.c \
-			sync.c \
 			table.c \
 			transaction.c \
 			user.c \
 			userlist.c \
+			xfer.c \
 			msnutils.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
diff --git a/libpurple/protocols/msn/cmdproc.c b/libpurple/protocols/msn/cmdproc.c
index 0b3646353b..a4202e4a9e 100644
--- a/libpurple/protocols/msn/cmdproc.c
+++ b/libpurple/protocols/msn/cmdproc.c
@@ -21,8 +21,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "cmdproc.h"
+#include "error.h"
 
 MsnCmdProc *
 msn_cmdproc_new(MsnSession *session)
@@ -122,7 +126,8 @@ msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
 		return;
 	}
 
-	msn_history_add(cmdproc->history, trans);
+	if (trans->saveable)
+		msn_history_add(cmdproc->history, trans);
 
 	data = msn_transaction_to_string(trans);
 
@@ -155,75 +160,6 @@ msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
 }
 
 void
-msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command,
-					   const char *format, ...)
-{
-	MsnServConn *servconn;
-	char *data;
-	char *params = NULL;
-	va_list arg;
-	size_t len;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(command != NULL);
-
-	servconn = cmdproc->servconn;
-
-	if (!servconn->connected)
-		return;
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	if (params != NULL)
-		data = g_strdup_printf("%s %s\r\n", command, params);
-	else
-		data = g_strdup_printf("%s\r\n", command);
-
-	g_free(params);
-
-	len = strlen(data);
-
-	show_debug_cmd(cmdproc, FALSE, data);
-
-	msn_servconn_write(servconn, data, len);
-
-	g_free(data);
-}
-
-void
-msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
-				 const char *format, ...)
-{
-	MsnTransaction *trans;
-	va_list arg;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(command != NULL);
-
-	if (!cmdproc->servconn->connected)
-		return;
-
-	trans = g_new0(MsnTransaction, 1);
-
-	trans->cmdproc = cmdproc;
-	trans->command = g_strdup(command);
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		trans->params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-void
 msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload,
 							int payload_len)
 {
@@ -243,58 +179,73 @@ void
 msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnMsgTypeCb cb;
-	const char *messageId = NULL;
+	const char *message_id = NULL;
 
 	/* Multi-part messages */
-	if ((messageId = msn_message_get_attr(msg, "Message-ID")) != NULL) {
-		const char *chunk_text = msn_message_get_attr(msg, "Chunks");
+	message_id = msn_message_get_header_value(msg, "Message-ID");
+	if (message_id != NULL) {
+		/* This is the first in a series of chunks */
+
+		const char *chunk_text = msn_message_get_header_value(msg, "Chunks");
 		guint chunk;
 		if (chunk_text != NULL) {
 			chunk = strtol(chunk_text, NULL, 10);
-			/* 1024 chunks of ~1300 bytes is ~1MB, which seems OK to prevent 
+			/* 1024 chunks of ~1300 bytes is ~1MB, which seems OK to prevent
 			   some random client causing pidgin to hog a ton of memory.
 			   Probably should figure out the maximum that the official client
 			   actually supports, though. */
 			if (chunk > 0 && chunk < 1024) {
 				msg->total_chunks = chunk;
 				msg->received_chunks = 1;
-				g_hash_table_insert(cmdproc->multiparts, (gpointer)messageId, msn_message_ref(msg));
-				purple_debug_info("msn", "Received chunked message, messageId: '%s', total chunks: %d\n",
-				                  messageId, chunk);
+				g_hash_table_insert(cmdproc->multiparts, (gpointer)message_id, msn_message_ref(msg));
+				purple_debug_info("msn", "Received chunked message, message_id: '%s', total chunks: %d\n",
+				                  message_id, chunk);
 			} else {
-				purple_debug_error("msn", "MessageId '%s' has too many chunks: %d\n", messageId, chunk);
+				purple_debug_error("msn", "MessageId '%s' has too many chunks: %d\n", message_id, chunk);
 			}
 			return;
 		} else {
-			chunk_text = msn_message_get_attr(msg, "Chunk");
+			chunk_text = msn_message_get_header_value(msg, "Chunk");
 			if (chunk_text != NULL) {
-				MsnMessage *first = g_hash_table_lookup(cmdproc->multiparts, messageId);
+				/* This is one chunk in a series of chunks */
+
+				MsnMessage *first = g_hash_table_lookup(cmdproc->multiparts, message_id);
 				chunk = strtol(chunk_text, NULL, 10);
-				if (first == NULL) {
-					purple_debug_error("msn",
-					                   "Unable to find first chunk of messageId '%s' to correspond with chunk %d.\n",
-					                   messageId, chunk+1);
-				} else if (first->received_chunks == chunk) {
+				if (first != NULL) {
+					if (first->received_chunks != chunk) {
+						/*
+						 * We received an out of order chunk number (i.e. not the
+						 * next one in the sequence).  Not sure if this can happen
+						 * legitimately, but we definitely don't handle it right
+						 * now.
+						 */
+						g_hash_table_remove(cmdproc->multiparts, message_id);
+						return;
+					}
+
 					/* Chunk is from 1 to total-1 (doesn't count first one) */
-					purple_debug_info("msn", "Received chunk %d of %d, messageId: '%s'\n",
-					                  chunk+1, first->total_chunks, messageId);
+					purple_debug_info("msn", "Received chunk %d of %d, message_id: '%s'\n",
+							chunk + 1, first->total_chunks, message_id);
 					first->body = g_realloc(first->body, first->body_len + msg->body_len);
 					memcpy(first->body + first->body_len, msg->body, msg->body_len);
 					first->body_len += msg->body_len;
 					first->received_chunks++;
 					if (first->received_chunks != first->total_chunks)
+						/* We're waiting for more chunks */
 						return;
-					else
-						/* We're done! Send it along... The caller takes care of
-						   freeing the old one. */
-						msg = first;
+
+					/*
+					 * We have all the chunks for this message, great!  Send
+					 * it along... The caller takes care of freeing the old one.
+					 */
+					msg = first;
 				} else {
-					/* TODO: Can you legitimately receive chunks out of order? */
-					g_hash_table_remove(cmdproc->multiparts, messageId);
-					return;
+					purple_debug_error("msn",
+					                   "Unable to find first chunk of message_id '%s' to correspond with chunk %d.\n",
+					                   message_id, chunk + 1);
 				}
 			} else {
-				purple_debug_error("msn", "Received MessageId '%s' with no chunk number!\n", messageId);
+				purple_debug_error("msn", "Received MessageId '%s' with no chunk number!\n", message_id);
 			}
 		}
 	}
@@ -314,8 +265,8 @@ msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 		purple_debug_warning("msn", "Unhandled content-type '%s'\n",
 						   msn_message_get_content_type(msg));
 
-	if (messageId != NULL)
-		g_hash_table_remove(cmdproc->multiparts, messageId);
+	if (message_id != NULL)
+		g_hash_table_remove(cmdproc->multiparts, message_id);
 }
 
 void
diff --git a/libpurple/protocols/msn/cmdproc.h b/libpurple/protocols/msn/cmdproc.h
index 4b13087861..68de2451ec 100644
--- a/libpurple/protocols/msn/cmdproc.h
+++ b/libpurple/protocols/msn/cmdproc.h
@@ -27,7 +27,6 @@
 typedef struct _MsnCmdProc MsnCmdProc;
 
 #include "command.h"
-#include "error.h"
 #include "history.h"
 #include "servconn.h"
 #include "session.h"
@@ -51,18 +50,45 @@ struct _MsnCmdProc
 	void *data; /**< Extra data, like the switchboard. */
 };
 
+/**
+ * Creates a MsnCmdProc structure.
+ *
+ * @param session 	The session to associate with.
+ *
+ * @return A new MsnCmdProc structure.
+ */
 MsnCmdProc *msn_cmdproc_new(MsnSession *session);
+
+/**
+ * Destroys an MsnCmdProc.
+ *
+ * @param cmdproc 	The object structure.
+ */
 void msn_cmdproc_destroy(MsnCmdProc *cmdproc);
 
+/**
+ * Process the queued transactions.
+ *
+ * @param cmdproc 	The MsnCmdProc.
+ */
 void msn_cmdproc_process_queue(MsnCmdProc *cmdproc);
 
+/**
+ * Sends transaction using this servconn.
+ *
+ * @param cmdproc 	The MsnCmdProc to be used.
+ * @param trans 	The MsnTransaction to be sent.
+ */
 void msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans);
+
+/**
+ * Add a transaction to the queue to be processed latter.
+ *
+ * @param cmdproc 	The MsnCmdProc in which the transaction will be queued.
+ * @param trans 	The MsnTransaction to be queued.
+ */
 void msn_cmdproc_queue_trans(MsnCmdProc *cmdproc,
 							 MsnTransaction *trans);
-void msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
-					  const char *format, ...);
-void msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command,
-							const char *format, ...);
 
 void msn_cmdproc_process_msg(MsnCmdProc *cmdproc,
 							 MsnMessage *msg);
diff --git a/libpurple/protocols/msn/command.c b/libpurple/protocols/msn/command.c
index 1ef24a9acf..c27669584b 100644
--- a/libpurple/protocols/msn/command.c
+++ b/libpurple/protocols/msn/command.c
@@ -21,7 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+#include "internal.h"
+
 #include "command.h"
 
 static gboolean
diff --git a/libpurple/protocols/msn/command.h b/libpurple/protocols/msn/command.h
index fdd82f9324..48fc7dccda 100644
--- a/libpurple/protocols/msn/command.h
+++ b/libpurple/protocols/msn/command.h
@@ -54,9 +54,39 @@ struct _MsnCommand
 	void *payload_cbdata;
 };
 
+/**
+ * Create a command object from the incoming string and ref it.
+ *
+ * @param string 	The incoming string.
+ *
+ * @return 			A MsnCommand object.
+ */
 MsnCommand *msn_command_from_string(const char *string);
+
+/**
+ * Destroy a MsnCommand object if its ref count is zero, otherwise
+ * just unref it.
+ *
+ * @param cmd 	The MsnCommand to be destroyed.
+ */
 void msn_command_destroy(MsnCommand *cmd);
+
+/**
+ * Increment the ref count.
+ *
+ * @param cmd 	The MsnCommand to be ref.
+ *
+ * @return 		The ref command.
+ */
 MsnCommand *msn_command_ref(MsnCommand *cmd);
+
+/**
+ * Decrement the ref count. If the count goes to 0, destroy it.
+ *
+ * @param cmd	The MsnCommand to be unref.
+ *
+ * @return 		The ref command.
+ */
 MsnCommand *msn_command_unref(MsnCommand *cmd);
 
 #endif /* MSN_COMMAND_H */
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c
index 0baff518ba..da25797e4b 100644
--- a/libpurple/protocols/msn/contact.c
+++ b/libpurple/protocols/msn/contact.c
@@ -24,12 +24,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
-#include "msn.h"
+#include "internal.h"
+#include "debug.h"
+
 #include "contact.h"
 #include "xmlnode.h"
 #include "group.h"
+#include "msnutils.h"
 #include "soap.h"
 #include "nexus.h"
+#include "user.h"
 
 const char *MsnSoapPartnerScenarioText[] =
 {
@@ -527,16 +531,20 @@ msn_get_contact_list_cb(MsnSoapMessage *req, MsnSoapMessage *resp,
 	g_return_if_fail(session != NULL);
 
 	if (resp != NULL) {
+#ifdef MSN_PARTIAL_LISTS
 		const char *abLastChange;
 		const char *dynamicItemLastChange;
+#endif
 
 		purple_debug_misc("msn", "Got the contact list!\n");
 
 		msn_parse_contact_list(session, resp->xml);
+#ifdef MSN_PARTIAL_LISTS
 		abLastChange = purple_account_get_string(session->account,
 			"ablastChange", NULL);
 		dynamicItemLastChange = purple_account_get_string(session->account,
 			"DynamicItemLastChanged", NULL);
+#endif
 
 		if (state->partner_scenario == MSN_PS_INITIAL) {
 #ifdef MSN_PARTIAL_LISTS
@@ -1168,7 +1176,7 @@ msn_add_contact_to_group_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp,
 		msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL);
 		msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL);
 
-		if (msn_userlist_user_is_in_list(user, MSN_LIST_PL)) {
+		if (msn_user_is_in_list(user, MSN_LIST_PL)) {
 			msn_del_contact_from_list(state->session, NULL, state->who, MSN_LIST_PL);
 			return;
 		}
@@ -1565,7 +1573,7 @@ msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 	
 	if (list == MSN_LIST_PL) {
 		partner_scenario = MSN_PS_CONTACT_API;
-		if (user && user->networkid != MSN_NETWORK_PASSPORT)
+		if (user->networkid != MSN_NETWORK_PASSPORT)
 			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
 			                         "EmailMember", "Email",
 			                         user->member_id_on_pending_list);
diff --git a/libpurple/protocols/msn/dialog.c b/libpurple/protocols/msn/dialog.c
deleted file mode 100644
index 48669d0597..0000000000
--- a/libpurple/protocols/msn/dialog.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @file dialog.c Dialog functions
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#include "msn.h"
-#include "dialog.h"
-
-typedef struct
-{
-	PurpleConnection *gc;
-	char *who;
-	char *group;
-	gboolean add;
-
-} MsnAddRemData;
-
-/* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed.
- * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */
-/* Actually with our MSNP14 code that isn't true yet, he won't be added back :( */
-static void
-msn_complete_sync_issue(MsnAddRemData *data)
-{
-	PurpleBuddy *buddy;
-	PurpleGroup *group = NULL;
-
-	if (data->group != NULL)
-		group = purple_find_group(data->group);
-
-	if (group != NULL)
-		buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
-	else
-		buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
-
-	if (buddy != NULL)
-		purple_blist_remove_buddy(buddy);
-}
-
-
-static void
-msn_add_cb(MsnAddRemData *data)
-{
-#if 0
-	/* this *should* be necessary !! */
-	msn_complete_sync_issue(data);
-#endif
-
-	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
-	{
-		MsnSession *session = data->gc->proto_data;
-		MsnUserList *userlist = session->userlist;
-
-		msn_userlist_add_buddy(userlist, data->who, data->group);
-	}
-
-	g_free(data->group);
-	g_free(data->who);
-	g_free(data);
-}
-
-static void
-msn_rem_cb(MsnAddRemData *data)
-{
-	msn_complete_sync_issue(data);
-
-	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
-	{
-		MsnSession *session = data->gc->proto_data;
-		MsnUserList *userlist = session->userlist;
-
-		if (data->group == NULL) {
-			msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL);
-		} else {
-			g_free(data->group);
-		}
-	}
-
-	g_free(data->who);
-	g_free(data);
-}
-
-void
-msn_show_sync_issue(MsnSession *session, const char *passport,
-					const char *group_name)
-{
-	PurpleConnection *gc;
-	PurpleAccount *account;
-	MsnAddRemData *data;
-	char *msg, *reason;
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	data        = g_new0(MsnAddRemData, 1);
-	data->who   = g_strdup(passport);
-	data->group = g_strdup(group_name);
-	data->gc    = gc;
-
-	msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
-						  purple_account_get_username(account),
-						  purple_account_get_protocol_name(account));
-
-	if (group_name != NULL)
-	{
-		reason = g_strdup_printf(_("%s on the local list is "
-								   "inside the group \"%s\" but not on "
-								   "the server list. "
-								   "Do you want this buddy to be added?"),
-								 passport, group_name);
-	}
-	else
-	{
-		reason = g_strdup_printf(_("%s is on the local list but "
-								   "not on the server list. "
-								   "Do you want this buddy to be added?"),
-								 passport);
-	}
-
-	purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE,
-						purple_connection_get_account(gc), data->who, NULL,
-						data, 2,
-						_("Yes"), G_CALLBACK(msn_add_cb),
-						_("No"), G_CALLBACK(msn_rem_cb));
-
-	g_free(reason);
-	g_free(msg);
-}
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index 6fb7fb72fd..7cfa24c927 100644
--- a/libpurple/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
@@ -21,30 +21,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+#include "cipher.h"
+#include "debug.h"
+
 #include "msn.h"
 #include "directconn.h"
 
 #include "slp.h"
 #include "slpmsg.h"
+#include "p2p.h"
 
-#pragma pack(push,1)
-typedef struct {
-	guint32 session_id;
-	guint32 seq_id;
-	guint64 offset;
-	guint64 total_size;
-	guint32 length;
-	guint32 flags;
-	guint32 ack_id;
-	guint32 ack_uid;
-	guint64 ack_size;
-/*	guint8  body[1]; */
-} MsnDcContext;
-#pragma pack(pop)
-
-#define DC_PACKET_HEADER_SIZE sizeof(MsnDcContext)
 #define DC_MAX_BODY_SIZE      8*1024
-#define DC_MAX_PACKET_SIZE    (DC_PACKET_HEADER_SIZE + DC_MAX_BODY_SIZE)
+#define DC_MAX_PACKET_SIZE    (P2P_PACKET_HEADER_SIZE + DC_MAX_BODY_SIZE)
 
 static void
 msn_dc_calculate_nonce_hash(MsnDirectConnNonceType type,
@@ -121,8 +111,12 @@ msn_dc_destroy_packet(MsnDirectConnPacket *p)
 {
 	g_free(p->data);
 
+#if 0
 	if (p->msg)
 		msn_message_unref(p->msg);
+#endif
+	if (p->part)
+		msn_slpmsgpart_unref(p->part);
 
 	g_free(p);
 }
@@ -191,7 +185,7 @@ msn_dc_destroy(MsnDirectConn *dc)
 	if (slplink) {
 		slplink->dc = NULL;
 		if (slplink->swboard == NULL)
-			msn_slplink_destroy(slplink);
+			msn_slplink_unref(slplink);
 	}
 
 	g_free(dc->msg_body);
@@ -353,7 +347,7 @@ msn_dc_fallback_to_sb(MsnDirectConn *dc)
 		if (queue) {
 			while (!g_queue_is_empty(queue)) {
 				MsnDirectConnPacket *p = g_queue_pop_head(queue);
-				msn_slplink_send_msg(slplink, p->msg);
+				msn_slplink_send_msgpart(slplink, (MsnSlpMessage*)p->part->ack_data);
 				msn_dc_destroy_packet(p);
 			}
 			g_queue_free(queue);
@@ -363,51 +357,6 @@ msn_dc_fallback_to_sb(MsnDirectConn *dc)
 }
 
 static void
-msn_dc_parse_binary_header(MsnDirectConn *dc)
-{
-	MsnSlpHeader *h;
-	MsnDcContext *context;
-
-	g_return_if_fail(dc != NULL);
-
-	h = &dc->header;
-	/* Skip packet size */
-	context = (MsnDcContext *)(dc->in_buffer + 4);
-
-	h->session_id = GUINT32_FROM_LE(context->session_id);
-	h->id = GUINT32_FROM_LE(context->seq_id);
-	h->offset = GUINT64_FROM_LE(context->offset);
-	h->total_size = GUINT64_FROM_LE(context->total_size);
-	h->length = GUINT32_FROM_LE(context->length);
-	h->flags = GUINT32_FROM_LE(context->flags);
-	h->ack_id = GUINT32_FROM_LE(context->ack_id);
-	h->ack_sub_id = GUINT32_FROM_LE(context->ack_uid);
-	h->ack_size = GUINT64_FROM_LE(context->ack_size);
-}
-
-static const gchar *
-msn_dc_serialize_binary_header(MsnDirectConn *dc) {
-	MsnSlpHeader *h;
-	static MsnDcContext bin_header;
-
-	g_return_val_if_fail(dc != NULL, NULL);
-
-	h = &dc->header;
-
-	bin_header.session_id = GUINT32_TO_LE(h->session_id);
-	bin_header.seq_id = GUINT32_TO_LE(h->id);
-	bin_header.offset = GUINT64_TO_LE(h->offset);
-	bin_header.total_size = GUINT64_TO_LE(h->total_size);
-	bin_header.length = GUINT32_TO_LE(h->length);
-	bin_header.flags = GUINT32_TO_LE(h->flags);
-	bin_header.ack_id = GUINT32_TO_LE(h->ack_id);
-	bin_header.ack_uid = GUINT32_TO_LE(h->ack_sub_id);
-	bin_header.ack_size = GUINT64_TO_LE(h->ack_size);
-
-	return (const gchar *)&bin_header;
-}
-
-static void
 msn_dc_send_cb(gpointer data, gint fd, PurpleInputCondition cond)
 {
 	MsnDirectConn *dc = data;
@@ -502,10 +451,11 @@ msn_dc_send_handshake_with_nonce(MsnDirectConn *dc, MsnDirectConnPacket *p)
 {
 	const gchar *h;
 
-	h = msn_dc_serialize_binary_header(dc);
-	memcpy(p->data, h, DC_PACKET_HEADER_SIZE);
+	h = (gchar*)  msn_p2p_header_to_wire(&dc->header);
+
+	memcpy(p->data, h, P2P_PACKET_HEADER_SIZE);
 
-	memcpy(p->data + offsetof(MsnDcContext, ack_id), dc->nonce, 16);
+	memcpy(p->data + offsetof(MsnP2PHeader, ack_id), dc->nonce, 16);
 
 	msn_dc_enqueue_packet(dc, p);
 }
@@ -515,7 +465,7 @@ msn_dc_send_handshake(MsnDirectConn *dc)
 {
 	MsnDirectConnPacket *p;
 
-	p = msn_dc_new_packet(DC_PACKET_HEADER_SIZE);
+	p = msn_dc_new_packet(P2P_PACKET_HEADER_SIZE);
 
 	dc->header.session_id = 0;
 	dc->header.id = dc->slpcall->slplink->slp_seq_id++;
@@ -532,7 +482,7 @@ msn_dc_send_handshake_reply(MsnDirectConn *dc)
 {
 	MsnDirectConnPacket *p;
 
-	p = msn_dc_new_packet(DC_PACKET_HEADER_SIZE);
+	p = msn_dc_new_packet(P2P_PACKET_HEADER_SIZE);
 
 	dc->header.id = dc->slpcall->slplink->slp_seq_id++;
 	dc->header.length = 0;
@@ -546,10 +496,10 @@ msn_dc_verify_handshake(MsnDirectConn *dc, guint32 packet_length)
 	guchar nonce[16];
 	gchar  nonce_hash[37];
 
-	if (packet_length != DC_PACKET_HEADER_SIZE)
+	if (packet_length != P2P_PACKET_HEADER_SIZE)
 		return FALSE;
 
-	memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnDcContext, ack_id), 16);
+	memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnP2PHeader, ack_id), 16);
 
 	if (dc->nonce_type == DC_NONCE_PLAIN) {
 		if (memcmp(dc->nonce, nonce, 16) == 0) {
@@ -589,6 +539,14 @@ msn_dc_verify_handshake(MsnDirectConn *dc, guint32 packet_length)
 static void
 msn_dc_send_packet_cb(MsnDirectConnPacket *p)
 {
+	if (p->part != NULL && p->part->ack_cb != NULL)
+		p->part->ack_cb(p->part, p->part->ack_data);
+}
+
+#if 0
+static void
+msn_dc_send_packet_cb(MsnDirectConnPacket *p)
+{
 	if (p->msg != NULL && p->msg->ack_cb != NULL)
 		p->msg->ack_cb(p->msg, p->msg->ack_data);
 }
@@ -599,21 +557,42 @@ msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg)
 	MsnDirectConnPacket *p;
 	guint32 length;
 
-	length = msg->body_len + DC_PACKET_HEADER_SIZE;
+	length = msg->body_len + P2P_PACKET_HEADER_SIZE;
 	p = msn_dc_new_packet(length);
 
-	memcpy(p->data, &msg->msnslp_header, DC_PACKET_HEADER_SIZE);
-	memcpy(p->data + DC_PACKET_HEADER_SIZE, msg->body, msg->body_len);
+	memcpy(p->data, msg->slpmsg->header, P2P_PACKET_HEADER_SIZE);
+	memcpy(p->data + P2P_PACKET_HEADER_SIZE, msg->body, msg->body_len);
 
 	p->sent_cb = msn_dc_send_packet_cb;
 	p->msg = msn_message_ref(msg);
 
 	msn_dc_enqueue_packet(dc, p);
 }
+#endif
+
+void
+msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part)
+{
+	MsnDirectConnPacket *p;
+	guint32 length;
+
+	length = part->size + P2P_PACKET_HEADER_SIZE;
+	p = msn_dc_new_packet(length);
+
+	memcpy(p->data, part->header, P2P_PACKET_HEADER_SIZE);
+	memcpy(p->data + P2P_PACKET_HEADER_SIZE, part->buffer, part->size);
+
+	p->sent_cb = msn_dc_send_packet_cb;
+	p->part = part;
+
+	msn_dc_enqueue_packet(dc, p);
+}
 
 static int
 msn_dc_process_packet(MsnDirectConn *dc, guint32 packet_length)
 {
+	MsnSlpMessagePart *part;
+
 	g_return_val_if_fail(dc != NULL, DC_PROCESS_ERROR);
 
 	switch (dc->state) {
@@ -650,12 +629,9 @@ msn_dc_process_packet(MsnDirectConn *dc, guint32 packet_length)
 		break;
 
 	case DC_STATE_ESTABLISHED:
-		msn_slplink_process_msg(
-			dc->slplink,
-			&dc->header,
-			dc->in_buffer + 4 + DC_PACKET_HEADER_SIZE,
-			dc->header.length
-		);
+
+		part = msn_slpmsgpart_new_from_data(dc->in_buffer + 4, dc->header.length);
+		msn_slplink_process_msg(dc->slplink, part);
 
 		/*
 		if (dc->num_calls == 0) {
@@ -727,7 +703,15 @@ msn_dc_recv_cb(gpointer data, gint fd, PurpleInputCondition cond)
 			return;
 
 		if (dc->state != DC_STATE_FOO) {
-			msn_dc_parse_binary_header(dc);
+			MsnP2PHeader *context;
+			MsnP2PHeader *h;
+			
+			/* Skip packet size */
+			context = (MsnP2PHeader *)(dc->in_buffer + 4);
+
+			h = msn_p2p_header_from_wire(context);
+			memcpy(&dc->header, h, P2P_PACKET_HEADER_SIZE);
+			g_free(h);
 		}
 
 		switch (msn_dc_process_packet(dc, packet_length)) {
diff --git a/libpurple/protocols/msn/directconn.h b/libpurple/protocols/msn/directconn.h
index 2aae22ec69..52e4548fc2 100644
--- a/libpurple/protocols/msn/directconn.h
+++ b/libpurple/protocols/msn/directconn.h
@@ -30,10 +30,13 @@ typedef struct _MsnDirectConn MsnDirectConn;
 #include "proxy.h"
 #include "circbuffer.h"
 
-#include "msg.h"
 #include "slp.h"
 #include "slplink.h"
 #include "slpmsg.h"
+#include "slpmsg_part.h"
+#include "p2p.h"
+
+#define MSN_DCCONN_MAX_SIZE 1352
 
 typedef enum
 {
@@ -68,7 +71,7 @@ struct _MsnDirectConnPacket {
 	guchar      *data;
 
 	void        (*sent_cb)(struct _MsnDirectConnPacket*);
-	MsnMessage  *msg;
+	MsnSlpMessagePart *part;
 };
 
 struct _MsnDirectConn
@@ -100,7 +103,7 @@ struct _MsnDirectConn
 	GQueue  *out_queue; /**< The outgoing packet queue */
 	int     msg_pos;    /**< The position of next byte to be sent in the actual packet */
 
-	MsnSlpHeader    header; /**< SLP header for parsing / serializing */
+	MsnP2PHeader    header; /**< SLP header for parsing / serializing */
 
 	/** The callback used for sending information to the peer about the opened socket */
 	void (*send_connection_info_msg_cb)(MsnDirectConn *);
@@ -124,8 +127,12 @@ struct _MsnDirectConn
 /*
  * Queues an MSN message to be sent via direct connection.
  */
+#if 0
 void
 msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg);
+#endif
+void
+msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part);
 
 /*
  * Creates, initializes, and returns a new MsnDirectConn structure.
diff --git a/libpurple/protocols/msn/error.c b/libpurple/protocols/msn/error.c
index fd13bea29f..0ca5299732 100644
--- a/libpurple/protocols/msn/error.c
+++ b/libpurple/protocols/msn/error.c
@@ -21,9 +21,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+/* Masca: can we get rid of the sync issue dialog? */
+#include "request.h"
+
 #include "error.h"
 
+typedef struct
+{
+	PurpleConnection *gc;
+	char *who;
+	char *group;
+	gboolean add;
+
+} MsnAddRemData;
+
 const char *
 msn_error_get_text(unsigned int type, gboolean *debug)
 {
@@ -264,3 +278,115 @@ msn_error_handle(MsnSession *session, unsigned int type)
 	g_free(buf);
 }
 
+/* Remove the buddy referenced by the MsnAddRemData before the serverside list
+ * is changed.  If the buddy will be added, he'll be added back; if he will be
+ * removed, he won't be. */
+/* Actually with our MSNP14 code that isn't true yet, he won't be added back :(
+ * */
+static void
+msn_complete_sync_issue(MsnAddRemData *data)
+{
+	PurpleBuddy *buddy;
+	PurpleGroup *group = NULL;
+
+	if (data->group != NULL)
+		group = purple_find_group(data->group);
+
+	if (group != NULL)
+		buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
+	else
+		buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
+
+	if (buddy != NULL)
+		purple_blist_remove_buddy(buddy);
+}
+
+
+static void
+msn_add_cb(MsnAddRemData *data)
+{
+#if 0
+	/* this *should* be necessary !! */
+	msn_complete_sync_issue(data);
+#endif
+
+	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+	{
+		MsnSession *session = data->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
+
+		msn_userlist_add_buddy(userlist, data->who, data->group);
+	}
+
+	g_free(data->group);
+	g_free(data->who);
+	g_free(data);
+}
+
+static void
+msn_rem_cb(MsnAddRemData *data)
+{
+	msn_complete_sync_issue(data);
+
+	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+	{
+		MsnSession *session = data->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
+
+		if (data->group == NULL) {
+			msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL);
+		} else {
+			g_free(data->group);
+		}
+	}
+
+	g_free(data->who);
+	g_free(data);
+}
+
+void
+msn_error_sync_issue(MsnSession *session, const char *passport,
+					const char *group_name)
+{
+	PurpleConnection *gc;
+	PurpleAccount *account;
+	MsnAddRemData *data;
+	char *msg, *reason;
+
+	account = session->account;
+	gc = purple_account_get_connection(account);
+
+	data        = g_new0(MsnAddRemData, 1);
+	data->who   = g_strdup(passport);
+	data->group = g_strdup(group_name);
+	data->gc    = gc;
+
+	msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
+						  purple_account_get_username(account),
+						  purple_account_get_protocol_name(account));
+
+	if (group_name != NULL)
+	{ 
+		reason = g_strdup_printf(_("%s on the local list is "
+								   "inside the group \"%s\" but not on "
+								   "the server list. "
+								   "Do you want this buddy to be added?"),
+								 passport, group_name);
+	}
+	else
+	{ 
+		reason = g_strdup_printf(_("%s is on the local list but "
+								   "not on the server list. "
+								   "Do you want this buddy to be added?"),
+								 passport);
+	}
+
+	purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE,
+						purple_connection_get_account(gc), data->who, NULL,
+						data, 2,
+						_("Yes"), G_CALLBACK(msn_add_cb),
+						_("No"), G_CALLBACK(msn_rem_cb));
+
+	g_free(reason);
+	g_free(msg);
+}
diff --git a/libpurple/protocols/msn/error.h b/libpurple/protocols/msn/error.h
index 257bfe1414..5194eaaac3 100644
--- a/libpurple/protocols/msn/error.h
+++ b/libpurple/protocols/msn/error.h
@@ -44,4 +44,14 @@ const char *msn_error_get_text(unsigned int type, gboolean *debug);
  */
 void msn_error_handle(MsnSession *session, unsigned int type);
 
+/**
+ * Show the sync issue in a dialog using request api
+ *
+ * @param sesion 		MsnSession associated to this error.
+ * @param passport 		The passport associated with the error.
+ * @param group_name 	The group in the buddy is suppoused to be
+ */
+void msn_error_sync_issue(MsnSession *session, const char *passport,
+						 const char *group_name);
+
 #endif /* MSN_ERROR_H */
diff --git a/libpurple/protocols/msn/group.h b/libpurple/protocols/msn/group.h
index 14776c9b17..620d24124f 100644
--- a/libpurple/protocols/msn/group.h
+++ b/libpurple/protocols/msn/group.h
@@ -26,7 +26,7 @@
 
 typedef struct _MsnGroup  MsnGroup;
 
-#include <stdio.h>
+#include "internal.h"
 
 #include "session.h"
 #include "user.h"
diff --git a/libpurple/protocols/msn/history.h b/libpurple/protocols/msn/history.h
index 8fdec6ec4d..7ceef1fce4 100644
--- a/libpurple/protocols/msn/history.h
+++ b/libpurple/protocols/msn/history.h
@@ -24,6 +24,8 @@
 #ifndef MSN_HISTORY_H
 #define MSN_HISTORY_H
 
+#include "internal.h"
+
 typedef struct _MsnHistory MsnHistory;
 
 #include "transaction.h"
diff --git a/libpurple/protocols/msn/httpconn.c b/libpurple/protocols/msn/httpconn.c
index ba44841091..708cbcc362 100644
--- a/libpurple/protocols/msn/httpconn.c
+++ b/libpurple/protocols/msn/httpconn.c
@@ -239,6 +239,9 @@ msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
 		}
 		else
 		{
+			/* I'll be honest, I don't fully understand all this, but this
+			 * causes crashes, Stu. */
+#if 0
 			MsnServConn *servconn;
 
 			/* It's going to die. */
@@ -246,10 +249,9 @@ msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
 
 			servconn = httpconn->servconn;
 
-			/* I'll be honest, I don't fully understand all this, but this
-			 * causes crashes, Stu. */
-			/* if (servconn != NULL)
-				servconn->wasted = TRUE; */
+			if (servconn != NULL)
+				servconn->wasted = TRUE;
+#endif
 
 			g_free(full_session_id);
 			g_free(session_id);
diff --git a/libpurple/protocols/msn/httpconn.h b/libpurple/protocols/msn/httpconn.h
index a7bfd69e18..381a27b85c 100644
--- a/libpurple/protocols/msn/httpconn.h
+++ b/libpurple/protocols/msn/httpconn.h
@@ -28,6 +28,7 @@ typedef struct _MsnHttpConn MsnHttpConn;
 
 #include "circbuffer.h"
 #include "servconn.h"
+#include "session.h"
 
 /**
  * An HTTP Connection.
diff --git a/libpurple/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
index 57c4aba706..e127850b34 100644
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -21,9 +21,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+#include "debug.h"
+
 #include "msn.h"
 #include "msg.h"
 #include "msnutils.h"
+#include "slpmsg.h"
+#include "slpmsg_part.h"
 
 MsnMessage *
 msn_message_new(MsnMsgType type)
@@ -36,7 +42,7 @@ msn_message_new(MsnMsgType type)
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "message new (%p)(%d)\n", msg, type);
 
-	msg->attr_table = g_hash_table_new_full(g_str_hash, g_str_equal,
+	msg->header_table = g_hash_table_new_full(g_str_hash, g_str_equal,
 											g_free, g_free);
 
 	msn_message_ref(msg);
@@ -64,8 +70,9 @@ msn_message_destroy(MsnMessage *msg)
 	g_free(msg->content_type);
 	g_free(msg->charset);
 
-	g_hash_table_destroy(msg->attr_table);
-	g_list_free(msg->attr_list);
+	g_hash_table_destroy(msg->header_table);
+	g_list_free(msg->header_list);
+	msn_slpmsgpart_destroy(msg->part);
 
 	g_free(msg);
 }
@@ -112,11 +119,11 @@ msn_message_new_plain(const char *message)
 
 	msg = msn_message_new(MSN_MSG_TEXT);
 	msg->retries = 1;
-	msn_message_set_attr(msg, "User-Agent", PACKAGE_NAME "/" VERSION);
+	msn_message_set_header(msg, "User-Agent", PACKAGE_NAME "/" VERSION);
 	msn_message_set_content_type(msg, "text/plain");
 	msn_message_set_charset(msg, "UTF-8");
 	msn_message_set_flag(msg, 'A');
-	msn_message_set_attr(msg, "X-MMS-IM-Format",
+	msn_message_set_header(msg, "X-MMS-IM-Format",
 						 "FN=Segoe%20UI; EF=; CO=0; CS=1;PF=0");
 
 	message_cr = purple_str_add_cr(message);
@@ -133,7 +140,7 @@ msn_message_new_msnslp(void)
 
 	msg = msn_message_new(MSN_MSG_SLP);
 
-	msn_message_set_attr(msg, "User-Agent", NULL);
+	msn_message_set_header(msg, "User-Agent", NULL);
 
 	msg->msnslp_message = TRUE;
 
@@ -157,46 +164,6 @@ msn_message_new_nudge(void)
 }
 
 void
-msn_message_parse_slp_body(MsnMessage *msg, const char *body, size_t len)
-{
-	MsnSlpHeader header;
-	const char *tmp;
-	int body_len;
-
-	tmp = body;
-
-	if (len < sizeof(header)) {
-		g_return_if_reached();
-	}
-
-	/* Import the header. */
-	memcpy(&header, tmp, sizeof(header));
-	tmp += sizeof(header);
-
-	msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id);
-	msg->msnslp_header.id         = GUINT32_FROM_LE(header.id);
-	msg->msnslp_header.offset     = GUINT64_FROM_LE(header.offset);
-	msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size);
-	msg->msnslp_header.length     = GUINT32_FROM_LE(header.length);
-	msg->msnslp_header.flags      = GUINT32_FROM_LE(header.flags);
-	msg->msnslp_header.ack_id     = GUINT32_FROM_LE(header.ack_id);
-	msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id);
-	msg->msnslp_header.ack_size   = GUINT64_FROM_LE(header.ack_size);
-
-	/* Import the body. */
-	body_len = len - (tmp - body);
-	/* msg->body_len = msg->msnslp_header.length; */
-
-	if (body_len > 0) {
-		msg->body_len = len - (tmp - body);
-		msg->body = g_malloc(msg->body_len + 1);
-		memcpy(msg->body, tmp, msg->body_len);
-		msg->body[msg->body_len] = '\0';
-		tmp += body_len;
-	}
-}
-
-void
 msn_message_parse_payload(MsnMessage *msg,
 						  const char *payload, size_t payload_len,
 						  const char *line_dem,const char *body_dem)
@@ -211,7 +178,7 @@ msn_message_parse_payload(MsnMessage *msg,
 	memcpy(tmp_base, payload, payload_len);
 	tmp_base[payload_len] = '\0';
 
-	/* Parse the attributes. */
+	/* Find the end of the headers */
 	end = strstr(tmp, body_dem);
 	/* TODO? some clients use \r delimiters instead of \r\n, the official client
 	 * doesn't send such messages, but does handle receiving them. We'll just
@@ -222,8 +189,8 @@ msn_message_parse_payload(MsnMessage *msg,
 	}
 	*end = '\0';
 
+	/* Split the headers and parse each one */
 	elems = g_strsplit(tmp, line_dem, 0);
-
 	for (cur = elems; *cur != NULL; cur++)
 	{
 		const char *key, *value;
@@ -240,7 +207,7 @@ msn_message_parse_payload(MsnMessage *msg,
 			if (!strcmp(key, "boundary")) {
 				char *end = strchr(value, '\"');
 				*end = '\0';
-				msn_message_set_attr(msg, key, value);
+				msn_message_set_header(msg, key, value);
 			}
 
 			g_strfreev(tokens);
@@ -278,12 +245,11 @@ msn_message_parse_payload(MsnMessage *msg,
 		}
 		else
 		{
-			msn_message_set_attr(msg, key, value);
+			msn_message_set_header(msg, key, value);
 		}
 
 		g_strfreev(tokens);
 	}
-
 	g_strfreev(elems);
 
 	/* Proceed to the end of the "\r\n\r\n" */
@@ -293,70 +259,26 @@ msn_message_parse_payload(MsnMessage *msg,
 	content_type = msn_message_get_content_type(msg);
 
 	if (content_type != NULL &&
-		!strcmp(content_type, "application/x-msnmsgrp2p"))
-	{
-		MsnSlpHeader header;
-		MsnSlpFooter footer;
-		int body_len;
-
-		if (payload_len - (tmp - tmp_base) < sizeof(header)) {
-			g_free(tmp_base);
-			g_return_if_reached();
-		}
-
+		!strcmp(content_type, "application/x-msnmsgrp2p")) {
 		msg->msnslp_message = TRUE;
+		msg->part = msn_slpmsgpart_new_from_data(tmp, payload_len - (tmp - tmp_base));
+	}
 
-		/* Import the header. */
-		memcpy(&header, tmp, sizeof(header));
-		tmp += sizeof(header);
-
-		msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id);
-		msg->msnslp_header.id         = GUINT32_FROM_LE(header.id);
-		msg->msnslp_header.offset     = GUINT64_FROM_LE(header.offset);
-		msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size);
-		msg->msnslp_header.length     = GUINT32_FROM_LE(header.length);
-		msg->msnslp_header.flags      = GUINT32_FROM_LE(header.flags);
-		msg->msnslp_header.ack_id     = GUINT32_FROM_LE(header.ack_id);
-		msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id);
-		msg->msnslp_header.ack_size   = GUINT64_FROM_LE(header.ack_size);
-
-		body_len = payload_len - (tmp - tmp_base) - sizeof(footer);
-
-		/* Import the body. */
-		if (body_len > 0) {
-			msg->body_len = body_len;
-			g_free(msg->body);
-			msg->body = g_malloc(msg->body_len + 1);
-			memcpy(msg->body, tmp, msg->body_len);
-			msg->body[msg->body_len] = '\0';
-			tmp += body_len;
-		}
-
-		/* Import the footer. */
-		if (body_len >= 0) {
-			memcpy(&footer, tmp, sizeof(footer));
-			tmp += sizeof(footer);
-			msg->msnslp_footer.value = GUINT32_FROM_BE(footer.value);
-		}
+	if (payload_len - (tmp - tmp_base) > 0) {
+		msg->body_len = payload_len - (tmp - tmp_base);
+		g_free(msg->body);
+		msg->body = g_malloc(msg->body_len + 1);
+		memcpy(msg->body, tmp, msg->body_len);
+		msg->body[msg->body_len] = '\0';
 	}
-	else
-	{
-		if (payload_len - (tmp - tmp_base) > 0) {
-			msg->body_len = payload_len - (tmp - tmp_base);
-			g_free(msg->body);
-			msg->body = g_malloc(msg->body_len + 1);
-			memcpy(msg->body, tmp, msg->body_len);
-			msg->body[msg->body_len] = '\0';
-		}
-		
-		if ((!content_type || !strcmp(content_type, "text/plain"))
+
+	if ((!content_type || !strcmp(content_type, "text/plain"))
 			&& msg->charset == NULL) {
-			char *body = g_convert(msg->body, msg->body_len, "UTF-8",
-			                       "ISO-8859-1", NULL, &msg->body_len, NULL);
-			g_free(msg->body);
-			msg->body = body;
-			msg->charset = g_strdup("UTF-8");
-		}
+		char *body = g_convert(msg->body, msg->body_len, "UTF-8",
+				"ISO-8859-1", NULL, &msg->body_len, NULL);
+		g_free(msg->body);
+		msg->body = body;
+		msg->charset = g_strdup("UTF-8");
 	}
 
 	g_free(tmp_base);
@@ -381,43 +303,10 @@ msn_message_new_from_cmd(MsnSession *session, MsnCommand *cmd)
 char *
 msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size)
 {
-	MsnSlpHeader header;
-
-	char *tmp, *base;
-	const void *body;
-	size_t len, body_len;
-
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	len = MSN_BUF_LEN;
-
-	base = tmp = g_malloc(len + 1);
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id);
-	header.id         = GUINT32_TO_LE(msg->msnslp_header.id);
-	header.offset     = GUINT64_TO_LE(msg->msnslp_header.offset);
-	header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size);
-	header.length     = GUINT32_TO_LE(msg->msnslp_header.length);
-	header.flags      = GUINT32_TO_LE(msg->msnslp_header.flags);
-	header.ack_id     = GUINT32_TO_LE(msg->msnslp_header.ack_id);
-	header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id);
-	header.ack_size   = GUINT64_TO_LE(msg->msnslp_header.ack_size);
-
-	memcpy(tmp, &header, 48);
-	tmp += 48;
+	char *tmp;
 
-	if (body != NULL)
-	{
-		memcpy(tmp, body, body_len);
-		tmp += body_len;
-	}
-
-	if (ret_size != NULL)
-		*ret_size = tmp - base;
-
-	return base;
+	tmp = msn_slpmsgpart_serialize(msg->part, ret_size);
+	return tmp;
 }
 
 char *
@@ -454,13 +343,13 @@ msn_message_gen_payload(MsnMessage *msg, size_t *ret_size)
 
 	n += strlen(n);
 
-	for (l = msg->attr_list; l != NULL; l = l->next)
+	for (l = msg->header_list; l != NULL; l = l->next)
 	{
 		const char *key;
 		const char *value;
 
 		key = l->data;
-		value = msn_message_get_attr(msg, key);
+		value = msn_message_get_header_value(msg, key);
 
 		g_snprintf(n, end - n, "%s: %s\r\n", key, value);
 		n += strlen(n);
@@ -472,33 +361,13 @@ msn_message_gen_payload(MsnMessage *msg, size_t *ret_size)
 
 	if (msg->msnslp_message)
 	{
-		MsnSlpHeader header;
-		MsnSlpFooter footer;
-
-		header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id);
-		header.id         = GUINT32_TO_LE(msg->msnslp_header.id);
-		header.offset     = GUINT64_TO_LE(msg->msnslp_header.offset);
-		header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size);
-		header.length     = GUINT32_TO_LE(msg->msnslp_header.length);
-		header.flags      = GUINT32_TO_LE(msg->msnslp_header.flags);
-		header.ack_id     = GUINT32_TO_LE(msg->msnslp_header.ack_id);
-		header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id);
-		header.ack_size   = GUINT64_TO_LE(msg->msnslp_header.ack_size);
-
-		memcpy(n, &header, 48);
-		n += 48;
-
-		if (body != NULL)
-		{
-			memcpy(n, body, body_len);
-
-			n += body_len;
-		}
-
-		footer.value = GUINT32_TO_BE(msg->msnslp_footer.value);
+		size_t siz;
+		char *body;
+		
+		body = msn_slpmsgpart_serialize(msg->part, &siz);
 
-		memcpy(n, &footer, 4);
-		n += 4;
+		memcpy(n, body, siz);
+		n += siz;
 	}
 	else
 	{
@@ -610,15 +479,15 @@ msn_message_get_charset(const MsnMessage *msg)
 }
 
 void
-msn_message_set_attr(MsnMessage *msg, const char *attr, const char *value)
+msn_message_set_header(MsnMessage *msg, const char *name, const char *value)
 {
 	const char *temp;
-	char *new_attr;
+	char *new_name;
 
 	g_return_if_fail(msg != NULL);
-	g_return_if_fail(attr != NULL);
+	g_return_if_fail(name != NULL);
 
-	temp = msn_message_get_attr(msg, attr);
+	temp = msn_message_get_header_value(msg, name);
 
 	if (value == NULL)
 	{
@@ -626,37 +495,37 @@ msn_message_set_attr(MsnMessage *msg, const char *attr, const char *value)
 		{
 			GList *l;
 
-			for (l = msg->attr_list; l != NULL; l = l->next)
+			for (l = msg->header_list; l != NULL; l = l->next)
 			{
-				if (!g_ascii_strcasecmp(l->data, attr))
+				if (!g_ascii_strcasecmp(l->data, name))
 				{
-					msg->attr_list = g_list_remove(msg->attr_list, l->data);
+					msg->header_list = g_list_remove(msg->header_list, l->data);
 
 					break;
 				}
 			}
 
-			g_hash_table_remove(msg->attr_table, attr);
+			g_hash_table_remove(msg->header_table, name);
 		}
 
 		return;
 	}
 
-	new_attr = g_strdup(attr);
+	new_name = g_strdup(name);
 
-	g_hash_table_insert(msg->attr_table, new_attr, g_strdup(value));
+	g_hash_table_insert(msg->header_table, new_name, g_strdup(value));
 
 	if (temp == NULL)
-		msg->attr_list = g_list_append(msg->attr_list, new_attr);
+		msg->header_list = g_list_append(msg->header_list, new_name);
 }
 
 const char *
-msn_message_get_attr(const MsnMessage *msg, const char *attr)
+msn_message_get_header_value(const MsnMessage *msg, const char *name)
 {
 	g_return_val_if_fail(msg != NULL, NULL);
-	g_return_val_if_fail(attr != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
 
-	return g_hash_table_lookup(msg->attr_table, attr);
+	return g_hash_table_lookup(msg->header_table, name);
 }
 
 GHashTable *
@@ -741,13 +610,13 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 				   msg->content_type, msg->charset);
 	}
 
-	for (l = msg->attr_list; l; l = l->next)
+	for (l = msg->header_list; l; l = l->next)
 	{
 		char *key;
 		const char *value;
 
 		key = l->data;
-		value = msn_message_get_attr(msg, key);
+		value = msn_message_get_header_value(msg, key);
 
 		g_string_append_printf(str, "%s: %s\r\n", key, value);
 	}
@@ -758,15 +627,15 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 
 	if (msg->msnslp_message)
 	{
-		g_string_append_printf(str, "Session ID: %u\r\n", msg->msnslp_header.session_id);
-		g_string_append_printf(str, "ID:         %u\r\n", msg->msnslp_header.id);
-		g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.offset);
-		g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.total_size);
-		g_string_append_printf(str, "Length:     %u\r\n", msg->msnslp_header.length);
-		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->msnslp_header.flags);
-		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->msnslp_header.ack_id);
-		g_string_append_printf(str, "SUB ID:     %u\r\n", msg->msnslp_header.ack_sub_id);
-		g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.ack_size);
+		g_string_append_printf(str, "Session ID: %u\r\n", msg->part->header->session_id);
+		g_string_append_printf(str, "ID:         %u\r\n", msg->part->header->id);
+		g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", msg->part->header->offset);
+		g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->part->header->total_size);
+		g_string_append_printf(str, "Length:     %u\r\n", msg->part->header->length);
+		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->part->header->flags);
+		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->part->header->ack_id);
+		g_string_append_printf(str, "SUB ID:     %u\r\n", msg->part->header->ack_sub_id);
+		g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", msg->part->header->ack_size);
 
 		if (purple_debug_is_verbose() && body != NULL)
 		{
@@ -783,17 +652,27 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 			else
 			{
 				int i;
-				for (i = 0; i < msg->body_len; i++)
+				int bin_len;
+				
+				if (msg->part->footer->value == P2P_APPID_SESION)
+					bin_len = P2P_PACKET_HEADER_SIZE;
+				else
+					bin_len = body_len;
+
+				for (i = 0; i < bin_len; i++)
 				{
 					g_string_append_printf(str, "%.2hhX ", body[i]);
 					if ((i % 16) == 15)
 						g_string_append(str, "\r\n");
 				}
+
+				if (bin_len == P2P_PACKET_HEADER_SIZE)
+					g_string_append_printf(str, "%s ", body + P2P_PACKET_HEADER_SIZE);
 				g_string_append(str, "\r\n");
 			}
 		}
 
-		g_string_append_printf(str, "Footer:     %u\r\n", msg->msnslp_footer.value);
+		g_string_append_printf(str, "Footer:     0x%08X\r\n", msg->part->footer->value);
 	}
 	else
 	{
@@ -817,7 +696,6 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	PurpleConnection *gc;
 	const char *body;
-	char *body_str;
 	char *body_enc;
 	char *body_final;
 	size_t body_len;
@@ -827,9 +705,7 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	gc = cmdproc->session->account->gc;
 
 	body = msn_message_get_bin_data(msg, &body_len);
-	body_str = g_strndup(body, body_len);
-	body_enc = g_markup_escape_text(body_str, -1);
-	g_free(body_str);
+	body_enc = g_markup_escape_text(body, body_len);
 
 	passport = msg->remote_user;
 
@@ -840,13 +716,13 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	}
 
 #if 0
-	if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "User-Agent")) != NULL)
 	{
 		purple_debug_misc("msn", "User-Agent = '%s'\n", value);
 	}
 #endif
 
-	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "X-MMS-IM-Format")) != NULL)
 	{
 		char *pre, *post;
 
@@ -887,8 +763,9 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 				swboard->flag |= MSN_SB_FLAG_IM;
 			}
 		}
-		else
+		else if (!g_str_equal(passport, purple_account_get_username(gc->account)))
 		{
+			/* Don't im ourselves ... */
 			serv_got_im(gc, passport, body_final, 0, time(NULL));
 			if (swboard->conv == NULL)
 			{
@@ -914,7 +791,7 @@ msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	gc = cmdproc->session->account->gc;
 	passport = msg->remote_user;
 
-	if (msn_message_get_attr(msg, "TypingUser") == NULL)
+	if (msn_message_get_header_value(msg, "TypingUser") == NULL)
 		return;
 
 	if (cmdproc->servconn->type == MSN_SERVCONN_SB) {
@@ -1035,6 +912,145 @@ got_voiceclip_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
 }
 
 void
+msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	MsnSession *session;
+	MsnSlpLink *slplink;
+
+	session = cmdproc->servconn->session;
+	slplink = msn_session_get_slplink(session, msg->remote_user);
+
+	if (slplink->swboard == NULL)
+	{
+		/*
+		 * We will need swboard in order to change its flags.  If its
+		 * NULL, something has probably gone wrong earlier on.  I
+		 * didn't want to do this, but MSN 7 is somehow causing us
+		 * to crash here, I couldn't reproduce it to debug more,
+		 * and people are reporting bugs. Hopefully this doesn't
+		 * cause more crashes. Stu.
+		 */
+		if (cmdproc->data == NULL)
+			g_warning("msn_p2p_msg cmdproc->data was NULL\n");
+		else {
+			slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
+			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
+		}
+	}
+
+	if (msg->part) {
+		msn_slplink_process_msg(slplink, msg->part);
+	}
+	else /* This should never happen. */
+		purple_debug_fatal("msn", "P2P message without a Part.\n");
+}
+
+static void
+got_emoticon(MsnSlpCall *slpcall,
+			 const guchar *data, gsize size)
+{
+	PurpleConversation *conv;
+	MsnSwitchBoard *swboard;
+
+	swboard = slpcall->slplink->swboard;
+	conv = swboard->conv;
+
+	if (conv) {
+		/* FIXME: it would be better if we wrote the data as we received it
+		   instead of all at once, calling write multiple times and
+		   close once at the very end
+		 */
+		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
+		purple_conv_custom_smiley_close(conv, slpcall->data_info );
+	}
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
+}
+
+void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	MsnSession *session;
+	MsnSlpLink *slplink;
+	MsnSwitchBoard *swboard;
+	MsnObject *obj;
+	char **tokens;
+	char *smile, *body_str;
+	const char *body, *who, *sha1;
+	guint tok;
+	size_t body_len;
+
+	PurpleConversation *conv;
+
+	session = cmdproc->servconn->session;
+
+	if (!purple_account_get_bool(session->account, "custom_smileys", TRUE))
+		return;
+
+	swboard = cmdproc->data;
+	conv = swboard->conv;
+
+	body = msn_message_get_bin_data(msg, &body_len);
+	if (!body || !body_len)
+		return;
+	body_str = g_strndup(body, body_len);
+
+	/* MSN Messenger 7 may send more than one MSNObject in a single message...
+	 * Maybe 10 tokens is a reasonable max value. */
+	tokens = g_strsplit(body_str, "\t", 10);
+
+	g_free(body_str);
+
+	for (tok = 0; tok < 9; tok += 2) {
+		if (tokens[tok] == NULL || tokens[tok + 1] == NULL) {
+			break;
+		}
+
+		smile = tokens[tok];
+		obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1]));
+
+		if (obj == NULL)
+			break;
+
+		who = msn_object_get_creator(obj);
+		sha1 = msn_object_get_sha1(obj);
+
+		slplink = msn_session_get_slplink(session, who);
+		if (slplink->swboard != swboard) {
+			if (slplink->swboard != NULL)
+				/*
+				 * Apparently we're using a different switchboard now or
+				 * something?  I don't know if this is normal, but it
+				 * definitely happens.  So make sure the old switchboard
+				 * doesn't still have a reference to us.
+				 */
+				slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
+			slplink->swboard = swboard;
+			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
+		}
+
+		/* If the conversation doesn't exist then this is a custom smiley
+		 * used in the first message in a MSN conversation: we need to create
+		 * the conversation now, otherwise the custom smiley won't be shown.
+		 * This happens because every GtkIMHtml has its own smiley tree: if
+		 * the conversation doesn't exist then we cannot associate the new
+		 * smiley with its GtkIMHtml widget. */
+		if (!conv) {
+			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
+		}
+
+		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
+			msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
+		}
+
+		msn_object_destroy(obj);
+		obj =   NULL;
+		who =   NULL;
+		sha1 = NULL;
+	}
+	g_strfreev(tokens);
+}
+
+void
 msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	GHashTable *body;
diff --git a/libpurple/protocols/msn/msg.h b/libpurple/protocols/msn/msg.h
index b75dbf19cc..be55c5aaee 100644
--- a/libpurple/protocols/msn/msg.h
+++ b/libpurple/protocols/msn/msg.h
@@ -58,6 +58,8 @@ typedef enum
 #include "session.h"
 #include "transaction.h"
 #include "user.h"
+#include "slpmsg.h"
+#include "slpmsg_part.h"
 
 typedef void (*MsnMsgCb)(MsnMessage *, void *data);
 
@@ -67,24 +69,6 @@ typedef void (*MsnMsgCb)(MsnMessage *, void *data);
 #define MSG_OIM_BODY_DEM	"\n\n"
 #define MSG_OIM_LINE_DEM	"\n"
 
-typedef struct
-{
-	guint32 session_id;
-	guint32 id;
-	guint64 offset;
-	guint64 total_size;
-	guint32 length;
-	guint32 flags;
-	guint32 ack_id;
-	guint32 ack_sub_id;
-	guint64 ack_size;
-} MsnSlpHeader;
-
-typedef struct
-{
-	guint32 value;
-} MsnSlpFooter;
-
 /**
  * A message.
  */
@@ -95,6 +79,8 @@ struct _MsnMessage
 	MsnMsgType type;
 
 	gboolean msnslp_message;
+	MsnSlpMessage *slpmsg;
+	MsnSlpMessagePart *part;
 
 	char *remote_user;
 	char flag;
@@ -106,11 +92,8 @@ struct _MsnMessage
 	guint total_chunks;   /**< How many chunks in this multi-part message */
 	guint received_chunks; /**< How many chunks we've received so far */
 
-	MsnSlpHeader msnslp_header;
-	MsnSlpFooter msnslp_footer;
-
-	GHashTable *attr_table;
-	GList *attr_list;
+	GHashTable *header_table;
+	GList *header_list;
 
 	gboolean ack_ref;           /**< A flag that states if this message has
 								  been ref'ed for using it in a callback. */
@@ -295,24 +278,24 @@ void msn_message_set_charset(MsnMessage *msg, const char *charset);
 const char *msn_message_get_charset(const MsnMessage *msg);
 
 /**
- * Sets an attribute in a message.
+ * Sets a header in a message.
  *
- * @param msg   The message.
- * @param attr  The attribute name.
- * @param value The attribute value.
+ * @param msg    The message.
+ * @param header The header name.
+ * @param value  The header value.
  */
-void msn_message_set_attr(MsnMessage *msg, const char *attr,
+void msn_message_set_header(MsnMessage *msg, const char *name,
 						  const char *value);
 
 /**
- * Returns an attribute from a message.
+ * Returns the value of a header from a message.
  *
- * @param msg  The message.
- * @param attr The attribute.
+ * @param msg    The message.
+ * @param header The header value.
  *
  * @return The value, or @c NULL if not found.
  */
-const char *msn_message_get_attr(const MsnMessage *msg, const char *attr);
+const char *msn_message_get_header_value(const MsnMessage *msg, const char *name);
 
 /**
  * Parses the body and returns it in the form of a hashtable.
@@ -326,9 +309,6 @@ GHashTable *msn_message_get_hashtable_from_body(const MsnMessage *msg);
 void msn_message_show_readable(MsnMessage *msg, const char *info,
 							   gboolean text_body);
 
-void msn_message_parse_slp_body(MsnMessage *msg, const char *body,
-								size_t len);
-
 char *msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size);
 
 char *msn_message_to_string(MsnMessage *msg);
@@ -337,8 +317,32 @@ void msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 void msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
+/**
+ * Processes peer to peer messages.
+ *
+ * @param cmdproc The command processor.
+ * @param msg     The message.
+ */
+void msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
+/**
+ * Processes emoticon messages.
+ *
+ * @param cmdproc The command processor.
+ * @param msg     The message.
+ */
+void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
 void msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
+/**
+ * Processes INVITE messages.
+ *
+ * @param cmdproc The command processor.
+ * @param msg     The message.
+ */
+void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
 void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 #endif /* MSN_MSG_H */
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index f0ab8c49ea..15b31d8713 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -23,7 +23,11 @@
  */
 #define PHOTO_SUPPORT 1
 
-#include "msn.h"
+#include "internal.h"
+
+#include "debug.h"
+#include "request.h"
+
 #include "accountopt.h"
 #include "contact.h"
 #include "msg.h"
@@ -40,10 +44,10 @@
 #include "msnutils.h"
 #include "version.h"
 
+#include "error.h"
 #include "msg.h"
 #include "switchboard.h"
 #include "notification.h"
-#include "sync.h"
 #include "slplink.h"
 
 #if PHOTO_SUPPORT
@@ -116,29 +120,6 @@ msn_normalize(const PurpleAccount *account, const char *str)
 	return buf;
 }
 
-gboolean
-msn_email_is_valid(const char *passport)
-{
-	if (purple_email_is_valid(passport)) {
-		/* Special characters aren't allowed in domains, so only go to '@' */
-		while (*passport != '@') {
-			if (*passport == '/')
-				return FALSE;
-			else if (*passport == '?')
-				return FALSE;
-			else if (*passport == '=')
-				return FALSE;
-			/* MSN also doesn't like colons, but that's checked already */
-
-			passport++;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
 static gboolean
 msn_send_attention(PurpleConnection *gc, const char *username, guint type)
 {
@@ -267,9 +248,9 @@ msn_set_public_alias(PurpleConnection *pc, const char *alias,
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
+	MsnTransaction *trans;
 	PurpleAccount *account;
 	const char *real_alias;
-	MsnTransaction *trans;
 	struct public_alias_closure *closure;
 
 	session = purple_connection_get_protocol_data(pc);
@@ -360,19 +341,21 @@ msn_set_prp(PurpleConnection *gc, const char *type, const char *entry)
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
+	MsnTransaction *trans;
 
 	session = gc->proto_data;
 	cmdproc = session->notification->cmdproc;
 
 	if (entry == NULL || *entry == '\0')
 	{
-		msn_cmdproc_send(cmdproc, "PRP", "%s", type);
+		trans = msn_transaction_new(cmdproc, "PRP", "%s", type);
 	}
 	else
 	{
-		msn_cmdproc_send(cmdproc, "PRP", "%s %s", type,
+		trans = msn_transaction_new(cmdproc, "PRP", "%s %s", type,
 						 purple_url_encode(entry));
 	}
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
@@ -478,7 +461,7 @@ msn_show_set_friendly_name(PurplePluginAction *action)
 
 	tmp = g_strdup_printf(_("Set friendly name for %s."),
 	                      purple_account_get_username(account));
-	purple_request_input(gc, _("Set your friendly name."), tmp,
+	purple_request_input(gc, _("Set Friendly Name"), tmp,
 					   _("This is the name that other MSN buddies will "
 						 "see you as."),
 					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
@@ -489,6 +472,111 @@ msn_show_set_friendly_name(PurplePluginAction *action)
 	g_free(tmp);
 }
 
+typedef struct MsnLocationData {
+	PurpleAccount *account;
+	MsnSession *session;
+	PurpleRequestFieldGroup *group;
+} MsnLocationData;
+
+static void
+update_endpoint_cb(MsnLocationData *data, PurpleRequestFields *fields)
+{
+	PurpleAccount *account;
+	MsnSession *session;
+	const char *old_name;
+	const char *name;
+	GList *others;
+
+	session = data->session;
+	account = data->account;
+
+	/* Update the current location's name */
+	old_name = purple_account_get_string(account, "endpoint-name", NULL);
+	name = purple_request_fields_get_string(fields, "endpoint-name");
+	if (!g_str_equal(old_name, name)) {
+		purple_account_set_string(account, "endpoint-name", name);
+		msn_notification_send_uux_private_endpointdata(session);
+	}
+
+	/* Sign out other locations */
+	for (others = purple_request_field_group_get_fields(data->group);
+	     others;
+	     others = g_list_next(others)) {
+		PurpleRequestField *field = others->data;
+		if (purple_request_field_get_type(field) != PURPLE_REQUEST_FIELD_BOOLEAN)
+			continue;
+		if (purple_request_field_bool_get_value(field)) {
+			const char *id = purple_request_field_get_id(field);
+			char *user;
+			purple_debug_info("msn", "Disconnecting Endpoint %s\n", id);
+
+			user = g_strdup_printf("%s;%s", purple_account_get_username(account), id);
+			msn_notification_send_uun(session, user, MSN_UNIFIED_NOTIFICATION_MPOP, "goawyplzthxbye");
+			g_free(user);
+		}
+	}
+
+	g_free(data);
+}
+
+static void
+msn_show_locations(PurplePluginAction *action)
+{
+	PurpleConnection *pc;
+	PurpleAccount *account;
+	MsnSession *session;
+	PurpleRequestFields *fields;
+	PurpleRequestFieldGroup *group;
+	PurpleRequestField *field;
+	GSList *l;
+	MsnLocationData *data;
+
+	pc = (PurpleConnection *)action->context;
+	account = purple_connection_get_account(pc);
+	session = purple_connection_get_protocol_data(pc);
+
+	fields = purple_request_fields_new();
+
+	group = purple_request_field_group_new(_("This Location"));
+	purple_request_fields_add_group(fields, group);
+	field = purple_request_field_label_new("endpoint-label", _("This is the name that identifies this location"));
+	purple_request_field_group_add_field(group, field);
+	field = purple_request_field_string_new("endpoint-name",
+	                                        _("Name"),
+	                                        purple_account_get_string(account, "endpoint-name", NULL),
+	                                        FALSE);
+	purple_request_field_set_required(field, TRUE);
+	purple_request_field_group_add_field(group, field);
+
+	group = purple_request_field_group_new(_("Other Locations"));
+	purple_request_fields_add_group(fields, group);
+	field = purple_request_field_label_new("others-label", _("You can sign out from other locations here"));
+	purple_request_field_group_add_field(group, field);
+
+	for (l = session->user->endpoints; l; l = l->next) {
+		MsnUserEndpoint *ep = l->data;
+
+		if (g_str_equal(ep->id, session->guid))
+			/* Don't add myself to the list */
+			continue;
+
+		field = purple_request_field_bool_new(ep->id, ep->name, FALSE);
+		purple_request_field_group_add_field(group, field);
+	}
+
+	data = g_new0(MsnLocationData, 1);
+	data->account = account;
+	data->session = session;
+	data->group = group;
+
+	purple_request_fields(pc, NULL, NULL, NULL,
+	                      fields,
+	                      _("OK"), G_CALLBACK(update_endpoint_cb),
+	                      _("Cancel"), G_CALLBACK(g_free),
+	                      account, NULL, NULL,
+	                      data);
+}
+
 static void
 msn_show_set_home_phone(PurplePluginAction *action)
 {
@@ -622,7 +710,6 @@ show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
-	MsnSession *session;
 	MsnMobileData *data;
 	PurpleAccount *account;
 	const char *name;
@@ -634,8 +721,6 @@ show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored)
 	gc = purple_account_get_connection(account);
 	name = purple_buddy_get_name(buddy);
 
-	session = gc->proto_data;
-
 	data = g_new0(MsnMobileData, 1);
 	data->gc = gc;
 	data->passport = name;
@@ -659,6 +744,7 @@ msn_send_privacy(PurpleConnection *gc)
 	PurpleAccount *account;
 	MsnSession *session;
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
 
 	account = purple_connection_get_account(gc);
 	session = gc->proto_data;
@@ -666,9 +752,11 @@ msn_send_privacy(PurpleConnection *gc)
 
 	if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
 	    account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "AL");
+		trans = msn_transaction_new(cmdproc, "BLP", "%s", "AL");
 	else
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "BL");
+		trans = msn_transaction_new(cmdproc, "BLP", "%s", "BL");
+
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
@@ -712,9 +800,7 @@ initiate_chat_cb(PurpleBlistNode *node, gpointer data)
 static void
 t_msn_xfer_init(PurpleXfer *xfer)
 {
-	MsnSlpLink *slplink = xfer->data;
-	msn_slplink_request_ft(slplink, xfer);
-	msn_slplink_unref(slplink);
+	msn_request_ft(xfer);
 }
 
 static void
@@ -1071,6 +1157,11 @@ msn_actions(PurplePlugin *plugin, gpointer context)
 	m = g_list_append(m, act);
 	m = g_list_append(m, NULL);
 
+	act = purple_plugin_action_new(_("View Locations..."),
+	                               msn_show_locations);
+	m = g_list_append(m, act);
+	m = g_list_append(m, NULL);
+
 	act = purple_plugin_action_new(_("Set Home Phone Number..."),
 								 msn_show_set_home_phone);
 	m = g_list_append(m, act);
@@ -1205,6 +1296,13 @@ msn_login(PurpleAccount *account)
 	username = purple_account_get_string(account, "display-name", NULL);
 	purple_connection_set_display_name(gc, username);
 
+	if (purple_account_get_string(account, "endpoint-name", NULL) == NULL) {
+		GHashTable *ui_info = purple_core_get_ui_info();
+		const gchar *ui_name = ui_info ? g_hash_table_lookup(ui_info, "name") : NULL;
+		purple_account_set_string(account, "endpoint-name",
+				ui_name && *ui_name ? ui_name : PACKAGE_NAME);
+	}
+
 	if (!msn_session_connect(session, host, port, http_method))
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -1415,7 +1513,7 @@ msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 
 		msg = msn_message_new_plain(msgtext);
 		msg->remote_user = g_strdup(who);
-		msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
+		msn_message_set_header(msg, "X-MMS-IM-Format", msgformat);
 
 		g_free(msgformat);
 		g_free(msgtext);
@@ -1448,7 +1546,7 @@ msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 			body_enc = g_markup_escape_text(body_str, -1);
 			g_free(body_str);
 
-			format = msn_message_get_attr(msg, "X-MMS-IM-Format");
+			format = msn_message_get_header_value(msg, "X-MMS-IM-Format");
 			msn_parse_format(format, &pre, &post);
 			body_str = g_strdup_printf("%s%s%s", pre ? pre :  "",
 									   body_enc ? body_enc : "", post ? post : "");
@@ -1523,7 +1621,7 @@ msn_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
 	msg = msn_message_new(MSN_MSG_TYPING);
 	msn_message_set_content_type(msg, "text/x-msmsgscontrol");
 	msn_message_set_flag(msg, 'U');
-	msn_message_set_attr(msg, "TypingUser",
+	msn_message_set_header(msg, "TypingUser",
 						 purple_account_get_username(account));
 	msn_message_set_bin_data(msg, "\r\n", 2);
 
@@ -1579,7 +1677,7 @@ add_pending_buddy(MsnSession *session,
 		MsnUser *user2 = msn_userlist_find_user(userlist, who);
 		if (user2 != NULL) {
 			/* User already in userlist, so just update it. */
-			msn_user_destroy(user);
+			msn_user_unref(user);
 			user = user2;
 		} else {
 			msn_userlist_add_user(userlist, user);
@@ -1599,7 +1697,7 @@ add_pending_buddy(MsnSession *session,
 
 		/* Remove from local list */
 		purple_blist_remove_buddy(buddy);
-		msn_user_destroy(user);
+		msn_user_unref(user);
 	}
 	g_free(group);
 }
@@ -1930,7 +2028,7 @@ msn_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMessageFl
 	}
 
 	msg = msn_message_new_plain(msgtext);
-	msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
+	msn_message_set_header(msg, "X-MMS-IM-Format", msgformat);
 
 	smileys = msn_msg_grab_emoticons(msg->body, username);
 	while (smileys) {
@@ -1970,6 +2068,7 @@ static void
 msn_keepalive(PurpleConnection *gc)
 {
 	MsnSession *session;
+	MsnTransaction *trans;
 
 	session = gc->proto_data;
 
@@ -1979,7 +2078,9 @@ msn_keepalive(PurpleConnection *gc)
 
 		cmdproc = session->notification->cmdproc;
 
-		msn_cmdproc_send_quick(cmdproc, "PNG", NULL, NULL);
+		trans = msn_transaction_new(cmdproc, "PNG", NULL);
+		msn_transaction_set_saveable(trans, FALSE);
+		msn_cmdproc_send_trans(cmdproc, trans);
 	}
 }
 
@@ -2084,11 +2185,9 @@ static void
 msn_remove_group(PurpleConnection *gc, PurpleGroup *group)
 {
 	MsnSession *session;
-	MsnCmdProc *cmdproc;
 	const char *gname;
 
 	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
 	gname = purple_group_get_name(group);
 
 	purple_debug_info("msn", "Remove group %s\n", gname);
@@ -2717,7 +2816,6 @@ static gboolean msn_load(PurplePlugin *plugin)
 {
 	msn_notification_init();
 	msn_switchboard_init();
-	msn_sync_init();
 
 	return TRUE;
 }
@@ -2726,7 +2824,6 @@ static gboolean msn_unload(PurplePlugin *plugin)
 {
 	msn_notification_end();
 	msn_switchboard_end();
-	msn_sync_end();
 
 	return TRUE;
 }
diff --git a/libpurple/protocols/msn/msn.h b/libpurple/protocols/msn/msn.h
index 1e597cf13d..cbd4d37ff5 100644
--- a/libpurple/protocols/msn/msn.h
+++ b/libpurple/protocols/msn/msn.h
@@ -26,16 +26,6 @@
 
 typedef enum
 {
-	MSN_LIST_FL_OP = 0x01,
-	MSN_LIST_AL_OP = 0x02,
-	MSN_LIST_BL_OP = 0x04,
-	MSN_LIST_RL_OP = 0x08,
-	MSN_LIST_PL_OP = 0x10
-} MsnListOp;
-#define MSN_LIST_OP_MASK	0x07
-
-typedef enum
-{
 	MSN_CLIENT_CAP_WIN_MOBILE = 0x0000001,
 	MSN_CLIENT_CAP_INK_GIF    = 0x0000004,
 	MSN_CLIENT_CAP_INK_ISF    = 0x0000008,
@@ -83,23 +73,7 @@ typedef enum
 
 #include "internal.h"
 
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "connection.h"
-#include "conversation.h"
-#include "debug.h"
-#include "cipher.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "servconn.h"
-#include "sslconn.h"
-#include "util.h"
-
-#include "ft.h"
+#include "session.h"
 
 #include "msg.h"
 
@@ -109,9 +83,9 @@ typedef enum
 #define MSN_SERVER "messenger.hotmail.com"
 #define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
 #define MSN_PORT 1863
-#define WLM_PROT_VER		15
+#define WLM_PROT_VER		16
 
-#define WLM_MAX_PROTOCOL	15
+#define WLM_MAX_PROTOCOL	16
 #define WLM_MIN_PROTOCOL	15
 
 #define MSN_TYPING_RECV_TIMEOUT 6
@@ -134,16 +108,14 @@ typedef enum
 /* Index into attention_types */
 #define MSN_NUDGE 0
 
-#define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_7_0
+#define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_9_0
 #define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM)
+#define MSN_CLIENT_ID_EXT_CAPS     (0)
 
 #define MSN_CLIENT_ID \
 	((MSN_CLIENT_ID_VERSION    << 24) | \
 	 (MSN_CLIENT_ID_CAPABILITIES))
 
-#define MSN_CLIENT_EXT_ID 0
-
-gboolean msn_email_is_valid(const char *passport);
 void
 msn_set_public_alias(PurpleConnection *gc, const char *alias,
                      PurpleSetPublicAliasSuccessCallback success_cb,
diff --git a/libpurple/protocols/msn/msnutils.c b/libpurple/protocols/msn/msnutils.c
index c8870d5603..e8032533a0 100644
--- a/libpurple/protocols/msn/msnutils.c
+++ b/libpurple/protocols/msn/msnutils.c
@@ -21,18 +21,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+
 #include "msn.h"
 #include "msnutils.h"
 
 #include "cipher.h"
 
-char *rand_guid(void);
-
 /**************************************************************************
  * Util
  **************************************************************************/
 char *
-rand_guid()
+rand_guid(void)
 {
 	return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
 			rand() % 0xAAFF + 0x1111,
@@ -476,6 +477,29 @@ msn_parse_socket(const char *str, char **ret_host, int *ret_port)
 	*ret_port = port;
 }
 
+gboolean
+msn_email_is_valid(const char *passport)
+{
+	if (purple_email_is_valid(passport)) {
+		/* Special characters aren't allowed in domains, so only go to '@' */
+		while (*passport != '@') {
+			if (*passport == '/')
+				return FALSE;
+			else if (*passport == '?')
+				return FALSE;
+			else if (*passport == '=')
+				return FALSE;
+			/* MSN also doesn't like colons, but that's checked already */
+
+			passport++;
+		}
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 /***************************************************************************
  * MSN Challenge Computing Function
  ***************************************************************************/
@@ -541,7 +565,7 @@ msn_handle_chl(char *input, char *output)
 	chlStringParts = (unsigned int *)buf;
 
 	/* this is magic */
-	for (i = 0; i < (strlen(buf) / 4); i += 2) {
+	for (i = 0; i < (len / 4); i += 2) {
 		long long temp;
 
 		chlStringParts[i] = GUINT_TO_LE(chlStringParts[i]);
diff --git a/libpurple/protocols/msn/msnutils.h b/libpurple/protocols/msn/msnutils.h
index 08c7f44bab..1548be395b 100644
--- a/libpurple/protocols/msn/msnutils.h
+++ b/libpurple/protocols/msn/msnutils.h
@@ -54,7 +54,32 @@ void msn_parse_format(const char *mime, char **pre_ret, char **post_ret);
  */
 void msn_import_html(const char *html, char **attributes, char **message);
 
+/**
+ * Parses a socket string.
+ *
+ * @param str		A host:port string.
+ * @param ret_host 	Return string value of the host.
+ * @param ret_port	Return integer value of the port.
+ */
 void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
+
+/**
+ * Verify if the email is a vaild passport.
+ *
+ * @param passport 	The email
+ *
+ * @return True if it is a valid passport, else FALSE
+ */
+gboolean msn_email_is_valid(const char *passport);
+
+/**
+ * Handle MSN Challenge Computation
+ * This algorithm references
+ * http://imfreedom.org/wiki/index.php/MSN:NS/Challenges
+ *
+ * @param input 	Challenge input.
+ * @param output 	Callenge output.
+ */
 void msn_handle_chl(char *input, char *output);
 
 #endif /* MSN_UTILS_H */
diff --git a/libpurple/protocols/msn/nexus.c b/libpurple/protocols/msn/nexus.c
index b54301582c..b8a25ab86e 100644
--- a/libpurple/protocols/msn/nexus.c
+++ b/libpurple/protocols/msn/nexus.c
@@ -21,7 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "cipher.h"
+#include "debug.h"
+
 #include "soap.h"
 #include "nexus.h"
 #include "notification.h"
diff --git a/libpurple/protocols/msn/nexus.h b/libpurple/protocols/msn/nexus.h
index ab6f7f4ffa..e16bd10aa1 100644
--- a/libpurple/protocols/msn/nexus.h
+++ b/libpurple/protocols/msn/nexus.h
@@ -24,6 +24,8 @@
 #ifndef MSN_NEXUS_H
 #define MSN_NEXUS_H
 
+#include "internal.h"
+
 typedef struct _MsnNexus MsnNexus;
 typedef struct _MsnTicketToken MsnTicketToken;
 typedef struct _MsnUsrKey MsnUsrKey;
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index 29c3f61923..0bb93572be 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -21,17 +21,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "cipher.h"
+#include "core.h"
+#include "debug.h"
+
 #include "notification.h"
+
 #include "contact.h"
-#include "state.h"
 #include "error.h"
 #include "msnutils.h"
-#include "page.h"
-
+#include "state.h"
 #include "userlist.h"
-#include "sync.h"
-#include "slplink.h"
 
 static MsnTable *cbs_table;
 
@@ -92,7 +94,7 @@ connect_cb(MsnServConn *servconn)
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
-	PurpleAccount *account;
+	MsnTransaction *trans;
 	GString *vers;
 	const char *ver_str;
 	int i;
@@ -101,7 +103,6 @@ connect_cb(MsnServConn *servconn)
 
 	cmdproc = servconn->cmdproc;
 	session = servconn->session;
-	account = session->account;
 
 	vers = g_string_new("");
 
@@ -117,7 +118,8 @@ connect_cb(MsnServConn *servconn)
 
 	/* Skip the initial space */
 	ver_str = (vers->str + 1);
-	msn_cmdproc_send(cmdproc, "VER", "%s", ver_str);
+	trans = msn_transaction_new(cmdproc, "VER", "%s", ver_str);
+	msn_cmdproc_send_trans(cmdproc, trans);
 
 	g_string_free(vers, TRUE);
 }
@@ -156,32 +158,36 @@ void
 msn_got_login_params(MsnSession *session, const char *ticket, const char *response)
 {
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
 
 	cmdproc = session->notification->cmdproc;
 
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END);
 
-	msn_cmdproc_send(cmdproc, "USR", "SSO S %s %s", ticket, response);
+	if (session->protocol_ver >= 16)
+		trans = msn_transaction_new(cmdproc, "USR", "SSO S %s %s %s", ticket, response, session->guid);
+	else
+		trans = msn_transaction_new(cmdproc, "USR", "SSO S %s %s", ticket, response);
+
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
 cvr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	PurpleAccount *account;
+	MsnTransaction *trans;
 
 	account = cmdproc->session->account;
 
-	msn_cmdproc_send(cmdproc, "USR", "SSO I %s", purple_account_get_username(account));
+	trans = msn_transaction_new(cmdproc, "USR", "SSO I %s", purple_account_get_username(account));
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	MsnSession *session;
-	PurpleAccount *account;
-
-	session = cmdproc->session;
-	account = session->account;
+	MsnSession *session = cmdproc->session;
 
 	if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
 	{
@@ -231,22 +237,25 @@ static void
 ver_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
+	MsnTransaction *trans;
 	PurpleAccount *account;
 	gboolean protocol_supported = FALSE;
-	char proto_str[8];
+	int proto_ver;
 	size_t i;
 
 	session = cmdproc->session;
 	account = session->account;
 
-	g_snprintf(proto_str, sizeof(proto_str), "MSNP%d", session->protocol_ver);
-
+	session->protocol_ver = 0;
 	for (i = 1; i < cmd->param_count; i++)
 	{
-		if (!strcmp(cmd->params[i], proto_str))
-		{
-			protocol_supported = TRUE;
-			break;
+		if (sscanf(cmd->params[i], "MSNP%d", &proto_ver) == 1) {
+			if (proto_ver >= WLM_MIN_PROTOCOL
+			 && proto_ver <= WLM_MAX_PROTOCOL
+			 && proto_ver > session->protocol_ver) {
+				protocol_supported = TRUE;
+				session->protocol_ver = proto_ver;
+			}
 		}
 	}
 
@@ -257,15 +266,18 @@ ver_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		return;
 	}
 
+	purple_debug_info("msn", "Negotiated protocol version %d with the server.\n", session->protocol_ver);
+
 	/*
 	 * Windows Live Messenger 8.5
 	 * Notice :CVR String discriminate!
 	 * reference of http://www.microsoft.com/globaldev/reference/oslocversion.mspx
 	 * to see the Local ID
 	 */
-	msn_cmdproc_send(cmdproc, "CVR",
+	trans = msn_transaction_new(cmdproc, "CVR",
 					"0x0409 winnt 5.1 i386 MSNMSGR 8.5.1302 BC01 %s",
 					 purple_account_get_username(account));
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 /**************************************************************************
@@ -287,12 +299,16 @@ out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 void
 msn_notification_close(MsnNotification *notification)
 {
+	MsnTransaction *trans;
+
 	g_return_if_fail(notification != NULL);
 
 	if (!notification->in_use)
 		return;
 
-	msn_cmdproc_send_quick(notification->cmdproc, "OUT", NULL, NULL);
+	trans = msn_transaction_new(notification->cmdproc, "OUT", NULL);
+	msn_transaction_set_saveable(trans, FALSE);
+	msn_cmdproc_send_trans(notification->cmdproc, trans);
 
 	msn_notification_disconnect(notification);
 }
@@ -710,11 +726,8 @@ adl_cmd_parse(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	for (domain_node = xmlnode_get_child(root, "d");
 	     domain_node;
 	     domain_node = xmlnode_get_next_twin(domain_node)) {
-		const gchar * domain = NULL;
 		xmlnode *contact_node = NULL;
 
-		domain = xmlnode_get_attrib(domain_node, "n");
-
 		for (contact_node = xmlnode_get_child(domain_node, "c");
 		     contact_node;
 		     contact_node = xmlnode_get_next_twin(contact_node)) {
@@ -999,18 +1012,15 @@ static void
 iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj = NULL;
-	unsigned long clientid;
+	unsigned long clientid, extcaps;
+	char *extcap_str;
 	int networkid = 0;
 	const char *state, *passport;
 	char *friendly;
 
 	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
 
 	state    = cmd->params[1];
 	passport = cmd->params[2];
@@ -1024,7 +1034,11 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		/* Yahoo! Buddy, looks like */
 		networkid = atoi(cmd->params[3]);
 		friendly = g_strdup(purple_url_decode(cmd->params[4]));
-		clientid = strtoul(cmd->params[5], NULL, 10);
+		clientid = strtoul(cmd->params[5], &extcap_str, 10);
+		if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+			extcaps = strtoul(extcap_str+1, NULL, 10);
+		else
+			extcaps = 0;
 
 		/* cmd->params[7] seems to be a URL to a Yahoo! icon:
 				https://sec.yimg.com/i/us/nt/b/purpley.1.0.png
@@ -1034,7 +1048,11 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		/* MSNP14+ with Display Picture object */
 		networkid = atoi(cmd->params[3]);
 		friendly = g_strdup(purple_url_decode(cmd->params[4]));
-		clientid = strtoul(cmd->params[5], NULL, 10);
+		clientid = strtoul(cmd->params[5], &extcap_str, 10);
+		if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+			extcaps = strtoul(extcap_str+1, NULL, 10);
+		else
+			extcaps = 0;
 		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[6]));
 	} else if (cmd->param_count == 6) {
 		/* Yes, this is 5. The friendly name could start with a number,
@@ -1043,17 +1061,29 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 			/* MSNP14 without Display Picture object */
 			networkid = atoi(cmd->params[3]);
 			friendly = g_strdup(purple_url_decode(cmd->params[4]));
-			clientid = strtoul(cmd->params[5], NULL, 10);
+			clientid = strtoul(cmd->params[5], &extcap_str, 10);
+			if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+				extcaps = strtoul(extcap_str+1, NULL, 10);
+			else
+				extcaps = 0;
 		} else {
 			/* MSNP8+ with Display Picture object */
 			friendly = g_strdup(purple_url_decode(cmd->params[3]));
-			clientid = strtoul(cmd->params[4], NULL, 10);
+			clientid = strtoul(cmd->params[4], &extcap_str, 10);
+			if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+				extcaps = strtoul(extcap_str+1, NULL, 10);
+			else
+				extcaps = 0;
 			msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
 		}
 	} else if (cmd->param_count == 5) {
 		/* MSNP8+ without Display Picture object */
 		friendly = g_strdup(purple_url_decode(cmd->params[3]));
-		clientid = strtoul(cmd->params[4], NULL, 10);
+		clientid = strtoul(cmd->params[4], &extcap_str, 10);
+		if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+			extcaps = strtoul(extcap_str+1, NULL, 10);
+		else
+			extcaps = 0;
 	} else {
 		purple_debug_warning("msn", "Received ILN with unknown number of parameters.\n");
 		return;
@@ -1068,6 +1098,7 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->extinfo && user->extinfo->phone_mobile && user->extinfo->phone_mobile[0] == '+');
 	msn_user_set_clientid(user, clientid);
+	msn_user_set_extcaps(user, extcaps);
 	msn_user_set_network(user, networkid);
 
 	msn_user_set_state(user, state);
@@ -1202,24 +1233,24 @@ static void
 nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj;
-	unsigned long clientid;
+	unsigned long clientid, extcaps;
+	char *extcap_str;
 	int networkid;
 	const char *state, *passport, *friendly;
 
 	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
 
 	state    = cmd->params[0];
 	passport = cmd->params[1];
 	networkid = atoi(cmd->params[2]);
 	friendly = purple_url_decode(cmd->params[3]);
 
-	user = msn_userlist_find_user(session->userlist, passport);
+	if (g_str_equal(passport, session->user->passport))
+		user = session->user;
+	else
+		user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) return;
 
 	if (msn_user_set_friendly_name(user, friendly))
@@ -1237,10 +1268,16 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		msn_user_set_object(user, NULL);
 	}
 
-	clientid = strtoul(cmd->params[4], NULL, 10);
+	clientid = strtoul(cmd->params[4], &extcap_str, 10);
+	if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+		extcaps = strtoul(extcap_str+1, NULL, 10);
+	else
+		extcaps = 0;
+
 	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->extinfo && user->extinfo->phone_mobile && user->extinfo->phone_mobile[0] == '+');
 
 	msn_user_set_clientid(user, clientid);
+	msn_user_set_extcaps(user, extcaps);
 	msn_user_set_network(user, networkid);
 
 	msn_user_set_state(user, state);
@@ -1401,7 +1438,7 @@ rng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	swboard = msn_switchboard_new(session);
 
 	msn_switchboard_set_invited(swboard, TRUE);
-	msn_switchboard_set_session_id(swboard, cmd->params[0]);
+	msn_switchboard_set_session_id(swboard, session_id);
 	msn_switchboard_set_auth_key(swboard, cmd->params[3]);
 	swboard->im_user = g_strdup(cmd->params[4]);
 	/* msn_switchboard_add_user(swboard, cmd->params[4]); */
@@ -1508,6 +1545,77 @@ sbs_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	/*get the payload content*/
 }
 
+static void
+parse_user_endpoints(MsnUser *user, xmlnode *payloadNode)
+{
+	xmlnode *epNode, *capsNode;
+	MsnUserEndpoint data;
+	const char *id;
+	char *caps, *tmp;
+
+	purple_debug_info("msn", "Get EndpointData\n");
+
+	for (epNode = xmlnode_get_child(payloadNode, "EndpointData");
+	     epNode;
+	     epNode = xmlnode_get_next_twin(epNode)) {
+		id = xmlnode_get_attrib(epNode, "id");
+		capsNode = xmlnode_get_child(epNode, "Capabilities");
+
+		if (capsNode != NULL) {
+			caps = xmlnode_get_data(capsNode);
+
+			data.clientid = strtoul(caps, &tmp, 10);
+			if (tmp && *tmp)
+				data.extcaps = strtoul(tmp + 1, NULL, 10);
+			else
+				data.extcaps = 0;
+
+			g_free(caps);
+
+		} else {
+			data.clientid = 0;
+			data.extcaps = 0;
+		}
+
+		msn_user_set_endpoint_data(user, id, &data);
+	}
+
+	/* Need to shortcut this check, probably... */
+	if (user == user->userlist->session->user) {
+		for (epNode = xmlnode_get_child(payloadNode, "PrivateEndpointData");
+		     epNode;
+		     epNode = xmlnode_get_next_twin(epNode)) {
+			MsnUserEndpoint *ep;
+			xmlnode *nameNode, *clientNode;
+
+			/*	<PrivateEndpointData id='{GUID}'>
+					<EpName>Endpoint Name</EpName>
+					<Idle>true/false</Idle>
+					<ClientType>1</ClientType>
+					<State>NLN</State>
+				</PrivateEndpointData>
+			*/
+			id = xmlnode_get_attrib(epNode, "id");
+			ep = msn_user_get_endpoint_data(user, id);
+
+			if (ep != NULL) {
+				nameNode = xmlnode_get_child(epNode, "EpName");
+				if (nameNode != NULL) {
+					g_free(ep->name);
+					ep->name = xmlnode_get_data(nameNode);
+				}
+
+				clientNode = xmlnode_get_child(epNode, "ClientType");
+				if (clientNode != NULL) {
+					tmp = xmlnode_get_data(clientNode);
+					ep->type = strtoul(tmp, NULL, 10);
+					g_free(tmp);
+				}
+			}
+		}
+	}
+}
+
 static void parse_currentmedia(MsnUser *user, const char *cmedia)
 {
 	char **cmedia_array;
@@ -1571,18 +1679,20 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 			 size_t len)
 {
 	MsnSession *session;
-	PurpleAccount *account;
 	MsnUser *user;
 	const char *passport;
-	char *str;
+	xmlnode *payloadNode;
+	char *psm_str, *str;
 
 	session = cmdproc->session;
-	account = session->account;
 
 	passport = cmd->params[0];
-	user = msn_userlist_find_user(session->userlist, passport);
+	if (g_str_equal(passport, session->user->passport))
+		user = session->user;
+	else
+		user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) {
-		str = g_strndup(payload, len);
+		char *str = g_strndup(payload, len);
 		purple_debug_info("msn", "unknown user %s, payload is %s\n",
 			passport, str);
 		g_free(str);
@@ -1601,13 +1711,28 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	}
 
 	if (len != 0) {
-		str = msn_get_psm(cmd->payload,len);
-		msn_user_set_statusline(user, str);
-		g_free(str);
+		payloadNode = xmlnode_from_str(payload, len);
+		if (!payloadNode) {
+			purple_debug_error("msn", "UBX XML parse Error!\n");
+
+			msn_user_set_statusline(user, NULL);
+
+			msn_user_update(user);
+			return;
+		}
+
+		psm_str = msn_get_psm(payloadNode);
+		msn_user_set_statusline(user, psm_str);
+		g_free(psm_str);
 
-		str = msn_get_currentmedia(cmd->payload, len);
+		str = msn_get_currentmedia(payloadNode);
 		parse_currentmedia(user, str);
 		g_free(str);
+
+		parse_user_endpoints(user, payloadNode);
+
+		xmlnode_free(payloadNode);
+
 	} else {
 		msn_user_set_statusline(user, NULL);
 	}
@@ -1640,6 +1765,161 @@ uux_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	cmd->payload_len = atoi(cmd->params[1]);
 }
 
+void
+msn_notification_send_uux(MsnSession *session, const char *payload)
+{
+	MsnTransaction *trans;
+	MsnCmdProc *cmdproc;
+	size_t len = strlen(payload);
+
+	cmdproc = session->notification->cmdproc;
+	purple_debug_misc("msn", "Sending UUX command with payload: %s\n", payload);
+	trans = msn_transaction_new(cmdproc, "UUX", "%" G_GSIZE_FORMAT, len);
+	msn_transaction_set_payload(trans, payload, len);
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+void msn_notification_send_uux_endpointdata(MsnSession *session)
+{
+	xmlnode *epDataNode;
+	xmlnode *capNode;
+	char *caps;
+	char *payload;
+	int length;
+
+	epDataNode = xmlnode_new("EndpointData");
+
+	capNode = xmlnode_new_child(epDataNode, "Capabilities");
+	if (session->protocol_ver >= 16)
+		caps = g_strdup_printf("%d:%02d", MSN_CLIENT_ID_CAPABILITIES, MSN_CLIENT_ID_EXT_CAPS);
+	else
+		caps = g_strdup_printf("%d", MSN_CLIENT_ID_CAPABILITIES);
+	xmlnode_insert_data(capNode, caps, -1);
+	g_free(caps);
+
+	payload = xmlnode_to_str(epDataNode, &length);
+
+	msn_notification_send_uux(session, payload);
+
+	xmlnode_free(epDataNode);
+	g_free(payload);
+}
+
+void msn_notification_send_uux_private_endpointdata(MsnSession *session)
+{
+	xmlnode *private;
+	const char *name;
+	xmlnode *epname;
+	xmlnode *idle;
+	GHashTable *ui_info;
+	const gchar *ui_type;
+	xmlnode *client_type;
+	xmlnode *state;
+	char *payload;
+	int length;
+
+	private = xmlnode_new("PrivateEndpointData");
+
+	name = purple_account_get_string(session->account, "endpoint-name", NULL);
+	epname = xmlnode_new_child(private, "EpName");
+	xmlnode_insert_data(epname, name, -1);
+
+	idle = xmlnode_new_child(private, "Idle");
+	xmlnode_insert_data(idle, "false", -1);
+
+	/* ClientType info (from amsn guys):
+		0: None
+		1: Computer
+		2: Website
+		3: Mobile / none
+		4: Xbox / phone /mobile
+		9: MsnGroup
+		32: Email member, currently Yahoo!
+	*/
+	client_type = xmlnode_new_child(private, "ClientType");
+	ui_info = purple_core_get_ui_info();
+	ui_type = ui_info ? g_hash_table_lookup(ui_info, "client_type") : NULL;
+	if (ui_type) {
+		if (strcmp(ui_type, "pc") == 0)
+			xmlnode_insert_data(client_type, "1", -1);
+		else if (strcmp(ui_type, "web") == 0)
+			xmlnode_insert_data(client_type, "2", -1);
+		else if (strcmp(ui_type, "phone") == 0)
+			xmlnode_insert_data(client_type, "3", -1);
+		else if (strcmp(ui_type, "handheld") == 0)
+			xmlnode_insert_data(client_type, "3", -1);
+		else
+			xmlnode_insert_data(client_type, "1", -1);
+	}
+	else
+		xmlnode_insert_data(client_type, "1", -1);
+
+	state = xmlnode_new_child(private, "State");
+	xmlnode_insert_data(state, msn_state_get_text(msn_state_from_account(session->account)), -1);
+
+	payload = xmlnode_to_str(private, &length);
+
+	msn_notification_send_uux(session, payload);
+
+	xmlnode_free(private);
+	g_free(payload);
+}
+
+static void
+ubn_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	/* Do Nothing, right now. */
+	if (payload != NULL)
+		purple_debug_info("msn", "UBN payload:\n%s\n", payload);
+}
+
+static void
+ubn_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_misc("msn", "UBN received from %s.\n", cmd->params[0]);
+	cmdproc->last_cmd->payload_cb  = ubn_cmd_post;
+	cmd->payload_len = atoi(cmd->params[2]);
+}
+
+static void
+uun_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	/* Do Nothing, right now. */
+	if (payload != NULL)
+		purple_debug_info("msn", "UUN payload:\n%s\n", payload);
+}
+
+static void
+uun_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	if (strcmp(cmd->params[1], "OK") != 0) {
+		purple_debug_misc("msn", "UUN received.\n");
+		cmdproc->last_cmd->payload_cb = uun_cmd_post;
+		cmd->payload_len = atoi(cmd->params[1]);
+	}
+	else
+		purple_debug_misc("msn", "UUN OK received.\n");
+}
+
+void
+msn_notification_send_uun(MsnSession *session, const char *user,
+                          MsnUnifiedNotificationType type, const char *payload)
+{
+	MsnTransaction *trans;
+	MsnCmdProc *cmdproc;
+	size_t len = strlen(payload);
+
+	cmdproc = session->notification->cmdproc;
+	purple_debug_misc("msn", "Sending UUN command %d to %s with payload: %s\n",
+	                  type, user, payload);
+	trans = msn_transaction_new(cmdproc, "UUN", "%s %d %" G_GSIZE_FORMAT,
+	                            user, type, len);
+	msn_transaction_set_payload(trans, payload, len);
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
 /**************************************************************************
  * Message Types
  **************************************************************************/
@@ -1649,7 +1929,9 @@ profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnSession *session;
 	const char *value;
+#ifdef MSN_PARTIAL_LISTS
 	const char *clLastChange;
+#endif
 
 	session = cmdproc->session;
 
@@ -1657,44 +1939,44 @@ profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 		/* This isn't an official message. */
 		return;
 
-	if ((value = msn_message_get_attr(msg, "kv")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "kv")) != NULL)
 	{
 		g_free(session->passport_info.kv);
 		session->passport_info.kv = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "sid")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "sid")) != NULL)
 	{
 		g_free(session->passport_info.sid);
 		session->passport_info.sid = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "MSPAuth")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "MSPAuth")) != NULL)
 	{
 		g_free(session->passport_info.mspauth);
 		session->passport_info.mspauth = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "ClientIP")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "ClientIP")) != NULL)
 	{
 		g_free(session->passport_info.client_ip);
 		session->passport_info.client_ip = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "ClientPort")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "ClientPort")) != NULL)
 	{
 		session->passport_info.client_port = ntohs(atoi(value));
 	}
 
-	if ((value = msn_message_get_attr(msg, "LoginTime")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "LoginTime")) != NULL)
 		session->passport_info.sl = atol(value);
 
-	if ((value = msn_message_get_attr(msg, "EmailEnabled")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "EmailEnabled")) != NULL)
 		session->passport_info.email_enabled = (gboolean)atol(value);
 
+#ifdef MSN_PARTIAL_LISTS
 	/*starting retrieve the contact list*/
 	clLastChange = purple_account_get_string(session->account, "CLLastChange", NULL);
-#ifdef MSN_PARTIAL_LISTS
 	/* msn_userlist_load defeats all attempts at trying to detect blist sync issues */
 	msn_userlist_load(session);
 	msn_get_contact_list(session, MSN_PS_INITIAL, clLastChange);
@@ -1898,7 +2180,7 @@ system_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	if ((type_s = g_hash_table_lookup(table, "Type")) != NULL)
 	{
 		int type = atoi(type_s);
-		char buf[MSN_BUF_LEN];
+		char buf[MSN_BUF_LEN] = "";
 		int minutes;
 
 		switch (type)
@@ -2093,6 +2375,9 @@ msn_notification_init(void)
 	msn_table_add_cmd(cbs_table, NULL, "UBX", ubx_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "UUX", uux_cmd);
 
+	msn_table_add_cmd(cbs_table, NULL, "UBN", ubn_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "UUN", uun_cmd);
+
 	msn_table_add_cmd(cbs_table, NULL, "URL", url_cmd);
 
 	msn_table_add_cmd(cbs_table, "fallback", "XFR", xfr_cmd);
diff --git a/libpurple/protocols/msn/notification.h b/libpurple/protocols/msn/notification.h
index 776f10ad20..b74cf4b8ce 100644
--- a/libpurple/protocols/msn/notification.h
+++ b/libpurple/protocols/msn/notification.h
@@ -49,6 +49,7 @@ typedef struct _MsnNotification MsnNotification;
 #include "servconn.h"
 #include "state.h"
 #include "user.h"
+#include "userlist.h"
 
 struct _MsnNotification
 {
@@ -66,6 +67,15 @@ struct _MsnNotification
 
 typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network, gpointer data);
 
+/* Type used for msn_notification_send_uun */
+typedef enum {
+	MSN_UNIFIED_NOTIFICATION_SHARED_FOLDERS = 1,
+	MSN_UNIFIED_NOTIFICATION_UNKNOWN1 = 2,
+	MSN_UNIFIED_NOTIFICATION_P2P = 3,
+	MSN_UNIFIED_NOTIFICATION_MPOP = 4
+
+} MsnUnifiedNotificationType;
+
 void uum_send_msg(MsnSession *session, MsnMessage *msg);
 
 void msn_notification_end(void);
@@ -87,6 +97,17 @@ gboolean msn_notification_connect(MsnNotification *notification,
 void msn_notification_disconnect(MsnNotification *notification);
 void msn_notification_dump_contact(MsnSession *session);
 
+void msn_notification_send_uux(MsnSession *session, const char *payload);
+
+void msn_notification_send_uux_endpointdata(MsnSession *session);
+
+void msn_notification_send_uux_private_endpointdata(MsnSession *session);
+
+void msn_notification_send_uun(MsnSession *session,
+                               const char *user,
+                               MsnUnifiedNotificationType type,
+                               const char *payload);
+
 /**
  * Closes a notification.
  *
diff --git a/libpurple/protocols/msn/object.c b/libpurple/protocols/msn/object.c
index dddbd271ea..ce0ce0ffab 100644
--- a/libpurple/protocols/msn/object.c
+++ b/libpurple/protocols/msn/object.c
@@ -400,7 +400,7 @@ msn_object_get_url1(const MsnObject *obj)
 	return obj->url1;
 }
 
-static MsnObject *
+MsnObject *
 msn_object_find_local(const char *sha1)
 {
 	GList *l;
diff --git a/libpurple/protocols/msn/object.h b/libpurple/protocols/msn/object.h
index d2745118f6..81572dc799 100644
--- a/libpurple/protocols/msn/object.h
+++ b/libpurple/protocols/msn/object.h
@@ -269,6 +269,8 @@ const char *msn_object_get_url(const MsnObject *obj);
  */
 const char *msn_object_get_url1(const MsnObject *obj);
 
+MsnObject * msn_object_find_local(const char *sha1);
+
 void msn_object_set_local(MsnObject *obj);
 
 #endif /* MSN_OBJECT_H */
diff --git a/libpurple/protocols/msn/oim.c b/libpurple/protocols/msn/oim.c
index a4ab5d2ce0..f45e226b1a 100644
--- a/libpurple/protocols/msn/oim.c
+++ b/libpurple/protocols/msn/oim.c
@@ -23,7 +23,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "soap.h"
 #include "oim.h"
 #include "msnutils.h"
@@ -618,7 +621,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 	                          MSG_OIM_LINE_DEM, MSG_OIM_BODY_DEM);
 	purple_debug_info("msn", "oim body:{%s}\n", message->body);
 
-	boundary = msn_message_get_attr(message, "boundary");
+	boundary = msn_message_get_header_value(message, "boundary");
 
 	if (boundary != NULL) {
 		char *bounds;
@@ -656,7 +659,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 		decode_msg = (char *)purple_base64_decode(message->body, &body_len);
 	}
 
-	from = msn_message_get_attr(message, "X-OIM-originatingSource");
+	from = msn_message_get_header_value(message, "X-OIM-originatingSource");
 
 	/* Match number to user's mobile number, FROM is a phone number
 	   if the other side pages you using your phone number */
@@ -671,7 +674,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 	if (passport == NULL) {
 		char *start, *end;
 
-		from = msn_message_get_attr(message, "From");
+		from = msn_message_get_header_value(message, "From");
 
 		tokens = g_strsplit(from, " ", 2);
 		if (tokens[1] != NULL)
@@ -690,7 +693,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 		g_strfreev(tokens);
 	}
 
-	date = msn_message_get_attr(message, "Date");
+	date = msn_message_get_header_value(message, "Date");
 	stamp = msn_oim_parse_timestamp(date);
 	purple_debug_info("msn", "oim Date:{%s},passport{%s}\n",
 	                  date, passport);
diff --git a/libpurple/protocols/msn/p2p.c b/libpurple/protocols/msn/p2p.c
new file mode 100644
index 0000000000..20caeb5469
--- /dev/null
+++ b/libpurple/protocols/msn/p2p.c
@@ -0,0 +1,76 @@
+#include "internal.h"
+
+#include "p2p.h"
+
+MsnP2PHeader *
+msn_p2p_header_from_wire(MsnP2PHeader *wire)
+{
+	MsnP2PHeader *header;
+
+	header = g_new(MsnP2PHeader, 1);
+
+	header->session_id = GUINT32_FROM_LE(wire->session_id);
+	header->id         = GUINT32_FROM_LE(wire->id);
+	header->offset     = GUINT64_FROM_LE(wire->offset);
+	header->total_size = GUINT64_FROM_LE(wire->total_size);
+	header->length     = GUINT32_FROM_LE(wire->length);
+	header->flags      = GUINT32_FROM_LE(wire->flags);
+	header->ack_id     = GUINT32_FROM_LE(wire->ack_id);
+	header->ack_sub_id = GUINT32_FROM_LE(wire->ack_sub_id);
+	header->ack_size   = GUINT64_FROM_LE(wire->ack_size);
+
+	return header;
+}
+
+MsnP2PHeader *
+msn_p2p_header_to_wire(MsnP2PHeader *header)
+{
+	MsnP2PHeader *wire;
+	
+	wire = g_new(MsnP2PHeader, 1);
+
+	wire->session_id = GUINT32_TO_LE(header->session_id);
+	wire->id         = GUINT32_TO_LE(header->id);
+	wire->offset     = GUINT64_TO_LE(header->offset);
+	wire->total_size = GUINT64_TO_LE(header->total_size);
+	wire->length     = GUINT32_TO_LE(header->length);
+	wire->flags      = GUINT32_TO_LE(header->flags);
+	wire->ack_id     = GUINT32_TO_LE(header->ack_id);
+	wire->ack_sub_id = GUINT32_TO_LE(header->ack_sub_id);
+	wire->ack_size   = GUINT64_TO_LE(header->ack_size);
+
+	return wire;
+
+}
+
+MsnP2PFooter *
+msn_p2p_footer_from_wire(MsnP2PFooter *wire)
+{
+	MsnP2PFooter *footer;
+
+	footer = g_new(MsnP2PFooter, 1);
+
+	footer->value = GUINT32_FROM_BE(wire->value);
+
+	return footer;
+}
+
+MsnP2PFooter *
+msn_p2p_footer_to_wire(MsnP2PFooter *footer)
+{
+	MsnP2PFooter *wire;
+
+	wire = g_new(MsnP2PFooter, 1);
+
+	wire->value = GUINT32_TO_BE(footer->value);
+
+	return wire;
+}
+
+gboolean
+msn_p2p_msg_is_data(const MsnP2PHeaderFlag flags)
+{
+	return (flags == P2P_MSN_OBJ_DATA ||
+	        flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
+	        flags == P2P_FILE_DATA);
+}
diff --git a/libpurple/protocols/msn/p2p.h b/libpurple/protocols/msn/p2p.h
new file mode 100644
index 0000000000..f7ee313e38
--- /dev/null
+++ b/libpurple/protocols/msn/p2p.h
@@ -0,0 +1,88 @@
+#ifndef MSN_P2P_H
+#define MSN_P2P_H
+
+
+#pragma pack(push,1)
+typedef struct {
+	guint32 session_id;
+	guint32 id;
+	/**
+	 * In a MsnSlpMessage:
+	 * For outgoing messages this is the number of bytes from buffer that
+	 * have already been sent out.  For incoming messages this is the
+	 * number of bytes that have been written to buffer.
+	 */
+	guint64 offset;
+	guint64 total_size;
+	guint32 length;
+	guint32 flags;
+	guint32 ack_id;
+	guint32 ack_sub_id;
+	guint64 ack_size;
+/*	guint8  body[1]; */
+} MsnP2PHeader;
+#pragma pack(pop)
+
+#pragma pack(push,1)
+typedef struct {
+	guint8  header_len;
+	guint8  opcode;
+	guint16 message_len;
+	guint32 base_id;
+} MsnP2Pv2Header;
+#pragma pack(pop)
+
+typedef struct
+{
+	guint32 value;
+} MsnP2PFooter;
+
+typedef enum
+{
+	P2P_NO_FLAG         = 0x0,        /**< No flags specified */
+	P2P_OUT_OF_ORDER    = 0x1,        /**< Chunk out-of-order */
+	P2P_ACK             = 0x2,        /**< Acknowledgement */
+	P2P_PENDING_INVITE  = 0x4,        /**< There is a pending invite */
+	P2P_BINARY_ERROR    = 0x8,        /**< Error on the binary level */
+	P2P_FILE            = 0x10,       /**< File */
+	P2P_MSN_OBJ_DATA    = 0x20,       /**< MsnObject data */
+	P2P_CLOSE           = 0x40,       /**< Close session */
+	P2P_TLP_ERROR       = 0x80,       /**< Error at transport layer protocol */
+	P2P_DC_HANDSHAKE    = 0x100,      /**< Direct Handshake */
+	P2P_WML2009_COMP    = 0x1000000,  /**< Compatibility with WLM 2009 */
+	P2P_FILE_DATA       = 0x1000030   /**< File transfer data */
+} MsnP2PHeaderFlag;
+/* Info From:
+ * http://msnpiki.msnfanatic.com/index.php/MSNC:P2Pv1_Headers#Flags
+ * http://trac.kmess.org/changeset/ba04d0c825769d23370511031c47f6be75fe9b86
+ * #7180
+ */
+
+typedef enum
+{
+	P2P_APPID_SESION    = 0x0,        /**< Negotiating session */
+	P2P_APPID_OBJ       = 0x1,        /**< MsnObject (Display or Emoticon) */
+	P2P_APPID_FILE      = 0x2,        /**< File transfer */
+	P2P_APPID_EMOTE     = 0xB,        /**< CustomEmoticon */
+	P2P_APPID_DISPLAY   = 0xC         /**< Display Image */
+} MsnP2PAppId;
+
+#define P2P_PACKET_HEADER_SIZE sizeof(MsnP2PHeader)
+#define P2P_PACKET_FOOTER_SIZE sizeof(MsnP2PFooter)
+
+MsnP2PHeader *
+msn_p2p_header_from_wire(MsnP2PHeader *wire);
+
+MsnP2PHeader *
+msn_p2p_header_to_wire(MsnP2PHeader *header);
+
+MsnP2PFooter *
+msn_p2p_footer_from_wire(MsnP2PFooter *wire);
+
+MsnP2PFooter *
+msn_p2p_footer_to_wire(MsnP2PFooter *footer);
+
+gboolean
+msn_p2p_msg_is_data(const MsnP2PHeaderFlag flags);
+
+#endif /* MSN_P2P_H */
diff --git a/libpurple/protocols/msn/sbconn.c b/libpurple/protocols/msn/sbconn.c
new file mode 100644
index 0000000000..c84284f512
--- /dev/null
+++ b/libpurple/protocols/msn/sbconn.c
@@ -0,0 +1,151 @@
+#include "internal.h"
+#include "debug.h"
+
+#include "msg.h"
+#include "sbconn.h"
+
+void msn_sbconn_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part)
+{
+	MsnMessage *msg;
+	const char *passport;
+	char *data;
+	size_t size;
+
+	msg = msn_message_new_msnslp();
+
+	passport = purple_normalize(slplink->session->account, slplink->remote_user);
+	msn_message_set_header(msg, "P2P-Dest", passport);
+
+	data = msn_slpmsgpart_serialize(part, &size);
+	msg->part = msn_slpmsgpart_ref(part);
+
+	msn_message_set_bin_data(msg, data, size);
+
+	if (slplink->swboard == NULL)
+	{
+		slplink->swboard = msn_session_get_swboard(slplink->session,
+				slplink->remote_user, MSN_SB_FLAG_FT);
+
+		g_return_if_fail(slplink->swboard != NULL);
+
+		/* If swboard is destroyed we will be too */
+		slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
+	}
+
+	msn_switchboard_send_msg(slplink->swboard, msg, TRUE);
+}
+
+/** Called when a message times out. */
+static void
+msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
+{
+	MsnMessage *msg;
+
+	msg = trans->data;
+
+	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
+}
+
+static void
+release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
+{
+	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
+	char *payload;
+	gsize payload_len;
+	char flag;
+
+	g_return_if_fail(swboard != NULL);
+	g_return_if_fail(msg     != NULL);
+
+	cmdproc = swboard->cmdproc;
+
+	payload = msn_message_gen_payload(msg, &payload_len);
+
+	if (purple_debug_is_verbose()) {
+		purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}\n", payload_len);
+		msn_message_show_readable(msg, "SB SEND", FALSE);
+	}
+
+	flag = msn_message_get_flag(msg);
+	trans = msn_transaction_new(cmdproc, "MSG", "%c %" G_GSIZE_FORMAT,
+								flag, payload_len);
+
+	/* Data for callbacks */
+	msn_transaction_set_data(trans, msg);
+
+	if (flag != 'U') {
+		if (msg->type == MSN_MSG_TEXT)
+		{
+			msg->ack_ref = TRUE;
+			msn_message_ref(msg);
+			swboard->ack_list = g_list_append(swboard->ack_list, msg);
+			msn_transaction_set_timeout_cb(trans, msg_timeout);
+		}
+		else if (msg->type == MSN_MSG_SLP)
+		{
+			msg->ack_ref = TRUE;
+			msn_message_ref(msg);
+			swboard->ack_list = g_list_append(swboard->ack_list, msg);
+			msn_transaction_set_timeout_cb(trans, msg_timeout);
+#if 0
+			if (msg->ack_cb != NULL)
+			{
+				msn_transaction_add_cb(trans, "ACK", msg_ack);
+				msn_transaction_add_cb(trans, "NAK", msg_nak);
+			}
+#endif
+		}
+	}
+
+	trans->payload = payload;
+	trans->payload_len = payload_len;
+
+	msg->trans = trans;
+
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+static void
+queue_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
+{
+	g_return_if_fail(swboard != NULL);
+	g_return_if_fail(msg     != NULL);
+
+	purple_debug_info("msn", "Appending message to queue.\n");
+
+	g_queue_push_tail(swboard->msg_queue, msg);
+
+	msn_message_ref(msg);
+}
+
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard)
+{
+	MsnMessage *msg;
+
+	g_return_if_fail(swboard != NULL);
+
+	purple_debug_info("msn", "Processing queue\n");
+
+	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
+	{
+		purple_debug_info("msn", "Sending message\n");
+		release_msg(swboard, msg);
+		msn_message_unref(msg);
+	}
+}
+
+void
+msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
+						 gboolean queue)
+{
+	g_return_if_fail(swboard != NULL);
+	g_return_if_fail(msg     != NULL);
+
+	purple_debug_info("msn", "switchboard send msg..\n");
+	if (msn_switchboard_can_send(swboard))
+		release_msg(swboard, msg);
+	else if (queue)
+		queue_msg(swboard, msg);
+}
diff --git a/libpurple/protocols/msn/sbconn.h b/libpurple/protocols/msn/sbconn.h
new file mode 100644
index 0000000000..6380641e03
--- /dev/null
+++ b/libpurple/protocols/msn/sbconn.h
@@ -0,0 +1,17 @@
+#ifndef MSN_SBCONN_H
+#define MSN_SBCONN_H
+
+#include "msg.h"
+#include "slplink.h"
+
+#define MSN_SBCONN_MAX_SIZE 1202
+
+void msn_sbconn_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part);
+
+void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
+						 gboolean queue);
+
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard);
+
+#endif /* MSN_SBCONN_H */
diff --git a/libpurple/protocols/msn/servconn.c b/libpurple/protocols/msn/servconn.c
index 28a9226ca6..617216cee2 100644
--- a/libpurple/protocols/msn/servconn.c
+++ b/libpurple/protocols/msn/servconn.c
@@ -21,7 +21,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+#include "internal.h"
+#include "debug.h"
+
 #include "servconn.h"
 #include "error.h"
 
diff --git a/libpurple/protocols/msn/servconn.h b/libpurple/protocols/msn/servconn.h
index 0c1434077e..b075fd08f2 100644
--- a/libpurple/protocols/msn/servconn.h
+++ b/libpurple/protocols/msn/servconn.h
@@ -46,6 +46,7 @@ typedef enum
 	MSN_SERVCONN_SB
 } MsnServConnType;
 
+#include "internal.h"
 #include "proxy.h"
 
 #include "cmdproc.h"
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index ab4886d332..25e1043caf 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -21,13 +21,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
+#include "error.h"
+#include "msnutils.h"
 #include "session.h"
 #include "notification.h"
 #include "oim.h"
 
-#include "dialog.h"
-
 MsnSession *
 msn_session_new(PurpleAccount *account)
 {
@@ -45,7 +48,9 @@ msn_session_new(PurpleAccount *account)
 								 purple_account_get_username(account), NULL);
 	session->oim = msn_oim_new(session);
 
-	session->protocol_ver = WLM_PROT_VER;
+	session->protocol_ver = 0;
+
+	session->guid = rand_guid();
 
 	return session;
 }
@@ -72,14 +77,11 @@ msn_session_destroy(MsnSession *session)
 		g_hash_table_destroy(session->soap_table);
 
 	while (session->slplinks != NULL)
-		msn_slplink_destroy(session->slplinks->data);
+		msn_slplink_unref(session->slplinks->data);
 
 	while (session->switches != NULL)
 		msn_switchboard_destroy(session->switches->data);
 
-	if (session->sync != NULL)
-		msn_sync_destroy(session->sync);
-
 	if (session->oim != NULL)
 		msn_oim_destroy(session->oim);
 
@@ -87,7 +89,7 @@ msn_session_destroy(MsnSession *session)
 		msn_nexus_destroy(session->nexus);
 
 	if (session->user != NULL)
-		msn_user_destroy(session->user);
+		msn_user_unref(session->user);
 
 	if (session->notification != NULL)
 		msn_notification_destroy(session->notification);
@@ -95,6 +97,7 @@ msn_session_destroy(MsnSession *session)
 	msn_userlist_destroy(session->userlist);
 
 	g_free(session->psm);
+	g_free(session->guid);
 	g_free(session->abch_cachekey);
 #if 0
 	g_free(session->blocked_text);
@@ -283,7 +286,7 @@ msn_login_timeout_cb(gpointer data)
 void
 msn_session_activate_login_timeout(MsnSession *session)
 {
-	if (!session->logged_in) {
+	if (!session->logged_in && session->connected) {
 		session->login_timeout =
 			purple_timeout_add_seconds(MSN_LOGIN_FQY_TIMEOUT,
 			                           msn_login_timeout_cb, session);
@@ -329,7 +332,7 @@ msn_session_sync_users(MsnSession *session)
 			if (!found) {
 				if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) {
 					/* The user is not on the server list */
-					msn_show_sync_issue(session, buddy_name, group_name);
+					msn_error_sync_issue(session, buddy_name, group_name);
 				} else {
 					/* The user is not in that group on the server list */
 					to_remove = g_list_prepend(to_remove, buddy);
@@ -483,6 +486,11 @@ msn_session_finish_login(MsnSession *session)
 		msn_session_sync_users(session);
 	}
 
+	if (session->protocol_ver >= 16) {
+		/* TODO: Send this when updating status instead? */
+		msn_notification_send_uux_endpointdata(session);
+		msn_notification_send_uux_private_endpointdata(session);
+	}
 	msn_change_status(session);
 }
 
diff --git a/libpurple/protocols/msn/session.h b/libpurple/protocols/msn/session.h
index 27ad890b16..4277112697 100644
--- a/libpurple/protocols/msn/session.h
+++ b/libpurple/protocols/msn/session.h
@@ -61,15 +61,12 @@ typedef enum
 
 #define MSN_LOGIN_FQY_TIMEOUT 30
 
-#include "group.h"
-#include "httpconn.h"
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
 #include "nexus.h"
 #include "notification.h"
 #include "oim.h"
-#include "slpcall.h"
-#include "sslconn.h"
 #include "switchboard.h"
-#include "sync.h"
 #include "user.h"
 #include "userlist.h"
 
@@ -92,7 +89,6 @@ struct _MsnSession
 	MsnNotification *notification;
 	MsnNexus        *nexus;
 	MsnOim          *oim;
-	MsnSync         *sync;
 	MsnUserList     *userlist;
 	char            *abch_cachekey;
 
@@ -122,6 +118,7 @@ struct _MsnSession
 
 	GHashTable *soap_table;
 	guint soap_cleanup_handle;
+	char *guid;
 
 	GSList *url_datas; /**< PurpleUtilFetchUrlData to be cancelled on exit */
 };
diff --git a/libpurple/protocols/msn/slp.c b/libpurple/protocols/msn/slp.c
index 710a0c7265..159613c3f8 100644
--- a/libpurple/protocols/msn/slp.c
+++ b/libpurple/protocols/msn/slp.c
@@ -21,7 +21,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "slp.h"
 #include "slpcall.h"
 #include "slpmsg.h"
@@ -29,16 +32,14 @@
 
 #include "object.h"
 #include "user.h"
-#include "switchboard.h"
+#include "sbconn.h"
 #include "directconn.h"
-
-#include "smiley.h"
+#include "p2p.h"
+#include "xfer.h"
 
 /* seconds to delay between sending buddy icon requests to the server. */
 #define BUDDY_ICON_DELAY 20
 
-static void request_user_display(MsnUser *user);
-
 typedef struct {
 	MsnSession *session;
 	const char *remote_user;
@@ -46,167 +47,6 @@ typedef struct {
 } MsnFetchUserDisplayData;
 
 /**************************************************************************
- * Util
- **************************************************************************/
-
-static char *
-get_token(const char *str, const char *start, const char *end)
-{
-	const char *c, *c2;
-
-	if ((c = strstr(str, start)) == NULL)
-		return NULL;
-
-	c += strlen(start);
-
-	if (end != NULL)
-	{
-		if ((c2 = strstr(c, end)) == NULL)
-			return NULL;
-
-		return g_strndup(c, c2 - c);
-	}
-	else
-	{
-		/* This has to be changed */
-		return g_strdup(c);
-	}
-
-}
-
-/**************************************************************************
- * Xfer
- **************************************************************************/
-
-static void
-msn_xfer_init(PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	/* MsnSlpLink *slplink; */
-	char *content;
-
-	purple_debug_info("msn", "xfer_init\n");
-
-	slpcall = xfer->data;
-
-	/* Send Ok */
-	content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-							  slpcall->session_id);
-
-	msn_slp_send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
-			content);
-
-	g_free(content);
-	msn_slplink_send_queued_slpmsgs(slpcall->slplink);
-}
-
-void
-msn_xfer_cancel(PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	char *content;
-
-	g_return_if_fail(xfer != NULL);
-	g_return_if_fail(xfer->data != NULL);
-
-	slpcall = xfer->data;
-
-	if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL)
-	{
-		if (slpcall->started)
-		{
-			msn_slpcall_close(slpcall);
-		}
-		else
-		{
-			content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-									slpcall->session_id);
-
-			msn_slp_send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
-						content);
-
-			g_free(content);
-			msn_slplink_send_queued_slpmsgs(slpcall->slplink);
-
-			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
-				slpcall->wasted = TRUE;
-			else
-				msn_slpcall_destroy(slpcall);
-		}
-	}
-}
-
-gssize
-msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-
-	g_return_val_if_fail(xfer != NULL, -1);
-	g_return_val_if_fail(data != NULL, -1);
-	g_return_val_if_fail(len > 0, -1);
-
-	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND, -1);
-
-	slpcall = xfer->data;
-	/* Not sure I trust it'll be there */
-	g_return_val_if_fail(slpcall != NULL, -1);
-
-	g_return_val_if_fail(slpcall->xfer_msg != NULL, -1);
-
-	slpcall->u.outgoing.len = len;
-	slpcall->u.outgoing.data = data;
-	msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg);
-	msn_message_unref(slpcall->xfer_msg->msg);
-	return MIN(1202, len);
-}
-
-gssize
-msn_xfer_read(guchar **data, PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	gsize len;
-
-	g_return_val_if_fail(xfer != NULL, -1);
-	g_return_val_if_fail(data != NULL, -1);
-
-	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE, -1);
-
-	slpcall = xfer->data;
-	/* Not sure I trust it'll be there */
-	g_return_val_if_fail(slpcall != NULL, -1);
-
-	/* Just pass up the whole GByteArray. We'll make another. */
-	*data = slpcall->u.incoming_data->data;
-	len = slpcall->u.incoming_data->len;
-
-	g_byte_array_free(slpcall->u.incoming_data, FALSE);
-	slpcall->u.incoming_data = g_byte_array_new();
-
-	return len;
-}
-
-void
-msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session)
-{
-	if ((purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_DONE) &&
-		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&
-		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))
-	{
-		purple_xfer_cancel_remote(slpcall->xfer);
-	}
-}
-
-void
-msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
-					  gsize size)
-{
-	PurpleXfer *xfer = slpcall->xfer;
-
-	purple_xfer_set_completed(xfer, TRUE);
-	purple_xfer_end(xfer);
-}
-
-/**************************************************************************
  * SLP Control
  **************************************************************************/
 
@@ -250,1042 +90,10 @@ msn_slp_send_decline(MsnSlpCall *slpcall, const char *branch,
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
 }
 
-/* XXX: this could be improved if we tracked custom smileys
- * per-protocol, per-account, per-session or (ideally) per-conversation
- */
-static PurpleStoredImage *
-find_valid_emoticon(PurpleAccount *account, const char *path)
-{
-	GList *smileys;
-
-	if (!purple_account_get_bool(account, "custom_smileys", TRUE))
-		return NULL;
-
-	smileys = purple_smileys_get_all();
-
-	for (; smileys; smileys = g_list_delete_link(smileys, smileys)) {
-		PurpleSmiley *smiley;
-		PurpleStoredImage *img;
-
-		smiley = smileys->data;
-		img = purple_smiley_get_stored_image(smiley);
-
-		if (purple_strequal(path, purple_imgstore_get_filename(img))) {
-			g_list_free(smileys);
-			return img;
-		}
-
-		purple_imgstore_unref(img);
-	}
-
-	purple_debug_error("msn", "Received illegal request for file %s\n", path);
-	return NULL;
-}
-
-static char *
-parse_dc_nonce(const char *content, MsnDirectConnNonceType *ntype)
-{
-	char *nonce;
-
-	*ntype = DC_NONCE_UNKNOWN;
-
-	nonce = get_token(content, "Hashed-Nonce: {", "}\r\n");
-	if (nonce) {
-		*ntype = DC_NONCE_SHA1;
-	} else {
-		guint32 n1, n6;
-		guint16 n2, n3, n4, n5;
-		nonce = get_token(content, "Nonce: {", "}\r\n");
-		if (nonce
-		 && sscanf(nonce, "%08x-%04hx-%04hx-%04hx-%04hx%08x",
-		           &n1, &n2, &n3, &n4, &n5, &n6) == 6) {
-			*ntype = DC_NONCE_PLAIN;
-			g_free(nonce);
-			nonce = g_malloc(16);
-			*(guint32 *)(nonce +  0) = GUINT32_TO_LE(n1);
-			*(guint16 *)(nonce +  4) = GUINT16_TO_LE(n2);
-			*(guint16 *)(nonce +  6) = GUINT16_TO_LE(n3);
-			*(guint16 *)(nonce +  8) = GUINT16_TO_BE(n4);
-			*(guint16 *)(nonce + 10) = GUINT16_TO_BE(n5);
-			*(guint32 *)(nonce + 12) = GUINT32_TO_BE(n6);
-		} else {
-			/* Invalid nonce, so ignore request */
-			g_free(nonce);
-			nonce = NULL;
-		}
-	}
-
-	return nonce;
-}
-
-static void
-msn_slp_process_transresp(MsnSlpCall *slpcall, const char *content)
-{
-	/* A direct connection negotiation response */
-	char *bridge;
-	char *nonce;
-	char *listening;
-	MsnDirectConn *dc = slpcall->slplink->dc;
-	MsnDirectConnNonceType ntype;
-
-	purple_debug_info("msn", "process_transresp\n");
-
-	/* Direct connections are disabled. */
-	if (!purple_account_get_bool(slpcall->slplink->session->account, "direct_connect", TRUE))
-		return;
-
-	g_return_if_fail(dc != NULL);
-	g_return_if_fail(dc->state == DC_STATE_CLOSED);
-
-	bridge = get_token(content, "Bridge: ", "\r\n");
-	nonce = parse_dc_nonce(content, &ntype);
-	listening = get_token(content, "Listening: ", "\r\n");
-	if (listening && bridge && !strcmp(bridge, "TCPv1")) {
-		/* Ok, the client supports direct TCP connection */
-
-		/* We always need this. */
-		if (ntype == DC_NONCE_SHA1) {
-			strncpy(dc->remote_nonce, nonce, 36);
-			dc->remote_nonce[36] = '\0';
-		}
-
-		if (!strcasecmp(listening, "false")) {
-			if (dc->listen_data != NULL) {
-				/*
-				 * We'll listen for incoming connections but
-				 * the listening socket isn't ready yet so we cannot
-				 * send the INVITE packet now. Put the slpcall into waiting mode
-				 * and let the callback send the invite.
-				 */
-				slpcall->wait_for_socket = TRUE;
-
-			} else if (dc->listenfd != -1) {
-				/* The listening socket is ready. Send the INVITE here. */
-				msn_dc_send_invite(dc);
-
-			} else {
-				/* We weren't able to create a listener either. Use SB. */
-				msn_dc_fallback_to_sb(dc);
-			}
-
-		} else {
-			/*
-			 * We should connect to the client so parse
-			 * IP/port from response.
-			 */
-			char *ip, *port_str;
-			int port = 0;
-
-			if (ntype == DC_NONCE_PLAIN) {
-				/* Only needed for listening side. */
-				memcpy(dc->nonce, nonce, 16);
-			}
-
-			/* Cancel any listen attempts because we don't need them. */
-			if (dc->listenfd_handle != 0) {
-				purple_input_remove(dc->listenfd_handle);
-				dc->listenfd_handle = 0;
-			}
-			if (dc->connect_timeout_handle != 0) {
-				purple_timeout_remove(dc->connect_timeout_handle);
-				dc->connect_timeout_handle = 0;
-			}
-			if (dc->listenfd != -1) {
-				purple_network_remove_port_mapping(dc->listenfd);
-				close(dc->listenfd);
-				dc->listenfd = -1;
-			}
-			if (dc->listen_data != NULL) {
-				purple_network_listen_cancel(dc->listen_data);
-				dc->listen_data = NULL;
-			}
-
-			/* Save external IP/port for later use. We'll try local connection first. */
-			dc->ext_ip = get_token(content, "IPv4External-Addrs: ", "\r\n");
-			port_str = get_token(content, "IPv4External-Port: ", "\r\n");
-			if (port_str) {
-				dc->ext_port = atoi(port_str);
-				g_free(port_str);
-			}
-
-			ip = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
-			port_str = get_token(content, "IPv4Internal-Port: ", "\r\n");
-			if (port_str) {
-				port = atoi(port_str);
-				g_free(port_str);
-			}
-
-			if (ip && port) {
-				/* Try internal address first */
-				dc->connect_data = purple_proxy_connect(
-					NULL,
-					slpcall->slplink->session->account,
-					ip,
-					port,
-					msn_dc_connected_to_peer_cb,
-					dc
-				);
-
-				if (dc->connect_data) {
-					/* Add connect timeout handle */
-					dc->connect_timeout_handle = purple_timeout_add_seconds(
-						DC_OUTGOING_TIMEOUT,
-						msn_dc_outgoing_connection_timeout_cb,
-						dc
-					);
-				} else {
-					/*
-					 * Connection failed
-					 * Try external IP/port (if specified)
-					 */
-					msn_dc_outgoing_connection_timeout_cb(dc);
-				}
-
-			} else {
-				/*
-				 * Omitted or invalid internal IP address / port
-				 * Try external IP/port (if specified)
-				 */
-				msn_dc_outgoing_connection_timeout_cb(dc);
-			}
-
-			g_free(ip);
-		}
-
-	} else {
-		/*
-		 * Invalid direct connect invitation or
-		 * TCP connection is not supported
-		 */
-	}
-
-	g_free(listening);
-	g_free(nonce);
-	g_free(bridge);
-
-	return;
-}
-
-static void
-got_sessionreq(MsnSlpCall *slpcall, const char *branch,
-			   const char *euf_guid, const char *context)
-{
-	gboolean accepted = FALSE;
-
-	if (!strcmp(euf_guid, MSN_OBJ_GUID))
-	{
-		/* Emoticon or UserDisplay */
-		char *content;
-		gsize len;
-		MsnSlpLink *slplink;
-		MsnSlpMessage *slpmsg;
-		MsnObject *obj;
-		char *msnobj_data;
-		PurpleStoredImage *img = NULL;
-		int type;
-
-		/* Send Ok */
-		content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-								  slpcall->session_id);
-
-		msn_slp_send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
-				content);
-
-		g_free(content);
-
-		slplink = slpcall->slplink;
-
-		msnobj_data = (char *)purple_base64_decode(context, &len);
-		obj = msn_object_new_from_string(msnobj_data);
-		type = msn_object_get_type(obj);
-		g_free(msnobj_data);
-		if (type == MSN_OBJECT_EMOTICON) {
-			img = find_valid_emoticon(slplink->session->account, obj->location);
-		} else if (type == MSN_OBJECT_USERTILE) {
-			img = msn_object_get_image(obj);
-			if (img)
-				purple_imgstore_ref(img);
-		}
-		msn_object_destroy(obj);
-
-		if (img != NULL) {
-			/* DATA PREP */
-			slpmsg = msn_slpmsg_new(slplink);
-			slpmsg->slpcall = slpcall;
-			slpmsg->session_id = slpcall->session_id;
-			msn_slpmsg_set_body(slpmsg, NULL, 4);
-			slpmsg->info = "SLP DATA PREP";
-			msn_slplink_queue_slpmsg(slplink, slpmsg);
-
-			/* DATA */
-			slpmsg = msn_slpmsg_new(slplink);
-			slpmsg->slpcall = slpcall;
-			slpmsg->flags = 0x20;
-			slpmsg->info = "SLP DATA";
-			msn_slpmsg_set_image(slpmsg, img);
-			msn_slplink_queue_slpmsg(slplink, slpmsg);
-			purple_imgstore_unref(img);
-
-			accepted = TRUE;
-
-		} else {
-			purple_debug_error("msn", "Wrong object.\n");
-		}
-	}
-
-	else if (!strcmp(euf_guid, MSN_FT_GUID))
-	{
-		/* File Transfer */
-		PurpleAccount *account;
-		PurpleXfer *xfer;
-		MsnFileContext *header;
-		gsize bin_len;
-		guint32 file_size;
-		char *file_name;
-
-		account = slpcall->slplink->session->account;
-
-		slpcall->end_cb = msn_xfer_end_cb;
-		slpcall->branch = g_strdup(branch);
-
-		slpcall->pending = TRUE;
-
-		xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE,
-							 slpcall->slplink->remote_user);
-
-		header = (MsnFileContext *)purple_base64_decode(context, &bin_len);
-		if (bin_len >= sizeof(MsnFileContext) - 1 &&
-			(header->version == 2 ||
-			 (header->version == 3 && header->length == sizeof(MsnFileContext) + 63))) {
-			file_size = GUINT64_FROM_LE(header->file_size);
-
-			file_name = g_convert((const gchar *)&header->file_name,
-			                      MAX_FILE_NAME_LEN * 2,
-			                      "UTF-8", "UTF-16LE",
-			                      NULL, NULL, NULL);
-
-			purple_xfer_set_filename(xfer, file_name ? file_name : "");
-			g_free(file_name);
-			purple_xfer_set_size(xfer, file_size);
-			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
-			purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel);
-			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
-			purple_xfer_set_read_fnc(xfer, msn_xfer_read);
-			purple_xfer_set_write_fnc(xfer, msn_xfer_write);
-
-			slpcall->u.incoming_data = g_byte_array_new();
-
-			slpcall->xfer = xfer;
-			purple_xfer_ref(slpcall->xfer);
-
-			xfer->data = slpcall;
-
-			if (header->type == 0 && bin_len >= sizeof(MsnFileContext)) {
-				purple_xfer_set_thumbnail(xfer, &header->preview,
-				                          bin_len - sizeof(MsnFileContext),
-				    					  "image/png");
-			}
-
-			purple_xfer_request(xfer);
-		}
-		g_free(header);
-
-		accepted = TRUE;
-
-	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
-		purple_debug_info("msn", "Cam request.\n");
-		if (slpcall && slpcall->slplink &&
-				slpcall->slplink->session) {
-			PurpleConversation *conv;
-			gchar *from = slpcall->slplink->remote_user;
-			conv = purple_find_conversation_with_account(
-					PURPLE_CONV_TYPE_IM, from,
-					slpcall->slplink->session->account);
-			if (conv) {
-				char *buf;
-				buf = g_strdup_printf(
-						_("%s requests to view your "
-						"webcam, but this request is "
-						"not yet supported."), from);
-				purple_conversation_write(conv, NULL, buf,
-						PURPLE_MESSAGE_SYSTEM |
-						PURPLE_MESSAGE_NOTIFY,
-						time(NULL));
-				g_free(buf);
-			}
-		}
-
-	} else if (!strcmp(euf_guid, MSN_CAM_GUID)) {
-		purple_debug_info("msn", "Cam invite.\n");
-		if (slpcall && slpcall->slplink &&
-				slpcall->slplink->session) {
-			PurpleConversation *conv;
-			gchar *from = slpcall->slplink->remote_user;
-			conv = purple_find_conversation_with_account(
-					PURPLE_CONV_TYPE_IM, from,
-					slpcall->slplink->session->account);
-			if (conv) {
-				char *buf;
-				buf = g_strdup_printf(
-						_("%s invited you to view his/her webcam, but "
-						"this is not yet supported."), from);
-				purple_conversation_write(conv, NULL, buf,
-						PURPLE_MESSAGE_SYSTEM |
-						PURPLE_MESSAGE_NOTIFY,
-						time(NULL));
-				g_free(buf);
-			}
-		}
-
-	} else
-		purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid);
-
-	if (!accepted) {
-		char *content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-		                                slpcall->session_id);
-		msn_slp_send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
-		g_free(content);
-	}
-}
-
-void
-send_bye(MsnSlpCall *slpcall, const char *type)
-{
-	MsnSlpLink *slplink;
-	PurpleAccount *account;
-	MsnSlpMessage *slpmsg;
-	char *header;
-
-	slplink = slpcall->slplink;
-
-	g_return_if_fail(slplink != NULL);
-
-	account = slplink->session->account;
-
-	header = g_strdup_printf("BYE MSNMSGR:%s MSNSLP/1.0",
-							 purple_account_get_username(account));
-
-	slpmsg = msn_slpmsg_sip_new(slpcall, 0, header,
-								"A0D624A6-6C0C-4283-A9E0-BC97B4B46D32",
-								type,
-								"\r\n");
-	g_free(header);
-
-	slpmsg->info = "SLP BYE";
-	slpmsg->text_body = TRUE;
-
-	msn_slplink_queue_slpmsg(slplink, slpmsg);
-}
-
-static void
-got_invite(MsnSlpCall *slpcall,
-		   const char *branch, const char *type, const char *content)
-{
-	MsnSlpLink *slplink;
-
-	slplink = slpcall->slplink;
-
-	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
-	{
-		char *euf_guid, *context;
-		char *temp;
-
-		euf_guid = get_token(content, "EUF-GUID: {", "}\r\n");
-
-		temp = get_token(content, "SessionID: ", "\r\n");
-		if (temp != NULL)
-			slpcall->session_id = atoi(temp);
-		g_free(temp);
-
-		temp = get_token(content, "AppID: ", "\r\n");
-		if (temp != NULL)
-			slpcall->app_id = atoi(temp);
-		g_free(temp);
-
-		context = get_token(content, "Context: ", "\r\n");
-
-		if (context != NULL)
-			got_sessionreq(slpcall, branch, euf_guid, context);
-
-		g_free(context);
-		g_free(euf_guid);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
-	{
-		/* A direct connection negotiation request */
-		char *bridges;
-		char *nonce;
-		MsnDirectConnNonceType ntype;
-
-		purple_debug_info("msn", "got_invite: transreqbody received\n");
-
-		/* Direct connections may be disabled. */
-		if (!purple_account_get_bool(slplink->session->account, "direct_connect", TRUE)) {
-			msn_slp_send_ok(slpcall, branch,
-				"application/x-msnmsgr-transrespbody",
-				"Bridge: TCPv1\r\n"
-				"Listening: false\r\n"
-				"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
-				"\r\n");
-			msn_slpcall_session_init(slpcall);
-
-			return;
-		}
-
-		/* Don't do anything if we already have a direct connection */
-		if (slplink->dc != NULL)
-			return;
-
-		bridges = get_token(content, "Bridges: ", "\r\n");
-		nonce = parse_dc_nonce(content, &ntype);
-		if (bridges && strstr(bridges, "TCPv1") != NULL) {
-			/*
-			 * Ok, the client supports direct TCP connection
-			 * Try to create a listening port
-			 */
-			MsnDirectConn *dc;
-
-			dc = msn_dc_new(slpcall);
-			if (ntype == DC_NONCE_PLAIN) {
-				/* There is only one nonce for plain auth. */
-				dc->nonce_type = ntype;
-				memcpy(dc->nonce, nonce, 16);
-			} else if (ntype == DC_NONCE_SHA1) {
-				/* Each side has a nonce in SHA1 auth. */
-				dc->nonce_type = ntype;
-				strncpy(dc->remote_nonce, nonce, 36);
-				dc->remote_nonce[36] = '\0';
-			}
-
-			dc->listen_data = purple_network_listen_range(
-				0, 0,
-				SOCK_STREAM,
-				msn_dc_listen_socket_created_cb,
-				dc
-			);
-
-			if (dc->listen_data == NULL) {
-				/* Listen socket creation failed */
-
-				purple_debug_info("msn", "got_invite: listening failed\n");
-
-				if (dc->nonce_type != DC_NONCE_PLAIN)
-					msn_slp_send_ok(slpcall, branch,
-						"application/x-msnmsgr-transrespbody",
-						"Bridge: TCPv1\r\n"
-						"Listening: false\r\n"
-						"Hashed-Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
-						"\r\n");
-				else
-					msn_slp_send_ok(slpcall, branch,
-						"application/x-msnmsgr-transrespbody",
-						"Bridge: TCPv1\r\n"
-						"Listening: false\r\n"
-						"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
-						"\r\n");
-
-			} else {
-				/*
-				 * Listen socket created successfully.
-				 * Don't send anything here because we don't know the parameters
-				 * of the created socket yet. msn_dc_send_ok will be called from
-				 * the callback function: dc_listen_socket_created_cb
-				 */
-				purple_debug_info("msn", "got_invite: listening socket created\n");
-
-				dc->send_connection_info_msg_cb = msn_dc_send_ok;
-				slpcall->wait_for_socket = TRUE;
-			}
-
-		} else {
-			/*
-			 * Invalid direct connect invitation or
-			 * TCP connection is not supported.
-			 */
-		}
-
-		g_free(nonce);
-		g_free(bridges);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
-	{
-		/* A direct connection negotiation response */
-		msn_slp_process_transresp(slpcall, content);
-	}
-}
-
-static void
-got_ok(MsnSlpCall *slpcall,
-	   const char *type, const char *content)
-{
-	g_return_if_fail(slpcall != NULL);
-	g_return_if_fail(type    != NULL);
-
-	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
-	{
-		char *content;
-		char *header;
-		char *nonce = NULL;
-		MsnSession *session = slpcall->slplink->session;
-		MsnSlpMessage *msg;
-		MsnDirectConn *dc;
-		MsnUser *user;
-
-		if (!purple_account_get_bool(session->account, "direct_connect", TRUE)) {
-			/* Don't attempt a direct connection if disabled. */
-			msn_slpcall_session_init(slpcall);
-			return;
-		}
-
-		if (slpcall->slplink->dc != NULL) {
-			/* If we already have an established direct connection
-			 * then just start the transfer.
-			 */
-			msn_slpcall_session_init(slpcall);
-			return;
-		}
-
-		user = msn_userlist_find_user(session->userlist,
-		                              slpcall->slplink->remote_user);
-		if (!user || !(user->clientid & 0xF0000000))	{
-			/* Just start a normal SB transfer. */
-			msn_slpcall_session_init(slpcall);
-			return;
-		}
-
-		/* Try direct file transfer by sending a second INVITE */
-		dc = msn_dc_new(slpcall);
-		slpcall->branch = rand_guid();
-
-		dc->listen_data = purple_network_listen_range(
-			0, 0,
-			SOCK_STREAM,
-			msn_dc_listen_socket_created_cb,
-			dc
-		);
-
-		header = g_strdup_printf(
-			"INVITE MSNMSGR:%s MSNSLP/1.0",
-			slpcall->slplink->remote_user
-		);
-
-		if (dc->nonce_type == DC_NONCE_SHA1)
-			nonce = g_strdup_printf("Hashed-Nonce: {%s}\r\n", dc->nonce_hash);
-
-		if (dc->listen_data == NULL) {
-			/* Listen socket creation failed */
-			purple_debug_info("msn", "got_ok: listening failed\n");
-
-			content = g_strdup_printf(
-				"Bridges: TCPv1\r\n"
-				"NetID: %u\r\n"
-				"Conn-Type: IP-Restrict-NAT\r\n"
-				"UPnPNat: false\r\n"
-				"ICF: false\r\n"
-				"%s"
-				"\r\n",
-
-				rand() % G_MAXUINT32,
-				nonce ? nonce : ""
-			);
-
-		} else {
-			/* Listen socket created successfully. */
-			purple_debug_info("msn", "got_ok: listening socket created\n");
-
-			content = g_strdup_printf(
-				"Bridges: TCPv1\r\n"
-				"NetID: 0\r\n"
-				"Conn-Type: Direct-Connect\r\n"
-				"UPnPNat: false\r\n"
-				"ICF: false\r\n"
-				"%s"
-				"\r\n",
-
-				nonce ? nonce : ""
-			);
-		}
-
-		msg = msn_slpmsg_sip_new(
-			slpcall,
-			0,
-			header,
-			slpcall->branch,
-			"application/x-msnmsgr-transreqbody",
-			content
-		);
-		msg->info = "DC INVITE";
-		msg->text_body = TRUE;
-		g_free(nonce);
-		g_free(header);
-		g_free(content);
-
-		msn_slplink_queue_slpmsg(slpcall->slplink, msg);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
-	{
-		/* Do we get this? */
-		purple_debug_info("msn", "OK with transreqbody\n");
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
-	{
-		msn_slp_process_transresp(slpcall, content);
-	}
-}
-
-static void
-got_error(MsnSlpCall *slpcall,
-          const char *error, const char *type, const char *content)
-{
-	/* It's not valid. Kill this off. */
-	purple_debug_error("msn", "Received non-OK result: %s\n",
-	                   error ? error : "Unknown");
-
-	if (type && (!strcmp(type, "application/x-msnmsgr-transreqbody")
-	          || !strcmp(type, "application/x-msnmsgr-transrespbody"))) {
-		MsnDirectConn *dc = slpcall->slplink->dc;
-		if (dc) {
-			msn_dc_fallback_to_sb(dc);
-			return;
-		}
-	}
-
-	slpcall->wasted = TRUE;
-}
-
-MsnSlpCall *
-msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
-{
-	MsnSlpCall *slpcall;
-
-	if (body == NULL)
-	{
-		purple_debug_warning("msn", "received bogus message\n");
-		return NULL;
-	}
-
-	if (!strncmp(body, "INVITE", strlen("INVITE")))
-	{
-		char *branch;
-		char *call_id;
-		char *content;
-		char *content_type;
-
-		/* From: <msnmsgr:buddy@hotmail.com> */
-#if 0
-		slpcall->remote_user = get_token(body, "From: <msnmsgr:", ">\r\n");
-#endif
-
-		branch = get_token(body, ";branch={", "}");
-
-		call_id = get_token(body, "Call-ID: {", "}");
-
-#if 0
-		long content_len = -1;
-
-		temp = get_token(body, "Content-Length: ", "\r\n");
-		if (temp != NULL)
-			content_len = atoi(temp);
-		g_free(temp);
-#endif
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		slpcall = NULL;
-		if (branch && call_id)
-		{
-			slpcall = msn_slplink_find_slp_call(slplink, call_id);
-			if (slpcall)
-			{
-				g_free(slpcall->branch);
-				slpcall->branch = g_strdup(branch);
-				got_invite(slpcall, branch, content_type, content);
-			}
-			else if (content_type && content)
-			{
-				slpcall = msn_slpcall_new(slplink);
-				slpcall->id = g_strdup(call_id);
-				got_invite(slpcall, branch, content_type, content);
-			}
-		}
-
-		g_free(call_id);
-		g_free(branch);
-		g_free(content_type);
-		g_free(content);
-	}
-	else if (!strncmp(body, "MSNSLP/1.0 ", strlen("MSNSLP/1.0 ")))
-	{
-		char *content;
-		char *content_type;
-		/* Make sure this is "OK" */
-		const char *status = body + strlen("MSNSLP/1.0 ");
-		char *call_id;
-
-		call_id = get_token(body, "Call-ID: {", "}");
-		slpcall = msn_slplink_find_slp_call(slplink, call_id);
-		g_free(call_id);
-
-		g_return_val_if_fail(slpcall != NULL, NULL);
-
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		if (strncmp(status, "200 OK", 6))
-		{
-			char *error = NULL;
-			const char *c;
-
-			/* Eww */
-			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
-				(c = strchr(status, '\0')))
-			{
-				size_t len = c - status;
-				error = g_strndup(status, len);
-			}
-
-			got_error(slpcall, error, content_type, content);
-			g_free(error);
-
-		} else {
-			/* Everything's just dandy */
-			got_ok(slpcall, content_type, content);
-		}
-
-		g_free(content_type);
-		g_free(content);
-	}
-	else if (!strncmp(body, "BYE", strlen("BYE")))
-	{
-		char *call_id;
-
-		call_id = get_token(body, "Call-ID: {", "}");
-		slpcall = msn_slplink_find_slp_call(slplink, call_id);
-		g_free(call_id);
-
-		if (slpcall != NULL)
-			slpcall->wasted = TRUE;
-
-		/* msn_slpcall_destroy(slpcall); */
-	}
-	else
-		slpcall = NULL;
-
-	return slpcall;
-}
-
 /**************************************************************************
  * Msg Callbacks
  **************************************************************************/
 
-void
-msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-	const char *data;
-	gsize len;
-
-	session = cmdproc->servconn->session;
-	slplink = msn_session_get_slplink(session, msg->remote_user);
-
-	if (slplink->swboard == NULL)
-	{
-		/*
-		 * We will need swboard in order to change its flags.  If its
-		 * NULL, something has probably gone wrong earlier on.  I
-		 * didn't want to do this, but MSN 7 is somehow causing us
-		 * to crash here, I couldn't reproduce it to debug more,
-		 * and people are reporting bugs. Hopefully this doesn't
-		 * cause more crashes. Stu.
-		 */
-		if (cmdproc->data == NULL)
-			g_warning("msn_p2p_msg cmdproc->data was NULL\n");
-		else {
-			slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-	}
-
-	data = msn_message_get_bin_data(msg, &len);
-
-	msn_slplink_process_msg(slplink, &msg->msnslp_header, data, len);
-}
-
-static void
-got_emoticon(MsnSlpCall *slpcall,
-			 const guchar *data, gsize size)
-{
-	PurpleConversation *conv;
-	MsnSwitchBoard *swboard;
-
-	swboard = slpcall->slplink->swboard;
-	conv = swboard->conv;
-
-	if (conv) {
-		/* FIXME: it would be better if we wrote the data as we received it
-		   instead of all at once, calling write multiple times and
-		   close once at the very end
-		 */
-		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
-		purple_conv_custom_smiley_close(conv, slpcall->data_info );
-	}
-	if (purple_debug_is_verbose())
-		purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
-}
-
-void
-msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-	MsnSwitchBoard *swboard;
-	MsnObject *obj;
-	char **tokens;
-	char *smile, *body_str;
-	const char *body, *who, *sha1;
-	guint tok;
-	size_t body_len;
-
-	PurpleConversation *conv;
-
-	session = cmdproc->servconn->session;
-
-	if (!purple_account_get_bool(session->account, "custom_smileys", TRUE))
-		return;
-
-	swboard = cmdproc->data;
-	conv = swboard->conv;
-
-	body = msn_message_get_bin_data(msg, &body_len);
-	if (!body || !body_len)
-		return;
-	body_str = g_strndup(body, body_len);
-
-	/* MSN Messenger 7 may send more than one MSNObject in a single message...
-	 * Maybe 10 tokens is a reasonable max value. */
-	tokens = g_strsplit(body_str, "\t", 10);
-
-	g_free(body_str);
-
-	for (tok = 0; tok < 9; tok += 2) {
-		if (tokens[tok] == NULL || tokens[tok + 1] == NULL) {
-			break;
-		}
-
-		smile = tokens[tok];
-		obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1]));
-
-		if (obj == NULL)
-			break;
-
-		who = msn_object_get_creator(obj);
-		sha1 = msn_object_get_sha1(obj);
-
-		slplink = msn_session_get_slplink(session, who);
-		if (slplink->swboard != swboard) {
-			if (slplink->swboard != NULL)
-				/*
-				 * Apparently we're using a different switchboard now or
-				 * something?  I don't know if this is normal, but it
-				 * definitely happens.  So make sure the old switchboard
-				 * doesn't still have a reference to us.
-				 */
-				slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
-			slplink->swboard = swboard;
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-
-		/* If the conversation doesn't exist then this is a custom smiley
-		 * used in the first message in a MSN conversation: we need to create
-		 * the conversation now, otherwise the custom smiley won't be shown.
-		 * This happens because every GtkIMHtml has its own smiley tree: if
-		 * the conversation doesn't exist then we cannot associate the new
-		 * smiley with its GtkIMHtml widget. */
-		if (!conv) {
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
-		}
-
-		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
-			msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
-		}
-
-		msn_object_destroy(obj);
-		obj =   NULL;
-		who =   NULL;
-		sha1 = NULL;
-	}
-	g_strfreev(tokens);
-}
-
-static gboolean
-buddy_icon_cached(PurpleConnection *gc, MsnObject *obj)
-{
-	PurpleAccount *account;
-	PurpleBuddy *buddy;
-	const char *old;
-	const char *new;
-
-	g_return_val_if_fail(obj != NULL, FALSE);
-
-	account = purple_connection_get_account(gc);
-
-	buddy = purple_find_buddy(account, msn_object_get_creator(obj));
-	if (buddy == NULL)
-		return FALSE;
-
-	old = purple_buddy_icons_get_checksum_for_user(buddy);
-	new = msn_object_get_sha1(obj);
-
-	if (new == NULL)
-		return FALSE;
-
-	/* If the old and new checksums are the same, and the file actually exists,
-	 * then return TRUE */
-	if (old != NULL && !strcmp(old, new))
-		return TRUE;
-
-	return FALSE;
-}
-
-static void
-msn_release_buddy_icon_request(MsnUserList *userlist)
-{
-	MsnUser *user;
-
-	g_return_if_fail(userlist != NULL);
-
-	if (purple_debug_is_verbose())
-		purple_debug_info("msn", "Releasing buddy icon request\n");
-
-	if (userlist->buddy_icon_window > 0)
-	{
-		GQueue *queue;
-		PurpleAccount *account;
-		const char *username;
-
-		queue = userlist->buddy_icon_requests;
-
-		if (g_queue_is_empty(userlist->buddy_icon_requests))
-			return;
-
-		user = g_queue_pop_head(queue);
-
-		account  = userlist->session->account;
-		username = user->passport;
-
-		userlist->buddy_icon_window--;
-		request_user_display(user);
-
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn",
-			                  "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
-			                  userlist->buddy_icon_window);
-	}
-}
-
 /*
  * Called on a timeout from end_user_display(). Frees a buddy icon window slow and dequeues the next
  * buddy icon request if there is one.
@@ -1306,48 +114,10 @@ msn_release_buddy_icon_request_timeout(gpointer data)
 	return FALSE;
 }
 
-void
-msn_queue_buddy_icon_request(MsnUser *user)
-{
-	PurpleAccount *account;
-	MsnObject *obj;
-	GQueue *queue;
-
-	g_return_if_fail(user != NULL);
-
-	account = user->userlist->session->account;
-
-	obj = msn_user_get_object(user);
-
-	if (obj == NULL)
-	{
-		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
-		return;
-	}
-
-	if (!buddy_icon_cached(account->gc, obj))
-	{
-		MsnUserList *userlist;
-
-		userlist = user->userlist;
-		queue = userlist->buddy_icon_requests;
-
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n",
-			                  user->passport, userlist->buddy_icon_window);
-
-		g_queue_push_tail(queue, user);
-
-		if (userlist->buddy_icon_window > 0)
-			msn_release_buddy_icon_request(userlist);
-	}
-}
-
 static void
 got_user_display(MsnSlpCall *slpcall,
 				 const guchar *data, gsize size)
 {
-	MsnUserList *userlist;
 	const char *info;
 	PurpleAccount *account;
 
@@ -1357,21 +127,10 @@ got_user_display(MsnSlpCall *slpcall,
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user);
 
-	userlist = slpcall->slplink->session->userlist;
 	account = slpcall->slplink->session->account;
 
 	purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user,
 								  g_memdup(data, size), size, info);
-
-#if 0
-	/* Free one window slot */
-	userlist->buddy_icon_window++;
-
-	purple_debug_info("msn", "got_user_display(): buddy_icon_window++ yields =%d\n",
-					userlist->buddy_icon_window);
-
-	msn_release_buddy_icon_request(userlist);
-#endif
 }
 
 static void
@@ -1431,7 +190,43 @@ fetched_user_display(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 }
 
 static void
-request_user_display(MsnUser *user)
+request_own_user_display(MsnUser *user)
+{
+	PurpleAccount *account;
+	MsnSession *session;
+	MsnObject *my_obj = NULL;
+	gconstpointer data = NULL;
+	const char *info = NULL;
+	size_t len = 0;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Requesting our own user display\n");
+
+	session = user->userlist->session;
+	account = session->account;
+	my_obj = msn_user_get_object(user);
+
+	if (my_obj != NULL) {
+		PurpleStoredImage *img = msn_object_get_image(my_obj);
+		data = purple_imgstore_get_data(img);
+		len = purple_imgstore_get_size(img);
+		info = msn_object_get_sha1(my_obj);
+	}
+
+	purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info);
+
+	/* Free one window slot */
+	session->userlist->buddy_icon_window++;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_request_user_display(): buddy_icon_window++ yields =%d\n",
+				session->userlist->buddy_icon_window);
+
+	msn_release_buddy_icon_request(session->userlist);
+}
+
+void
+msn_request_user_display(MsnUser *user)
 {
 	PurpleAccount *account;
 	MsnSession *session;
@@ -1467,32 +262,134 @@ request_user_display(MsnUser *user)
 		}
 	}
 	else
-	{
-		MsnObject *my_obj = NULL;
-		gconstpointer data = NULL;
-		size_t len = 0;
+		request_own_user_display(user);
+}
 
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn", "Requesting our own user display\n");
+static void
+send_file_cb(MsnSlpCall *slpcall)
+{
+	MsnSlpMessage *slpmsg;
+	PurpleXfer *xfer;
 
-		my_obj = msn_user_get_object(session->user);
+	xfer = (PurpleXfer *)slpcall->xfer;
+	if (purple_xfer_get_status(xfer) >= PURPLE_XFER_STATUS_STARTED)
+		return;
 
-		if (my_obj != NULL)
-		{
-			PurpleStoredImage *img = msn_object_get_image(my_obj);
-			data = purple_imgstore_get_data(img);
-			len = purple_imgstore_get_size(img);
-		}
+	purple_xfer_ref(xfer);
+	purple_xfer_start(xfer, -1, NULL, 0);
+	if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) {
+		purple_xfer_unref(xfer);
+		return;
+	}
+	purple_xfer_unref(xfer);
+
+	slpmsg = msn_slpmsg_file_new(slpcall, purple_xfer_get_size(xfer));
+	msn_slpmsg_set_slplink(slpmsg, slpcall->slplink);
+
+	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
+}
+
+static gchar *
+gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path)
+{
+	gsize size = 0;
+	MsnFileContext *header;
+	gchar *u8 = NULL;
+	gchar *ret;
+	gunichar2 *uni = NULL;
+	glong currentChar = 0;
+	glong len = 0;
+	const char *preview;
+	gsize preview_len;
+
+	size = purple_xfer_get_size(xfer);
+
+	purple_xfer_prepare_thumbnail(xfer, "png");
+
+	if (!file_name) {
+		gchar *basename = g_path_get_basename(file_path);
+		u8 = purple_utf8_try_convert(basename);
+		g_free(basename);
+		file_name = u8;
+	}
+
+	uni = g_utf8_to_utf16(file_name, -1, NULL, &len, NULL);
 
-		purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info);
+	if (u8) {
+		g_free(u8);
+		file_name = NULL;
+		u8 = NULL;
+	}
+
+	preview = purple_xfer_get_thumbnail(xfer, &preview_len);
+	header = g_malloc(sizeof(MsnFileContext) + preview_len);
 
-		/* Free one window slot */
-		session->userlist->buddy_icon_window++;
+	header->length = GUINT32_TO_LE(sizeof(MsnFileContext) - 1);
+	header->version = GUINT32_TO_LE(2); /* V.3 contains additional unnecessary data */
+	header->file_size = GUINT64_TO_LE(size);
+	if (preview)
+		header->type = GUINT32_TO_LE(0);
+	else
+		header->type = GUINT32_TO_LE(1);
 
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n",
-			                  session->userlist->buddy_icon_window);
+	len = MIN(len, MAX_FILE_NAME_LEN);
+	for (currentChar = 0; currentChar < len; currentChar++) {
+		header->file_name[currentChar] = GUINT16_TO_LE(uni[currentChar]);
+	}
+	memset(&header->file_name[currentChar], 0x00, (MAX_FILE_NAME_LEN - currentChar) * 2);
 
-		msn_release_buddy_icon_request(session->userlist);
+	memset(&header->unknown1, 0, sizeof(header->unknown1));
+	header->unknown2 = GUINT32_TO_LE(0xffffffff);
+	if (preview) {
+		memcpy(&header->preview, preview, preview_len);
 	}
+	header->preview[preview_len] = '\0';
+
+	g_free(uni);
+	ret = purple_base64_encode((const guchar *)header, sizeof(MsnFileContext) + preview_len);
+	g_free(header);
+	return ret;
 }
+
+void
+msn_request_ft(PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	MsnSlpLink *slplink;
+	char *context;
+	const char *fn;
+	const char *fp;
+
+	fn = purple_xfer_get_filename(xfer);
+	fp = purple_xfer_get_local_filename(xfer);
+
+	slplink = xfer->data;
+
+	g_return_if_fail(slplink != NULL);
+	g_return_if_fail(fp != NULL);
+
+	slpcall = msn_slpcall_new(slplink);
+	msn_slpcall_init(slpcall, MSN_SLPCALL_DC);
+
+	slpcall->session_init_cb = send_file_cb;
+	slpcall->end_cb = msn_xfer_end_cb;
+	slpcall->cb = msn_xfer_completed_cb;
+	slpcall->xfer = xfer;
+	purple_xfer_ref(slpcall->xfer);
+
+	slpcall->pending = TRUE;
+
+	purple_xfer_set_cancel_send_fnc(xfer, msn_xfer_cancel);
+	purple_xfer_set_read_fnc(xfer, msn_xfer_read);
+	purple_xfer_set_write_fnc(xfer, msn_xfer_write);
+
+	xfer->data = slpcall;
+
+	context = gen_context(xfer, fn, fp);
+
+	msn_slpcall_invite(slpcall, MSN_FT_GUID, P2P_APPID_FILE, context);
+	msn_slplink_unref(slplink);
+
+	g_free(context);
+}
+
diff --git a/libpurple/protocols/msn/slp.h b/libpurple/protocols/msn/slp.h
index 4539adfa7f..69c0b46dc2 100644
--- a/libpurple/protocols/msn/slp.h
+++ b/libpurple/protocols/msn/slp.h
@@ -25,10 +25,12 @@
 #define MSN_SLP_H
 
 #include "internal.h"
-
 #include "ft.h"
+
 #include "session.h"
 #include "slpcall.h"
+#include "slplink.h"
+#include "user.h"
 
 #define MAX_FILE_NAME_LEN 260 /* MAX_PATH in Windows */
 
@@ -49,8 +51,6 @@ typedef struct
 } MsnFileContext;
 #pragma pack(pop)
 
-MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
-							  const char *body);
 void
 msn_slp_send_ok(MsnSlpCall *slpcall, const char *branch,
 		const char *type, const char *content);
@@ -62,15 +62,9 @@ msn_slp_send_decline(MsnSlpCall *slpcall, const char *branch,
 
 void send_bye(MsnSlpCall *slpcall, const char *type);
 
-void msn_xfer_completed_cb(MsnSlpCall *slpcall,
-						   const guchar *body, gsize size);
-
-void msn_xfer_cancel(PurpleXfer *xfer);
-gssize msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer);
-gssize msn_xfer_read(guchar **data, PurpleXfer *xfer);
 
-void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
+void msn_request_user_display(MsnUser *user);
 
-void msn_queue_buddy_icon_request(MsnUser *user);
+void msn_request_ft(PurpleXfer *xfer);
 
 #endif /* MSN_SLP_H */
diff --git a/libpurple/protocols/msn/slpcall.c b/libpurple/protocols/msn/slpcall.c
index 569209d286..c46d7057ec 100644
--- a/libpurple/protocols/msn/slpcall.c
+++ b/libpurple/protocols/msn/slpcall.c
@@ -21,11 +21,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+#include "smiley.h"
+
 #include "msnutils.h"
 #include "slpcall.h"
 
 #include "slp.h"
+#include "p2p.h"
+#include "xfer.h"
 
 /**************************************************************************
  * Main
@@ -140,7 +146,7 @@ msn_slpcall_session_init(MsnSlpCall *slpcall)
 
 void
 msn_slpcall_invite(MsnSlpCall *slpcall, const char *euf_guid,
-					int app_id, const char *context)
+					MsnP2PAppId app_id, const char *context)
 {
 	MsnSlpLink *slplink;
 	MsnSlpMessage *slpmsg;
@@ -190,6 +196,859 @@ msn_slpcall_close(MsnSlpCall *slpcall)
 	msn_slpcall_destroy(slpcall);
 }
 
+/*****************************************************************************
+ * Parse received SLP messages
+ ****************************************************************************/
+
+/**************************************************************************
+ *** Util
+ **************************************************************************/
+
+static char *
+get_token(const char *str, const char *start, const char *end)
+{
+	const char *c, *c2;
+
+	if ((c = strstr(str, start)) == NULL)
+		return NULL;
+
+	c += strlen(start);
+
+	if (end != NULL)
+	{
+		if ((c2 = strstr(c, end)) == NULL)
+			return NULL;
+
+		return g_strndup(c, c2 - c);
+	}
+	else
+	{
+		/* This has to be changed */
+		return g_strdup(c);
+	}
+
+}
+
+/* XXX: this could be improved if we tracked custom smileys
+ * per-protocol, per-account, per-session or (ideally) per-conversation
+ */
+static PurpleStoredImage *
+find_valid_emoticon(PurpleAccount *account, const char *path)
+{
+	GList *smileys;
+
+	if (!purple_account_get_bool(account, "custom_smileys", TRUE))
+		return NULL;
+
+	smileys = purple_smileys_get_all();
+
+	for (; smileys; smileys = g_list_delete_link(smileys, smileys)) {
+		PurpleSmiley *smiley;
+		PurpleStoredImage *img;
+
+		smiley = smileys->data;
+		img = purple_smiley_get_stored_image(smiley);
+
+		if (purple_strequal(path, purple_imgstore_get_filename(img))) {
+			g_list_free(smileys);
+			return img;
+		}
+
+		purple_imgstore_unref(img);
+	}
+
+	purple_debug_error("msn", "Received illegal request for file %s\n", path);
+	return NULL;
+}
+
+static char *
+parse_dc_nonce(const char *content, MsnDirectConnNonceType *ntype)
+{
+	char *nonce;
+
+	*ntype = DC_NONCE_UNKNOWN;
+
+	nonce = get_token(content, "Hashed-Nonce: {", "}\r\n");
+	if (nonce) {
+		*ntype = DC_NONCE_SHA1;
+	} else {
+		guint32 n1, n6;
+		guint16 n2, n3, n4, n5;
+		nonce = get_token(content, "Nonce: {", "}\r\n");
+		if (nonce
+		 && sscanf(nonce, "%08x-%04hx-%04hx-%04hx-%04hx%08x",
+		           &n1, &n2, &n3, &n4, &n5, &n6) == 6) {
+			*ntype = DC_NONCE_PLAIN;
+			g_free(nonce);
+			nonce = g_malloc(16);
+			*(guint32 *)(nonce +  0) = GUINT32_TO_LE(n1);
+			*(guint16 *)(nonce +  4) = GUINT16_TO_LE(n2);
+			*(guint16 *)(nonce +  6) = GUINT16_TO_LE(n3);
+			*(guint16 *)(nonce +  8) = GUINT16_TO_BE(n4);
+			*(guint16 *)(nonce + 10) = GUINT16_TO_BE(n5);
+			*(guint32 *)(nonce + 12) = GUINT32_TO_BE(n6);
+		} else {
+			/* Invalid nonce, so ignore request */
+			g_free(nonce);
+			nonce = NULL;
+		}
+	}
+
+	return nonce;
+}
+
+static void
+msn_slp_process_transresp(MsnSlpCall *slpcall, const char *content)
+{
+	/* A direct connection negotiation response */
+	char *bridge;
+	char *nonce;
+	char *listening;
+	MsnDirectConn *dc = slpcall->slplink->dc;
+	MsnDirectConnNonceType ntype;
+
+	purple_debug_info("msn", "process_transresp\n");
+
+	/* Direct connections are disabled. */
+	if (!purple_account_get_bool(slpcall->slplink->session->account, "direct_connect", TRUE))
+		return;
+
+	g_return_if_fail(dc != NULL);
+	g_return_if_fail(dc->state == DC_STATE_CLOSED);
+
+	bridge = get_token(content, "Bridge: ", "\r\n");
+	nonce = parse_dc_nonce(content, &ntype);
+	listening = get_token(content, "Listening: ", "\r\n");
+	if (listening && bridge && !strcmp(bridge, "TCPv1")) {
+		/* Ok, the client supports direct TCP connection */
+
+		/* We always need this. */
+		if (ntype == DC_NONCE_SHA1) {
+			strncpy(dc->remote_nonce, nonce, 36);
+			dc->remote_nonce[36] = '\0';
+		}
+
+		if (!strcasecmp(listening, "false")) {
+			if (dc->listen_data != NULL) {
+				/*
+				 * We'll listen for incoming connections but
+				 * the listening socket isn't ready yet so we cannot
+				 * send the INVITE packet now. Put the slpcall into waiting mode
+				 * and let the callback send the invite.
+				 */
+				slpcall->wait_for_socket = TRUE;
+
+			} else if (dc->listenfd != -1) {
+				/* The listening socket is ready. Send the INVITE here. */
+				msn_dc_send_invite(dc);
+
+			} else {
+				/* We weren't able to create a listener either. Use SB. */
+				msn_dc_fallback_to_sb(dc);
+			}
+
+		} else {
+			/*
+			 * We should connect to the client so parse
+			 * IP/port from response.
+			 */
+			char *ip, *port_str;
+			int port = 0;
+
+			if (ntype == DC_NONCE_PLAIN) {
+				/* Only needed for listening side. */
+				memcpy(dc->nonce, nonce, 16);
+			}
+
+			/* Cancel any listen attempts because we don't need them. */
+			if (dc->listenfd_handle != 0) {
+				purple_input_remove(dc->listenfd_handle);
+				dc->listenfd_handle = 0;
+			}
+			if (dc->connect_timeout_handle != 0) {
+				purple_timeout_remove(dc->connect_timeout_handle);
+				dc->connect_timeout_handle = 0;
+			}
+			if (dc->listenfd != -1) {
+				purple_network_remove_port_mapping(dc->listenfd);
+				close(dc->listenfd);
+				dc->listenfd = -1;
+			}
+			if (dc->listen_data != NULL) {
+				purple_network_listen_cancel(dc->listen_data);
+				dc->listen_data = NULL;
+			}
+
+			/* Save external IP/port for later use. We'll try local connection first. */
+			dc->ext_ip = get_token(content, "IPv4External-Addrs: ", "\r\n");
+			port_str = get_token(content, "IPv4External-Port: ", "\r\n");
+			if (port_str) {
+				dc->ext_port = atoi(port_str);
+				g_free(port_str);
+			}
+
+			ip = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
+			port_str = get_token(content, "IPv4Internal-Port: ", "\r\n");
+			if (port_str) {
+				port = atoi(port_str);
+				g_free(port_str);
+			}
+
+			if (ip && port) {
+				/* Try internal address first */
+				dc->connect_data = purple_proxy_connect(
+					NULL,
+					slpcall->slplink->session->account,
+					ip,
+					port,
+					msn_dc_connected_to_peer_cb,
+					dc
+				);
+
+				if (dc->connect_data) {
+					/* Add connect timeout handle */
+					dc->connect_timeout_handle = purple_timeout_add_seconds(
+						DC_OUTGOING_TIMEOUT,
+						msn_dc_outgoing_connection_timeout_cb,
+						dc
+					);
+				} else {
+					/*
+					 * Connection failed
+					 * Try external IP/port (if specified)
+					 */
+					msn_dc_outgoing_connection_timeout_cb(dc);
+				}
+
+			} else {
+				/*
+				 * Omitted or invalid internal IP address / port
+				 * Try external IP/port (if specified)
+				 */
+				msn_dc_outgoing_connection_timeout_cb(dc);
+			}
+
+			g_free(ip);
+		}
+
+	} else {
+		/*
+		 * Invalid direct connect invitation or
+		 * TCP connection is not supported
+		 */
+	}
+
+	g_free(listening);
+	g_free(nonce);
+	g_free(bridge);
+
+	return;
+}
+
+static void
+got_sessionreq(MsnSlpCall *slpcall, const char *branch,
+			   const char *euf_guid, const char *context)
+{
+	gboolean accepted = FALSE;
+
+	if (!strcmp(euf_guid, MSN_OBJ_GUID))
+	{
+		/* Emoticon or UserDisplay */
+		char *content;
+		gsize len;
+		MsnSlpLink *slplink;
+		MsnSlpMessage *slpmsg;
+		MsnObject *obj;
+		char *msnobj_data;
+		PurpleStoredImage *img = NULL;
+		int type;
+
+		/* Send Ok */
+		content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+								  slpcall->session_id);
+
+		msn_slp_send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
+				content);
+
+		g_free(content);
+
+		slplink = slpcall->slplink;
+
+		msnobj_data = (char *)purple_base64_decode(context, &len);
+		obj = msn_object_new_from_string(msnobj_data);
+		type = msn_object_get_type(obj);
+		g_free(msnobj_data);
+		if (type == MSN_OBJECT_EMOTICON) {
+			img = find_valid_emoticon(slplink->session->account, obj->location);
+		} else if (type == MSN_OBJECT_USERTILE) {
+			img = msn_object_get_image(obj);
+			if (img)
+				purple_imgstore_ref(img);
+		}
+		msn_object_destroy(obj);
+
+		if (img != NULL) {
+			/* DATA PREP */
+			slpmsg = msn_slpmsg_dataprep_new(slpcall);
+			msn_slpmsg_set_slplink(slpmsg, slplink);
+			msn_slplink_queue_slpmsg(slplink, slpmsg);
+
+			/* DATA */
+			slpmsg = msn_slpmsg_obj_new(slpcall, img);
+			msn_slpmsg_set_slplink(slpmsg, slplink);
+			msn_slplink_queue_slpmsg(slplink, slpmsg);
+			purple_imgstore_unref(img);
+
+			accepted = TRUE;
+
+		} else {
+			purple_debug_error("msn", "Wrong object.\n");
+		}
+	}
+
+	else if (!strcmp(euf_guid, MSN_FT_GUID))
+	{
+		/* File Transfer */
+		PurpleAccount *account;
+		PurpleXfer *xfer;
+		MsnFileContext *header;
+		gsize bin_len;
+		guint32 file_size;
+		char *file_name;
+
+		account = slpcall->slplink->session->account;
+
+		slpcall->end_cb = msn_xfer_end_cb;
+		slpcall->branch = g_strdup(branch);
+
+		slpcall->pending = TRUE;
+
+		xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE,
+							 slpcall->slplink->remote_user);
+
+		header = (MsnFileContext *)purple_base64_decode(context, &bin_len);
+		if (header != NULL && bin_len >= sizeof(MsnFileContext) - 1 &&
+			(header->version == 2 ||
+			 (header->version == 3 && header->length == sizeof(MsnFileContext) + 63))) {
+			file_size = GUINT64_FROM_LE(header->file_size);
+
+			file_name = g_convert((const gchar *)&header->file_name,
+			                      MAX_FILE_NAME_LEN * 2,
+			                      "UTF-8", "UTF-16LE",
+			                      NULL, NULL, NULL);
+
+			purple_xfer_set_filename(xfer, file_name ? file_name : "");
+			g_free(file_name);
+			purple_xfer_set_size(xfer, file_size);
+			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
+			purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel);
+			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
+			purple_xfer_set_read_fnc(xfer, msn_xfer_read);
+			purple_xfer_set_write_fnc(xfer, msn_xfer_write);
+
+			slpcall->u.incoming_data = g_byte_array_new();
+
+			slpcall->xfer = xfer;
+			purple_xfer_ref(slpcall->xfer);
+
+			xfer->data = slpcall;
+
+			if (header->type == 0 && bin_len >= sizeof(MsnFileContext)) {
+				purple_xfer_set_thumbnail(xfer, &header->preview,
+				                          bin_len - sizeof(MsnFileContext),
+				    					  "image/png");
+			}
+
+			purple_xfer_request(xfer);
+		}
+		g_free(header);
+
+		accepted = TRUE;
+
+	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
+		purple_debug_info("msn", "Cam request.\n");
+		if (slpcall->slplink && slpcall->slplink->session) {
+			PurpleConversation *conv;
+			gchar *from = slpcall->slplink->remote_user;
+			conv = purple_find_conversation_with_account(
+					PURPLE_CONV_TYPE_IM, from,
+					slpcall->slplink->session->account);
+			if (conv) {
+				char *buf;
+				buf = g_strdup_printf(
+						_("%s requests to view your "
+						"webcam, but this request is "
+						"not yet supported."), from);
+				purple_conversation_write(conv, NULL, buf,
+						PURPLE_MESSAGE_SYSTEM |
+						PURPLE_MESSAGE_NOTIFY,
+						time(NULL));
+				g_free(buf);
+			}
+		}
+
+	} else if (!strcmp(euf_guid, MSN_CAM_GUID)) {
+		purple_debug_info("msn", "Cam invite.\n");
+		if (slpcall->slplink && slpcall->slplink->session) {
+			PurpleConversation *conv;
+			gchar *from = slpcall->slplink->remote_user;
+			conv = purple_find_conversation_with_account(
+					PURPLE_CONV_TYPE_IM, from,
+					slpcall->slplink->session->account);
+			if (conv) {
+				char *buf;
+				buf = g_strdup_printf(
+						_("%s invited you to view his/her webcam, but "
+						"this is not yet supported."), from);
+				purple_conversation_write(conv, NULL, buf,
+						PURPLE_MESSAGE_SYSTEM |
+						PURPLE_MESSAGE_NOTIFY,
+						time(NULL));
+				g_free(buf);
+			}
+		}
+
+	} else
+		purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid);
+
+	if (!accepted) {
+		char *content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+		                                slpcall->session_id);
+		msn_slp_send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
+		g_free(content);
+	}
+}
+
+void
+send_bye(MsnSlpCall *slpcall, const char *type)
+{
+	MsnSlpLink *slplink;
+	PurpleAccount *account;
+	MsnSlpMessage *slpmsg;
+	char *header;
+
+	slplink = slpcall->slplink;
+
+	g_return_if_fail(slplink != NULL);
+
+	account = slplink->session->account;
+
+	header = g_strdup_printf("BYE MSNMSGR:%s MSNSLP/1.0",
+							 purple_account_get_username(account));
+
+	slpmsg = msn_slpmsg_sip_new(slpcall, 0, header,
+								"A0D624A6-6C0C-4283-A9E0-BC97B4B46D32",
+								type,
+								"\r\n");
+	g_free(header);
+
+	slpmsg->info = "SLP BYE";
+	slpmsg->text_body = TRUE;
+
+	msn_slplink_queue_slpmsg(slplink, slpmsg);
+}
+
+static void
+got_invite(MsnSlpCall *slpcall,
+		   const char *branch, const char *type, const char *content)
+{
+	MsnSlpLink *slplink;
+
+	slplink = slpcall->slplink;
+
+	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
+	{
+		char *euf_guid, *context;
+		char *temp;
+
+		euf_guid = get_token(content, "EUF-GUID: {", "}\r\n");
+
+		temp = get_token(content, "SessionID: ", "\r\n");
+		if (temp != NULL)
+			slpcall->session_id = atoi(temp);
+		g_free(temp);
+
+		temp = get_token(content, "AppID: ", "\r\n");
+		if (temp != NULL)
+			slpcall->app_id = atoi(temp);
+		g_free(temp);
+
+		context = get_token(content, "Context: ", "\r\n");
+
+		if (context != NULL)
+			got_sessionreq(slpcall, branch, euf_guid, context);
+
+		g_free(context);
+		g_free(euf_guid);
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
+	{
+		/* A direct connection negotiation request */
+		char *bridges;
+		char *nonce;
+		MsnDirectConnNonceType ntype;
+
+		purple_debug_info("msn", "got_invite: transreqbody received\n");
+
+		/* Direct connections may be disabled. */
+		if (!purple_account_get_bool(slplink->session->account, "direct_connect", TRUE)) {
+			msn_slp_send_ok(slpcall, branch,
+				"application/x-msnmsgr-transrespbody",
+				"Bridge: TCPv1\r\n"
+				"Listening: false\r\n"
+				"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+				"\r\n");
+			msn_slpcall_session_init(slpcall);
+
+			return;
+		}
+
+		/* Don't do anything if we already have a direct connection */
+		if (slplink->dc != NULL)
+			return;
+
+		bridges = get_token(content, "Bridges: ", "\r\n");
+		nonce = parse_dc_nonce(content, &ntype);
+		if (bridges && strstr(bridges, "TCPv1") != NULL) {
+			/*
+			 * Ok, the client supports direct TCP connection
+			 * Try to create a listening port
+			 */
+			MsnDirectConn *dc;
+
+			dc = msn_dc_new(slpcall);
+			if (ntype == DC_NONCE_PLAIN) {
+				/* There is only one nonce for plain auth. */
+				dc->nonce_type = ntype;
+				memcpy(dc->nonce, nonce, 16);
+			} else if (ntype == DC_NONCE_SHA1) {
+				/* Each side has a nonce in SHA1 auth. */
+				dc->nonce_type = ntype;
+				strncpy(dc->remote_nonce, nonce, 36);
+				dc->remote_nonce[36] = '\0';
+			}
+
+			dc->listen_data = purple_network_listen_range(
+				0, 0,
+				SOCK_STREAM,
+				msn_dc_listen_socket_created_cb,
+				dc
+			);
+
+			if (dc->listen_data == NULL) {
+				/* Listen socket creation failed */
+
+				purple_debug_info("msn", "got_invite: listening failed\n");
+
+				if (dc->nonce_type != DC_NONCE_PLAIN)
+					msn_slp_send_ok(slpcall, branch,
+						"application/x-msnmsgr-transrespbody",
+						"Bridge: TCPv1\r\n"
+						"Listening: false\r\n"
+						"Hashed-Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+						"\r\n");
+				else
+					msn_slp_send_ok(slpcall, branch,
+						"application/x-msnmsgr-transrespbody",
+						"Bridge: TCPv1\r\n"
+						"Listening: false\r\n"
+						"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+						"\r\n");
+
+			} else {
+				/*
+				 * Listen socket created successfully.
+				 * Don't send anything here because we don't know the parameters
+				 * of the created socket yet. msn_dc_send_ok will be called from
+				 * the callback function: dc_listen_socket_created_cb
+				 */
+				purple_debug_info("msn", "got_invite: listening socket created\n");
+
+				dc->send_connection_info_msg_cb = msn_dc_send_ok;
+				slpcall->wait_for_socket = TRUE;
+			}
+
+		} else {
+			/*
+			 * Invalid direct connect invitation or
+			 * TCP connection is not supported.
+			 */
+		}
+
+		g_free(nonce);
+		g_free(bridges);
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
+	{
+		/* A direct connection negotiation response */
+		msn_slp_process_transresp(slpcall, content);
+	}
+}
+
+static void
+got_ok(MsnSlpCall *slpcall,
+	   const char *type, const char *content)
+{
+	g_return_if_fail(slpcall != NULL);
+	g_return_if_fail(type    != NULL);
+
+	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
+	{
+		char *content;
+		char *header;
+		char *nonce = NULL;
+		MsnSession *session = slpcall->slplink->session;
+		MsnSlpMessage *msg;
+		MsnDirectConn *dc;
+		MsnUser *user;
+
+		if (!purple_account_get_bool(session->account, "direct_connect", TRUE)) {
+			/* Don't attempt a direct connection if disabled. */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
+		if (slpcall->slplink->dc != NULL) {
+			/* If we already have an established direct connection
+			 * then just start the transfer.
+			 */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
+		user = msn_userlist_find_user(session->userlist,
+		                              slpcall->slplink->remote_user);
+		if (!user || !(user->clientid & 0xF0000000))	{
+			/* Just start a normal SB transfer. */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
+		/* Try direct file transfer by sending a second INVITE */
+		dc = msn_dc_new(slpcall);
+		slpcall->branch = rand_guid();
+
+		dc->listen_data = purple_network_listen_range(
+			0, 0,
+			SOCK_STREAM,
+			msn_dc_listen_socket_created_cb,
+			dc
+		);
+
+		header = g_strdup_printf(
+			"INVITE MSNMSGR:%s MSNSLP/1.0",
+			slpcall->slplink->remote_user
+		);
+
+		if (dc->nonce_type == DC_NONCE_SHA1)
+			nonce = g_strdup_printf("Hashed-Nonce: {%s}\r\n", dc->nonce_hash);
+
+		if (dc->listen_data == NULL) {
+			/* Listen socket creation failed */
+			purple_debug_info("msn", "got_ok: listening failed\n");
+
+			content = g_strdup_printf(
+				"Bridges: TCPv1\r\n"
+				"NetID: %u\r\n"
+				"Conn-Type: IP-Restrict-NAT\r\n"
+				"UPnPNat: false\r\n"
+				"ICF: false\r\n"
+				"%s"
+				"\r\n",
+
+				rand() % G_MAXUINT32,
+				nonce ? nonce : ""
+			);
+
+		} else {
+			/* Listen socket created successfully. */
+			purple_debug_info("msn", "got_ok: listening socket created\n");
+
+			content = g_strdup_printf(
+				"Bridges: TCPv1\r\n"
+				"NetID: 0\r\n"
+				"Conn-Type: Direct-Connect\r\n"
+				"UPnPNat: false\r\n"
+				"ICF: false\r\n"
+				"%s"
+				"\r\n",
+
+				nonce ? nonce : ""
+			);
+		}
+
+		msg = msn_slpmsg_sip_new(
+			slpcall,
+			0,
+			header,
+			slpcall->branch,
+			"application/x-msnmsgr-transreqbody",
+			content
+		);
+		msg->info = "DC INVITE";
+		msg->text_body = TRUE;
+		g_free(nonce);
+		g_free(header);
+		g_free(content);
+
+		msn_slplink_queue_slpmsg(slpcall->slplink, msg);
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
+	{
+		/* Do we get this? */
+		purple_debug_info("msn", "OK with transreqbody\n");
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
+	{
+		msn_slp_process_transresp(slpcall, content);
+	}
+}
+
+static void
+got_error(MsnSlpCall *slpcall,
+          const char *error, const char *type, const char *content)
+{
+	/* It's not valid. Kill this off. */
+	purple_debug_error("msn", "Received non-OK result: %s\n",
+	                   error ? error : "Unknown");
+
+	if (type && !strcmp(type, "application/x-msnmsgr-transreqbody")) {
+		MsnDirectConn *dc = slpcall->slplink->dc;
+		if (dc) {
+			msn_dc_fallback_to_sb(dc);
+			return;
+		}
+	}
+
+	slpcall->wasted = TRUE;
+}
+
+static MsnSlpCall *
+msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
+{
+	MsnSlpCall *slpcall;
+
+	if (body == NULL)
+	{
+		purple_debug_warning("msn", "received bogus message\n");
+		return NULL;
+	}
+
+	if (!strncmp(body, "INVITE", strlen("INVITE")))
+	{
+		/* This is an INVITE request */
+		char *branch;
+		char *call_id;
+		char *content;
+		char *content_type;
+
+		/* From: <msnmsgr:buddy@hotmail.com> */
+#if 0
+		slpcall->remote_user = get_token(body, "From: <msnmsgr:", ">\r\n");
+#endif
+
+		branch = get_token(body, ";branch={", "}");
+
+		call_id = get_token(body, "Call-ID: {", "}");
+
+#if 0
+		long content_len = -1;
+
+		temp = get_token(body, "Content-Length: ", "\r\n");
+		if (temp != NULL)
+			content_len = atoi(temp);
+		g_free(temp);
+#endif
+		content_type = get_token(body, "Content-Type: ", "\r\n");
+
+		content = get_token(body, "\r\n\r\n", NULL);
+
+		slpcall = NULL;
+		if (branch && call_id)
+		{
+			slpcall = msn_slplink_find_slp_call(slplink, call_id);
+			if (slpcall)
+			{
+				g_free(slpcall->branch);
+				slpcall->branch = g_strdup(branch);
+				got_invite(slpcall, branch, content_type, content);
+			}
+			else if (content_type && content)
+			{
+				slpcall = msn_slpcall_new(slplink);
+				slpcall->id = g_strdup(call_id);
+				got_invite(slpcall, branch, content_type, content);
+			}
+		}
+
+		g_free(call_id);
+		g_free(branch);
+		g_free(content_type);
+		g_free(content);
+	}
+	else if (!strncmp(body, "MSNSLP/1.0 ", strlen("MSNSLP/1.0 ")))
+	{
+		/* This is a response */
+		char *content;
+		char *content_type;
+		/* Make sure this is "OK" */
+		const char *status = body + strlen("MSNSLP/1.0 ");
+		char *call_id;
+
+		call_id = get_token(body, "Call-ID: {", "}");
+		slpcall = msn_slplink_find_slp_call(slplink, call_id);
+		g_free(call_id);
+
+		g_return_val_if_fail(slpcall != NULL, NULL);
+
+		content_type = get_token(body, "Content-Type: ", "\r\n");
+
+		content = get_token(body, "\r\n\r\n", NULL);
+
+		if (strncmp(status, "200 OK", 6))
+		{
+			char *error = NULL;
+			const char *c;
+
+			/* Eww */
+			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
+				(c = strchr(status, '\0')))
+			{
+				size_t len = c - status;
+				error = g_strndup(status, len);
+			}
+
+			got_error(slpcall, error, content_type, content);
+			g_free(error);
+
+		} else {
+			/* Everything's just dandy */
+			got_ok(slpcall, content_type, content);
+		}
+
+		g_free(content_type);
+		g_free(content);
+	}
+	else if (!strncmp(body, "BYE", strlen("BYE")))
+	{
+		/* This is a BYE request */
+		char *call_id;
+
+		call_id = get_token(body, "Call-ID: {", "}");
+		slpcall = msn_slplink_find_slp_call(slplink, call_id);
+		g_free(call_id);
+
+		if (slpcall != NULL)
+			slpcall->wasted = TRUE;
+
+		/* msn_slpcall_destroy(slpcall); */
+	}
+	else
+		slpcall = NULL;
+
+	return slpcall;
+}
+
 MsnSlpCall *
 msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
@@ -199,13 +1058,13 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 
 	slpcall = NULL;
 	body = slpmsg->buffer;
-	body_len = slpmsg->offset;
+	body_len = slpmsg->header->offset;
 
-	if (slpmsg->flags == 0x0 || slpmsg->flags == 0x1000000)
+	if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP)
 	{
 		char *body_str;
 
-		if (slpmsg->session_id == 64)
+		if (slpmsg->header->session_id == 64)
 		{
 			/* This is for handwritten messages (Ink) */
 			GError *error = NULL;
@@ -262,11 +1121,9 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		}
 		g_free(body_str);
 	}
-	else if (slpmsg->flags == 0x20 ||
-	         slpmsg->flags == 0x1000020 ||
-	         slpmsg->flags == 0x1000030)
+	 else if (msn_p2p_msg_is_data(slpmsg->header->flags))
 	{
-		slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
+		slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
 
 		if (slpcall != NULL)
 		{
@@ -282,7 +1139,7 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		}
 	}
 #if 0
-	else if (slpmsg->flags == 0x100)
+	else if (slpmsg->header->flags == 0x100)
 	{
 		slpcall = slplink->directconn->initial_call;
 
@@ -290,13 +1147,13 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 			msn_slpcall_session_init(slpcall);
 	}
 #endif
-	else if (slpmsg->flags == 0x2)
+	else if (slpmsg->header->flags == P2P_ACK)
 	{
 		/* Acknowledgement of previous message. Don't do anything currently. */
 	}
 	else
-		purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%08lx\n",
-		                     slpmsg->flags);
+		purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%04x\n",
+		                     slpmsg->header->flags);
 
 	return slpcall;
 }
diff --git a/libpurple/protocols/msn/slpcall.h b/libpurple/protocols/msn/slpcall.h
index fb68c79952..04bb88a210 100644
--- a/libpurple/protocols/msn/slpcall.h
+++ b/libpurple/protocols/msn/slpcall.h
@@ -34,8 +34,6 @@ typedef enum
 
 #include "internal.h"
 
-#include "ft.h"
-
 #include "slplink.h"
 
 /* The official client seems to timeout slp calls after 5 minutes */
@@ -94,7 +92,7 @@ void msn_slpcall_init(MsnSlpCall *slpcall, MsnSlpCallType type);
 void msn_slpcall_session_init(MsnSlpCall *slpcall);
 void msn_slpcall_destroy(MsnSlpCall *slpcall);
 void msn_slpcall_invite(MsnSlpCall *slpcall, const char *euf_guid,
-						 int app_id, const char *context);
+						 MsnP2PAppId app_id, const char *context);
 void msn_slpcall_close(MsnSlpCall *slpcall);
 
 #endif /* MSN_SLPCALL_H */
diff --git a/libpurple/protocols/msn/slplink.c b/libpurple/protocols/msn/slplink.c
index 6c2b2473fd..20821bc7b6 100644
--- a/libpurple/protocols/msn/slplink.c
+++ b/libpurple/protocols/msn/slplink.c
@@ -21,30 +21,37 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+#include "debug.h"
+
 #include "msn.h"
 #include "slplink.h"
+#include "slpmsg_part.h"
 
+#include "sbconn.h"
 #include "switchboard.h"
 #include "slp.h"
+#include "p2p.h"
 
 #ifdef MSN_DEBUG_SLP_FILES
 static int m_sc = 0;
 static int m_rc = 0;
 
 static void
-debug_msg_to_file(MsnMessage *msg, gboolean send)
+debug_part_to_file(MsnSlpMessage *msg, gboolean send)
 {
 	char *tmp;
 	char *dir;
-	char *pload;
+	char *data;
 	int c;
-	gsize pload_size;
+	gsize data_size;
 
 	dir = send ? "send" : "recv";
 	c = send ? m_sc++ : m_rc++;
 	tmp = g_strdup_printf("%s/msntest/%s/%03d", g_get_home_dir(), dir, c);
-	pload = msn_message_gen_payload(msg, &pload_size);
-	if (!purple_util_write_data_to_file_absolute(tmp, pload, pload_size))
+	data = msn_slpmsg_serialize(msg, &data_size);
+	if (!purple_util_write_data_to_file_absolute(tmp, data, data_size))
 	{
 		purple_debug_error("msn", "could not save debug file\n");
 	}
@@ -81,7 +88,7 @@ msn_slplink_new(MsnSession *session, const char *username)
 	return msn_slplink_ref(slplink);
 }
 
-void
+static void
 msn_slplink_destroy(MsnSlpLink *slplink)
 {
 	MsnSession *session;
@@ -264,78 +271,69 @@ msn_slplink_find_slp_call_with_session_id(MsnSlpLink *slplink, long id)
 	return NULL;
 }
 
-void
-msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
+static void
+msn_slplink_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part)
 {
 	if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED)
 	{
-		msn_dc_enqueue_msg(slplink->dc, msg);
+		msn_dc_enqueue_part(slplink->dc, part);
 	}
 	else
 	{
-		if (slplink->swboard == NULL)
-		{
-			slplink->swboard = msn_session_get_swboard(slplink->session,
-													   slplink->remote_user, MSN_SB_FLAG_FT);
-
-			g_return_if_fail(slplink->swboard != NULL);
-
-			/* If swboard is destroyed we will be too */
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-
-		msn_switchboard_send_msg(slplink->swboard, msg, TRUE);
+		msn_sbconn_send_part(slplink, part);
 	}
 }
 
 void
 msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
-	MsnMessage *msg;
+	MsnSlpMessagePart *part;
 	long long real_size;
 	size_t len = 0;
 
 	/* Maybe we will want to create a new msg for this slpmsg instead of
 	 * reusing the same one all the time. */
-	msg = slpmsg->msg;
+	part = msn_slpmsgpart_new(slpmsg->header, slpmsg->footer);
+	part->ack_data = slpmsg;
 
-	real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
+	real_size = (slpmsg->header->flags == P2P_ACK) ? 0 : slpmsg->size;
 
-	if (slpmsg->offset < real_size)
+	if (slpmsg->header->offset < real_size)
 	{
 		if (slpmsg->slpcall && slpmsg->slpcall->xfer && purple_xfer_get_type(slpmsg->slpcall->xfer) == PURPLE_XFER_SEND &&
 				purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
 		{
-			len = MIN(1202, slpmsg->slpcall->u.outgoing.len);
-			msn_message_set_bin_data(msg, slpmsg->slpcall->u.outgoing.data, len);
+			len = MIN(MSN_SBCONN_MAX_SIZE, slpmsg->slpcall->u.outgoing.len);
+			msn_slpmsgpart_set_bin_data(part, slpmsg->slpcall->u.outgoing.data, len);
 		}
 		else
 		{
-			len = slpmsg->size - slpmsg->offset;
+			len = slpmsg->size - slpmsg->header->offset;
 
-			if (len > 1202)
-				len = 1202;
+			if (len > MSN_SBCONN_MAX_SIZE)
+				len = MSN_SBCONN_MAX_SIZE;
 
-			msn_message_set_bin_data(msg, slpmsg->buffer + slpmsg->offset, len);
+			msn_slpmsgpart_set_bin_data(part, slpmsg->buffer + slpmsg->header->offset, len);
 		}
 
-		msg->msnslp_header.offset = slpmsg->offset;
-		msg->msnslp_header.length = len;
+		slpmsg->header->length = len;
 	}
 
+#if 0
+	/* TODO: port this function to SlpMessageParts */
 	if (purple_debug_is_verbose())
 		msn_message_show_readable(msg, slpmsg->info, slpmsg->text_body);
+#endif
 
 #ifdef MSN_DEBUG_SLP_FILES
-	debug_msg_to_file(msg, TRUE);
+	debug_part_to_file(slpmsg, TRUE);
 #endif
 
-	slpmsg->msgs =
-		g_list_append(slpmsg->msgs, msn_message_ref(msg));
-	msn_slplink_send_msg(slplink, msg);
+	slpmsg->parts = g_list_append(slpmsg->parts, part);
+	msn_slplink_send_part(slplink, part);
+
 
-	if ((slpmsg->flags == 0x20 || slpmsg->flags == 0x1000020 ||
-	     slpmsg->flags == 0x1000030) &&
+	if (msn_p2p_msg_is_data(slpmsg->header->flags) &&
 		(slpmsg->slpcall != NULL))
 	{
 		slpmsg->slpcall->progress = TRUE;
@@ -343,124 +341,39 @@ msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		if (slpmsg->slpcall->progress_cb != NULL)
 		{
 			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
-										 len, slpmsg->offset);
+										 len, slpmsg->header->offset);
 		}
 	}
 
 	/* slpmsg->offset += len; */
 }
 
-/* We have received the message ack */
-static void
-msg_ack(MsnMessage *msg, void *data)
-{
-	MsnSlpMessage *slpmsg;
-	long long real_size;
-
-	slpmsg = data;
-
-	real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
-
-	slpmsg->offset += msg->msnslp_header.length;
-
-	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-
-	if (slpmsg->offset < real_size)
-	{
-		if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
-		{
-			slpmsg->slpcall->xfer_msg = slpmsg;
-			msn_message_ref(msg);
-			purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
-		}
-		else
-			msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-	}
-	else
-	{
-		/* The whole message has been sent */
-		if (slpmsg->flags == 0x20 ||
-		    slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
-		{
-			if (slpmsg->slpcall != NULL)
-			{
-				if (slpmsg->slpcall->cb)
-					slpmsg->slpcall->cb(slpmsg->slpcall,
-						NULL, 0);
-			}
-		}
-	}
-
-	msn_message_unref(msg);
-}
-
-/* We have received the message nak. */
-static void
-msg_nak(MsnMessage *msg, void *data)
-{
-	MsnSlpMessage *slpmsg;
-
-	slpmsg = data;
-
-	msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-
-	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-	msn_message_unref(msg);
-}
-
 static void
 msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
-	MsnMessage *msg;
-	const char *passport;
-
-	slpmsg->msg = msg = msn_message_new_msnslp();
+	slpmsg = slpmsg;
+	slpmsg->footer = g_new0(MsnP2PFooter, 1);
 
-	if (slpmsg->flags == 0x0)
+	if (slpmsg->header->flags == P2P_NO_FLAG)
 	{
-		msg->msnslp_header.session_id = slpmsg->session_id;
-		msg->msnslp_header.ack_id = rand() % 0xFFFFFF00;
+		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
 	}
-	else if (slpmsg->flags == 0x2)
-	{
-		msg->msnslp_header.session_id = slpmsg->session_id;
-		msg->msnslp_header.ack_id = slpmsg->ack_id;
-		msg->msnslp_header.ack_size = slpmsg->ack_size;
-		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
-	}
-	else if (slpmsg->flags == 0x20 ||
-	         slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
+	else if (msn_p2p_msg_is_data(slpmsg->header->flags))
 	{
 		MsnSlpCall *slpcall;
 		slpcall = slpmsg->slpcall;
 
 		g_return_if_fail(slpcall != NULL);
-		msg->msnslp_header.session_id = slpcall->session_id;
-		msg->msnslp_footer.value = slpcall->app_id;
-		msg->msnslp_header.ack_id = rand() % 0xFFFFFF00;
-	}
-	else if (slpmsg->flags == 0x100)
-	{
-		msg->msnslp_header.ack_id     = slpmsg->ack_id;
-		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
-		msg->msnslp_header.ack_size   = slpmsg->ack_size;
+		slpmsg->header->session_id = slpcall->session_id;
+		slpmsg->footer->value = slpcall->app_id;
+		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
 	}
 
-	msg->msnslp_header.id = slpmsg->id;
-	msg->msnslp_header.flags = slpmsg->flags;
-
-	msg->msnslp_header.total_size = slpmsg->size;
-
-	passport = purple_normalize(slplink->session->account, slplink->remote_user);
-	msn_message_set_attr(msg, "P2P-Dest", passport);
+	slpmsg->header->id = slpmsg->id;
 
-	msg->ack_cb = msg_ack;
-	msg->nak_cb = msg_nak;
-	msg->ack_data = slpmsg;
+	slpmsg->header->total_size = slpmsg->size;
 
 	msn_slplink_send_msgpart(slplink, slpmsg);
-
-	msn_message_destroy(msg);
 }
 
 void
@@ -494,25 +407,18 @@ msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink)
 }
 
 static MsnSlpMessage *
-msn_slplink_create_ack(MsnSlpLink *slplink, MsnSlpHeader *header)
+msn_slplink_create_ack(MsnSlpLink *slplink, MsnP2PHeader *header)
 {
 	MsnSlpMessage *slpmsg;
 
-	slpmsg = msn_slpmsg_new(slplink);
-
-	slpmsg->session_id = header->session_id;
-	slpmsg->size       = header->total_size;
-	slpmsg->flags      = 0x02;
-	slpmsg->ack_id     = header->id;
-	slpmsg->ack_sub_id = header->ack_id;
-	slpmsg->ack_size   = header->total_size;
-	slpmsg->info = "SLP ACK";
+	slpmsg = msn_slpmsg_ack_new(header);
+	msn_slpmsg_set_slplink(slpmsg, slplink);
 
 	return slpmsg;
 }
 
 static void
-msn_slplink_send_ack(MsnSlpLink *slplink, MsnSlpHeader *header)
+msn_slplink_send_ack(MsnSlpLink *slplink, MsnP2PHeader *header)
 {
 	MsnSlpMessage *slpmsg = msn_slplink_create_ack(slplink, header);
 
@@ -520,33 +426,6 @@ msn_slplink_send_ack(MsnSlpLink *slplink, MsnSlpHeader *header)
 	msn_slpmsg_destroy(slpmsg);
 }
 
-static void
-send_file_cb(MsnSlpCall *slpcall)
-{
-	MsnSlpMessage *slpmsg;
-	PurpleXfer *xfer;
-
-	xfer = (PurpleXfer *)slpcall->xfer;
-	if (purple_xfer_get_status(xfer) >= PURPLE_XFER_STATUS_STARTED)
-		return;
-
-	purple_xfer_ref(xfer);
-	purple_xfer_start(xfer, -1, NULL, 0);
-	if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) {
-		purple_xfer_unref(xfer);
-		return;
-	}
-	purple_xfer_unref(xfer);
-
-	slpmsg = msn_slpmsg_new(slpcall->slplink);
-	slpmsg->slpcall = slpcall;
-	slpmsg->flags = 0x1000030;
-	slpmsg->info = "SLP FILE";
-	slpmsg->size = purple_xfer_get_size(xfer);
-
-	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
-}
-
 static MsnSlpMessage *
 msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id)
 {
@@ -556,280 +435,196 @@ msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id)
 	{
 		MsnSlpMessage *slpmsg = e->data;
 
-		if ((slpmsg->session_id == session_id) && (slpmsg->id == id))
+		if ((slpmsg->header->session_id == session_id) && (slpmsg->id == id))
 			return slpmsg;
 	}
 
 	return NULL;
 }
 
-void
-msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpHeader *header, const char *data, gsize len)
+static MsnSlpMessage *
+init_first_msg(MsnSlpLink *slplink, MsnP2PHeader *header)
 {
 	MsnSlpMessage *slpmsg;
-	guint64 offset;
-	PurpleXfer *xfer = NULL;
 
-	if (header->total_size < header->length)
-	{
-		purple_debug_error("msn", "This can't be good\n");
-		g_return_if_reached();
-	}
-
-	offset = header->offset;
+	slpmsg = msn_slpmsg_new(slplink);
+	slpmsg->id = header->id;
+	slpmsg->header->session_id = header->session_id;
+	slpmsg->size = header->total_size;
+	slpmsg->header->flags = header->flags;
 
-	if (offset == 0)
+	if (slpmsg->header->session_id)
 	{
-		slpmsg = msn_slpmsg_new(slplink);
-		slpmsg->id = header->id;
-		slpmsg->session_id = header->session_id;
-		slpmsg->size = header->total_size;
-		slpmsg->flags = header->flags;
-
-		if (slpmsg->session_id)
+		slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
+		if (slpmsg->slpcall != NULL)
 		{
-			if (slpmsg->slpcall == NULL)
-				slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
-
-			if (slpmsg->slpcall != NULL)
+			if (msn_p2p_msg_is_data(header->flags))
 			{
-				if (slpmsg->flags == 0x20 ||
-				    slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
+				PurpleXfer *xfer = slpmsg->slpcall->xfer;
+				if (xfer != NULL)
 				{
-					xfer = slpmsg->slpcall->xfer;
-					if (xfer != NULL)
-					{
-						slpmsg->ft = TRUE;
-						slpmsg->slpcall->xfer_msg = slpmsg;
-
-						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	-1, NULL, 0);
-
-						if (xfer->data == NULL) {
-							purple_xfer_unref(xfer);
-							msn_slpmsg_destroy(slpmsg);
-							g_return_if_reached();
-						} else {
-							purple_xfer_unref(xfer);
-						}
+					slpmsg->ft = TRUE;
+					slpmsg->slpcall->xfer_msg = slpmsg;
+
+					purple_xfer_ref(xfer);
+					purple_xfer_start(xfer,	-1, NULL, 0);
+
+					if (xfer->data == NULL) {
+						purple_xfer_unref(xfer);
+						msn_slpmsg_destroy(slpmsg);
+						g_return_val_if_reached(NULL);
+					} else {
+						purple_xfer_unref(xfer);
 					}
 				}
 			}
 		}
-		if (!slpmsg->ft && slpmsg->size)
-		{
-			slpmsg->buffer = g_try_malloc(slpmsg->size);
-			if (slpmsg->buffer == NULL)
-			{
-				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
-				msn_slpmsg_destroy(slpmsg);
-				return;
-			}
-		}
 	}
-	else
+	if (!slpmsg->ft && slpmsg->size)
 	{
-		slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id);
-		if (slpmsg == NULL)
+		slpmsg->buffer = g_try_malloc(slpmsg->size);
+		if (slpmsg->buffer == NULL)
 		{
-			/* Probably the transfer was canceled */
-			purple_debug_error("msn", "Couldn't find slpmsg\n");
-			return;
+			purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
+			msn_slpmsg_destroy(slpmsg);
+			return NULL;
 		}
 	}
 
-	if (slpmsg->ft)
-	{
-		xfer = slpmsg->slpcall->xfer;
-		slpmsg->slpcall->u.incoming_data =
-				g_byte_array_append(slpmsg->slpcall->u.incoming_data, (const guchar *)data, len);
-		purple_xfer_prpl_ready(xfer);
-	}
-	else if (slpmsg->size && slpmsg->buffer)
-	{
-		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size || slpmsg->offset != offset)
-		{
-			purple_debug_error("msn",
-				"Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
-				slpmsg->size, offset, len);
-			g_return_if_reached();
-		} else {
-			memcpy(slpmsg->buffer + offset, data, len);
-			slpmsg->offset += len;
-		}
-	}
+	return slpmsg;
+}
 
-	if ((slpmsg->flags == 0x20 ||
-	     slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030) &&
-		(slpmsg->slpcall != NULL))
-	{
-		slpmsg->slpcall->progress = TRUE;
+static void
+process_complete_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg, MsnP2PHeader *header)
+{
+	MsnSlpCall *slpcall;
 
-		if (slpmsg->slpcall->progress_cb != NULL)
-		{
-			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
-										 len, offset);
-		}
-	}
+	slpcall = msn_slp_process_msg(slplink, slpmsg);
 
-#if 0
-	if (slpmsg->buffer == NULL)
+	if (slpcall == NULL) {
+		msn_slpmsg_destroy(slpmsg);
 		return;
-#endif
-
-	if (header->offset + header->length >= header->total_size)
-	{
-		/* All the pieces of the slpmsg have been received */
-		MsnSlpCall *slpcall;
-
-		slpcall = msn_slp_process_msg(slplink, slpmsg);
-
-		if (slpcall == NULL) {
-			msn_slpmsg_destroy(slpmsg);
-			return;
-		}
+	}
 
-		purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n");
+	purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n");
 
-		if (/* !slpcall->wasted && */ slpmsg->flags == 0x100)
-		{
+	if (/* !slpcall->wasted && */ slpmsg->header->flags == P2P_DC_HANDSHAKE)
+	{
 #if 0
-			MsnDirectConn *directconn;
+		MsnDirectConn *directconn;
 
-			directconn = slplink->directconn;
-			if (!directconn->acked)
-				msn_directconn_send_handshake(directconn);
+		directconn = slplink->directconn;
+		if (!directconn->acked)
+			msn_directconn_send_handshake(directconn);
 #endif
-		}
-		else if (slpmsg->flags == 0x00 || slpmsg->flags == 0x1000000 ||
-		         slpmsg->flags == 0x20 || slpmsg->flags == 0x1000020 ||
-		         slpmsg->flags == 0x1000030)
-		{
-			/* Release all the messages and send the ACK */
-
-			if (slpcall->wait_for_socket) {
-				/*
-				 * Save ack for later because we have to send
-				 * a 200 OK message to the previous direct connect
-				 * invitation before ACK but the listening socket isn't
-				 * created yet.
-				 */
-				purple_debug_info("msn", "msn_slplink_process_msg: save ACK\n");
-
-				slpcall->slplink->dc->prev_ack = msn_slplink_create_ack(slplink, header);
-			} else if (!slpcall->wasted) {
-				purple_debug_info("msn", "msn_slplink_process_msg: send ACK\n");
-
-				msn_slplink_send_ack(slplink, header);
-				msn_slplink_send_queued_slpmsgs(slplink);
-			}
-		}
-
-		msn_slpmsg_destroy(slpmsg);
-
-		if (!slpcall->wait_for_socket && slpcall->wasted)
-			msn_slpcall_destroy(slpcall);
-	}
-}
-
-static gchar *
-gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path)
-{
-	gsize size = 0;
-	MsnFileContext *header;
-	gchar *u8 = NULL;
-	gchar *ret;
-	gunichar2 *uni = NULL;
-	glong currentChar = 0;
-	glong len = 0;
-	const char *preview;
-	gsize preview_len;
-
-	size = purple_xfer_get_size(xfer);
-
-	purple_xfer_prepare_thumbnail(xfer, "png");
-
-	if (!file_name) {
-		gchar *basename = g_path_get_basename(file_path);
-		u8 = purple_utf8_try_convert(basename);
-		g_free(basename);
-		file_name = u8;
 	}
+	else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP ||
+			msn_p2p_msg_is_data(slpmsg->header->flags))
+	{
+		/* Release all the messages and send the ACK */
+
+		if (slpcall->wait_for_socket) {
+			/*
+			 * Save ack for later because we have to send
+			 * a 200 OK message to the previous direct connect
+			 * invitation before ACK but the listening socket isn't
+			 * created yet.
+			 */
+			purple_debug_info("msn", "msn_slplink_process_msg: save ACK\n");
 
-	uni = g_utf8_to_utf16(file_name, -1, NULL, &len, NULL);
+			slpcall->slplink->dc->prev_ack = msn_slplink_create_ack(slplink, header);
+		} else if (!slpcall->wasted) {
+			purple_debug_info("msn", "msn_slplink_process_msg: send ACK\n");
 
-	if (u8) {
-		g_free(u8);
-		file_name = NULL;
-		u8 = NULL;
+			msn_slplink_send_ack(slplink, header);
+			msn_slplink_send_queued_slpmsgs(slplink);
+		}
 	}
 
-	preview = purple_xfer_get_thumbnail(xfer, &preview_len);
-	header = g_malloc(sizeof(MsnFileContext) + preview_len);
+	msn_slpmsg_destroy(slpmsg);
 
-	header->length = GUINT32_TO_LE(sizeof(MsnFileContext) - 1);
-	header->version = GUINT32_TO_LE(2); /* V.3 contains additional unnecessary data */
-	header->file_size = GUINT64_TO_LE(size);
-	if (preview)
-		header->type = GUINT32_TO_LE(0);
-	else
-		header->type = GUINT32_TO_LE(1);
+	if (!slpcall->wait_for_socket && slpcall->wasted)
+		msn_slpcall_destroy(slpcall);
+}
 
-	len = MIN(len, MAX_FILE_NAME_LEN);
-	for (currentChar = 0; currentChar < len; currentChar++) {
-		header->file_name[currentChar] = GUINT16_TO_LE(uni[currentChar]);
+static void
+slpmsg_add_part(MsnSlpMessage *slpmsg, MsnSlpMessagePart *part)
+{
+	if (slpmsg->ft) {
+		slpmsg->slpcall->u.incoming_data =
+				g_byte_array_append(slpmsg->slpcall->u.incoming_data, (const guchar *)part->buffer, part->size);
+		purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
 	}
-	memset(&header->file_name[currentChar], 0x00, (MAX_FILE_NAME_LEN - currentChar) * 2);
-
-	memset(&header->unknown1, 0, sizeof(header->unknown1));
-	header->unknown2 = GUINT32_TO_LE(0xffffffff);
-	if (preview) {
-		memcpy(&header->preview, preview, preview_len);
+	else if (slpmsg->size && slpmsg->buffer) {
+		if (G_MAXSIZE - part->size < part->header->offset
+				|| (part->header->offset + part->size) > slpmsg->size
+				|| slpmsg->header->offset != part->header->offset) {
+			purple_debug_error("msn",
+				"Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
+				slpmsg->size, part->header->offset, part->size);
+			g_return_if_reached();
+		} else {
+			memcpy(slpmsg->buffer + part->header->offset, part->buffer, part->size);
+			slpmsg->header->offset += part->size;
+		}
 	}
-	header->preview[preview_len] = '\0';
-
-	g_free(uni);
-	ret = purple_base64_encode((const guchar *)header, sizeof(MsnFileContext) + preview_len);
-	g_free(header);
-	return ret;
 }
 
 void
-msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer)
+msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpMessagePart *part)
 {
-	MsnSlpCall *slpcall;
-	char *context;
-	const char *fn;
-	const char *fp;
+	MsnSlpMessage *slpmsg;
+	MsnP2PHeader *header;
+	guint64 offset;
 
-	fn = purple_xfer_get_filename(xfer);
-	fp = purple_xfer_get_local_filename(xfer);
+	header = part->header;
 
-	g_return_if_fail(slplink != NULL);
-	g_return_if_fail(fp != NULL);
+	if (header->total_size < header->length)
+	{
+		/* We seem to have received a bad header */
+		purple_debug_warning("msn", "Total size listed in SLP binary header "
+				"was less than length of this particular message.  This "
+				"should not happen.  Dropping message.\n");
+		return;
+	}
 
-	slpcall = msn_slpcall_new(slplink);
-	msn_slpcall_init(slpcall, MSN_SLPCALL_DC);
+	offset = header->offset;
 
-	slpcall->session_init_cb = send_file_cb;
-	slpcall->end_cb = msn_xfer_end_cb;
-	slpcall->cb = msn_xfer_completed_cb;
-	slpcall->xfer = xfer;
-	purple_xfer_ref(slpcall->xfer);
+	if (offset == 0)
+		slpmsg = init_first_msg(slplink, header);
+	else {
+		slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id);
+		if (slpmsg == NULL)
+		{
+			/* Probably the transfer was cancelled */
+			purple_debug_error("msn", "Couldn't find slpmsg\n");
+			return;
+		}
+	}
 
-	slpcall->pending = TRUE;
+	slpmsg_add_part(slpmsg, part);
 
-	purple_xfer_set_cancel_send_fnc(xfer, msn_xfer_cancel);
-	purple_xfer_set_read_fnc(xfer, msn_xfer_read);
-	purple_xfer_set_write_fnc(xfer, msn_xfer_write);
 
-	xfer->data = slpcall;
+	if (msn_p2p_msg_is_data(slpmsg->header->flags) &&
+		(slpmsg->slpcall != NULL))
+	{
+		slpmsg->slpcall->progress = TRUE;
 
-	context = gen_context(xfer, fn, fp);
+		if (slpmsg->slpcall->progress_cb != NULL)
+		{
+			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
+										 part->size, offset);
+		}
+	}
 
-	msn_slpcall_invite(slpcall, MSN_FT_GUID, 2, context);
+#if 0
+	if (slpmsg->buffer == NULL)
+		return;
+#endif
 
-	g_free(context);
+	/* All the pieces of the slpmsg have been received */
+	if (header->offset + header->length >= header->total_size)
+		process_complete_msg(slplink, slpmsg, header);
 }
 
 void
@@ -857,7 +652,7 @@ msn_slplink_request_object(MsnSlpLink *slplink,
 	slpcall->cb = cb;
 	slpcall->end_cb = end_cb;
 
-	msn_slpcall_invite(slpcall, MSN_OBJ_GUID, 1, msnobj_base64);
+	msn_slpcall_invite(slpcall, MSN_OBJ_GUID, P2P_APPID_OBJ, msnobj_base64);
 
 	g_free(msnobj_base64);
 }
diff --git a/libpurple/protocols/msn/slplink.h b/libpurple/protocols/msn/slplink.h
index e3b2e97de0..a1fff48f45 100644
--- a/libpurple/protocols/msn/slplink.h
+++ b/libpurple/protocols/msn/slplink.h
@@ -26,8 +26,6 @@
 
 typedef struct _MsnSlpLink MsnSlpLink;
 
-#include "ft.h"
-
 #include "directconn.h"
 #include "session.h"
 #include "slpcall.h"
@@ -59,8 +57,6 @@ struct _MsnSlpLink
 MsnSlpLink *msn_slplink_ref(MsnSlpLink *slplink);
 void msn_slplink_unref(MsnSlpLink *slplink);
 
-void msn_slplink_destroy(MsnSlpLink *slplink);
-
 /**
  * @return An MsnSlpLink for the given user, or NULL if there is no
  *         existing MsnSlpLink.
@@ -83,10 +79,8 @@ void msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
 void msn_slplink_send_slpmsg(MsnSlpLink *slplink,
 							 MsnSlpMessage *slpmsg);
 void msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink);
-void msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpHeader *header, const char *data, gsize len);
-void msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer);
+void msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpMessagePart *part);
 
-void msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg);
 /* Only exported for msn_xfer_write */
 void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
 
diff --git a/libpurple/protocols/msn/slpmsg.c b/libpurple/protocols/msn/slpmsg.c
index 4b3f96a926..58c08df261 100644
--- a/libpurple/protocols/msn/slpmsg.c
+++ b/libpurple/protocols/msn/slpmsg.c
@@ -21,8 +21,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "slpmsg.h"
+#include "slpmsg_part.h"
 #include "slplink.h"
 
 /**************************************************************************
@@ -39,10 +43,48 @@ msn_slpmsg_new(MsnSlpLink *slplink)
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "slpmsg new (%p)\n", slpmsg);
 
-	slpmsg->slplink = slplink;
+	if (slplink) 
+		msn_slpmsg_set_slplink(slpmsg, slplink);
+	else
+		slpmsg->slplink = NULL;
 
-	slplink->slp_msgs =
-		g_list_append(slplink->slp_msgs, slpmsg);
+	slpmsg->header = g_new0(MsnP2PHeader, 1);
+	slpmsg->footer = NULL;
+
+	return slpmsg;
+}
+
+MsnSlpMessage *msn_slpmsg_new_from_data(const char *data, size_t data_len)
+{
+	MsnSlpMessage *slpmsg;
+	MsnP2PHeader *header;
+	const char *tmp;
+	int body_len;
+
+	tmp = data;
+	slpmsg = msn_slpmsg_new(NULL);
+
+	if (data_len < sizeof(*header)) {
+		return NULL;
+	}
+
+	/* Extract the binary SLP header */
+	slpmsg->header = msn_p2p_header_from_wire((MsnP2PHeader*)tmp);
+
+	/* Extract the body */
+	body_len = data_len - (tmp - data);
+	/* msg->body_len = msg->msnslp_header.length; */
+
+	if (body_len > 0) {
+		slpmsg->size = body_len;
+		slpmsg->buffer = g_malloc(body_len);
+		memcpy(slpmsg->buffer, tmp, body_len);
+		tmp += body_len;
+	}
+
+	/* Extract the footer */
+	if (body_len >= 0) 
+		slpmsg->footer = msn_p2p_footer_from_wire((MsnP2PFooter*)tmp);
 
 	return slpmsg;
 }
@@ -67,26 +109,41 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
 	if (slpmsg->img == NULL)
 		g_free(slpmsg->buffer);
 
-	for (cur = slpmsg->msgs; cur != NULL; cur = g_list_delete_link(cur, cur))
+	for (cur = slpmsg->parts; cur != NULL; cur = g_list_delete_link(cur, cur))
 	{
 		/* Something is pointing to this slpmsg, so we should remove that
 		 * pointer to prevent a crash. */
 		/* Ex: a user goes offline and after that we receive an ACK */
 
-		MsnMessage *msg = cur->data;
+		MsnSlpMessagePart *part = cur->data;
 
-		msg->ack_cb = NULL;
-		msg->nak_cb = NULL;
-		msg->ack_data = NULL;
-		msn_message_unref(msg);
+		part->ack_cb = NULL;
+		part->nak_cb = NULL;
+		part->ack_data = NULL;
+		msn_slpmsgpart_destroy(part);
 	}
 
 	slplink->slp_msgs = g_list_remove(slplink->slp_msgs, slpmsg);
 
+	g_free(slpmsg->header);
+	g_free(slpmsg->footer);
+
 	g_free(slpmsg);
 }
 
 void
+msn_slpmsg_set_slplink(MsnSlpMessage *slpmsg, MsnSlpLink *slplink)
+{
+	g_return_if_fail(slplink != NULL);
+
+	slpmsg->slplink = slplink;
+
+	slplink->slp_msgs =
+		g_list_append(slplink->slp_msgs, slpmsg);
+
+}
+
+void
 msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body,
 						 long long size)
 {
@@ -116,34 +173,6 @@ msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img)
 	slpmsg->size = purple_imgstore_get_size(img);
 }
 
-void
-msn_slpmsg_show(MsnMessage *msg)
-{
-	const char *info;
-	gboolean text;
-	guint32 flags;
-
-	text = FALSE;
-
-	flags = GUINT32_TO_LE(msg->msnslp_header.flags);
-
-	switch (flags)
-	{
-		case 0x0:
-			info = "SLP CONTROL";
-			text = TRUE;
-			break;
-		case 0x2:
-			info = "SLP ACK"; break;
-		case 0x20:
-		case 0x1000030:
-			info = "SLP DATA"; break;
-		default:
-			info = "SLP UNKNOWN"; break;
-	}
-
-	msn_message_show_readable(msg, info, text);
-}
 
 MsnSlpMessage *
 msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
@@ -206,3 +235,128 @@ msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
 
 	return slpmsg;
 }
+
+MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+
+	slpmsg->header->session_id = header->session_id;
+	slpmsg->size       = header->total_size;
+	slpmsg->header->flags      = P2P_ACK;
+	slpmsg->header->ack_id     = header->id;
+	slpmsg->header->ack_sub_id = header->ack_id;
+	slpmsg->header->ack_size   = header->total_size;
+	slpmsg->info = "SLP ACK";
+
+	return slpmsg;
+}
+
+MsnSlpMessage *msn_slpmsg_obj_new(MsnSlpCall *slpcall, PurpleStoredImage *img)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+	slpmsg->slpcall = slpcall;
+	slpmsg->header->flags = P2P_MSN_OBJ_DATA;
+	slpmsg->info = "SLP DATA";
+
+	msn_slpmsg_set_image(slpmsg, img);
+
+	return slpmsg;
+}
+
+MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+
+	slpmsg->slpcall = slpcall;
+	slpmsg->header->session_id = slpcall->session_id;
+	msn_slpmsg_set_body(slpmsg, NULL, 4);
+	slpmsg->info = "SLP DATA PREP";
+
+	return slpmsg;
+
+}
+
+MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+
+	slpmsg->slpcall = slpcall;
+	slpmsg->header->flags = P2P_FILE_DATA;
+	slpmsg->info = "SLP FILE";
+	slpmsg->size = size;
+
+	return slpmsg;
+}
+
+char *msn_slpmsg_serialize(MsnSlpMessage *slpmsg, size_t *ret_size)
+{
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+	char *base;
+	char *tmp;
+	size_t siz;
+
+	base = g_malloc(P2P_PACKET_HEADER_SIZE + slpmsg->size + sizeof(MsnP2PFooter));
+	tmp = base;
+
+	header = msn_p2p_header_to_wire(slpmsg->header);
+	footer = msn_p2p_footer_to_wire(slpmsg->footer);
+
+	siz = sizeof(MsnP2PHeader);
+	/* Copy header */
+	memcpy(tmp, (char*)header, siz);
+	tmp += siz;
+
+	/* Copy body */
+	memcpy(tmp, slpmsg->buffer, slpmsg->size);
+	tmp += slpmsg->size;
+
+	/* Copy footer */
+	siz = sizeof(MsnP2PFooter);
+	memcpy(tmp, (char*)footer, siz);
+	tmp += siz;
+
+	*ret_size = tmp - base;
+
+	return base;
+}
+
+void msn_slpmsg_show_readable(MsnSlpMessage *slpmsg)
+{
+	GString *str;
+
+	str = g_string_new(NULL);
+
+	g_string_append_printf(str, "Session ID: %u\r\n", slpmsg->header->session_id);
+	g_string_append_printf(str, "ID:         %u\r\n", slpmsg->header->id);
+	g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", slpmsg->header->offset);
+	g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", slpmsg->header->total_size);
+	g_string_append_printf(str, "Length:     %u\r\n", slpmsg->header->length);
+	g_string_append_printf(str, "Flags:      0x%x\r\n", slpmsg->header->flags);
+	g_string_append_printf(str, "ACK ID:     %u\r\n", slpmsg->header->ack_id);
+	g_string_append_printf(str, "SUB ID:     %u\r\n", slpmsg->header->ack_sub_id);
+	g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", slpmsg->header->ack_size);
+
+	if (purple_debug_is_verbose() && slpmsg->buffer != NULL) {
+		g_string_append_len(str, (gchar*)slpmsg->buffer, slpmsg->size);
+
+		if (slpmsg->buffer[slpmsg->size - 1] == '\0') {
+			str->len--;
+			g_string_append(str, " 0x00");
+		}
+		g_string_append(str, "\r\n");
+
+	}
+
+	g_string_append_printf(str, "Footer:     %u\r\n", slpmsg->footer->value);
+
+	purple_debug_info("msn", "SlpMessage %s:\n{%s}\n", slpmsg->info, str->str);
+}
diff --git a/libpurple/protocols/msn/slpmsg.h b/libpurple/protocols/msn/slpmsg.h
index d85a462313..facff320f2 100644
--- a/libpurple/protocols/msn/slpmsg.h
+++ b/libpurple/protocols/msn/slpmsg.h
@@ -31,7 +31,7 @@ typedef struct _MsnSlpMessage MsnSlpMessage;
 #include "slpcall.h"
 #include "slplink.h"
 #include "session.h"
-#include "msg.h"
+#include "p2p.h"
 
 #include "slp.h"
 
@@ -45,37 +45,24 @@ struct _MsnSlpMessage
 	MsnSlpLink *slplink; /**< The slplink through which this slp message is being sent. */
 	MsnSession *session;
 
-	long session_id;
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+
 	long id;
-	long ack_id;
-	long ack_sub_id;
-	long long ack_size;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
-	long flags;
 
 	gboolean ft;
 	PurpleStoredImage *img;
 	guchar *buffer;
 
 	/**
-	 * For outgoing messages this is the number of bytes from buffer that
-	 * have already been sent out.  For incoming messages this is the
-	 * number of bytes that have been written to buffer.
-	 */
-	long long offset;
-
-	/**
 	 * This is the size of buffer, unless this is an outgoing file transfer,
 	 * in which case this is the size of the file.
 	 */
 	long long size;
 
-	GList *msgs; /**< The real messages. */
-
-#if 1
-	MsnMessage *msg; /**< The temporary real message that will be sent. */
-#endif
+	GList *parts; /**< A list with the SlpMsgParts */
 
 	const char *info;
 	gboolean text_body;
@@ -85,17 +72,35 @@ struct _MsnSlpMessage
  * Creates a new slp message
  *
  * @param slplink The slplink through which this slp message will be sent.
+ * If it's set to NULL, it is a temporary SlpMessage.
  * @return The created slp message.
  */
 MsnSlpMessage *msn_slpmsg_new(MsnSlpLink *slplink);
 
 /**
+ * Creates a MsnSlpMessage without a MsnSlpLink by parsing the raw data.
+ *
+ * @param data 		The raw data with the slp message.
+ * @param data_len 	The len of the data
+ *
+ * @return The createed slp message.
+ */
+MsnSlpMessage *msn_slpmsg_new_from_data(const char *data, size_t data_len);
+
+/**
  * Destroys a slp message
  *
  * @param slpmsg The slp message to destory.
  */
 void msn_slpmsg_destroy(MsnSlpMessage *slpmsg);
 
+/**
+ * Relate this SlpMessage with an existing SlpLink
+ *
+ * @param slplink 	The SlpLink that will send this message.
+ */
+void msn_slpmsg_set_slplink(MsnSlpMessage *slpmsg, MsnSlpLink *slplink);
+
 void msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body,
 						 long long size);
 void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img);
@@ -107,6 +112,54 @@ MsnSlpMessage * msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
 								   const char *content_type,
 								   const char *content);
 
-void msn_slpmsg_show(MsnMessage *msg);
+/**
+ * Create a new SLP Ack message
+ *
+ * @param header the value of the header in this slpmsg.
+ *
+ * @return A new SlpMessage with ACK headers
+ */
+MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header);
+
+/**
+ * Create a new SLP message for MsnObject data.
+ *
+ * @param slpcall 	The slpcall that manages this message.
+ * @param img 		The image to be sent in this message.
+ *
+ * @return A new SlpMessage with MsnObject info.
+ */
+MsnSlpMessage *msn_slpmsg_obj_new(MsnSlpCall *slpcall, PurpleStoredImage *img);
+
+/**
+ * Create a new SLP message for data preparation.
+ *
+ * @param slpcall 	The slpcall that manages this message.
+ * 
+ * @return A new SlpMessage with data preparation info.
+ */
+MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall);
+
+/**
+ * Create a new SLP message for File transfer.
+ *
+ * @param slpcall 	The slpcall that manages this message.
+ * @param size 		The size of the file being transsmited.
+ *
+ * @return A new SlpMessage with the file transfer info.
+ */
+MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size);
+
+/**
+ * Serialize the MsnSlpMessage in a way it can be used to be transmited
+ *
+ * @param slpmsg 	The MsnSlpMessage.
+ * @param ret_size 	The size of the buffer cointaining the message.
+ *
+ * @return a buffer with the serialized data.
+ */
+char *msn_slpmsg_serialize(MsnSlpMessage *slpmsg, size_t *ret_size);
+
+void msn_slpmsg_show_readable(MsnSlpMessage *slpmsg);
 
 #endif /* _MSN_SLPMSG_H_ */
diff --git a/libpurple/protocols/msn/slpmsg_part.c b/libpurple/protocols/msn/slpmsg_part.c
new file mode 100644
index 0000000000..d89a878a67
--- /dev/null
+++ b/libpurple/protocols/msn/slpmsg_part.c
@@ -0,0 +1,210 @@
+#include "internal.h"
+#include "debug.h"
+
+#include "slpmsg.h"
+#include "slpmsg_part.h"
+
+MsnSlpMessagePart *msn_slpmsgpart_new(MsnP2PHeader *header, MsnP2PFooter *footer)
+{
+	MsnSlpMessagePart *part;
+
+	part = g_new0(MsnSlpMessagePart, 1);
+
+	if (header)
+		part->header = g_memdup(header, P2P_PACKET_HEADER_SIZE);
+	if (footer)
+		part->footer = g_memdup(footer, P2P_PACKET_FOOTER_SIZE);
+
+	part->ack_cb = msn_slpmsgpart_ack;
+	part->nak_cb = msn_slpmsgpart_nak;
+
+	return msn_slpmsgpart_ref(part);
+}
+
+MsnSlpMessagePart *msn_slpmsgpart_new_from_data(const char *data, size_t data_len)
+{
+	MsnSlpMessagePart *part;
+	MsnP2PHeader *header;
+	const char *tmp;
+	int body_len;
+
+	tmp = data;
+	part = msn_slpmsgpart_new(NULL, NULL);
+
+	if (data_len < sizeof(*header)) {
+		return NULL;
+	}
+
+	/* Extract the binary SLP header */
+	part->header = msn_p2p_header_from_wire((MsnP2PHeader*)tmp);
+	tmp += P2P_PACKET_HEADER_SIZE;
+
+	/* Extract the body */
+	body_len = data_len - P2P_PACKET_HEADER_SIZE - P2P_PACKET_FOOTER_SIZE;
+	/* msg->body_len = msg->msnslp_header.length; */
+
+	if (body_len > 0) {
+		part->size = body_len;
+		part->buffer = g_malloc(body_len);
+		memcpy(part->buffer, tmp, body_len);
+		tmp += body_len;
+	}
+
+	/* Extract the footer */
+	if (body_len >= 0) 
+		part->footer = msn_p2p_footer_from_wire((MsnP2PFooter*)tmp);
+
+	return part;
+}
+
+void msn_slpmsgpart_destroy(MsnSlpMessagePart *part)
+{
+	if (!part)
+		return;
+
+	if (part->ref_count > 0) {
+		msn_slpmsgpart_unref(part);
+		
+		return;
+	}
+
+	g_free(part->header);
+	g_free(part->footer);
+
+	g_free(part);
+
+}
+
+MsnSlpMessagePart *msn_slpmsgpart_ref(MsnSlpMessagePart *part)
+{
+	g_return_val_if_fail(part != NULL, NULL);
+	part->ref_count ++;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "part ref (%p)[%d]\n", part, part->ref_count);
+
+	return part;
+}
+
+MsnSlpMessagePart *msn_slpmsgpart_unref(MsnSlpMessagePart *part)
+{
+	g_return_val_if_fail(part != NULL, NULL);
+	g_return_val_if_fail(part->ref_count > 0, NULL);
+
+	part->ref_count--;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "part unref (%p)[%d]\n", part, part->ref_count);
+
+	if (part->ref_count == 0) {
+		msn_slpmsgpart_destroy(part);
+
+		 return NULL;
+	}
+
+	return part;
+}
+
+void msn_slpmsgpart_set_bin_data(MsnSlpMessagePart *part, const void *data, size_t len)
+{
+	g_return_if_fail(part != NULL);
+
+	if (part->buffer != NULL)
+		g_free(part->buffer);
+
+	if (data != NULL && len > 0) {
+		part->buffer = g_malloc(len + 1);
+		memcpy(part->buffer, data, len);
+		part->buffer[len] = '\0';
+		part->size = len;
+	} else {
+		part->buffer = NULL;
+		part->size = 0;
+	}
+
+}
+
+char *msn_slpmsgpart_serialize(MsnSlpMessagePart *part, size_t *ret_size)
+{
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+	char *base;
+	char *tmp;
+	size_t siz;
+
+	base = g_malloc(P2P_PACKET_HEADER_SIZE + part->size + sizeof(MsnP2PFooter));
+	tmp = base;
+
+	header = msn_p2p_header_to_wire(part->header);
+	footer = msn_p2p_footer_to_wire(part->footer);
+
+	siz = sizeof(MsnP2PHeader);
+	/* Copy header */
+	memcpy(tmp, (char*)header, siz);
+	tmp += siz;
+
+	/* Copy body */
+	memcpy(tmp, part->buffer, part->size);
+	tmp += part->size;
+
+	/* Copy footer */
+	siz = sizeof(MsnP2PFooter);
+	memcpy(tmp, (char*)footer, siz);
+	tmp += siz;
+
+	*ret_size = tmp - base;
+
+	return base;
+}
+/* We have received the message ack */
+void
+msn_slpmsgpart_ack(MsnSlpMessagePart *part, void *data)
+{
+	MsnSlpMessage *slpmsg;
+	long long real_size;
+
+	slpmsg = data;
+
+	real_size = (slpmsg->header->flags == P2P_ACK) ? 0 : slpmsg->size;
+
+	slpmsg->header->offset += part->header->length;
+
+	slpmsg->parts = g_list_remove(slpmsg->parts, part);
+
+	if (slpmsg->header->offset < real_size)
+	{
+		if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
+		{
+			slpmsg->slpcall->xfer_msg = slpmsg;
+			purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
+		}
+		else
+			msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+	}
+	else
+	{
+		/* The whole message has been sent */
+		if (msn_p2p_msg_is_data(slpmsg->header->flags))
+		{
+			if (slpmsg->slpcall != NULL)
+			{
+				if (slpmsg->slpcall->cb)
+					slpmsg->slpcall->cb(slpmsg->slpcall,
+						NULL, 0);
+			}
+		}
+	}
+}
+
+/* We have received the message nak. */
+void
+msn_slpmsgpart_nak(MsnSlpMessagePart *part, void *data)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = data;
+
+	msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+
+	slpmsg->parts = g_list_remove(slpmsg->parts, part);
+}
diff --git a/libpurple/protocols/msn/slpmsg_part.h b/libpurple/protocols/msn/slpmsg_part.h
new file mode 100644
index 0000000000..8bdb428ea5
--- /dev/null
+++ b/libpurple/protocols/msn/slpmsg_part.h
@@ -0,0 +1,41 @@
+#ifndef MSN_SLPMSG_PART_H
+#define MSN_SLPMSG_PART_H
+
+#include "p2p.h"
+
+typedef struct _MsnSlpMessagePart MsnSlpMessagePart;
+typedef void (*MsnSlpPartCb)(MsnSlpMessagePart *part, void *data);
+
+struct _MsnSlpMessagePart
+{
+	int ref_count;
+
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+
+	MsnSlpPartCb ack_cb;
+	MsnSlpPartCb nak_cb;
+	void *ack_data;
+
+	guchar *buffer;
+	size_t size;
+};
+
+MsnSlpMessagePart *msn_slpmsgpart_new(MsnP2PHeader *header, MsnP2PFooter *footer);
+
+MsnSlpMessagePart *msn_slpmsgpart_new_from_data(const char *data, size_t data_len);
+
+void msn_slpmsgpart_destroy(MsnSlpMessagePart *part);
+
+MsnSlpMessagePart *msn_slpmsgpart_ref(MsnSlpMessagePart *part);
+
+MsnSlpMessagePart *msn_slpmsgpart_unref(MsnSlpMessagePart *part);
+
+void msn_slpmsgpart_set_bin_data(MsnSlpMessagePart *part, const void *data, size_t len);
+
+char *msn_slpmsgpart_serialize(MsnSlpMessagePart *part, size_t *ret_size);
+
+void msn_slpmsgpart_ack(MsnSlpMessagePart *part, void *data);
+
+void msn_slpmsgpart_nak(MsnSlpMessagePart *part, void *data);
+#endif /* MSN_SLPMSG_PART_H */
diff --git a/libpurple/protocols/msn/state.c b/libpurple/protocols/msn/state.c
index 536a36e33d..743627f898 100644
--- a/libpurple/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
@@ -23,10 +23,11 @@
  */
 
 #include "internal.h"
+#include "debug.h"
 
 #include "core.h"
 
-#include "msn.h"
+#include "notification.h"
 #include "state.h"
 
 static const char *away_text[] =
@@ -43,10 +44,6 @@ static const char *away_text[] =
 	N_("Available")
 };
 
-/* Local Function Prototype*/
-static char *msn_build_psm(const char *psmstr,const char *mediastr,
-						   const char *guidstr);
-
 /*
  * WLM media PSM info build prcedure
  *
@@ -56,7 +53,7 @@ static char *msn_build_psm(const char *psmstr,const char *mediastr,
  *	<CurrentMedia>\0Office\01\0Office Message\0Office App Name\0</CurrentMedia>"
  */
 static char *
-msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr)
+msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr, guint protocol_ver)
 {
 	xmlnode *dataNode,*psmNode,*mediaNode,*guidNode;
 	char *result;
@@ -82,60 +79,50 @@ msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr)
 	}
 	xmlnode_insert_child(dataNode, guidNode);
 
+	if (protocol_ver >= 16) {
+		/* TODO: What is this for? */
+		xmlnode *ddpNode = xmlnode_new("DDP");
+		xmlnode_insert_child(dataNode, ddpNode);
+	}
+
 	result = xmlnode_to_str(dataNode, &length);
 	xmlnode_free(dataNode);
 	return result;
 }
 
-/* get the CurrentMedia info from the XML string */
+/* get the CurrentMedia info from the XML node */
 char *
-msn_get_currentmedia(char *xml_str, gsize len)
+msn_get_currentmedia(xmlnode *payloadNode)
 {
-	xmlnode *payloadNode, *currentmediaNode;
+	xmlnode *currentmediaNode;
 	char *currentmedia;
 
 	purple_debug_info("msn", "Get CurrentMedia\n");
-	payloadNode = xmlnode_from_str(xml_str, len);
-	if (!payloadNode) {
-		purple_debug_error("msn", "PSM XML parse Error!\n");
-		return NULL;
-	}
 	currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia");
 	if (currentmediaNode == NULL) {
 		purple_debug_info("msn", "No CurrentMedia Node\n");
-		xmlnode_free(payloadNode);
 		return NULL;
 	}
 	currentmedia = xmlnode_get_data(currentmediaNode);
 
-	xmlnode_free(payloadNode);
-
 	return currentmedia;
 }
 
-/*get the PSM info from the XML string*/
+/* Get the PSM info from the XML node */
 char *
-msn_get_psm(char *xml_str, gsize len)
+msn_get_psm(xmlnode *payloadNode)
 {
-	xmlnode *payloadNode, *psmNode;
+	xmlnode *psmNode;
 	char *psm;
 
 	purple_debug_info("msn", "msn get PSM\n");
-	payloadNode = xmlnode_from_str(xml_str, len);
-	if (!payloadNode) {
-		purple_debug_error("msn", "PSM XML parse Error!\n");
-		return NULL;
-	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
 	if (psmNode == NULL) {
 		purple_debug_info("msn", "No PSM status Node\n");
-		xmlnode_free(payloadNode);
 		return NULL;
 	}
 	psm = xmlnode_get_data(psmNode);
 
-	xmlnode_free(payloadNode);
-
 	return psm;
 }
 
@@ -175,14 +162,12 @@ create_media_string(PurplePresence *presence)
 /* set the MSN's PSM info,Currently Read from the status Line
  * Thanks for Cris Code
  */
-void
+static void
 msn_set_psm(MsnSession *session)
 {
 	PurpleAccount *account;
 	PurplePresence *presence;
 	PurpleStatus *status;
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
 	char *payload;
 	const char *statusline;
 	gchar *statusline_stripped, *media = NULL;
@@ -191,7 +176,6 @@ msn_set_psm(MsnSession *session)
 	g_return_if_fail(session->notification != NULL);
 
 	account = session->account;
-	cmdproc = session->notification->cmdproc;
 
 	/* Get the PSM string from Purple's Status Line */
 	presence = purple_account_get_presence(account);
@@ -202,13 +186,11 @@ msn_set_psm(MsnSession *session)
 	statusline_stripped = purple_markup_strip_html(statusline);
 	media = create_media_string(presence);
 	g_free(session->psm);
-	session->psm = msn_build_psm(statusline_stripped, media, NULL);
+	session->psm = msn_build_psm(statusline_stripped, media, session->protocol_ver >= 16 ? session->guid : NULL, session->protocol_ver);
 
 	payload = session->psm;
-	purple_debug_misc("msn", "Sending UUX command with payload: %s\n", payload);
-	trans = msn_transaction_new(cmdproc, "UUX", "%" G_GSIZE_FORMAT, strlen(payload));
-	msn_transaction_set_payload(trans, payload, strlen(payload));
-	msn_cmdproc_send_trans(cmdproc, trans);
+
+	msn_notification_send_uux(session, payload);
 
 	g_free(statusline_stripped);
 	g_free(media);
@@ -219,6 +201,7 @@ msn_change_status(MsnSession *session)
 {
 	PurpleAccount *account;
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
 	MsnUser *user;
 	MsnObject *msnobj;
 	const char *state_text;
@@ -256,11 +239,16 @@ msn_change_status(MsnSession *session)
 	if (!session->logged_in)
 		return;
 
+	msn_set_psm(session);
+
 	msnobj = msn_user_get_object(user);
 
 	if (msnobj == NULL)
 	{
-		msn_cmdproc_send(cmdproc, "CHG", "%s %u", state_text, caps);
+		if (session->protocol_ver >= 16)
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u:%02u 0", state_text, caps, MSN_CLIENT_ID_EXT_CAPS);
+		else
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u", state_text, caps);
 	}
 	else
 	{
@@ -268,12 +256,17 @@ msn_change_status(MsnSession *session)
 
 		msnobj_str = msn_object_to_string(msnobj);
 
-		msn_cmdproc_send(cmdproc, "CHG", "%s %u %s", state_text,
-						 caps, purple_url_encode(msnobj_str));
+		if (session->protocol_ver >= 16)
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u:%02u %s", state_text,
+							 caps, MSN_CLIENT_ID_EXT_CAPS, purple_url_encode(msnobj_str));
+		else
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u %s", state_text,
+							 caps, purple_url_encode(msnobj_str));
 
 		g_free(msnobj_str);
 	}
-	msn_set_psm(session);
+
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 const char *
diff --git a/libpurple/protocols/msn/state.h b/libpurple/protocols/msn/state.h
index 7e31afefea..eca877729c 100644
--- a/libpurple/protocols/msn/state.h
+++ b/libpurple/protocols/msn/state.h
@@ -58,13 +58,11 @@ const char *msn_away_get_text(MsnAwayType type);
 
 const char *msn_state_get_text(MsnAwayType state);
 
-void msn_set_psm(MsnSession *session);
+/* Get the CurrentMedia info from the XML node */
+char *msn_get_currentmedia(xmlnode *payloadNode);
 
-/* Get the CurrentMedia info from the XML string */
-char *msn_get_currentmedia(char *xml_str, gsize len);
-
-/*get the PSM info from the XML string*/
-char *msn_get_psm(char *xml_str, gsize len);
+/* Get the PSM info from the XML node */
+char *msn_get_psm(xmlnode *payloadNode);
 
 MsnAwayType msn_state_from_account(PurpleAccount *account);
 
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 827a03709b..f875a35ecf 100644
--- a/libpurple/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
@@ -21,18 +21,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
-#include "prefs.h"
-#include "switchboard.h"
-#include "notification.h"
-#include "msnutils.h"
 
-#include "error.h"
+#include "internal.h"
+#include "debug.h"
 
-static MsnTable *cbs_table;
+#include "msnutils.h"
+#include "switchboard.h"
+#include "sbconn.h"
+#include "slplink.h"
+#include "user.h"
+#include "userlist.h"
 
-static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg,
-							 MsnMsgErrorType error);
+static MsnTable *cbs_table;
 
 /**************************************************************************
  * Main
@@ -90,9 +90,11 @@ msn_switchboard_destroy(MsnSwitchBoard *swboard)
 	while (swboard->slplinks != NULL) {
 		MsnSlpLink *slplink = swboard->slplinks->data;
 
+		swboard->slplinks = g_list_remove(swboard->slplinks, slplink);
+
 		/* Destroy only those slplinks which use the switchboard */
 		if (slplink->dc == NULL)
-			msn_slplink_destroy(slplink);
+			msn_slplink_unref(slplink);
 		else {
 			swboard->slplinks = g_list_remove(swboard->slplinks, slplink);
 			slplink->swboard = NULL;
@@ -123,7 +125,7 @@ msn_switchboard_destroy(MsnSwitchBoard *swboard)
 	g_free(swboard->session_id);
 
 	for (; swboard->users; swboard->users = g_list_delete_link(swboard->users, swboard->users))
-		g_free(swboard->users->data);
+		msn_user_unref(swboard->users->data);
 
 	session = swboard->session;
 	session->switches = g_list_remove(session->switches, swboard);
@@ -231,6 +233,8 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 {
 	MsnCmdProc *cmdproc;
 	PurpleAccount *account;
+	MsnUserList *userlist;
+	MsnUser *msnuser;
 	char *semicolon;
 	char *passport;
 
@@ -246,13 +250,36 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	else
 		passport = g_strdup(user);
 
+	userlist = swboard->session->userlist;
+	msnuser = msn_userlist_find_user(userlist, passport);
+
 	/* Don't add multiple endpoints to the conversation. */
-	if (g_list_find_custom(swboard->users, passport, (GCompareFunc)strcmp)) {
+	if (g_list_find_custom(swboard->users, passport, (GCompareFunc)msn_user_passport_cmp)) {
+		g_free(passport);
+		return;
+	}
+
+	/* Don't add ourselves either... */
+	if (g_str_equal(passport, purple_account_get_username(account))) {
 		g_free(passport);
 		return;
 	}
 
-	swboard->users = g_list_prepend(swboard->users, passport);
+	/* Don't add ourselves either... */
+	if (g_str_equal(passport, purple_account_get_username(account))) {
+		g_free(passport);
+		return;
+	}
+	
+	if (!msnuser) {
+		purple_debug_info("msn","User %s is not on our list.\n", passport);
+		msnuser = msn_user_new(userlist, passport, NULL);
+	} else
+		msn_user_ref(msnuser);
+
+	g_free(passport);
+
+	swboard->users = g_list_prepend(swboard->users, msnuser);
 	swboard->current_users++;
 	swboard->empty = FALSE;
 
@@ -270,11 +297,11 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	if ((swboard->conv != NULL) &&
 		(purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
 	{
-		purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL,
+		purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), msnuser->passport, NULL,
 								PURPLE_CBFLAGS_NONE, TRUE);
 		msn_servconn_set_idle_timeout(swboard->servconn, 0);
 	}
-	else if (swboard->current_users > 1 || swboard->total_users > 1)
+	else if (swboard->current_users > 1)
 	{
 		msn_servconn_set_idle_timeout(swboard->servconn, 0);
 		if (swboard->conv == NULL ||
@@ -299,7 +326,7 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 			{
 				const char *tmp_user;
 
-				tmp_user = l->data;
+				tmp_user = ((MsnUser*)l->data)->passport;
 
 				purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
 										tmp_user, NULL, PURPLE_CBFLAGS_NONE, TRUE);
@@ -316,7 +343,7 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	else if (swboard->conv == NULL)
 	{
 		swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-															user, account);
+															msnuser->passport, account);
 	}
 	else
 	{
@@ -406,7 +433,7 @@ msg_resend_cb(gpointer data)
 	return FALSE;
 }
 
-static void
+void
 msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
 {
 	MsnSwitchBoard *swboard;
@@ -514,7 +541,7 @@ msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
 		body_enc = g_markup_escape_text(body_str, -1);
 		g_free(body_str);
 
-		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
+		format = msn_message_get_header_value(msg, "X-MMS-IM-Format");
 		msn_parse_format(format, &pre, &post);
 		body_str = g_strdup_printf("%s%s%s", pre ? pre : "",
 								   body_enc ? body_enc : "", post ? post : "");
@@ -543,17 +570,6 @@ msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
  * Message Stuff
  **************************************************************************/
 
-/** Called when a message times out. */
-static void
-msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	MsnMessage *msg;
-
-	msg = trans->data;
-
-	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
-}
-
 /** Called when we receive an error of a message. */
 static void
 msg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
@@ -588,96 +604,6 @@ msg_nak(MsnCmdProc *cmdproc, MsnCommand *cmd)
 }
 #endif
 
-static void
-release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
-{
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
-	char *payload;
-	gsize payload_len;
-	char flag;
-
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	cmdproc = swboard->cmdproc;
-
-	payload = msn_message_gen_payload(msg, &payload_len);
-
-	if (purple_debug_is_verbose()) {
-		purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}\n", payload_len);
-		msn_message_show_readable(msg, "SB SEND", FALSE);
-	}
-
-	flag = msn_message_get_flag(msg);
-	trans = msn_transaction_new(cmdproc, "MSG", "%c %" G_GSIZE_FORMAT,
-								flag, payload_len);
-
-	/* Data for callbacks */
-	msn_transaction_set_data(trans, msg);
-
-	if (flag != 'U') {
-		if (msg->type == MSN_MSG_TEXT)
-		{
-			msg->ack_ref = TRUE;
-			msn_message_ref(msg);
-			swboard->ack_list = g_list_append(swboard->ack_list, msg);
-			msn_transaction_set_timeout_cb(trans, msg_timeout);
-		}
-		else if (msg->type == MSN_MSG_SLP)
-		{
-			msg->ack_ref = TRUE;
-			msn_message_ref(msg);
-			swboard->ack_list = g_list_append(swboard->ack_list, msg);
-			msn_transaction_set_timeout_cb(trans, msg_timeout);
-#if 0
-			if (msg->ack_cb != NULL)
-			{
-				msn_transaction_add_cb(trans, "ACK", msg_ack);
-				msn_transaction_add_cb(trans, "NAK", msg_nak);
-			}
-#endif
-		}
-	}
-
-	trans->payload = payload;
-	trans->payload_len = payload_len;
-
-	msg->trans = trans;
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-static void
-queue_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	purple_debug_info("msn", "Appending message to queue.\n");
-
-	g_queue_push_tail(swboard->msg_queue, msg);
-
-	msn_message_ref(msg);
-}
-
-static void
-process_queue(MsnSwitchBoard *swboard)
-{
-	MsnMessage *msg;
-
-	g_return_if_fail(swboard != NULL);
-
-	purple_debug_info("msn", "Processing queue\n");
-
-	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
-	{
-		purple_debug_info("msn", "Sending message\n");
-		release_msg(swboard, msg);
-		msn_message_unref(msg);
-	}
-}
-
 gboolean
 msn_switchboard_can_send(MsnSwitchBoard *swboard)
 {
@@ -689,20 +615,6 @@ msn_switchboard_can_send(MsnSwitchBoard *swboard)
 	return TRUE;
 }
 
-void
-msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
-						 gboolean queue)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	purple_debug_info("msn", "switchboard send msg..\n");
-	if (msn_switchboard_can_send(swboard))
-		release_msg(swboard, msg);
-	else if (queue)
-		queue_msg(swboard, msg);
-}
-
 /**************************************************************************
  * Switchboard Commands
  **************************************************************************/
@@ -745,7 +657,10 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL);
 
 		passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp);
-		g_free(passport->data);
+		if (passport)
+			g_free(passport->data);
+		else
+			purple_debug_warning("msn", "Can't find user %s in the switchboard\n", user);
 		swboard->users = g_list_delete_link(swboard->users, passport);
 		swboard->current_users--;
 		if (swboard->current_users == 0)
@@ -762,11 +677,9 @@ static void
 iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnSwitchBoard *swboard;
 
 	account = cmdproc->session->account;
-	gc = account->gc;
 	swboard = cmdproc->data;
 
 	swboard->total_users = atoi(cmd->params[2]);
@@ -779,7 +692,6 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnSwitchBoard *swboard;
 	const char *passport;
 
@@ -787,12 +699,11 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	session = cmdproc->session;
 	account = session->account;
-	gc = account->gc;
 	swboard = cmdproc->data;
 
 	msn_switchboard_add_user(swboard, passport);
 
-	process_queue(swboard);
+	msn_sbconn_process_queue(swboard);
 
 	if (!session->http_method)
 		send_clientcaps(swboard);
@@ -855,8 +766,8 @@ ack_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	msg = cmd->trans->data;
 
-	if (msg->ack_cb != NULL)
-		msg->ack_cb(msg, msg->ack_data);
+	if (msg->part && msg->part->ack_cb != NULL)
+		msg->part->ack_cb(msg->part, msg->part->ack_data);
 
 	swboard = cmdproc->data;
 	if (swboard)
@@ -978,6 +889,7 @@ connect_cb(MsnServConn *servconn)
 	MsnTransaction *trans;
 	MsnCmdProc *cmdproc;
 	PurpleAccount *account;
+	char *username;
 
 	cmdproc = servconn->cmdproc;
 	g_return_if_fail(cmdproc != NULL);
@@ -986,24 +898,33 @@ connect_cb(MsnServConn *servconn)
 	swboard = cmdproc->data;
 	g_return_if_fail(swboard != NULL);
 
+	if (servconn->session->protocol_ver >= 16)
+		username = g_strdup_printf("%s;{%s}",
+		                           purple_account_get_username(account),
+		                           servconn->session->guid);
+	else
+		username = g_strdup(purple_account_get_username(account));
+
 	if (msn_switchboard_is_invited(swboard))
 	{
 		swboard->empty = FALSE;
 
 		trans = msn_transaction_new(cmdproc, "ANS", "%s %s %s",
-									purple_account_get_username(account),
+									username,
 									swboard->auth_key, swboard->session_id);
 	}
 	else
 	{
 		trans = msn_transaction_new(cmdproc, "USR", "%s %s",
-									purple_account_get_username(account),
+									username,
 									swboard->auth_key);
 	}
 
 	msn_transaction_set_error_cb(trans, ans_usr_error);
 	msn_transaction_set_data(trans, swboard);
 	msn_cmdproc_send_trans(cmdproc, trans);
+
+	g_free(username);
 }
 
 static void
@@ -1221,8 +1142,11 @@ msn_switchboard_close(MsnSwitchBoard *swboard)
 			 !swboard->session->connected)
 	{
 		MsnCmdProc *cmdproc;
+		MsnTransaction *trans;
 		cmdproc = swboard->cmdproc;
-		msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
+		trans = msn_transaction_new(cmdproc, "OUT", NULL);
+		msn_transaction_set_saveable(trans, FALSE);
+		msn_cmdproc_send_trans(cmdproc, trans);
 
 		msn_switchboard_destroy(swboard);
 	}
diff --git a/libpurple/protocols/msn/switchboard.h b/libpurple/protocols/msn/switchboard.h
index 1a6c958914..213fe58f82 100644
--- a/libpurple/protocols/msn/switchboard.h
+++ b/libpurple/protocols/msn/switchboard.h
@@ -50,12 +50,10 @@ typedef enum
 	MSN_SB_FLAG_FT = 0x02  /**< This switchboard is being used for file transfer. */
 } MsnSBFlag;
 
-#include "conversation.h"
-
+#include "cmdproc.h"
 #include "msg.h"
 #include "servconn.h"
-#include "slplink.h"
-#include "user.h"
+#include "session.h"
 
 /**
  * A switchboard.
@@ -246,6 +244,9 @@ gboolean msn_switchboard_can_send(MsnSwitchBoard *swboard);
 void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
 							  gboolean queue);
 
+void
+msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error);
+
 gboolean msn_switchboard_chat_leave(MsnSwitchBoard *swboard);
 gboolean msn_switchboard_chat_invite(MsnSwitchBoard *swboard, const char *who);
 
@@ -253,30 +254,6 @@ void msn_switchboard_request(MsnSwitchBoard *swboard);
 void msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user);
 
 /**
- * Processes peer to peer messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
- * Processes emoticon messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
- * Processes INVITE messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
  * Shows an ink message from this switchboard.
  *
  * @param swboard  The switchboard.
diff --git a/libpurple/protocols/msn/sync.c b/libpurple/protocols/msn/sync.c
deleted file mode 100644
index 0fa21e734a..0000000000
--- a/libpurple/protocols/msn/sync.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * @file sync.c MSN list synchronization functions
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#include "msn.h"
-#include "sync.h"
-#include "state.h"
-
-static MsnTable *cbs_table;
-
-static void
-blp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	PurpleConnection *gc = cmdproc->session->account->gc;
-	const char *list_name;
-
-	list_name = cmd->params[0];
-
-	if (!g_ascii_strcasecmp(list_name, "AL"))
-	{
-		/*
-		 * If the current setting is AL, messages from users who
-		 * are not in BL will be delivered.
-		 *
-		 * In other words, deny some.
-		 */
-		gc->account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
-	}
-	else
-	{
-		/* If the current setting is BL, only messages from people
-		 * who are in the AL will be delivered.
-		 *
-		 * In other words, permit some.
-		 */
-		gc->account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
-	}
-}
-
-static void
-prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *type, *value;
-
-	type  = cmd->params[0];
-	value = cmd->params[1];
-
-	if (cmd->param_count == 2)
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, purple_url_decode(value));
-	}
-	else
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, NULL);
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, NULL);
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, NULL);
-	}
-}
-
-static void
-lsg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *name;
-	const char *group_id;
-
-	group_id = cmd->params[0];
-	name = purple_url_decode(cmd->params[1]);
-
-	msn_group_new(session->userlist, group_id, name);
-
-	/* HACK */
-	if (group_id == 0)
-	{
-		/* Group of ungroupped buddies */
-		if (session->sync->total_users == 0)
-		{
-			cmdproc->cbs_table = session->sync->old_cbs_table;
-
-			msn_session_finish_login(session);
-
-			msn_sync_destroy(session->sync);
-			session->sync = NULL;
-		}
-		return;
-	}
-
-	if ((purple_find_group(name)) == NULL)
-	{
-		PurpleGroup *g = purple_group_new(name);
-		purple_blist_add_group(g, NULL);
-	}
-}
-
-static void
-lst_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	char *passport = NULL;
-	const char *friend = NULL;
-	int list_op;
-	MsnUser *user;
-
-	passport = cmd->params[0];
-	friend   = purple_url_decode(cmd->params[1]);
-	list_op  = atoi(cmd->params[2]);
-
-	user = msn_user_new(session->userlist, passport, friend);
-
-	msn_userlist_add_user(session->userlist, user);
-
-	session->sync->last_user = user;
-
-	/* TODO: This can be improved */
-
-	if (list_op & MSN_LIST_FL_OP)
-	{
-		char **c;
-		char **tokens;
-		const char *group_nums;
-		GSList *group_ids;
-
-		group_nums = cmd->params[3];
-
-		group_ids = NULL;
-
-		tokens = g_strsplit(group_nums, ",", -1);
-
-		for (c = tokens; *c != NULL; c++)
-		{
-			group_ids = g_slist_append(group_ids, *c);
-		}
-
-
-		msn_got_lst_user(session, user, list_op, group_ids);
-
-		g_strfreev(tokens);
-		g_slist_free(group_ids);
-	}
-	else
-	{
-		msn_got_lst_user(session, user, list_op, NULL);
-	}
-
-	session->sync->num_users++;
-
-	if (session->sync->num_users == session->sync->total_users)
-	{
-		cmdproc->cbs_table = session->sync->old_cbs_table;
-
-		msn_session_finish_login(session);
-
-		msn_sync_destroy(session->sync);
-		session->sync = NULL;
-	}
-}
-
-static void
-bpr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSync *sync = cmdproc->session->sync;
-	const char *type, *value;
-	MsnUser *user;
-
-	user = sync->last_user;
-
-	g_return_if_fail(user != NULL);
-
-	type     = cmd->params[0];
-	value    = cmd->params[1];
-
-	if (value)
-	{
-		if (!strcmp(type, "MOB"))
-		{
-			if (!strcmp(value, "Y"))
-				user->mobile = TRUE;
-		}
-		else if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(user, purple_url_decode(value));
-	}
-}
-
-void
-msn_sync_init(void)
-{
-	cbs_table = msn_table_new();
-
-	/* Syncing */
-	msn_table_add_cmd(cbs_table, NULL, "GTC", NULL);
-	msn_table_add_cmd(cbs_table, NULL, "BLP", blp_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "PRP", prp_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "LSG", lsg_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "LST", lst_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "BPR", bpr_cmd);
-}
-
-void
-msn_sync_end(void)
-{
-	msn_table_destroy(cbs_table);
-}
-
-MsnSync *
-msn_sync_new(MsnSession *session)
-{
-	MsnSync *sync;
-
-	sync = g_new0(MsnSync, 1);
-
-	sync->session = session;
-	sync->cbs_table = cbs_table;
-
-	return sync;
-}
-
-void
-msn_sync_destroy(MsnSync *sync)
-{
-	g_free(sync);
-}
diff --git a/libpurple/protocols/msn/table.h b/libpurple/protocols/msn/table.h
index f6a7b64478..83d9954d13 100644
--- a/libpurple/protocols/msn/table.h
+++ b/libpurple/protocols/msn/table.h
@@ -34,20 +34,60 @@ typedef void (*MsnMsgTypeCb)(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 struct _MsnTable
 {
-	GHashTable *cmds;
-	GHashTable *msgs;
-	GHashTable *errors;
+	GHashTable *cmds; 		/**< Callbacks that manage command response. */
+	GHashTable *msgs; 		/**< Callbacks that manage incoming messages. */
+	GHashTable *errors; 	/**< Callbacks that manage command errors. */
 
-	GHashTable *async;
-	GHashTable *fallback;
+	GHashTable *async; 		/**< Callbacks that manage incoming asyncronous messages. */
+	/* TODO: Does this one is really needed? */
+	GHashTable *fallback; 	/**< Fallback callback. */
 };
 
+/**
+ * Create a new instance of a MsnTable which map commands, errors and messages
+ * with callbacks that will handle it.
+ *
+ * @return A new MsnTable.
+ */
 MsnTable *msn_table_new(void);
+
+/**
+ * Destroy a MsnTable.
+ *
+ * @param table The MsnTable to be destroyed.
+ */
 void msn_table_destroy(MsnTable *table);
 
+/**
+ * Relate an incomming command from server with a callback able to handle
+ * the event.
+ *
+ * @param table 	The MsnTable.
+ * @param command 	If NULL this add an incoming asyncronous command set in answer.
+ * 					Else, the command sent.
+ * @param answer 	The server answer to 'command'. If 'command' is NULL,
+ * 					the asyncronous command sent by the server.
+ * @param cb 		Callback to handle this event.
+ */
 void msn_table_add_cmd(MsnTable *table, char *command, char *answer,
 					   MsnTransCb cb);
+
+/**
+ * Set a callback to handle incoming command errors.
+ *
+ * @param table 	The MsnTable.
+ * @param answer 	Incoming command with error.
+ * @param cb 		Callback to handle this error.
+ */
 void msn_table_add_error(MsnTable *table, char *answer, MsnErrorCb cb);
+
+/**
+ * Relate a message Content-type with a callback able to handle it.
+ *
+ * @param table 	The MsnTable.
+ * @param type 		The Message Content-Type.
+ * @param cb 		Callback to handle this Content-type.
+ */
 void msn_table_add_msg_type(MsnTable *table, char *type, MsnMsgTypeCb cb);
 
 #endif /* MSN_TABLE_H */
diff --git a/libpurple/protocols/msn/transaction.c b/libpurple/protocols/msn/transaction.c
index 936f665696..73ffcd2cdc 100644
--- a/libpurple/protocols/msn/transaction.c
+++ b/libpurple/protocols/msn/transaction.c
@@ -21,6 +21,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+#include "debug.h"
+
 #include "msn.h"
 #include "transaction.h"
 
@@ -37,6 +41,7 @@ msn_transaction_new(MsnCmdProc *cmdproc, const char *command,
 
 	trans->cmdproc = cmdproc;
 	trans->command = g_strdup(command);
+	trans->saveable = TRUE;
 
 	if (format != NULL)
 	{
@@ -96,8 +101,10 @@ msn_transaction_to_string(MsnTransaction *trans)
 
 	if (trans->params != NULL)
 		str = g_strdup_printf("%s %u %s\r\n", trans->command, trans->trId, trans->params);
-	else
+	else if (trans->saveable)
 		str = g_strdup_printf("%s %u\r\n", trans->command, trans->trId);
+	else
+		str = g_strdup_printf("%s\r\n", trans->command);
 
 	return str;
 }
@@ -175,6 +182,14 @@ void msn_transaction_set_data_free(MsnTransaction *trans, GDestroyNotify fn)
 }
 
 void
+msn_transaction_set_saveable(MsnTransaction  *trans, gboolean saveable)
+{
+	g_return_if_fail(trans != NULL);
+
+	trans->saveable = saveable;
+}
+
+void
 msn_transaction_add_cb(MsnTransaction *trans, char *answer,
 					   MsnTransCb cb)
 {
diff --git a/libpurple/protocols/msn/transaction.h b/libpurple/protocols/msn/transaction.h
index 2e977fa3f8..7d4764145e 100644
--- a/libpurple/protocols/msn/transaction.h
+++ b/libpurple/protocols/msn/transaction.h
@@ -24,6 +24,8 @@
 #ifndef MSN_TRANSACTION_H
 #define MSN_TRANSACTION_H
 
+#include "internal.h"
+
 typedef struct _MsnTransaction MsnTransaction;
 
 #include "cmdproc.h"
@@ -40,7 +42,9 @@ typedef void (*MsnErrorCb)(MsnCmdProc *cmdproc, MsnTransaction *trans,
 struct _MsnTransaction
 {
 	MsnCmdProc *cmdproc;
-	unsigned int trId;
+
+	gboolean saveable;	/**< Whether to save this transaction in the history */
+	unsigned int trId;	/**< The ID of this transaction, if it's being saved */
 
 	char *command;
 	char *params;
@@ -74,6 +78,7 @@ void msn_transaction_set_payload(MsnTransaction *trans,
 								 const char *payload, int payload_len);
 void msn_transaction_set_data(MsnTransaction *trans, void *data);
 void msn_transaction_set_data_free(MsnTransaction *trans, GDestroyNotify fn);
+void msn_transaction_set_saveable(MsnTransaction  *trans, gboolean saveable);
 void msn_transaction_add_cb(MsnTransaction *trans, char *answer,
 							MsnTransCb cb);
 void msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb);
diff --git a/libpurple/protocols/msn/user.c b/libpurple/protocols/msn/user.c
index 8e6ba9fe43..7c1664509f 100644
--- a/libpurple/protocols/msn/user.c
+++ b/libpurple/protocols/msn/user.c
@@ -21,10 +21,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+#include "util.h"
+
 #include "user.h"
 #include "slp.h"
 
+static void free_user_endpoint(MsnUserEndpoint *data)
+{
+	g_free(data->id);
+	g_free(data->name);
+	g_free(data);
+}
+
 /*new a user object*/
 MsnUser *
 msn_user_new(MsnUserList *userlist, const char *passport,
@@ -39,15 +50,25 @@ msn_user_new(MsnUserList *userlist, const char *passport,
 	msn_user_set_passport(user, passport);
 	msn_user_set_friendly_name(user, friendly_name);
 
-	return user;
+	return msn_user_ref(user);
 }
 
 /*destroy a user object*/
-void
+static void
 msn_user_destroy(MsnUser *user)
 {
 	g_return_if_fail(user != NULL);
 
+	if (user->refcount > 1) {
+		msn_user_unref(user);
+		return;
+	}
+
+	while (user->endpoints != NULL) {
+		free_user_endpoint(user->endpoints->data);
+		user->endpoints = g_slist_delete_link(user->endpoints, user->endpoints);
+	}
+
 	if (user->clientcaps != NULL)
 		g_hash_table_destroy(user->clientcaps);
 
@@ -82,6 +103,27 @@ msn_user_destroy(MsnUser *user)
 	g_free(user);
 }
 
+MsnUser *
+msn_user_ref(MsnUser *user)
+{
+	g_return_val_if_fail(user != NULL, NULL);
+
+	user->refcount++;
+
+	return user;
+}
+
+void
+msn_user_unref(MsnUser *user)
+{
+	g_return_if_fail(user != NULL);
+
+	user->refcount--;
+
+	if(user->refcount == 0)
+		msn_user_destroy(user);
+}
+
 void
 msn_user_update(MsnUser *user)
 {
@@ -186,6 +228,9 @@ msn_user_set_friendly_name(MsnUser *user, const char *name)
 {
 	g_return_val_if_fail(user != NULL, FALSE);
 
+	if (user == user->userlist->session->user)
+		return FALSE;
+
 	if (user->friendly_name && name && (!strcmp(user->friendly_name, name) ||
 				!strcmp(user->passport, name)))
 		return FALSE;
@@ -217,6 +262,47 @@ msn_user_set_uid(MsnUser *user, const char *uid)
 }
 
 void
+msn_user_set_endpoint_data(MsnUser *user, const char *input, MsnUserEndpoint *newep)
+{
+	MsnUserEndpoint *ep;
+	char *endpoint;
+	GSList *l;
+
+	g_return_if_fail(user != NULL);
+	g_return_if_fail(input != NULL);
+
+	endpoint = g_ascii_strdown(input, -1);
+
+	for (l = user->endpoints; l; l = l->next) {
+		ep = l->data;
+		if (g_str_equal(ep->id, endpoint)) {
+			/* We have info about this endpoint! */
+
+			g_free(endpoint);
+
+			if (newep == NULL) {
+				/* Delete it and exit */
+				user->endpoints = g_slist_delete_link(user->endpoints, l);
+				free_user_endpoint(ep);
+				return;
+			}
+
+			/* Break out of our loop and update it */
+			break;
+		}
+	}
+	if (l == NULL) {
+		/* Need to add a new endpoint */
+		ep = g_new0(MsnUserEndpoint, 1);
+		ep->id = endpoint;
+		user->endpoints = g_slist_prepend(user->endpoints, ep);
+	}
+
+	ep->clientid = newep->clientid;
+	ep->extcaps = newep->extcaps;
+}
+
+void
 msn_user_set_op(MsnUser *user, MsnListOp list_op)
 {
 	g_return_if_fail(user != NULL);
@@ -406,6 +492,14 @@ msn_user_set_clientid(MsnUser *user, guint clientid)
 }
 
 void
+msn_user_set_extcaps(MsnUser *user, guint extcaps)
+{
+	g_return_if_fail(user != NULL);
+
+	user->extcaps = extcaps;
+}
+
+void
 msn_user_set_network(MsnUser *user, MsnNetwork network)
 {
 	g_return_if_fail(user != NULL);
@@ -413,18 +507,83 @@ msn_user_set_network(MsnUser *user, MsnNetwork network)
 	user->networkid = network;
 }
 
+static gboolean
+buddy_icon_cached(PurpleConnection *gc, MsnObject *obj)
+{
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	const char *old;
+	const char *new;
+
+	g_return_val_if_fail(obj != NULL, FALSE);
+
+	account = purple_connection_get_account(gc);
+
+	buddy = purple_find_buddy(account, msn_object_get_creator(obj));
+	if (buddy == NULL)
+		return FALSE;
+
+	old = purple_buddy_icons_get_checksum_for_user(buddy);
+	new = msn_object_get_sha1(obj);
+
+	if (new == NULL)
+		return FALSE;
+
+	/* If the old and new checksums are the same, and the file actually exists,
+	 * then return TRUE */
+	if (old != NULL && !strcmp(old, new))
+		return TRUE;
+
+	return FALSE;
+}
+
+static void
+queue_buddy_icon_request(MsnUser *user)
+{
+	PurpleAccount *account;
+	MsnObject *obj;
+	GQueue *queue;
+
+	g_return_if_fail(user != NULL);
+
+	account = user->userlist->session->account;
+
+	obj = msn_user_get_object(user);
+
+	if (obj == NULL) {
+		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
+		return;
+	}
+
+	if (!buddy_icon_cached(account->gc, obj)) {
+		MsnUserList *userlist;
+
+		userlist = user->userlist;
+		queue = userlist->buddy_icon_requests;
+
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n",
+			                  user->passport, userlist->buddy_icon_window);
+
+		g_queue_push_tail(queue, user);
+
+		if (userlist->buddy_icon_window > 0)
+			msn_release_buddy_icon_request(userlist);
+	}
+}
+
 void
 msn_user_set_object(MsnUser *user, MsnObject *obj)
 {
 	g_return_if_fail(user != NULL);
 
-	if (user->msnobj != NULL)
+	if (user->msnobj != NULL && !msn_object_find_local(msn_object_get_sha1(obj)))
 		msn_object_destroy(user->msnobj);
 
 	user->msnobj = obj;
 
-	if (user->list_op & MSN_LIST_FL_OP)
-		msn_queue_buddy_icon_request(user);
+	if (user != user->userlist->session->user && user->list_op & MSN_LIST_FL_OP)
+		queue_buddy_icon_request(user);
 }
 
 void
@@ -496,6 +655,39 @@ msn_user_get_clientid(const MsnUser *user)
 	return user->clientid;
 }
 
+guint
+msn_user_get_extcaps(const MsnUser *user)
+{
+	g_return_val_if_fail(user != NULL, 0);
+
+	return user->extcaps;
+}
+
+MsnUserEndpoint *
+msn_user_get_endpoint_data(MsnUser *user, const char *input)
+{
+	char *endpoint;
+	GSList *l;
+	MsnUserEndpoint *ep;
+
+	g_return_val_if_fail(user != NULL, NULL);
+	g_return_val_if_fail(input != NULL, NULL);
+
+	endpoint = g_ascii_strdown(input, -1);
+
+	for (l = user->endpoints; l; l = l->next) {
+		ep = l->data;
+		if (g_str_equal(ep->id, endpoint)) {
+			g_free(endpoint);
+			return ep;
+		}
+	}
+
+	g_free(endpoint);
+
+	return NULL;
+}
+
 MsnObject *
 msn_user_get_object(const MsnUser *user)
 {
@@ -520,3 +712,71 @@ msn_user_get_invite_message(const MsnUser *user)
 	return user->invite_message;
 }
 
+gboolean
+msn_user_is_capable(MsnUser *user, char *endpoint, guint capability, guint extcap)
+{
+	g_return_val_if_fail(user != NULL, FALSE);
+
+	if (endpoint != NULL) {
+		MsnUserEndpoint *ep = msn_user_get_endpoint_data(user, endpoint);
+		if (ep != NULL)
+			return (ep->clientid & capability) && (ep->extcaps & extcap);
+		else
+			return FALSE;
+	}
+
+	return (user->clientid & capability) && (user->extcaps & extcap);
+}
+
+/**************************************************************************
+ * Utility functions
+ **************************************************************************/
+
+int
+msn_user_passport_cmp(MsnUser *user, const char *passport)
+{
+	const char *str;
+	char *pass;
+	int result;
+
+	str = purple_normalize_nocase(NULL, msn_user_get_passport(user));
+	pass = g_strdup(str);
+
+#if GLIB_CHECK_VERSION(2,16,0)
+	result = g_strcmp0(pass, purple_normalize_nocase(NULL, passport));
+#else
+	str = purple_normalize_nocase(NULL, passport);
+	if (!pass)
+		result = -(pass != str);
+	else if (!str)
+		result = pass != str;
+	else
+		result = strcmp(pass, str);
+#endif /* GLIB < 2.16.0 */
+
+	g_free(pass);
+
+	return result;
+}
+
+gboolean
+msn_user_is_in_group(MsnUser *user, const char * group_id)
+{
+	if (user == NULL)
+		return FALSE;
+
+	if (group_id == NULL)
+		return FALSE;
+
+	return (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp)) != NULL;
+}
+
+gboolean
+msn_user_is_in_list(MsnUser *user, MsnListId list_id)
+{
+	if (user == NULL)
+		return FALSE;
+
+	return (user->list_op & (1 << list_id));
+}
+
diff --git a/libpurple/protocols/msn/user.h b/libpurple/protocols/msn/user.h
index 49fa34ec1e..02cd297c25 100644
--- a/libpurple/protocols/msn/user.h
+++ b/libpurple/protocols/msn/user.h
@@ -79,10 +79,13 @@ struct _MsnUser
 {
 	MsnUserList *userlist;
 
+	guint8 refcount;        /**< The reference count of this object */
+
 	char *passport;         /**< The passport account.          */
 	char *friendly_name;    /**< The friendly name.             */
 
 	char *uid;              /*< User ID                         */
+	GSList *endpoints;      /*< Endpoint-specific data          */
 
 	const char *status;     /**< The state of the user.         */
 	char *statusline;       /**< The state of the user.         */
@@ -102,6 +105,7 @@ struct _MsnUser
 	GHashTable *clientcaps; /**< The client's capabilities.     */
 
 	guint clientid;         /**< The client's ID                */
+	guint extcaps;			/**< The client's extended capabilities */
 
 	MsnNetwork networkid;   /**< The user's network             */
 
@@ -116,6 +120,18 @@ struct _MsnUser
 	char *invite_message;   /**< Invite message of user request */
 };
 
+/**
+ * A specific user endpoint.
+ */
+typedef struct MsnUserEndpoint {
+	char *id;               /**< The client's endpoint ID          */
+	char *name;             /**< The client's endpoint's name      */
+	int type;               /**< The client's endpoint type        */
+	guint clientid;         /**< The client's ID                   */
+	guint extcaps;          /**< The client's extended capabilites */
+
+} MsnUserEndpoint;
+
 /**************************************************************************
  ** @name User API                                                        *
  **************************************************************************/
@@ -134,12 +150,20 @@ MsnUser *msn_user_new(MsnUserList *userlist, const char *passport,
 					  const char *friendly_name);
 
 /**
- * Destroys a user structure.
+ * Increment the reference count.
+ *
+ * @param user 	The user.
  *
- * @param user The user to destroy.
+ * @return 		user.
  */
-void msn_user_destroy(MsnUser *user);
+MsnUser *msn_user_ref(MsnUser *user);
 
+/**
+ * Decrement the reference count.
+ *
+ * @param user 	The user
+ */
+void msn_user_unref(MsnUser *user);
 
 /**
  * Updates the user.
@@ -252,6 +276,16 @@ void msn_user_set_work_phone(MsnUser *user, const char *number);
 void msn_user_set_uid(MsnUser *user, const char *uid);
 
 /**
+ * Sets endpoint data for a user.
+ *
+ * @param user     The user.
+ * @param endpoint The endpoint.
+ * @param data     The endpoint data.
+ */
+void
+msn_user_set_endpoint_data(MsnUser *user, const char *endpoint, MsnUserEndpoint *data);
+
+/**
  * Sets the client id for a user.
  *
  * @param user     The user.
@@ -260,6 +294,14 @@ void msn_user_set_uid(MsnUser *user, const char *uid);
 void msn_user_set_clientid(MsnUser *user, guint clientid);
 
 /**
+ * Sets the client id for a user.
+ *
+ * @param user     The user.
+ * @param extcaps  The client's extended capabilities.
+ */
+void msn_user_set_extcaps(MsnUser *user, guint extcaps);
+
+/**
  * Sets the network id for a user.
  *
  * @param user    The user.
@@ -346,6 +388,17 @@ const char *msn_user_get_work_phone(const MsnUser *user);
 const char *msn_user_get_mobile_phone(const MsnUser *user);
 
 /**
+ * Gets endpoint data for a user.
+ *
+ * @param user     The user.
+ * @param endpoint The endpoint.
+ *
+ * @return The user's endpoint data.
+ */
+MsnUserEndpoint *
+msn_user_get_endpoint_data(MsnUser *user, const char *endpoint);
+
+/**
  * Returns the client id for a user.
  *
  * @param user    The user.
@@ -355,6 +408,39 @@ const char *msn_user_get_mobile_phone(const MsnUser *user);
 guint msn_user_get_clientid(const MsnUser *user);
 
 /**
+ * Returns the extended capabilities for a user.
+ *
+ * @param user    The user.
+ *
+ * @return The user's extended capabilities.
+ */
+guint msn_user_get_extcaps(const MsnUser *user);
+
+/**************************************************************************
+ * Utility functions
+ **************************************************************************/
+
+
+/**
+ * Check if the user is part of the group.
+ *
+ * @param user 		The user we are asking group membership.
+ * @param group_id 	The group where the user may be in.
+ * 
+ * @return TRUE if user is part of the group. Otherwise, FALSE.
+ */
+gboolean msn_user_is_in_group(MsnUser *user, const char * group_id);
+
+/**
+ * Check if user is on list.
+ *
+ * @param user 		The user we are asking list membership.
+ * @param list_id 	The list where the user may be in.
+ *
+ * @return TRUE if the user is on the list, else FALSE.
+ */
+gboolean msn_user_is_in_list(MsnUser *user, MsnListId list_id);
+/**
  * Returns the network id for a user.
  *
  * @param user    The user.
@@ -398,11 +484,36 @@ gboolean msn_user_is_online(PurpleAccount *account, const char *name);
 /**
  * check to see if user is Yahoo User
  */
-gboolean msn_user_is_yahoo(PurpleAccount *account ,const char *name);
+gboolean msn_user_is_yahoo(PurpleAccount *account, const char *name);
 
 void msn_user_set_op(MsnUser *user, MsnListOp list_op);
 void msn_user_unset_op(MsnUser *user, MsnListOp list_op);
 
+/**
+ * Compare the given passport with the one of the user
+ *
+ * @param user 	User to compare.
+ * @oaran passport 	Passport to compare.
+ *
+ * @return Zero if the passport match with the one of the user, otherwise
+ * a positive integer if the user passport is greather than the one given
+ * and a negative integer if it is less.
+ */
+int msn_user_passport_cmp(MsnUser *user, const char *passport);
+
+/**
+ * Checks whether a user is capable of some task.
+ *
+ * @param user       The user.
+ * @param endpoint   The endpoint. Can be @NULL to check overall capabilities.
+ * @param capability The capability (including client version).
+ * @param extcap     The extended capability.
+ *
+ * @return Whether the user supports the capability.
+ */
+gboolean
+msn_user_is_capable(MsnUser *user, char *endpoint, guint capability, guint extcap);
+
 /*@}*/
 
 #endif /* MSN_USER_H */
diff --git a/libpurple/protocols/msn/userlist.c b/libpurple/protocols/msn/userlist.c
index 157ef26945..a840d90a6c 100644
--- a/libpurple/protocols/msn/userlist.c
+++ b/libpurple/protocols/msn/userlist.c
@@ -21,7 +21,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+#include "debug.h"
+#include "request.h"
+
 #include "msn.h"
+#include "msnutils.h"
 #include "userlist.h"
 
 #include "contact.h"
@@ -107,31 +113,6 @@ got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly,
 }
 
 /**************************************************************************
- * Utility functions
- **************************************************************************/
-
-gboolean
-msn_userlist_user_is_in_group(MsnUser *user, const char * group_id)
-{
-	if (user == NULL)
-		return FALSE;
-
-	if (group_id == NULL)
-		return FALSE;
-
-	return (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp)) != NULL;
-}
-
-gboolean
-msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
-{
-	if (user == NULL)
-		return FALSE;
-
-	return (user->list_op & (1 << list_id));
-}
-
-/**************************************************************************
  * Server functions
  **************************************************************************/
 
@@ -235,7 +216,7 @@ msn_userlist_destroy(MsnUserList *userlist)
 	/*destroy userlist*/
 	for (l = userlist->users; l != NULL; l = l->next)
 	{
-		msn_user_destroy(l->data);
+		msn_user_unref(l->data);
 	}
 	g_list_free(userlist->users);
 
@@ -503,7 +484,7 @@ msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
 
 	g_return_if_fail(user != NULL);
 
-	if ( !msn_userlist_user_is_in_list(user, list_id)) {
+	if ( !msn_user_is_in_list(user, list_id)) {
 		list = lists[list_id];
 		purple_debug_info("msn", "User %s is not in list %s, not removing.\n", who, list);
 		return;
@@ -569,13 +550,13 @@ msn_userlist_add_buddy(MsnUserList *userlist, const char *who, const char *group
 
 	user = msn_userlist_find_add_user(userlist, who, who);
 
-	if ( msn_userlist_user_is_in_list(user, MSN_LIST_FL) ) {
+	if ( msn_user_is_in_list(user, MSN_LIST_FL) ) {
 
 		purple_debug_info("msn", "User %s already exists\n", who);
 
 		msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_BL);
 
-		if (msn_userlist_user_is_in_group(user, group_id)) {
+		if (msn_user_is_in_group(user, group_id)) {
 			purple_debug_info("msn", "User %s is already in group %s, returning\n", who, new_group_name);
 			msn_callback_state_free(state);
 			return;
@@ -604,7 +585,7 @@ msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who,
 	user = msn_userlist_find_add_user(userlist, who, who);
 
 	/* First we're going to check if it's already there. */
-	if (msn_userlist_user_is_in_list(user, list_id))
+	if (msn_user_is_in_list(user, list_id))
 	{
 		list = lists[list_id];
 		purple_debug_info("msn", "User '%s' is already in list: %s\n", who, list);
@@ -706,6 +687,37 @@ msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
 	msn_add_contact_to_group(userlist->session, state, who, new_group_id);
 }
 
+void
+msn_release_buddy_icon_request(MsnUserList *userlist)
+{
+	MsnUser *user;
+
+	g_return_if_fail(userlist != NULL);
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Releasing buddy icon request\n");
+
+	if (userlist->buddy_icon_window > 0) {
+		GQueue *queue;
+
+		queue = userlist->buddy_icon_requests;
+
+		if (g_queue_is_empty(userlist->buddy_icon_requests))
+			return;
+
+		user = g_queue_pop_head(queue);
+
+		userlist->buddy_icon_window--;
+
+		msn_request_user_display(user);
+
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn",
+			                  "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
+			                  userlist->buddy_icon_window);
+	}
+}
+
 /*load userlist from the Blist file cache*/
 void
 msn_userlist_load(MsnSession *session)
diff --git a/libpurple/protocols/msn/userlist.h b/libpurple/protocols/msn/userlist.h
index c7600e8263..0b7f9407a2 100644
--- a/libpurple/protocols/msn/userlist.h
+++ b/libpurple/protocols/msn/userlist.h
@@ -35,6 +35,16 @@ typedef enum
 	MSN_LIST_PL  /**< Pending list */
 } MsnListId;
 
+typedef enum
+{
+	MSN_LIST_FL_OP = 0x01,
+	MSN_LIST_AL_OP = 0x02,
+	MSN_LIST_BL_OP = 0x04,
+	MSN_LIST_RL_OP = 0x08,
+	MSN_LIST_PL_OP = 0x10
+} MsnListOp;
+#define MSN_LIST_OP_MASK	0x07
+
 #include "group.h"
 #include "msn.h"
 #include "user.h"
@@ -52,9 +62,6 @@ struct _MsnUserList
 
 };
 
-gboolean msn_userlist_user_is_in_group(MsnUser *user, const char * group_id);
-gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id);
-
 void msn_got_lst_user(MsnSession *session, MsnUser *user,
 					  MsnListOp list_op, GSList *group_ids);
 
@@ -98,6 +105,7 @@ void msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who,
 				    MsnListId list_id);
 void msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
 				      MsnListId list_id);
+void msn_release_buddy_icon_request(MsnUserList *userlist);
 
 void msn_userlist_load(MsnSession *session);
 
diff --git a/libpurple/protocols/msn/xfer.c b/libpurple/protocols/msn/xfer.c
new file mode 100644
index 0000000000..6ccf5f9c56
--- /dev/null
+++ b/libpurple/protocols/msn/xfer.c
@@ -0,0 +1,138 @@
+#include "internal.h"
+#include "debug.h"
+
+#include "sbconn.h"
+#include "xfer.h"
+
+/**************************************************************************
+ * Xfer
+ **************************************************************************/
+
+void
+msn_xfer_init(PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	/* MsnSlpLink *slplink; */
+	char *content;
+
+	purple_debug_info("msn", "xfer_init\n");
+
+	slpcall = xfer->data;
+
+	/* Send Ok */
+	content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+							  slpcall->session_id);
+
+	msn_slp_send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
+			content);
+
+	g_free(content);
+	msn_slplink_send_queued_slpmsgs(slpcall->slplink);
+}
+
+void
+msn_xfer_cancel(PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	char *content;
+
+	g_return_if_fail(xfer != NULL);
+	g_return_if_fail(xfer->data != NULL);
+
+	slpcall = xfer->data;
+
+	if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL)
+	{
+		if (slpcall->started)
+		{
+			msn_slpcall_close(slpcall);
+		}
+		else
+		{
+			content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+									slpcall->session_id);
+
+			msn_slp_send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
+						content);
+
+			g_free(content);
+			msn_slplink_send_queued_slpmsgs(slpcall->slplink);
+
+			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
+				slpcall->wasted = TRUE;
+			else
+				msn_slpcall_destroy(slpcall);
+		}
+	}
+}
+
+gssize
+msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+
+	g_return_val_if_fail(xfer != NULL, -1);
+	g_return_val_if_fail(data != NULL, -1);
+	g_return_val_if_fail(len > 0, -1);
+
+	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND, -1);
+
+	slpcall = xfer->data;
+	/* Not sure I trust it'll be there */
+	g_return_val_if_fail(slpcall != NULL, -1);
+
+	g_return_val_if_fail(slpcall->xfer_msg != NULL, -1);
+
+	slpcall->u.outgoing.len = len;
+	slpcall->u.outgoing.data = data;
+	msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg);
+
+	return MIN(MSN_SBCONN_MAX_SIZE, len);
+}
+
+gssize
+msn_xfer_read(guchar **data, PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	gsize len;
+
+	g_return_val_if_fail(xfer != NULL, -1);
+	g_return_val_if_fail(data != NULL, -1);
+
+	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE, -1);
+
+	slpcall = xfer->data;
+	/* Not sure I trust it'll be there */
+	g_return_val_if_fail(slpcall != NULL, -1);
+
+	/* Just pass up the whole GByteArray. We'll make another. */
+	*data = slpcall->u.incoming_data->data;
+	len = slpcall->u.incoming_data->len;
+
+	g_byte_array_free(slpcall->u.incoming_data, FALSE);
+	slpcall->u.incoming_data = g_byte_array_new();
+
+	return len;
+}
+
+void
+msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session)
+{
+	if ((purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_DONE) &&
+		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&
+		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))
+	{
+		purple_xfer_cancel_remote(slpcall->xfer);
+	}
+}
+
+void
+msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
+					  gsize size)
+{
+	PurpleXfer *xfer = slpcall->xfer;
+
+	purple_xfer_set_completed(xfer, TRUE);
+	purple_xfer_end(xfer);
+}
+
diff --git a/libpurple/protocols/msn/xfer.h b/libpurple/protocols/msn/xfer.h
new file mode 100644
index 0000000000..27edb9b77f
--- /dev/null
+++ b/libpurple/protocols/msn/xfer.h
@@ -0,0 +1,12 @@
+
+#include "slpcall.h"
+
+void msn_xfer_init(PurpleXfer *xfer);
+void msn_xfer_cancel(PurpleXfer *xfer);
+
+gssize msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer);
+gssize msn_xfer_read(guchar **data, PurpleXfer *xfer);
+
+void msn_xfer_completed_cb(MsnSlpCall *slpcall,
+						   const guchar *body, gsize size);
+void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
diff --git a/libpurple/protocols/myspace/message.c b/libpurple/protocols/myspace/message.c
index 2311c49239..b20a7364ed 100644
--- a/libpurple/protocols/myspace/message.c
+++ b/libpurple/protocols/myspace/message.c
@@ -1363,7 +1363,7 @@ msim_msg_get_binary_from_element(MsimMessageElement *elem, gchar **binary_data,
 			 *
 			 */
 			*binary_data = (gchar *)purple_base64_decode((const gchar *)elem->data, binary_length);
-			return TRUE;
+			return ((*binary_data) != NULL);
 
 		case MSIM_TYPE_BINARY:
 			gs = (GString *)elem->data;
diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am
index 4cf5e4995b..fc78e47b0c 100644
--- a/libpurple/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -10,6 +10,7 @@ OSCARSOURCES = \
 	bstream.c           \
 	clientlogin.c       \
 	encoding.c          \
+	encoding.h          \
 	family_admin.c      \
 	family_alert.c      \
 	family_auth.c       \
@@ -44,7 +45,8 @@ OSCARSOURCES = \
 	tlv.c               \
 	userinfo.c          \
 	util.c              \
-	visibility.c
+	visibility.c	    \
+	visibility.h
 
 AM_CFLAGS = $(st)
 
diff --git a/libpurple/protocols/oscar/clientlogin.c b/libpurple/protocols/oscar/clientlogin.c
index 9221e5c49d..1a1f1363f3 100644
--- a/libpurple/protocols/oscar/clientlogin.c
+++ b/libpurple/protocols/oscar/clientlogin.c
@@ -42,8 +42,36 @@
 #include "cipher.h"
 #include "core.h"
 
-#define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
-#define URL_START_OSCAR_SESSION "https://api.oscar.aol.com/aim/startOSCARSession"
+#define AIM_LOGIN_HOST "api.screenname.aol.com"
+#define ICQ_LOGIN_HOST "api.login.icq.net"
+
+#define AIM_API_HOST "api.oscar.aol.com"
+#define ICQ_API_HOST "api.icq.net"
+
+#define CLIENT_LOGIN_PAGE "/auth/clientLogin"
+#define START_OSCAR_SESSION_PAGE "/aim/startOSCARSession"
+
+#define HTTPS_FORMAT_URL(host, page) "https://" host page
+
+static const gchar *client_login_urls[] = {
+	HTTPS_FORMAT_URL(AIM_LOGIN_HOST, CLIENT_LOGIN_PAGE),
+	HTTPS_FORMAT_URL(ICQ_LOGIN_HOST, CLIENT_LOGIN_PAGE),
+};
+
+static const gchar *start_oscar_session_urls[] = {
+	HTTPS_FORMAT_URL(AIM_API_HOST, START_OSCAR_SESSION_PAGE),
+	HTTPS_FORMAT_URL(ICQ_API_HOST, START_OSCAR_SESSION_PAGE),
+};
+
+static const gchar *get_client_login_url(OscarData *od)
+{
+	return client_login_urls[od->icq ? 1 : 0];
+}
+
+static const gchar *get_start_oscar_session_url(OscarData *od)
+{
+	return start_oscar_session_urls[od->icq ? 1 : 0];
+}
 
 /*
  * Using clientLogin requires a developer ID.  This key is for libpurple.
@@ -65,10 +93,22 @@ static const char *get_client_key(OscarData *od)
 static gchar *generate_error_message(xmlnode *resp, const char *url)
 {
 	xmlnode *text;
+	xmlnode *status_code_node;
+	gchar *status_code;
+	gboolean have_error_code = TRUE;
 	gchar *err = NULL;
 	gchar *details = NULL;
 
-	if (resp && (text = xmlnode_get_child(resp, "statusText"))) {
+	status_code_node = xmlnode_get_child(resp, "statusCode");
+	if (status_code_node) {
+		/* We can get 200 OK here if the server omitted something we think it shouldn't have (see #12783).
+		 * No point in showing the "Ok" string to the user.
+		 */
+		if ((status_code = xmlnode_get_data_unescaped(status_code_node)) && strcmp(status_code, "200") == 0) {
+			have_error_code = FALSE;
+		}
+	}
+	if (have_error_code && resp && (text = xmlnode_get_child(resp, "statusText"))) {
 		details = xmlnode_get_data(text);
 	}
 
@@ -125,13 +165,12 @@ static gchar *generate_signature(const char *method, const char *url, const char
 
 static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const gchar *response, gsize response_len, char **host, unsigned short *port, char **cookie, char **tls_certname)
 {
+	OscarData *od = purple_connection_get_protocol_data(gc);
 	xmlnode *response_node, *tmp_node, *data_node;
 	xmlnode *host_node = NULL, *port_node = NULL, *cookie_node = NULL, *tls_node = NULL;
-	gboolean use_tls;
 	char *tmp;
 	guint code;
-
-	use_tls = purple_account_get_bool(purple_connection_get_account(gc), "use_ssl", OSCAR_DEFAULT_USE_SSL);
+	const gchar *encryption_type = purple_account_get_string(purple_connection_get_account(gc), "encryption", OSCAR_DEFAULT_ENCRYPTION);
 
 	/* Parse the response as XML */
 	response_node = xmlnode_from_str(response, response_len);
@@ -142,7 +181,7 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 				"response as XML: %s\n", response);
 		/* Note to translators: %s in this string is a URL */
 		msg = generate_error_message(response_node,
-				URL_START_OSCAR_SESSION);
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -156,7 +195,6 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		host_node = xmlnode_get_child(data_node, "host");
 		port_node = xmlnode_get_child(data_node, "port");
 		cookie_node = xmlnode_get_child(data_node, "cookie");
-		tls_node = xmlnode_get_child(data_node, "tlsCertName");
 	}
 
 	/* Make sure we have a status code */
@@ -165,7 +203,7 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		purple_debug_error("oscar", "startOSCARSession response was "
 				"missing statusCode: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_START_OSCAR_SESSION);
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -203,7 +241,7 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		else {
 			char *msg;
 			msg = generate_error_message(response_node,
-					URL_START_OSCAR_SESSION);
+					get_start_oscar_session_url(od));
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR, msg);
 			g_free(msg);
@@ -216,15 +254,13 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 	g_free(tmp);
 
 	/* Make sure we have everything else */
-	if (data_node == NULL || host_node == NULL ||
-		port_node == NULL || cookie_node == NULL ||
-		(use_tls && tls_node == NULL))
+	if (data_node == NULL || host_node == NULL || port_node == NULL || cookie_node == NULL)
 	{
 		char *msg;
 		purple_debug_error("oscar", "startOSCARSession response was missing "
 				"something: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_START_OSCAR_SESSION);
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -232,22 +268,37 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		return FALSE;
 	}
 
+	if (strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0) {
+		tls_node = xmlnode_get_child(data_node, "tlsCertName");
+		if (tls_node != NULL) {
+			*tls_certname = xmlnode_get_data_unescaped(tls_node);
+		} else {
+			if (strcmp(encryption_type, OSCAR_OPPORTUNISTIC_ENCRYPTION) == 0) {
+				purple_debug_warning("oscar", "We haven't received a tlsCertName to use. We will not do SSL to BOS.\n");
+			} else {
+				purple_debug_error("oscar", "startOSCARSession was missing tlsCertName: %s\n", response);
+				purple_connection_error_reason(
+					gc,
+					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+					_("You required encryption in your account settings, but one of the servers doesn't support it."));
+				xmlnode_free(response_node);
+				return FALSE;
+			}
+		}
+	}
+
 	/* Extract data from the XML */
 	*host = xmlnode_get_data_unescaped(host_node);
 	tmp = xmlnode_get_data_unescaped(port_node);
 	*cookie = xmlnode_get_data_unescaped(cookie_node);
 
-	if (use_tls)
-		*tls_certname = xmlnode_get_data_unescaped(tls_node);
-
-	if (*host == NULL || **host == '\0' || tmp == NULL || *tmp == '\0' || *cookie == NULL || **cookie == '\0' ||
-			(use_tls && (*tls_certname == NULL || **tls_certname == '\0')))
+	if (*host == NULL || **host == '\0' || tmp == NULL || *tmp == '\0' || *cookie == NULL || **cookie == '\0')
 	{
 		char *msg;
 		purple_debug_error("oscar", "startOSCARSession response was missing "
 				"something: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_START_OSCAR_SESSION);
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -272,7 +323,7 @@ static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer us
 	char *tls_certname = NULL;
 	unsigned short port;
 	guint8 *cookiedata;
-	gsize cookiedata_len;
+	gsize cookiedata_len = 0;
 
 	od = user_data;
 	gc = od->gc;
@@ -284,7 +335,7 @@ static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer us
 		/* Note to translators: The first %s is a URL, the second is an
 		   error message. */
 		tmp = g_strdup_printf(_("Error requesting %s: %s"),
-				URL_START_OSCAR_SESSION, error_message);
+				get_start_oscar_session_url(od), error_message);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
@@ -306,11 +357,8 @@ static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer us
 static void send_start_oscar_session(OscarData *od, const char *token, const char *session_key, time_t hosttime)
 {
 	char *query_string, *signature, *url;
-	PurpleAccount *account;
-	gboolean use_tls;
-
-	account = purple_connection_get_account(od->gc);
-	use_tls = purple_account_get_bool(account, "use_ssl", OSCAR_DEFAULT_USE_SSL);
+	PurpleAccount *account = purple_connection_get_account(od->gc);
+	const gchar *encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
 
 	/*
 	 * Construct the GET parameters.  0x00000611 is the distid given to
@@ -323,12 +371,13 @@ static void send_start_oscar_session(OscarData *od, const char *token, const cha
 			"&ts=%" PURPLE_TIME_T_MODIFIER
 			"&useTLS=%d",
 			purple_url_encode(token),
-			oscar_get_ui_info_int(od->icq ? "prpl-icq-distid"
-					: "prpl-aim-distid", 0x00000611),
-			get_client_key(od), hosttime, use_tls);
-	signature = generate_signature("GET", URL_START_OSCAR_SESSION,
+			oscar_get_ui_info_int(od->icq ? "prpl-icq-distid" : "prpl-aim-distid", 0x00000611),
+			get_client_key(od),
+			hosttime,
+			strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0 ? 1 : 0);
+	signature = generate_signature("GET", get_start_oscar_session_url(od),
 			query_string, session_key);
-	url = g_strdup_printf(URL_START_OSCAR_SESSION "?%s&sig_sha256=%s",
+	url = g_strdup_printf("%s?%s&sig_sha256=%s", get_start_oscar_session_url(od),
 			query_string, signature);
 	g_free(query_string);
 	g_free(signature);
@@ -367,6 +416,7 @@ static void send_start_oscar_session(OscarData *od, const char *token, const cha
  */
 static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *response, gsize response_len, char **token, char **secret, time_t *hosttime)
 {
+	OscarData *od = purple_connection_get_protocol_data(gc);
 	xmlnode *response_node, *tmp_node, *data_node;
 	xmlnode *secret_node = NULL, *hosttime_node = NULL, *token_node = NULL, *tokena_node = NULL;
 	char *tmp;
@@ -379,7 +429,7 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		purple_debug_error("oscar", "clientLogin could not parse "
 				"response as XML: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_CLIENT_LOGIN);
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -403,7 +453,7 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		purple_debug_error("oscar", "clientLogin response was "
 				"missing statusCode: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_CLIENT_LOGIN);
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -446,7 +496,7 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		} else {
 			char *msg;
 			msg = generate_error_message(response_node,
-					URL_CLIENT_LOGIN);
+					get_client_login_url(od));
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR, msg);
 			g_free(msg);
@@ -465,7 +515,7 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		purple_debug_error("oscar", "clientLogin response was missing "
 				"something: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_CLIENT_LOGIN);
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -483,7 +533,7 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		purple_debug_error("oscar", "clientLogin response was missing "
 				"something: %s\n", response);
 		msg = generate_error_message(response_node,
-				URL_CLIENT_LOGIN);
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -520,10 +570,10 @@ static void client_login_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data
 		gchar *tmp;
 		if (error_message != NULL)
 			tmp = g_strdup_printf(_("Error requesting %s: %s"),
-					URL_CLIENT_LOGIN, error_message);
+					get_client_login_url(od), error_message);
 		else
 			tmp = g_strdup_printf(_("Error requesting %s"),
-					URL_CLIENT_LOGIN);
+					get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
@@ -599,7 +649,7 @@ void send_client_login(OscarData *od, const char *username)
 
 	/* Send the POST request  */
 	od->url_data = purple_util_fetch_url_request_len_with_account(
-			purple_connection_get_account(gc), URL_CLIENT_LOGIN,
+			purple_connection_get_account(gc), get_client_login_url(od),
 			TRUE, NULL, FALSE, request->str, FALSE, -1,
 			client_login_cb, od);
 	g_string_free(request, TRUE);
diff --git a/libpurple/protocols/oscar/encoding.c b/libpurple/protocols/oscar/encoding.c
index 985f2cb295..195965cc7a 100644
--- a/libpurple/protocols/oscar/encoding.c
+++ b/libpurple/protocols/oscar/encoding.c
@@ -61,7 +61,6 @@ oscar_encoding_to_utf8(const char *encoding, const char *text, int textlen)
 	} else if (!g_ascii_strcasecmp(extracted_encoding, "unicode-2-0")) {
 		glib_encoding = "UTF-16BE";
 	} else if (g_ascii_strcasecmp(extracted_encoding, "utf-8")) {
-		purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", attempting to convert to UTF-8 anyway\n", extracted_encoding);
 		glib_encoding = extracted_encoding;
 	}
 
diff --git a/libpurple/protocols/oscar/family_chat.c b/libpurple/protocols/oscar/family_chat.c
index 89fa331c0c..b1b3ab72df 100644
--- a/libpurple/protocols/oscar/family_chat.c
+++ b/libpurple/protocols/oscar/family_chat.c
@@ -88,6 +88,8 @@ infoupdate(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 		return 1;
 	}
 
+	byte_stream_get16(bs); /* skip the TLV count */
+
 	/*
 	 * Everything else are TLVs.
 	 */
diff --git a/libpurple/protocols/oscar/family_icbm.c b/libpurple/protocols/oscar/family_icbm.c
index 2399271297..9b05a1e571 100644
--- a/libpurple/protocols/oscar/family_icbm.c
+++ b/libpurple/protocols/oscar/family_icbm.c
@@ -1320,7 +1320,7 @@ static int incomingim_ch2(OscarData *od, FlapConnection *conn, aim_module_t *mod
 
 	/*
 	 * Terminate connection/error code.  0x0001 means the other user
-	 * canceled the connection.
+	 * cancelled the connection.
 	 */
 	if (aim_tlv_gettlv(list2, 0x000b, 1))
 		args.errorcode = aim_tlv_get16(list2, 0x000b, 1);
@@ -1691,7 +1691,7 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 				purple_debug_misc("oscar", "X-Status: Received XML reply\n");
 				if (xml) {
 					GString *xstatus;
-					char *tmp1, *tmp2;
+					char *tmp1, *tmp2, *unescaped_xstatus;
 
 					/* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", xml); */
 
@@ -1709,29 +1709,32 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 						tmp1 += 12;
 						tmp2 = strstr(tmp1, "&lt;/desc&gt;");
 						if (tmp2 != NULL) {
-							if (xstatus->len > 0)
+							if (xstatus->len > 0 && tmp2 > tmp1)
 								g_string_append(xstatus, " - ");
 							g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
 						}
 					}
-					if (xstatus->len > 0) {
-						purple_debug_misc("oscar", "X-Status reply: %s\n", xstatus->str);
+					unescaped_xstatus = purple_unescape_text(xstatus->str);
+					g_string_free(xstatus, TRUE);
+					if (*unescaped_xstatus) {
+						purple_debug_misc("oscar", "X-Status reply: %s\n", unescaped_xstatus);
 						account = purple_connection_get_account(od->gc);
 						buddy = purple_find_buddy(account, bn);
 						presence = purple_buddy_get_presence(buddy);
-						status = purple_presence_get_active_status(presence);
-						purple_prpl_got_user_status(account, bn,
-								purple_status_get_id(status),
-								"message", xstatus->str, NULL);
+						status = purple_presence_get_status(presence, "mood");
+						if (status) {
+							purple_prpl_got_user_status(account, bn,
+									"mood",
+									PURPLE_MOOD_NAME, purple_status_get_attr_string(status, PURPLE_MOOD_NAME),
+									PURPLE_MOOD_COMMENT, unescaped_xstatus, NULL);
+						}
 					}
-					g_string_free(xstatus, TRUE);
+					g_free(unescaped_xstatus);
 				} else {
 					purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
 				}
 			} else {
 				purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n");
-				/* if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-					ret = userfunc(od, conn, frame, channel, sn, reason); */
 			}
 
 		}
@@ -1936,10 +1939,9 @@ int icq_im_xstatus_request(OscarData *od, const char *sn)
 	fmt = "<N><QUERY>&lt;Q&gt;&lt;PluginID&gt;srvMng&lt;/PluginID&gt;&lt;/Q&gt;</QUERY><NOTIFY>&lt;srv&gt;&lt;id&gt;cAwaySrv&lt;/id&gt;&lt;req&gt;&lt;id&gt;AwayStat&lt;/id&gt;&lt;trans&gt;2&lt;/trans&gt;&lt;senderId&gt;%s&lt;/senderId&gt;&lt;/req&gt;&lt;/srv&gt;</NOTIFY></N>\r\n";
 
 	account = purple_connection_get_account(od->gc);
-	xmllen = strlen(fmt) - 2 + strlen(account->username);
 
-	statxml = g_malloc(xmllen);
-	snprintf(statxml, xmllen, fmt, account->username);
+	statxml = g_strdup_printf(fmt, account->username);
+	xmllen = strlen(statxml);
 
 	aim_icbm_makecookie(cookie);
 
@@ -1962,7 +1964,7 @@ int icq_im_xstatus_request(OscarData *od, const char *sn)
 	/* Add Plugin Specific Data */
 	byte_stream_new(&plugindata, (sizeof(c_plugindata) + xmllen));
 	byte_stream_putraw(&plugindata, c_plugindata, sizeof(c_plugindata)); /* Content of TLV 0x2711 */
-	byte_stream_putstr(&plugindata, statxml);
+	byte_stream_putraw(&plugindata, (const guint8*)statxml, xmllen);
 
 	aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, (sizeof(c_plugindata) + xmllen), plugindata.data);
 
@@ -2048,20 +2050,18 @@ int icq_relay_xstatus(OscarData *od, const char *sn, const guchar *cookie)
 	if (!msg)
 		return -EINVAL;
 
-	len = strlen(fmt) - 6 + strlen(account->username) + strlen(title) + strlen(msg);
-	statxml = g_malloc(len);
-
-	snprintf(statxml, len, fmt, account->username, title, msg);
+	statxml = g_strdup_printf(fmt, account->username, title, msg);
+	len = strlen(statxml);
 
 	purple_debug_misc("oscar", "X-Status AutoReply: %s, %s\n", formatted_msg, msg);
 
-	byte_stream_new(&bs, 10 + 8 + 2 + 1 + strlen(sn) + 2 + sizeof(plugindata) + strlen(statxml)); /* 16 extra */
+	byte_stream_new(&bs, 10 + 8 + 2 + 1 + strlen(sn) + 2 + sizeof(plugindata) + len); /* 16 extra */
 
 	snacid = aim_cachesnac(od, 0x0004, 0x000b, 0x0000, NULL, 0);
 	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 	byte_stream_put16(&bs, 0x0003);
 	byte_stream_putraw(&bs, plugindata, sizeof(plugindata));
-	byte_stream_putraw(&bs, (const guint8*)statxml, strlen(statxml));
+	byte_stream_putraw(&bs, (const guint8*)statxml, len);
 
 	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x000b, snacid, &bs, TRUE);
 
diff --git a/libpurple/protocols/oscar/family_icq.c b/libpurple/protocols/oscar/family_icq.c
index 92008e8319..0dd17ed39c 100644
--- a/libpurple/protocols/oscar/family_icq.c
+++ b/libpurple/protocols/oscar/family_icq.c
@@ -408,27 +408,27 @@ int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char
 	return 0;
 }
 
-static int
+static void
 gotalias(OscarData *od, struct aim_icq_info *info)
 {
 	PurpleConnection *gc = od->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar who[16], *utf8;
 	PurpleBuddy *b;
+	gchar *utf8 = oscar_utf8_try_convert(account, od, info->nick);
 
-	if (info->nick[0] && (utf8 = oscar_utf8_try_convert(account, od, info->nick))) {
-		if (info->for_auth_request) {
-			oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason);
-		} else {
+	if (info->for_auth_request) {
+		oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason);
+	} else {
+		if (utf8 && *utf8) {
+			gchar who[16];
 			g_snprintf(who, sizeof(who), "%u", info->uin);
 			serv_got_alias(gc, who, utf8);
 			if ((b = purple_find_buddy(account, who))) {
 				purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8);
 			}
-			g_free(utf8);
 		}
+		g_free(utf8);
 	}
-	return 1;
 }
 
 /**
diff --git a/libpurple/protocols/oscar/family_oservice.c b/libpurple/protocols/oscar/family_oservice.c
index b566642289..e24018c11c 100644
--- a/libpurple/protocols/oscar/family_oservice.c
+++ b/libpurple/protocols/oscar/family_oservice.c
@@ -1041,63 +1041,45 @@ aim_sendmemblock(OscarData *od, FlapConnection *conn, guint32 offset, guint32 le
 static int
 aim_parse_extstatus(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	guint16 type;
-	guint8 flags, length;
-
-	type = byte_stream_get16(bs);
-	flags = byte_stream_get8(bs);
-	length = byte_stream_get8(bs);
-
-	/*
-	 * A flag of 0x01 could mean "this is the checksum we have for you"
-	 * A flag of 0x40 could mean "I don't have your icon, upload it"
-	 */
-
-	switch (type) {
-		case 0x0000:
-		case 0x0001: { /* buddy icon checksum */
-			/* not sure what the difference between 1 and 0 is */
-			guint8 *md5 = byte_stream_getraw(bs, length);
-
-			if ((flags == 0x00) || (flags == 0x41)) {
-				if (!flap_connection_getbytype(od, SNAC_FAMILY_BART) && !od->iconconnecting) {
-					od->iconconnecting = TRUE;
-					od->set_icon = TRUE;
-					aim_srv_requestnew(od, SNAC_FAMILY_BART);
-				} else {
-					PurpleAccount *account = purple_connection_get_account(od->gc);
-					PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
-					if (img == NULL) {
-						aim_ssi_delicon(od);
-					} else {
-
-						purple_debug_info("oscar",
-										"Uploading icon to icon server\n");
-						aim_bart_upload(od, purple_imgstore_get_data(img),
-						                purple_imgstore_get_size(img));
-						purple_imgstore_unref(img);
-					}
-				}
-			} else if (flags == 0x81) {
+	guint16 type = byte_stream_get16(bs);
+	if (type == 0x0000 || type == 0x0001) {
+		/* buddy icon checksum */
+		/* not sure what the difference between 1 and 0 is */
+		guint8 flags = byte_stream_get8(bs);
+		guint8 length = byte_stream_get8(bs);
+		guint8 *md5 = byte_stream_getraw(bs, length);
+
+		if ((flags == 0x00) || (flags == 0x41)) {
+			if (!flap_connection_getbytype(od, SNAC_FAMILY_BART) && !od->iconconnecting) {
+				od->iconconnecting = TRUE;
+				od->set_icon = TRUE;
+				aim_srv_requestnew(od, SNAC_FAMILY_BART);
+			} else {
 				PurpleAccount *account = purple_connection_get_account(od->gc);
 				PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
-				if (img == NULL)
+				if (img == NULL) {
 					aim_ssi_delicon(od);
-				else {
-					aim_ssi_seticon(od, md5, length);
+				} else {
+
+					purple_debug_info("oscar",
+									"Uploading icon to icon server\n");
+					aim_bart_upload(od, purple_imgstore_get_data(img),
+							purple_imgstore_get_size(img));
 					purple_imgstore_unref(img);
 				}
 			}
+		} else if (flags == 0x81) {
+			PurpleAccount *account = purple_connection_get_account(od->gc);
+			PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
+			if (img == NULL)
+				aim_ssi_delicon(od);
+			else {
+				aim_ssi_seticon(od, md5, length);
+				purple_imgstore_unref(img);
+			}
+		}
 
-			g_free(md5);
-		} break;
-
-		case 0x0002: {
-			/* We just set an available message? */
-			/* there is a second length that is just for the message */
-			char *msg = byte_stream_getstr(bs, byte_stream_get16(bs));
-			g_free(msg);
-		} break;
+		g_free(md5);
 	}
 
 	return 0;
diff --git a/libpurple/protocols/oscar/flap_connection.c b/libpurple/protocols/oscar/flap_connection.c
index 8b4dc621d4..e6905a08c8 100644
--- a/libpurple/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
@@ -435,11 +435,16 @@ flap_connection_destroy_cb(gpointer data)
 	aim_rxcallback_t userfunc;
 
 	conn = data;
+	/* Explicitly added for debugging #5927.  Don't re-order this, only
+	 * consider removing it.
+	 */
+	purple_debug_info("oscar", "Destroying FLAP connection %p\n", conn);
+
 	od = conn->od;
 	account = purple_connection_get_account(od->gc);
 
-	purple_debug_info("oscar", "Destroying oscar connection of "
-			"type 0x%04hx.  Disconnect reason is %d\n",
+	purple_debug_info("oscar", "Destroying oscar connection (%p) of "
+			"type 0x%04hx.  Disconnect reason is %d\n", conn,
 			conn->type, conn->disconnect_reason);
 
 	od->oscar_connections = g_slist_remove(od->oscar_connections, conn);
@@ -575,7 +580,7 @@ flap_connection_schedule_destroy(FlapConnection *conn, OscarDisconnectReason rea
 		return;
 
 	purple_debug_info("oscar", "Scheduling destruction of FLAP "
-			"connection of type 0x%04hx\n", conn->type);
+			"connection %p of type 0x%04hx\n", conn, conn->type);
 	conn->disconnect_reason = reason;
 	g_free(conn->error_message);
 	conn->error_message = g_strdup(error_message);
diff --git a/libpurple/protocols/oscar/libaim.c b/libpurple/protocols/oscar/libaim.c
index 3862930728..36d8c9395b 100644
--- a/libpurple/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/libaim.c
@@ -143,7 +143,7 @@ static PurplePluginInfo info =
 static void
 init_plugin(PurplePlugin *plugin)
 {
-	oscar_init(plugin);
+	oscar_init(plugin, FALSE);
 }
 
 PURPLE_INIT_PLUGIN(aim, init_plugin, info);
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
index f7bfecaa79..2edb501d91 100644
--- a/libpurple/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/libicq.c
@@ -155,7 +155,7 @@ init_plugin(PurplePlugin *plugin)
 {
 	PurpleAccountOption *option;
 
-	oscar_init(plugin);
+	oscar_init(plugin, TRUE);
 
 	option = purple_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
diff --git a/libpurple/protocols/oscar/oft.c b/libpurple/protocols/oscar/oft.c
index 47891cebca..2b99ae4212 100644
--- a/libpurple/protocols/oscar/oft.c
+++ b/libpurple/protocols/oscar/oft.c
@@ -207,7 +207,7 @@ peer_oft_checksum_file(PeerConnection *conn, PurpleXfer *xfer, GSourceFunc callb
 	checksum_data->callback = callback;
 	checksum_data->size = size;
 	checksum_data->checksum = 0xffff0000;
-	checksum_data->file = fopen(purple_xfer_get_local_filename(xfer), "rb");
+	checksum_data->file = g_fopen(purple_xfer_get_local_filename(xfer), "rb");
 
 	if (checksum_data->file == NULL)
 	{
@@ -240,7 +240,7 @@ void
 peer_oft_close(PeerConnection *conn)
 {
 	/*
-	 * If canceled by local user, and we're receiving a file, and
+	 * If cancelled by local user, and we're receiving a file, and
 	 * we're not connected/ready then send an ICBM cancel message.
 	 */
 	if ((purple_xfer_get_status(conn->xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) &&
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index fb1820f74d..1506c86bd5 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -73,7 +73,6 @@ static guint64 purple_caps =
 
 static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02};
 static guint8 features_icq[] = {0x01};
-static guint8 ck[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 struct create_room {
 	char *name;
@@ -376,12 +375,10 @@ connection_common_established_cb(FlapConnection *conn)
 		aim_request_login(od, conn, purple_account_get_username(account));
 		purple_debug_info("oscar", "Username sent, waiting for response\n");
 		purple_connection_update_progress(gc, _("Username sent"), 1, OSCAR_CONNECT_STEPS);
-		ck[1] = 0x65;
 	}
 	else if (conn->type == SNAC_FAMILY_LOCATE)
 	{
 		purple_connection_update_progress(gc, _("Connection established, cookie sent"), 4, OSCAR_CONNECT_STEPS);
-		ck[4] = 0x61;
 	}
 	else if (conn->type == SNAC_FAMILY_CHAT)
 	{
@@ -612,11 +609,53 @@ recent_buddies_pref_cb(const char *name, PurplePrefType type,
 		aim_ssi_setpresence(od, presence | AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES);
 }
 
+static const gchar *login_servers[] = {
+	AIM_DEFAULT_LOGIN_SERVER,
+	AIM_DEFAULT_SSL_LOGIN_SERVER,
+	ICQ_DEFAULT_LOGIN_SERVER,
+	ICQ_DEFAULT_SSL_LOGIN_SERVER,
+};
+
+static const gchar *
+get_login_server(gboolean is_icq, gboolean use_ssl)
+{
+	return login_servers[(is_icq ? 2 : 0) + (use_ssl ? 1 : 0)];
+}
+
+static gint
+compare_handlers(gconstpointer a, gconstpointer b)
+{
+	guint aa = GPOINTER_TO_UINT(a);
+	guint bb = GPOINTER_TO_UINT(b);
+	guint family1 = aa >> 16;
+	guint family2 = bb >> 16;
+	guint subtype1 = aa & 0xFFFF;
+	guint subtype2 = bb & 0xFFFF;
+	if (family1 != family2) {
+		return family1 - family2;
+	}
+	return subtype1 - subtype2;
+}
+
+#if !GLIB_CHECK_VERSION(2,14,0)
+static void hash_table_get_list_of_keys(gpointer key, gpointer value, gpointer user_data)
+{
+	GList **handlers = (GList **)user_data;
+
+	*handlers = g_list_prepend(*handlers, key);
+}
+#endif /* GLIB < 2.14.0 */
+
 void
 oscar_login(PurpleAccount *account)
 {
 	PurpleConnection *gc;
 	OscarData *od;
+	const gchar *encryption_type;
+	GList *handlers;
+	GList *sorted_handlers;
+	GList *cur;
+	GString *msg = g_string_new("");
 
 	gc = purple_account_get_connection(account);
 	od = oscar_data_new();
@@ -675,6 +714,23 @@ oscar_login(PurpleAccount *account)
 	oscar_data_addhandler(od, SNAC_FAMILY_USERLOOKUP, SNAC_SUBTYPE_USERLOOKUP_ERROR, purple_parse_searcherror, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_USERLOOKUP, 0x0003, purple_parse_searchreply, 0);
 
+	g_string_append(msg, "Registered handlers: ");
+#if GLIB_CHECK_VERSION(2,14,0)
+	handlers = g_hash_table_get_keys(od->handlerlist);
+#else
+	handlers = NULL;
+	g_hash_table_foreach(od->handlerlist, hash_table_get_list_of_keys, &handlers);
+#endif /* GLIB < 2.14.0 */
+	sorted_handlers = g_list_sort(g_list_copy(handlers), compare_handlers);
+	for (cur = sorted_handlers; cur; cur = cur->next) {
+		guint x = GPOINTER_TO_UINT(cur->data);
+		g_string_append_printf(msg, "%04x/%04x, ", x >> 16, x & 0xFFFF);
+	}
+	g_list_free(sorted_handlers);
+	g_list_free(handlers);
+	purple_debug_misc("oscar", "%s\n", msg->str);
+	g_string_free(msg, TRUE);
+
 	purple_debug_misc("oscar", "oscar_login: gc = %p\n", gc);
 
 	if (!oscar_util_valid_name(purple_account_get_username(account))) {
@@ -694,7 +750,16 @@ oscar_login(PurpleAccount *account)
 	}
 
 	od->default_port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT);
-	od->use_ssl = purple_account_get_bool(account, "use_ssl", OSCAR_DEFAULT_USE_SSL);
+
+	encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
+	if (!purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) {
+		purple_connection_error_reason(
+			gc,
+			PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+			_("You required encryption in your account settings, but encryption is not supported by your system."));
+		return;
+	}
+	od->use_ssl = purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0;
 
 	/* Connect to core Purple signals */
 	purple_prefs_connect_callback(gc, "/purple/away/idle_reporting", idle_reporting_pref_cb, gc);
@@ -719,13 +784,7 @@ oscar_login(PurpleAccount *account)
 		newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
 
 		if (od->use_ssl) {
-			if (!purple_ssl_is_supported()) {
-				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-						_("SSL support unavailable"));
-				return;
-			}
-
-			server = purple_account_get_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
+			server = purple_account_get_string(account, "server", get_login_server(od->icq, TRUE));
 
 			/*
 			 * If the account's server is what the oscar prpl has offered as
@@ -734,27 +793,27 @@ oscar_login(PurpleAccount *account)
 			 * do what we know is best for them and change the setting out
 			 * from under them to the SSL login server.
 			 */
-			if (!strcmp(server, OSCAR_DEFAULT_LOGIN_SERVER) || !strcmp(server, OSCAR_OLD_LOGIN_SERVER)) {
+			if (!strcmp(server, get_login_server(od->icq, FALSE))) {
 				purple_debug_info("oscar", "Account uses SSL, so changing server to default SSL server\n");
-				purple_account_set_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
-				server = OSCAR_DEFAULT_SSL_LOGIN_SERVER;
+				purple_account_set_string(account, "server", get_login_server(od->icq, TRUE));
+				server = get_login_server(od->icq, TRUE);
 			}
 
 			newconn->gsc = purple_ssl_connect(account, server,
 					purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT),
 					ssl_connection_established_cb, ssl_connection_error_cb, newconn);
 		} else {
-			server = purple_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
+			server = purple_account_get_string(account, "server", get_login_server(od->icq, FALSE));
 
 			/*
 			 * See the comment above. We do the reverse here. If they don't want
 			 * SSL but their server is set to OSCAR_DEFAULT_SSL_LOGIN_SERVER,
 			 * set it back to the default.
 			 */
-			if (!strcmp(server, OSCAR_DEFAULT_SSL_LOGIN_SERVER)) {
+			if (!strcmp(server, get_login_server(od->icq, TRUE))) {
 				purple_debug_info("oscar", "Account does not use SSL, so changing server back to non-SSL\n");
-				purple_account_set_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
-				server = OSCAR_DEFAULT_LOGIN_SERVER;
+				purple_account_set_string(account, "server", get_login_server(od->icq, FALSE));
+				server = get_login_server(od->icq, FALSE);
 			}
 
 			newconn->connect_data = purple_proxy_connect(NULL, account, server,
@@ -770,7 +829,6 @@ oscar_login(PurpleAccount *account)
 	}
 
 	purple_connection_update_progress(gc, _("Connecting"), 0, OSCAR_CONNECT_STEPS);
-	ck[0] = 0x5a;
 }
 
 void
@@ -969,8 +1027,8 @@ int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host,
 	conn->cookie = g_memdup(cookie, cookielen);
 
 	/*
-	 * tls_certname is only set (and must be set if we get this far) if
-	 * SSL is enabled.
+	 * Use TLS only if the server provided us with a tls_certname. The server might not specify a tls_certname even if we requested to use TLS, 
+	 * and that is something we should be prepared to.
 	 */
 	if (tls_certname)
 	{
@@ -994,7 +1052,6 @@ int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host,
 	od->default_port = port;
 
 	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
-	ck[3] = 0x64;
 
 	return 1;
 }
@@ -1114,7 +1171,6 @@ purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	}
 
 	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
-	ck[3] = 0x64;
 
 	return 1;
 }
@@ -1198,7 +1254,6 @@ purple_parse_login(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 			purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS));
 
 	purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
-	ck[2] = 0x6c;
 
 	return 1;
 }
@@ -1228,6 +1283,20 @@ purple_handle_redirect(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	else
 		host = g_strdup(redir->ip);
 
+	if (!redir->use_ssl) {
+		const gchar *encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
+		if (strcmp(encryption_type, OSCAR_OPPORTUNISTIC_ENCRYPTION) == 0) {
+			purple_debug_warning("oscar", "We won't use SSL for FLAP type 0x%04hx.\n", redir->group);
+		} else if (strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) {
+			purple_debug_error("oscar", "FLAP server %s:%d of type 0x%04hx doesn't support encryption.", host, port, redir->group);
+			purple_connection_error_reason(
+				gc,
+				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+				_("You required encryption in your account settings, but one of the servers doesn't support it."));
+			return 0;
+		} 
+	}
+
 	/*
 	 * These FLAP servers advertise SSL (type "0x02"), but SSL connections to these hosts
 	 * die a painful death. iChat and Miranda, when using SSL, still do these in plaintext.
@@ -1235,14 +1304,11 @@ purple_handle_redirect(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	if (redir->use_ssl && (redir->group == SNAC_FAMILY_ADMIN ||
 	                       redir->group == SNAC_FAMILY_BART))
 	{
-		purple_debug_info("oscar", "Ignoring broken SSL for FLAP type 0x%04hx.\n",
-						redir->group);
+		purple_debug_info("oscar", "Ignoring broken SSL for FLAP type 0x%04hx.\n", redir->group);
 		redir->use_ssl = 0;
 	}
 
-	purple_debug_info("oscar", "Connecting to FLAP server %s:%d of type 0x%04hx%s\n",
-					host, port, redir->group,
-					od->use_ssl && !redir->use_ssl ? " without SSL, despite main stream encryption" : "");
+	purple_debug_info("oscar", "Connecting to FLAP server %s:%d of type 0x%04hx\n", host, port, redir->group);
 
 	newconn = flap_connection_new(od, redir->group);
 	newconn->cookielen = redir->cookielen;
@@ -1292,6 +1358,8 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
+	PurpleBuddy *buddy = NULL;
+	PurpleStatus *previous_status = NULL;
 	struct buddyinfo *bi;
 	time_t time_idle = 0, signon = 0;
 	int type = 0;
@@ -1301,8 +1369,6 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 	aim_userinfo_t *info;
 	char *message = NULL;
 	char *itmsurl = NULL;
-	char *tmp;
-	const char *tmp2;
 
 	gc = od->gc;
 	account = purple_connection_get_account(gc);
@@ -1314,6 +1380,11 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 	g_return_val_if_fail(info != NULL, 1);
 	g_return_val_if_fail(info->bn != NULL, 1);
 
+	buddy = purple_find_buddy(account, info->bn);
+	if (buddy) {
+		previous_status = purple_presence_get_active_status(purple_buddy_get_presence(buddy));
+	}
+
 	/*
 	 * If this is an AIM buddy and their name has formatting, set their
 	 * server alias.
@@ -1377,40 +1448,33 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 			status_id = OSCAR_STATUS_ID_AVAILABLE;
 	}
 
-	if (info->flags & AIM_FLAG_WIRELESS)
-	{
+	if (info->flags & AIM_FLAG_WIRELESS) {
 		purple_prpl_got_user_status(account, info->bn, OSCAR_STATUS_ID_MOBILE, NULL);
 	} else {
 		purple_prpl_got_user_status_deactive(account, info->bn, OSCAR_STATUS_ID_MOBILE);
 	}
 
-	if (info->status != NULL && info->status[0] != '\0') {
-		/* Grab the available message */
-		message = oscar_encoding_to_utf8(info->status_encoding, info->status, info->status_len);
+	/* Empty status means we should unset the status message. NULL status means we should keep it from the previous active status.
+	 * Same goes for itmsurl (which is available only for the "available" status).
+	 */
+	if (info->status != NULL) {
+		message = (info->status_len > 0) ? oscar_encoding_to_utf8(info->status_encoding, info->status, info->status_len) : NULL;
+	} else if (previous_status != NULL) {
+		message = g_strdup(purple_status_get_attr_string(previous_status, "message"));
 	}
 
-	tmp2 = tmp = (message ? purple_markup_escape_text(message, -1) : NULL);
-
 	if (strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) == 0) {
-		if (info->itmsurl_encoding && info->itmsurl && info->itmsurl_len) {
-			/* Grab the iTunes Music Store URL */
-			itmsurl = oscar_encoding_to_utf8(info->itmsurl_encoding, info->itmsurl, info->itmsurl_len);
+		if (info->itmsurl != NULL) {
+			itmsurl = (info->itmsurl_len > 0) ? oscar_encoding_to_utf8(info->itmsurl_encoding, info->itmsurl, info->itmsurl_len) : NULL;
+		} else if (previous_status != NULL && purple_status_is_available(previous_status)) {
+			itmsurl = g_strdup(purple_status_get_attr_string(previous_status, "itmsurl"));
 		}
-
-		if (tmp2 == NULL && itmsurl != NULL)
-			/*
-			 * The message can't be NULL because NULL means it was the
-			 * last attribute, so the itmsurl would get ignored below.
-			 */
-			tmp2 = "";
-
-		purple_prpl_got_user_status(account, info->bn, status_id,
-									"message", tmp2, "itmsurl", itmsurl, NULL);
+		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s', itmsurl = '%s'\n", status_id, info->bn, message, itmsurl);
+		purple_prpl_got_user_status(account, info->bn, status_id, "message", message, "itmsurl", itmsurl, NULL);
+	} else {
+		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s'\n", status_id, info->bn, message);
+		purple_prpl_got_user_status(account, info->bn, status_id, "message", message, NULL);
 	}
-	else
-		purple_prpl_got_user_status(account, info->bn, status_id, "message", tmp2, NULL);
-
-	g_free(tmp);
 
 	g_free(message);
 	g_free(itmsurl);
@@ -1471,13 +1535,6 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 	return 1;
 }
 
-static void purple_check_comment(OscarData *od, const char *str) {
-	if ((str == NULL) || strcmp(str, (const char *)ck))
-		aim_locate_setcaps(od, purple_caps);
-	else
-		aim_locate_setcaps(od, purple_caps | OSCAR_CAPABILITY_SECUREIM);
-}
-
 static int purple_parse_offgoing(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	PurpleConnection *gc = od->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
@@ -1699,7 +1756,7 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 		}
 		else if (args->status == AIM_RENDEZVOUS_CANCEL)
 		{
-			/* The other user canceled a peer request */
+			/* The other user cancelled a peer request */
 			PeerConnection *conn;
 
 			conn = peer_connection_find_by_cookie(od, userinfo->bn, args->cookie);
@@ -2376,6 +2433,7 @@ static int purple_chatnav_info(OscarData *od, FlapConnection *conn, FlapFrame *f
 
 	switch(type) {
 		case 0x0002: {
+			GString *msg = g_string_new("");
 			guint8 maxrooms;
 			struct aim_chat_exchangeinfo *exchanges;
 			int exchangecount, i;
@@ -2384,15 +2442,17 @@ static int purple_chatnav_info(OscarData *od, FlapConnection *conn, FlapFrame *f
 			exchangecount = va_arg(ap, int);
 			exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
 
-			purple_debug_misc("oscar", "chat info: Chat Rights:\n");
-			purple_debug_misc("oscar",
-					   "chat info: \tMax Concurrent Rooms: %hhd\n", maxrooms);
-			purple_debug_misc("oscar",
-					   "chat info: \tExchange List: (%d total)\n", exchangecount);
-			for (i = 0; i < exchangecount; i++)
-				purple_debug_misc("oscar",
-						   "chat info: \t\t%hu    %s\n",
-						   exchanges[i].number, exchanges[i].name ? exchanges[i].name : "");
+			g_string_append_printf(msg, "chat info: Max Concurrent Rooms: %hhd, Exchange List (%d total): ", maxrooms, exchangecount);
+			for (i = 0; i < exchangecount; i++) {
+				g_string_append_printf(msg, "%hu", exchanges[i].number);
+				if (exchanges[i].name) {
+					g_string_append_printf(msg, " %s", exchanges[i].name);
+				}
+				g_string_append(msg, ", ");
+			}
+			purple_debug_misc("oscar", "%s\n", msg->str);
+			g_string_free(msg, TRUE);
+
 			while (od->create_rooms) {
 				struct create_room *cr = od->create_rooms->data;
 				purple_debug_info("oscar",
@@ -3917,14 +3977,6 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
 						purple_blist_add_buddy(b, NULL, g, NULL);
 					}
-					if (!oscar_util_name_compare(curitem->name, purple_account_get_username(account))) {
-						char *comment = aim_ssi_getcomment(od->ssi.local, gname, curitem->name);
-						if (comment != NULL)
-						{
-							purple_check_comment(od, comment);
-							g_free(comment);
-						}
-					}
 
 					/* Mobile users should always be online */
 					if (curitem->name[0] == '+') {
@@ -4569,7 +4621,7 @@ void oscar_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolea
 	od = purple_connection_get_protocol_data(gc);
 	userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
-	oscar_user_info_append_status(gc, user_info, b, userinfo, /* strip_html_tags */ TRUE);
+	oscar_user_info_append_status(gc, user_info, b, userinfo, /* use_html_status */ FALSE);
 
 	if (full)
 		oscar_user_info_append_extra_info(gc, user_info, b, userinfo);
@@ -4607,13 +4659,9 @@ char *oscar_status_text(PurpleBuddy *b)
 		message = purple_status_get_attr_string(status, "message");
 		if (message != NULL)
 		{
-			gchar *tmp1, *tmp2;
-			tmp1 = purple_markup_strip_html(message);
-			purple_util_chrreplace(tmp1, '\n', ' ');
-			tmp2 = g_markup_escape_text(tmp1, -1);
-			ret = oscar_util_format_string(tmp2, purple_account_get_username(account));
-			g_free(tmp1);
-			g_free(tmp2);
+			gchar *tmp = oscar_util_format_string(message, purple_account_get_username(account));
+			ret = purple_markup_escape_text(tmp, -1);
+			g_free(tmp);
 		}
 		else if (purple_status_is_available(status))
 		{
@@ -4797,7 +4845,6 @@ static void oscar_ssi_editcomment(struct name_data *data, const char *text) {
 	OscarData *od;
 	PurpleBuddy *b;
 	PurpleGroup *g;
-	const char *username;
 
 	gc = data->gc;
 	od = purple_connection_get_protocol_data(gc);
@@ -4816,11 +4863,6 @@ static void oscar_ssi_editcomment(struct name_data *data, const char *text) {
 	}
 
 	aim_ssi_editcomment(od, purple_group_get_name(g), data->name, text);
-
-	username = purple_account_get_username(account);
-	if (!oscar_util_name_compare(data->name, username))
-		purple_check_comment(od, text);
-
 	oscar_free_name_data(data);
 }
 
@@ -4953,7 +4995,7 @@ oscar_close_directim(gpointer object, gpointer ignored)
 		peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL);
 
 		/* OSCAR_DISCONNECT_LOCAL_CLOSED doesn't write anything to the convo
-		 * window. Let the user know that we canceled the Direct IM. */
+		 * window. Let the user know that we cancelled the Direct IM. */
 		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
 		purple_conversation_write(conv, NULL, _("You closed the connection."),
 				PURPLE_MESSAGE_SYSTEM, time(NULL));
@@ -5459,10 +5501,10 @@ oscar_actions(PurplePlugin *plugin, gpointer context)
 				oscar_show_icq_privacy_opts);
 		menu = g_list_prepend(menu, act);
 
-		act = purple_plugin_action_new("Show Visible List", oscar_show_visible_list);
+		act = purple_plugin_action_new(_("Show Visible List"), oscar_show_visible_list);
 		menu = g_list_prepend(menu, act);
 
-		act = purple_plugin_action_new("Show Invisible List", oscar_show_invisible_list);
+		act = purple_plugin_action_new(_("Show Invisible List"), oscar_show_invisible_list);
 		menu = g_list_prepend(menu, act);
 	}
 	else
@@ -5666,20 +5708,39 @@ static gboolean oscar_uri_handler(const char *proto, const char *cmd, GHashTable
 	return FALSE;
 }
 
-void oscar_init(PurplePlugin *plugin)
+void oscar_init(PurplePlugin *plugin, gboolean is_icq)
 {
 	PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 	PurpleAccountOption *option;
 	static gboolean init = FALSE;
+	static const gchar *encryption_keys[] = {
+		N_("Use encryption if available"),
+		N_("Require encryption"),
+		N_("Don't use encryption"),
+		NULL
+	};
+	static const gchar *encryption_values[] = {
+		OSCAR_OPPORTUNISTIC_ENCRYPTION,
+		OSCAR_REQUIRE_ENCRYPTION,
+		OSCAR_NO_ENCRYPTION,
+		NULL
+	};
+	GList *encryption_options = NULL;
+	int i;
 
-	option = purple_account_option_string_new(_("Server"), "server", OSCAR_DEFAULT_LOGIN_SERVER);
+	option = purple_account_option_string_new(_("Server"), "server", get_login_server(is_icq, TRUE));
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
 	option = purple_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Use SSL"), "use_ssl",
-			OSCAR_DEFAULT_USE_SSL);
+	for (i = 0; encryption_keys[i]; i++) {
+		PurpleKeyValuePair *kvp = g_new0(PurpleKeyValuePair, 1);
+		kvp->key = g_strdup(_(encryption_keys[i]));
+		kvp->value = g_strdup(encryption_values[i]);
+		encryption_options = g_list_append(encryption_options, kvp);
+	}
+	option = purple_account_option_list_new(_("Connection security"), "encryption", encryption_options);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
 	option = purple_account_option_bool_new(_("Use clientLogin"), "use_clientlogin",
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index 638536e793..a1fd4516ab 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -1304,7 +1304,7 @@ void flap_connection_destroy_chat(OscarData *od, FlapConnection *conn);
 
 /* userinfo.c - displaying user information */
 
-void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean strip_html_tags);
+void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean use_html_status);
 void oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo);
 void oscar_user_info_display_error(OscarData *od, guint16 error_reason, char *buddy);
 void oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info);
diff --git a/libpurple/protocols/oscar/oscar_data.c b/libpurple/protocols/oscar/oscar_data.c
index 8c0a9e17d9..5498bba986 100644
--- a/libpurple/protocols/oscar/oscar_data.c
+++ b/libpurple/protocols/oscar/oscar_data.c
@@ -37,6 +37,8 @@ OscarData *
 oscar_data_new(void)
 {
 	OscarData *od;
+	aim_module_t *cur;
+	GString *msg;
 
 	od = g_new0(OscarData, 1);
 
@@ -70,6 +72,20 @@ oscar_data_new(void)
 	aim__registermodule(od, auth_modfirst);
 	aim__registermodule(od, email_modfirst);
 
+	msg = g_string_new("Registered modules: ");
+	for (cur = od->modlistv; cur; cur = cur->next) {
+		g_string_append_printf(
+			msg,
+			"%s (family=0x%04x, version=0x%04x, toolid=0x%04x, toolversion=0x%04x), ",
+			cur->name,
+			cur->family,
+			cur->version,
+			cur->toolid,
+			cur->toolversion);
+	}
+	purple_debug_misc("oscar", "%s\n", msg->str);
+	g_string_free(msg, TRUE);
+
 	return od;
 }
 
@@ -118,8 +134,6 @@ oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcall
 {
 	SnacHandler *snac_handler;
 
-	purple_debug_misc("oscar", "Adding handler for %04x/%04x\n", family, subtype);
-
 	snac_handler = g_new0(SnacHandler, 1);
 
 	snac_handler->family = family;
diff --git a/libpurple/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h
index 52433e5f99..1795ab64ec 100644
--- a/libpurple/protocols/oscar/oscarcommon.h
+++ b/libpurple/protocols/oscar/oscarcommon.h
@@ -32,10 +32,17 @@
 #include "notify.h"
 #include "status.h"
 
-#define OSCAR_DEFAULT_LOGIN_SERVER "login.messaging.aol.com"
+#define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com"
+#define AIM_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com"
+#define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com"
+#define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com"
+
 #define OSCAR_DEFAULT_LOGIN_PORT 5190
-#define OSCAR_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com"
-#define OSCAR_OLD_LOGIN_SERVER "login.oscar.aol.com"
+
+#define OSCAR_OPPORTUNISTIC_ENCRYPTION "opportunistic_encryption"
+#define OSCAR_REQUIRE_ENCRYPTION "require_encryption"
+#define OSCAR_NO_ENCRYPTION "no_encryption"
+
 #ifndef _WIN32
 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1"
 #else
@@ -46,8 +53,8 @@
 #define OSCAR_DEFAULT_WEB_AWARE FALSE
 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
 #define OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS TRUE
-#define OSCAR_DEFAULT_USE_SSL TRUE
 #define OSCAR_DEFAULT_USE_CLIENTLOGIN TRUE
+#define OSCAR_DEFAULT_ENCRYPTION OSCAR_OPPORTUNISTIC_ENCRYPTION
 
 #ifdef _WIN32
 const char *oscar_get_locale_charset(void);
@@ -96,4 +103,4 @@ PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who);
 gboolean oscar_offline_message(const PurpleBuddy *buddy);
 void oscar_format_username(PurpleConnection *gc, const char *nick);
 GList *oscar_actions(PurplePlugin *plugin, gpointer context);
-void oscar_init(PurplePlugin *plugin);
+void oscar_init(PurplePlugin *plugin, gboolean is_icq);
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
index c544e5316f..2a17d21e06 100644
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -879,7 +879,9 @@ peer_connection_trynext(PeerConnection *conn)
 		}
 
 		conn->verified_connect_data = purple_proxy_connect(NULL, account,
-				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
+				(conn->proxyip != NULL)
+					? conn->proxyip
+					: (conn->od->icq ? ICQ_PEER_PROXY_SERVER : AIM_PEER_PROXY_SERVER),
 				PEER_PROXY_PORT,
 				peer_proxy_connection_established_cb, conn);
 		if (conn->verified_connect_data != NULL)
diff --git a/libpurple/protocols/oscar/peer.h b/libpurple/protocols/oscar/peer.h
index ec5d127f63..a706c3ff31 100644
--- a/libpurple/protocols/oscar/peer.h
+++ b/libpurple/protocols/oscar/peer.h
@@ -58,7 +58,8 @@ typedef struct _PeerConnection        PeerConnection;
 /*
  * For peer proxying
  */
-#define PEER_PROXY_SERVER         "ars.oscar.aol.com"
+#define AIM_PEER_PROXY_SERVER         "ars.oscar.aol.com"
+#define ICQ_PEER_PROXY_SERVER         "ars.icq.com"
 #define PEER_PROXY_PORT           5190   /* The port we should always connect to */
 #define PEER_PROXY_PACKET_VERSION 0x044a
 
diff --git a/libpurple/protocols/oscar/rxhandlers.c b/libpurple/protocols/oscar/rxhandlers.c
index 75675a9fbe..265648cad9 100644
--- a/libpurple/protocols/oscar/rxhandlers.c
+++ b/libpurple/protocols/oscar/rxhandlers.c
@@ -69,8 +69,6 @@ int aim__registermodule(OscarData *od, int (*modfirst)(OscarData *, aim_module_t
 	mod->next = (aim_module_t *)od->modlistv;
 	od->modlistv = mod;
 
-	purple_debug_misc("oscar", "registered module %s (family 0x%04x, version = 0x%04x, tool 0x%04x, tool version 0x%04x)\n", mod->name, mod->family, mod->version, mod->toolid, mod->toolversion);
-
 	return 0;
 }
 
diff --git a/libpurple/protocols/oscar/userinfo.c b/libpurple/protocols/oscar/userinfo.c
index 5762977ad6..58653e6eb9 100644
--- a/libpurple/protocols/oscar/userinfo.c
+++ b/libpurple/protocols/oscar/userinfo.c
@@ -173,17 +173,17 @@ oscar_user_info_convert_and_add_hyperlink(PurpleAccount *account, OscarData *od,
  * @param user_info A PurpleNotifyUserInfo object to which status information will be added
  * @param b The PurpleBuddy whose status is desired. This or the aim_userinfo_t (or both) must be passed to oscar_user_info_append_status().
  * @param userinfo The aim_userinfo_t of the buddy whose status is desired. This or the PurpleBuddy (or both) must be passed to oscar_user_info_append_status().
- * @param strip_html_tags If strip_html_tags is TRUE, tags embedded in the status message will be stripped, returning a non-formatted string. The string will still be HTML escaped.
+ * @param use_html_status If TRUE, prefer HTML-formatted away message over plaintext available message.
  */
 void
-oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean strip_html_tags)
+oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean use_html_status)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	OscarData *od;
 	PurplePresence *presence = NULL;
 	PurpleStatus *status = NULL;
 	gchar *message = NULL, *itmsurl = NULL, *tmp;
-	gboolean is_away;
+	gboolean escaping_needed = TRUE;
 
 	od = purple_connection_get_protocol_data(gc);
 
@@ -205,9 +205,10 @@ oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_i
 	   the "message" attribute of the status contains only the plaintext
 	   message. */
 	if (userinfo) {
-		if ((userinfo->flags & AIM_FLAG_AWAY) && userinfo->away_len > 0 && userinfo->away != NULL && userinfo->away_encoding != NULL) {
+		if ((userinfo->flags & AIM_FLAG_AWAY) && use_html_status && userinfo->away_len > 0 && userinfo->away != NULL && userinfo->away_encoding != NULL) {
 			/* Away message */
 			message = oscar_encoding_to_utf8(userinfo->away_encoding, userinfo->away, userinfo->away_len);
+			escaping_needed = FALSE;
 		} else {
 			/*
 			 * Available message or non-HTML away message (because that's
@@ -227,44 +228,26 @@ oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_i
 		itmsurl = g_strdup(purple_status_get_attr_string(status, "itmsurl"));
 	}
 
-	is_away = ((status && !purple_status_is_available(status)) ||
-			   (userinfo && (userinfo->flags & AIM_FLAG_AWAY)));
-
-	if (strip_html_tags) {
-		/* Away messages are HTML, but available messages were originally plain text.
-		 * We therefore need to strip away messages but not available messages if we're asked to remove HTML tags.
-		 */
-		/*
-		 * It seems like the above comment no longer applies.  All messages need
-		 * to be escaped.
-		 */
-		if (message) {
-			gchar *tmp2;
-			tmp = purple_markup_strip_html(message);
-			g_free(message);
-			tmp2 = g_markup_escape_text(tmp, -1);
-			g_free(tmp);
-			message = tmp2;
-		}
-
-	} else {
-		if (itmsurl) {
-			tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
-								  itmsurl, message);
+	if (message) {
+		tmp = oscar_util_format_string(message, purple_account_get_username(account));
+		g_free(message);
+		message = tmp;
+		if (escaping_needed) {
+			tmp = purple_markup_escape_text(message, -1);
 			g_free(message);
 			message = tmp;
 		}
 	}
-	g_free(itmsurl);
 
-	if (message) {
-		tmp = oscar_util_format_string(message, purple_account_get_username(account));
+	if (use_html_status && itmsurl) {
+		tmp = g_strdup_printf("<a href=\"%s\">%s</a>", itmsurl, message);
 		g_free(message);
 		message = tmp;
 	}
 
 	if (b) {
 		if (purple_presence_is_online(presence)) {
+			gboolean is_away = ((status && !purple_status_is_available(status)) || (userinfo && (userinfo->flags & AIM_FLAG_AWAY)));
 			if (oscar_util_valid_name_icq(purple_buddy_get_name(b)) || is_away || !message || !(*message)) {
 				/* Append the status name for online ICQ statuses, away AIM statuses, and for all buddies with no message.
 				 * If the status name and the message are the same, only show one. */
@@ -299,12 +282,22 @@ oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_i
 
 	if (presence) {
 		const char *mood;
-		const char *description;
+		const char *comment;
+		char *description;
 		status = purple_presence_get_status(presence, "mood");
-		mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
-		description = icq_get_custom_icon_description(mood);
-		if (description && *description)
-			purple_notify_user_info_add_pair(user_info, _("Mood"), _(description));
+		mood = icq_get_custom_icon_description(purple_status_get_attr_string(status, PURPLE_MOOD_NAME));
+		if (mood) {
+			comment = purple_status_get_attr_string(status, PURPLE_MOOD_COMMENT);
+			if (comment) {
+				char *escaped_comment = purple_markup_escape_text(comment, -1);
+				description = g_strdup_printf("%s (%s)", _(mood), escaped_comment);
+				g_free(escaped_comment);
+			} else {
+				description = g_strdup(_(mood));
+			}
+			purple_notify_user_info_add_pair(user_info, _("Mood"), description);
+			g_free(description);
+		}
 	}
 
 	purple_notify_user_info_add_pair(user_info, _("Status"), message);
@@ -458,7 +451,7 @@ oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info)
 	}
 	oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Personal Web Page"), info->email, "");
 	if (buddy != NULL)
-		oscar_user_info_append_status(gc, user_info, buddy, /* aim_userinfo_t */ NULL, /* strip_html_tags */ FALSE);
+		oscar_user_info_append_status(gc, user_info, buddy, /* aim_userinfo_t */ NULL, /* use_html_status */ TRUE);
 
 	oscar_user_info_convert_and_add(account, od, user_info, _("Additional Information"), info->info);
 	purple_notify_user_info_add_section_break(user_info);
@@ -504,7 +497,7 @@ oscar_user_info_display_aim(OscarData *od, aim_userinfo_t *userinfo)
 	PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
 	gchar *tmp = NULL, *info_utf8 = NULL, *base_profile_url = NULL;
 
-	oscar_user_info_append_status(gc, user_info, /* PurpleBuddy */ NULL, userinfo, /* strip_html_tags */ FALSE);
+	oscar_user_info_append_status(gc, user_info, /* PurpleBuddy */ NULL, userinfo, /* use_html_status */ TRUE);
 
 	if ((userinfo->present & AIM_USERINFO_PRESENT_IDLE) && userinfo->idletime != 0) {
 		tmp = purple_str_seconds_to_string(userinfo->idletime*60);
diff --git a/libpurple/protocols/oscar/visibility.c b/libpurple/protocols/oscar/visibility.c
index abec4688f8..e68bd623c0 100644
--- a/libpurple/protocols/oscar/visibility.c
+++ b/libpurple/protocols/oscar/visibility.c
@@ -16,10 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
+*/
 
 #include "visibility.h"
-#include "request.h"
 
 /* 4 separate strings are needed in order to ease translators' job */
 #define APPEAR_ONLINE		N_("Appear Online")
@@ -71,77 +70,17 @@ create_visibility_menu_item(OscarData *od, const char *bname)
 	return purple_menu_action_new(label, PURPLE_CALLBACK(visibility_cb), NULL, NULL);
 }
 
-typedef void (*ShowDialog)(PurplePluginAction *);
-
-struct list_remove_data
-{
-	PurplePluginAction *action;
-	ShowDialog show_dialog_again;
-	OscarData *od;
-	guint16 list_type;
-	const gchar *list_name;
-};
-
-static void
-list_remove_cb(struct list_remove_data *data, PurpleRequestFields *fields)
-{
-	ShowDialog show_dialog_again = data->show_dialog_again;
-	PurplePluginAction *action = data->action;
-	PurpleRequestField *field = purple_request_fields_get_field(fields, "list-items");
-	GList *sels = purple_request_field_list_get_selected(field);
-	for (; sels; sels = sels->next) {
-		const gchar *name = sels->data;
-		const gchar *bname = purple_request_field_list_get_data(field, name);
-
-		purple_debug_info("oscar", "Removing %s from %s\n", bname, data->list_name);
-
-		aim_ssi_del_from_private_list(data->od, bname, data->list_type);
-	}
-
-	g_free(data);
-	show_dialog_again(action);
-}
-
 static void
-list_close_cb(struct list_remove_data *data, gpointer ignored)
-{
-	g_free(data);
-}
-
-static void
-show_private_list(PurplePluginAction *action,
-		  guint16 list_type,
-		  const gchar *list_name,
-		  const gchar *list_description,
-		  const gchar *menu_action_name,
-		  ShowDialog caller)
+show_private_list(PurplePluginAction *action, guint16 list_type, const gchar *title, const gchar *list_description, const gchar *menu_action_name)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	PurpleAccount *account = purple_connection_get_account(gc);
-	GSList *buddies, *cur;
-	gchar *desc;
-	struct list_remove_data *data;
-
-	PurpleRequestField *field;
-	PurpleRequestFields *fields = purple_request_fields_new();
-	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
-
-	purple_request_fields_add_group(fields, group);
-
-	desc = g_strdup_printf(_("You can add a buddy to this list "
-				 "by right-clicking on them and "
-				 "selecting \"%s\""), menu_action_name);
-
-	field = purple_request_field_list_new("list-items", desc);
-	g_free(desc);
-
-	purple_request_field_group_add_field(group, field);
-
-	purple_request_field_list_set_multi_select(field, TRUE);
-	purple_request_field_set_required(field, TRUE);
+	GSList *buddies, *filtered_buddies, *cur;
+	gchar *text, *secondary;
 
 	buddies = purple_find_buddies(account, NULL);
+	filtered_buddies = NULL;
 	for (cur = buddies; cur != NULL; cur = cur->next) {
 		PurpleBuddy *buddy;
 		const gchar *bname;
@@ -149,51 +88,38 @@ show_private_list(PurplePluginAction *action,
 		buddy = cur->data;
 		bname = purple_buddy_get_name(buddy);
 		if (aim_ssi_itemlist_finditem(od->ssi.local, NULL, bname, list_type)) {
-			const gchar *alias = purple_buddy_get_alias_only(buddy);
-			char *dname = alias ? g_strdup_printf("%s (%s)", bname, alias) : NULL;
-			purple_request_field_list_add(field, dname ? dname : bname, (void *)bname);
-			g_free(dname);
+			filtered_buddies = g_slist_prepend(filtered_buddies, buddy);
 		}
 	}
 
 	g_slist_free(buddies);
 
-	data = g_new0(struct list_remove_data, 1);
-	data->action = action;
-	data->show_dialog_again = caller;
-	data->od = od;
-	data->list_type = list_type;
-	data->list_name = list_name;
-
-	purple_request_fields(gc, list_name, list_description, NULL,
-			      fields,
-			      _("Close"), G_CALLBACK(list_close_cb),
-			      _("Remove"), G_CALLBACK(list_remove_cb),
-			      account, NULL, NULL,
-			      data);
+	filtered_buddies = g_slist_reverse(filtered_buddies);
+	text = oscar_format_buddies(filtered_buddies, _("you have no buddies on this list"));
+	g_slist_free(filtered_buddies);
+
+	secondary = g_strdup_printf(_("You can add a buddy to this list "
+					"by right-clicking on them and "
+					"selecting \"%s\""), menu_action_name);
+	purple_notify_formatted(gc, title, list_description, secondary, text, NULL, NULL);
+	g_free(secondary);
+	g_free(text);
 }
 
 void
 oscar_show_visible_list(PurplePluginAction *action)
 {
-	show_private_list(action,
-			  AIM_SSI_TYPE_PERMIT,
-			  _("Visible List"),
-			  _("These buddies will see "
-			    "your status when you switch "
-			    "to \"Invisible\""),
-			  _(APPEAR_ONLINE),
-			  oscar_show_visible_list);
+	show_private_list(action, AIM_SSI_TYPE_PERMIT, _("Visible List"),
+							_("These buddies will see "
+							"your status when you switch "
+							"to \"Invisible\""),
+							_(APPEAR_ONLINE));
 }
 
 void
 oscar_show_invisible_list(PurplePluginAction *action)
 {
-	show_private_list(action,
-			  AIM_SSI_TYPE_DENY,
-			  _("Invisible List"),
-			  _("These buddies will always see you as offline"),
-			  _(APPEAR_OFFLINE),
-			  oscar_show_invisible_list);
+	show_private_list(action, AIM_SSI_TYPE_DENY, _("Invisible List"),
+							_("These buddies will always see you as offline"),
+							_(APPEAR_OFFLINE));
 }
-
diff --git a/libpurple/protocols/qq/ChangeLog b/libpurple/protocols/qq/ChangeLog
index cb6d7a1877..b0a7534071 100644
--- a/libpurple/protocols/qq/ChangeLog
+++ b/libpurple/protocols/qq/ChangeLog
@@ -233,7 +233,7 @@
 2008.08.06 - ccpaging <ccpaging(at)gmail.com>
 	* Rename names of variables, Group, to Room
 	* Functions of group_network merged into qq_network and qq_process
-	* Canceled managing glist of group packet, add sub_cmdd and room_id  to transaction
+	* Cancelled managing glist of group packet, add sub_cmdd and room_id  to transaction
 	* Fixed error of demo group:
 		If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet.
 
diff --git a/libpurple/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index 019ac8e41c..489bd1c525 100644
--- a/libpurple/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
@@ -224,12 +224,10 @@ static void info_display_only(PurpleConnection *gc, gchar **segments)
 void qq_request_buddy_info(PurpleConnection *gc, guint32 uid,
 		guint32 update_class, int action)
 {
-	qq_data *qd;
 	gchar raw_data[16] = {0};
 
 	g_return_if_fail(uid != 0);
 
-	qd = (qq_data *) gc->proto_data;
 	g_snprintf(raw_data, sizeof(raw_data), "%u", uid);
 	qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDY_INFO, (guint8 *) raw_data, strlen(raw_data),
 			update_class, action);
@@ -271,7 +269,6 @@ static void info_modify_cancel_cb(modify_info_request *info_request)
 static void info_modify_ok_cb(modify_info_request *info_request, PurpleRequestFields *fields)
 {
 	PurpleConnection *gc;
-	qq_data *qd;
 	gchar **segments;
 	int index;
 	const char *utf8_str;
@@ -279,8 +276,7 @@ static void info_modify_ok_cb(modify_info_request *info_request, PurpleRequestFi
 	int choice_num;
 
 	gc = info_request->gc;
-	g_return_if_fail(gc != NULL && info_request->gc);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(gc != NULL);
 	segments = info_request->segments;
 	g_return_if_fail(segments != NULL);
 
@@ -390,14 +386,12 @@ static void field_request_new(PurpleRequestFieldGroup *group, gint index, gchar
 
 static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int iclass)
 {
-	qq_data *qd;
 	PurpleRequestFieldGroup *group;
 	PurpleRequestFields *fields;
 	modify_info_request *info_request;
 	gchar *utf8_title, *utf8_prim;
 	int index;
 
-	qd = (qq_data *) gc->proto_data;
 	/* Keep one dialog once a time */
 	purple_request_close_with_handle(gc);
 
@@ -416,9 +410,11 @@ static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int icl
 		case QQ_FIELD_CONTACT:
 			utf8_title = g_strdup(_("Modify Contact"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Contact"), segments[0]);
+			break;
 		case QQ_FIELD_ADDR:
 			utf8_title = g_strdup(_("Modify Address"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Address"), segments[0]);
+			break;
 		case QQ_FIELD_EXT:
 			utf8_title = g_strdup(_("Modify Extended Information"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Extended Information"), segments[0]);
@@ -427,6 +423,7 @@ static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int icl
 		default:
 			utf8_title = g_strdup(_("Modify Information"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Information"), segments[0]);
+			break;
 	}
 
 	info_request = g_new0(modify_info_request, 1);
diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index 7498e1a54f..a927a87f3a 100644
--- a/libpurple/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
@@ -55,11 +55,9 @@ typedef struct _qq_buddy_online {
 /* get a list of online_buddies */
 void qq_request_get_buddies_online(PurpleConnection *gc, guint8 position, guint32 update_class)
 {
-	qq_data *qd;
 	guint8 *raw_data;
 	gint bytes = 0;
 
-	qd = (qq_data *) gc->proto_data;
 	raw_data = g_newa(guint8, 5);
 
 	/* 000-000 get online friends cmd
@@ -360,7 +358,6 @@ guint16 qq_process_get_buddies(guint8 *data, gint data_len, PurpleConnection *gc
 
 guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	qq_data *qd;
 	gint i, j;
 	gint bytes;
 	guint8 sub_cmd, reply_code;
@@ -371,8 +368,6 @@ guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConn
 
 	g_return_val_if_fail(data != NULL && data_len != 0, -1);
 
-	qd = (qq_data *) gc->proto_data;
-
 	bytes = 0;
 	bytes += qq_get8(&sub_cmd, data + bytes);
 	g_return_val_if_fail(sub_cmd == 0x01, -1);
@@ -468,11 +463,6 @@ void qq_request_change_status(PurpleConnection *gc, guint32 update_class)
 	guint8 away_cmd;
 	guint32 misc_status;
 	gboolean fake_video;
-	PurpleAccount *account;
-	PurplePresence *presence;
-
-	account = purple_connection_get_account(gc);
-	presence = purple_account_get_presence(account);
 
 	qd = (qq_data *) gc->proto_data;
 	if (!qd->is_login)
@@ -596,14 +586,13 @@ void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnectio
 void qq_update_buddy_status(PurpleConnection *gc, guint32 uid, guint8 status, guint8 flag)
 {
 	gchar *who;
-	gchar *status_id;
+	const gchar *status_id;
 
 	g_return_if_fail(uid != 0);
 
 	/* purple supports signon and idle time
 	 * but it is not much use for QQ, I do not use them */
 	/* serv_got_update(gc, name, online, 0, q_bud->signon, q_bud->idle, bud->uc); */
-	status_id = "available";
 	switch(status) {
 	case QQ_BUDDY_OFFLINE:
 		status_id = "offline";
@@ -677,13 +666,10 @@ void qq_update_buddyies_status(PurpleConnection *gc)
 
 void qq_buddy_data_free_all(PurpleConnection *gc)
 {
-	qq_data *qd;
 	PurpleBuddy *buddy;
 	GSList *buddies, *it;
 	gint count = 0;
 
-	qd = (qq_data *)purple_connection_get_protocol_data(gc);
-
 	buddies = purple_find_buddies(purple_connection_get_account(gc), NULL);
 	for (it = buddies; it; it = it->next) {
 		qq_buddy_data *qbd = NULL;
diff --git a/libpurple/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index f8bb588367..fef9ee3920 100644
--- a/libpurple/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
@@ -262,7 +262,6 @@ void qq_request_auth_code(PurpleConnection *gc, guint8 cmd, guint16 sub_cmd, gui
 
 void qq_process_auth_code(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
 {
-	qq_data *qd;
 	gint bytes;
 	guint8 cmd, reply;
 	guint16 sub_cmd;
@@ -272,8 +271,6 @@ void qq_process_auth_code(PurpleConnection *gc, guint8 *data, gint data_len, gui
 	g_return_if_fail(data != NULL && data_len != 0);
 	g_return_if_fail(uid != 0);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_show_packet("qq_process_auth_code", data, data_len);
 	bytes = 0;
 	bytes += qq_get8(&cmd, data + bytes);
@@ -324,7 +321,7 @@ static void add_buddy_question_input(PurpleConnection *gc, guint32 uid, gchar *q
 	add_req->auth_len = 0;
 
 	who = uid_to_purple_name(uid);
-	msg = g_strdup_printf(_("%u requires verification"), uid);
+	msg = g_strdup_printf(_("%u requires verification: %s"), uid, question);
 	purple_request_input(gc, _("Add buddy question"), msg,
 			_("Enter answer here"),
 			NULL,
@@ -400,7 +397,6 @@ static void request_add_buddy_by_question(PurpleConnection *gc, guint32 uid,
 
 void qq_process_question(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
 {
-	qq_data *qd;
 	gint bytes;
 	guint8 cmd, reply;
 	gchar *question, *answer;
@@ -409,8 +405,6 @@ void qq_process_question(PurpleConnection *gc, guint8 *data, gint data_len, guin
 
 	g_return_if_fail(data != NULL && data_len != 0);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_show_packet("qq_process_question", data, data_len);
 	bytes = 0;
 	bytes += qq_get8(&cmd, data + bytes);
@@ -720,13 +714,10 @@ void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 /*  process reply to add_buddy_auth request */
 void qq_process_add_buddy_auth(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	qq_data *qd;
 	gchar **segments, *msg_utf8;
 
 	g_return_if_fail(data != NULL && data_len != 0);
 
-	qd = (qq_data *) gc->proto_data;
-
 	if (data[0] == '0') {
 		purple_debug_info("QQ", "Reply OK for sending authorize\n");
 		return;
@@ -767,11 +758,9 @@ void qq_process_remove_buddy(PurpleConnection *gc, guint8 *data, gint data_len,
 /* process the server reply for my request to remove myself from a buddy */
 void qq_process_buddy_remove_me(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
 {
-	qq_data *qd;
 	gchar *msg;
 
 	g_return_if_fail(data != NULL && data_len != 0);
-	qd = (qq_data *) gc->proto_data;
 
 	if (data[0] == 0) {
 		purple_debug_info("QQ", "Reply OK for removing me from %u's buddy list\n", uid);
@@ -1004,7 +993,6 @@ static void server_buddy_add_request(PurpleConnection *gc, gchar *from, gchar *t
 
 void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_len)
 {
-	qq_data *qd;
 	gint bytes;
 	guint8 cmd;
 	guint8 reply;
@@ -1013,8 +1001,6 @@ void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_l
 
 	g_return_if_fail(data != NULL && data_len >= 5);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_show_packet("buddy_check_code", data, data_len);
 
 	bytes = 0;
diff --git a/libpurple/protocols/qq/file_trans.c b/libpurple/protocols/qq/file_trans.c
index 1ee9a3172c..306fd96733 100644
--- a/libpurple/protocols/qq/file_trans.c
+++ b/libpurple/protocols/qq/file_trans.c
@@ -84,7 +84,7 @@ static void _fill_file_md5(const gchar *filename, gint filelen, guint8 *md5)
 	if (filelen > QQ_MAX_FILE_MD5_LENGTH)
 		filelen = QQ_MAX_FILE_MD5_LENGTH;
 
-	fp = fopen(filename, "rb");
+	fp = g_fopen(filename, "rb");
 	g_return_if_fail(fp != NULL);
 
 	buffer = g_newa(guint8, filelen);
@@ -202,7 +202,7 @@ void qq_xfer_close_file(PurpleXfer *xfer)
 static int _qq_xfer_open_file(const gchar *filename, const gchar *method, PurpleXfer *xfer)
 {
 	ft_info *info = xfer->data;
-	info->dest_fp = fopen(purple_xfer_get_local_filename(xfer), method);
+	info->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer), method);
 	if (info->dest_fp == NULL) {
 		return -1;
 	}
@@ -238,12 +238,9 @@ static gint _qq_send_file(PurpleConnection *gc, guint8 *data, gint len, guint16
 	gint bytes = 0;
 	guint32 file_key;
 	qq_data *qd;
-	ft_info *info;
 
 	qd = (qq_data *) gc->proto_data;
 
-	info = (ft_info *) qd->xfer->data;
-
 	raw_data = g_newa(guint8, MAX_PACKET_SIZE);
 	file_key = _gen_file_key();
 
@@ -805,9 +802,6 @@ void qq_process_recv_file(PurpleConnection *gc, guint8 *data, gint len)
 {
 	gint bytes;
 	guint8 tag;
-	qq_data *qd;
-
-	qd = (qq_data *) gc->proto_data;
 
 	bytes = 0;
 	bytes += qq_get8(&tag, data + bytes);
diff --git a/libpurple/protocols/qq/group.c b/libpurple/protocols/qq/group.c
index fe0fe22bff..268bda23a6 100644
--- a/libpurple/protocols/qq/group.c
+++ b/libpurple/protocols/qq/group.c
@@ -119,13 +119,11 @@ PurpleRoomlist *qq_roomlist_get_list(PurpleConnection *gc)
 /* free roomlist space, I have no idea when this one is called... */
 void qq_roomlist_cancel(PurpleRoomlist *list)
 {
-	qq_data *qd;
 	PurpleConnection *gc;
 
 	g_return_if_fail(list != NULL);
 	gc = purple_account_get_connection(list->account);
 
-	qd = (qq_data *) gc->proto_data;
 	purple_roomlist_set_in_progress(list, FALSE);
 	purple_roomlist_unref(list);
 }
diff --git a/libpurple/protocols/qq/group_im.c b/libpurple/protocols/qq/group_im.c
index cba79accf5..2816e124c7 100644
--- a/libpurple/protocols/qq/group_im.c
+++ b/libpurple/protocols/qq/group_im.c
@@ -48,12 +48,10 @@
 PurpleConversation *qq_room_conv_open(PurpleConnection *gc, qq_room_data *rmd)
 {
 	PurpleConversation *conv;
-	qq_data *qd;
 	gchar *topic_utf8;
 
 	g_return_val_if_fail(rmd != NULL, NULL);
 	g_return_val_if_fail(rmd->title_utf8, NULL);
-	qd = (qq_data *) gc->proto_data;
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
 			rmd->title_utf8, purple_connection_get_account(gc));
@@ -207,7 +205,6 @@ void qq_room_got_chat_in(PurpleConnection *gc,
 /* recv an IM from a group chat */
 void qq_process_room_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 msg_type)
 {
-	qq_data *qd;
 	gchar *msg_smiley, *msg_fmt, *msg_utf8;
 	gint bytes, tail_len;
 	struct {
@@ -229,7 +226,6 @@ void qq_process_room_im(guint8 *data, gint data_len, guint32 id, PurpleConnectio
 
 	/* at least include im_text.msg_len */
 	g_return_if_fail(data != NULL && data_len > 23);
-	qd = (qq_data *) gc->proto_data;
 
 	/* qq_show_packet("ROOM_IM", data, data_len); */
 	memset(&im_text, 0, sizeof(im_text));
@@ -376,7 +372,6 @@ int qq_chat_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 	gint msg_len;
 	const gchar *start_invalid;
 	gboolean is_smiley_none;
-	guint8 frag_count, frag_index;
 
 	g_return_val_if_fail(NULL != gc && NULL != gc->proto_data, -1);
 	g_return_val_if_fail(id != 0 && what != NULL, -1);
@@ -386,9 +381,6 @@ int qq_chat_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 
 	/* qq_show_packet("chat IM UTF8", (guint8 *)what, strlen(what)); */
 
-	fmt = qq_im_fmt_new_by_purple(what);
-	is_smiley_none = qq_im_smiley_none(what);
-
 	msg_stripped = purple_markup_strip_html(what);
 	g_return_val_if_fail(msg_stripped != NULL, -1);
 	/* qq_show_packet("IM Stripped", (guint8 *)what, strlen(what)); */
@@ -417,26 +409,10 @@ int qq_chat_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 
 	qd->send_im_id++;
 	fmt = qq_im_fmt_new_by_purple(what);
-	frag_count = g_slist_length(segments);
-	frag_index = 0;
-/*
-	if (frag_count <= 1) {
-*/
-		for (it = segments; it; it = it->next) {
-			request_room_send_im(gc, id, fmt, (gchar *)it->data);
-			g_free(it->data);
-		}
-/*
-	} else {
-		for (it = segments; it; it = it->next) {
-			request_room_send_im_ex(gc, id, fmt, (gchar *)it->data,
-					qd->send_im_id, frag_count, frag_index);
-			g_free(it->data);
-			frag_index++;
-		}
+	for (it = segments; it; it = g_slist_delete_link(it, it)) {
+		request_room_send_im(gc, id, fmt, (gchar *)it->data);
+		g_free(it->data);
 	}
-*/
 	qq_im_fmt_free(fmt);
-	g_slist_free(segments);
 	return 1;
 }
diff --git a/libpurple/protocols/qq/group_join.c b/libpurple/protocols/qq/group_join.c
index 8bf3df090b..6d27a2ff05 100644
--- a/libpurple/protocols/qq/group_join.c
+++ b/libpurple/protocols/qq/group_join.c
@@ -178,12 +178,10 @@ void qq_send_cmd_group_auth(PurpleConnection *gc, qq_room_data *rmd,
 /* If comes here, cmd is OK already */
 void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc)
 {
-	qq_data *qd;
 	gint bytes;
 	guint32 id;
 
 	g_return_if_fail(data != NULL && len > 0);
-	qd = (qq_data *) gc->proto_data;
 
 	if (len < 4) {
 		purple_debug_error("QQ", "Invalid exit group reply, expect %d bytes, read %d bytes\n", 4, len);
@@ -201,12 +199,10 @@ void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnecti
 {
 	gint bytes;
 	guint32 id;
-	qq_data *qd;
 	qq_room_data *rmd;
 	gchar *msg;
 
 	g_return_if_fail(data != NULL && len > 0);
-	qd = (qq_data *) gc->proto_data;
 
 	if (len < 4) {
 		purple_debug_error("QQ",
@@ -283,7 +279,6 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 /* Attempt to join a group without auth */
 void qq_group_join(PurpleConnection *gc, GHashTable *data)
 {
-	qq_data *qd;
 	gchar *ext_id_str;
 	gchar *id_str;
 	guint32 ext_id;
@@ -291,7 +286,6 @@ void qq_group_join(PurpleConnection *gc, GHashTable *data)
 	qq_room_data *rmd;
 
 	g_return_if_fail(data != NULL);
-	qd = (qq_data *) gc->proto_data;
 
 	ext_id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_EXTERNAL_ID);
 	id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID);
diff --git a/libpurple/protocols/qq/group_opt.c b/libpurple/protocols/qq/group_opt.c
index b30608c2e0..5391f0fc87 100644
--- a/libpurple/protocols/qq/group_opt.c
+++ b/libpurple/protocols/qq/group_opt.c
@@ -134,12 +134,10 @@ void qq_group_modify_members(PurpleConnection *gc, qq_room_data *rmd, guint32 *n
 {
 	guint32 *old_members, *del_members, *add_members;
 	qq_buddy_data *bd;
-	qq_data *qd;
 	gint i = 0, old = 0, new = 0, del = 0, add = 0;
 	GList *list;
 
 	g_return_if_fail(rmd != NULL);
-	qd = (qq_data *) gc->proto_data;
 	if (new_members[0] == 0xffffffff)
 		return;
 
diff --git a/libpurple/protocols/qq/im.c b/libpurple/protocols/qq/im.c
index c4363bf826..32684174ae 100644
--- a/libpurple/protocols/qq/im.c
+++ b/libpurple/protocols/qq/im.c
@@ -547,7 +547,6 @@ qq_im_format *qq_im_fmt_new_by_purple(const gchar *msg)
 	const gchar *start, *end, *last;
 	GData *attribs;
 	gchar *tmp;
-	unsigned char *rgb;
 
 	g_return_val_if_fail(msg != NULL, NULL);
 
@@ -570,8 +569,11 @@ qq_im_format *qq_im_fmt_new_by_purple(const gchar *msg)
 
 		tmp = g_datalist_get_data(&attribs, "color");
 		if (tmp && strlen(tmp) > 1) {
-			rgb = purple_base16_decode(tmp + 1, NULL);
-			g_memmove(fmt->rgb, rgb, 3);
+			unsigned char *rgb;
+			gsize rgb_len;
+			rgb = purple_base16_decode(tmp + 1, &rgb_len);
+			if (rgb != NULL && rgb_len >= 3)
+				g_memmove(fmt->rgb, rgb, 3);
 			g_free(rgb);
 		}
 
@@ -725,7 +727,6 @@ void qq_got_message(PurpleConnection *gc, const gchar *msg)
 /* process received normal text IM */
 static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header)
 {
-	qq_data *qd;
 	guint16 purple_msg_type;
 	gchar *who;
 	gchar *msg_smiley, *msg_fmt, *msg_utf8;
@@ -749,10 +750,9 @@ static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_
 		gchar *msg;		/* no fixed length, ends with 0x00 */
 	} im_text;
 
-	g_return_if_fail (data != NULL && len > 0);
+	g_return_if_fail(data != NULL && len > 0);
 	g_return_if_fail(im_header != NULL);
 
-	qd = (qq_data *) gc->proto_data;
 	memset(&im_text, 0, sizeof(im_text));
 
 	/* qq_show_packet("IM text", data, len); */
@@ -823,7 +823,6 @@ static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_
 /* process received extended (2007) text IM */
 static void process_extend_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header)
 {
-	qq_data *qd;
 	guint16 purple_msg_type;
 	gchar *who;
 	gchar *msg_smiley, *msg_fmt, *msg_utf8;
@@ -848,10 +847,9 @@ static void process_extend_im_text(PurpleConnection *gc, guint8 *data, gint len,
 		guint8 fromMobileQQ;
 	} im_text;
 
-	g_return_if_fail (data != NULL && len > 0);
+	g_return_if_fail(data != NULL && len > 0);
 	g_return_if_fail(im_header != NULL);
 
-	qd = (qq_data *) gc->proto_data;
 	memset(&im_text, 0, sizeof(im_text));
 
 	/* qq_show_packet("Extend IM text", data, len); */
@@ -1043,12 +1041,10 @@ static void request_send_im(PurpleConnection *gc, guint32 uid_to, gint type,
 {
 	qq_data *qd;
 	guint8 raw_data[MAX_PACKET_SIZE - 16];
-	guint16 im_type;
 	gint bytes;
 	time_t now;
 
 	qd = (qq_data *) gc->proto_data;
-	im_type = QQ_NORMAL_IM_TEXT;
 
 	/* purple_debug_info("QQ", "Send IM %d-%d\n", frag_count, frag_index); */
 	bytes = 0;
@@ -1118,13 +1114,12 @@ GSList *qq_im_get_segments(gchar *msg_stripped, gboolean is_smiley_none)
 	GString *new_string;
 	GString *append_utf8;
 	gchar *start, *p;
-	gint count, len;
+	gint len;
 	qq_emoticon *emoticon;
 
 	g_return_val_if_fail(msg_stripped != NULL, NULL);
 
 	start = msg_stripped;
-	count = 0;
 	new_string = g_string_new("");
 	append_utf8 = g_string_new("");
 	while (*start) {
diff --git a/libpurple/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 5b84104863..46cbc8d8ba 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -89,15 +89,12 @@ static void server_list_create(PurpleAccount *account)
 {
 	PurpleConnection *gc;
 	qq_data *qd;
-	PurpleProxyInfo *gpi;
 	const gchar *custom_server;
 
 	gc = purple_account_get_connection(account);
 	g_return_if_fail(gc != NULL  && gc->proto_data != NULL);
 	qd = gc->proto_data;
 
-	gpi = purple_proxy_get_setup(account);
-
 	qd->use_tcp = purple_account_get_bool(account, "use_tcp", TRUE);
 
 	custom_server = purple_account_get_string(account, "server", NULL);
@@ -381,11 +378,10 @@ static void qq_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gbo
 static const char *qq_list_emblem(PurpleBuddy *b)
 {
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	qq_buddy_data *buddy;
 
 	if (!b || !(account = purple_buddy_get_account(b)) ||
-		!(gc = purple_account_get_connection(account)))
+		!purple_account_get_connection(account))
 		return NULL;
 
 	buddy = purple_buddy_get_protocol_data(b);
@@ -618,12 +614,10 @@ static void action_show_account_info(PurplePluginAction *action)
 static void action_about_openq(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	qq_data *qd;
 	GString *info;
 	gchar *title;
 
-	g_return_if_fail(NULL != gc && NULL != gc->proto_data);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(NULL != gc);
 
 	info = g_string_new("<html><body>");
 	g_string_append(info, _("<p><b>Original Author</b>:<br>\n"));
diff --git a/libpurple/protocols/qq/qq_base.c b/libpurple/protocols/qq/qq_base.c
index 8a4f3fe0e8..281d1b451e 100644
--- a/libpurple/protocols/qq/qq_base.c
+++ b/libpurple/protocols/qq/qq_base.c
@@ -386,7 +386,6 @@ static const guint8 login_53_68[16] = {
 /* process the login reply packet */
 guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len)
 {
-	qq_data *qd;
 	guint8 ret = data[0];
 	gchar *msg, *msg_utf8;
 	gchar *error;
@@ -394,8 +393,6 @@ guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len)
 
 	g_return_val_if_fail(data != NULL && data_len != 0, QQ_LOGIN_REPLY_ERR);
 
-	qd = (qq_data *) gc->proto_data;
-
 	switch (ret) {
 		case QQ_LOGIN_REPLY_OK:
 			purple_debug_info("QQ", "Login OK\n");
diff --git a/libpurple/protocols/qq/qq_network.c b/libpurple/protocols/qq/qq_network.c
index 4c391d475b..09b4868766 100644
--- a/libpurple/protocols/qq/qq_network.c
+++ b/libpurple/protocols/qq/qq_network.c
@@ -482,13 +482,11 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
 {
 	PurpleConnection *gc = NULL;
-	qq_data *qd;
 	guint8 *buf;
 	gint buf_len;
 
 	gc = (PurpleConnection *) data;
-	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(gc != NULL);
 
 	if(cond != PURPLE_INPUT_READ) {
 		purple_connection_error_reason(gc,
@@ -748,14 +746,12 @@ static void connect_cb(gpointer data, gint source, const gchar *error_message)
 {
 	PurpleConnection *gc;
 	qq_data *qd;
-	PurpleAccount *account ;
 	qq_connection *conn;
 
 	gc = (PurpleConnection *) data;
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
 
 	qd = (qq_data *) gc->proto_data;
-	account = purple_connection_get_account(gc);
 
 	/* conn_data will be destoryed */
 	qd->conn_data = NULL;
diff --git a/libpurple/protocols/qq/qq_process.c b/libpurple/protocols/qq/qq_process.c
index 56f00c8116..74d3b395b3 100644
--- a/libpurple/protocols/qq/qq_process.c
+++ b/libpurple/protocols/qq/qq_process.c
@@ -58,15 +58,12 @@ enum {
 /* default process, decrypt and dump */
 static void process_unknow_cmd(PurpleConnection *gc,const gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq)
 {
-	qq_data *qd;
 	gchar *msg;
 
 	g_return_if_fail(data != NULL && data_len != 0);
 
 	qq_show_packet(title, data, data_len);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
 			data, data_len,
 			">>> [%d] %s -> [default] decrypt and dump",
@@ -80,12 +77,8 @@ static void process_unknow_cmd(PurpleConnection *gc,const gchar *title, guint8 *
 /* parse the reply to send_im */
 static void do_im_ack(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	qq_data *qd;
-
 	g_return_if_fail(data != NULL && data_len != 0);
 
-	qd = gc->proto_data;
-
 	if (data[0] != 0) {
 		purple_debug_warning("QQ", "Failed sent IM\n");
 		purple_notify_error(gc, _("Error"), _("Unable to send message."), NULL);
@@ -380,14 +373,11 @@ static void process_private_msg(guint8 *data, gint data_len, guint16 seq, Purple
 /* Send ACK if the sys message needs an ACK */
 static void request_server_ack(PurpleConnection *gc, gchar *funct_str, gchar *from, guint16 seq)
 {
-	qq_data *qd;
 	guint8 *raw_data;
 	gint bytes;
 	guint8 bar;
 
 	g_return_if_fail(funct_str != NULL && from != NULL);
-	qd = (qq_data *) gc->proto_data;
-
 
 	bar = 0x1e;
 	raw_data = g_newa(guint8, strlen(funct_str) + strlen(from) + 16);
@@ -568,11 +558,9 @@ static void process_room_cmd_notify(PurpleConnection *gc,
 
 void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
-	qq_data *qd;
 	gint ret;
 
-	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail (gc != NULL);
 
 	switch (room_cmd) {
 		case 0:
@@ -599,12 +587,10 @@ void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 
 void qq_update_all_rooms(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
-	qq_data *qd;
 	gboolean is_new_turn = FALSE;
 	guint32 next_id;
 
-	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(gc != NULL);
 
 	next_id = qq_room_get_next(gc, room_id);
 	purple_debug_info("QQ", "Update rooms, next id %u, prev id %u\n", next_id, room_id);
@@ -689,11 +675,9 @@ void qq_update_all(PurpleConnection *gc, guint16 cmd)
 
 static void update_all_rooms_online(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
-	qq_data *qd;
 	guint32 next_id;
 
-	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail (gc != NULL);
 
 	next_id = qq_room_get_next_conv(gc, room_id);
 	if (next_id <= 0 && room_id <= 0) {
diff --git a/libpurple/protocols/qq/qq_trans.c b/libpurple/protocols/qq/qq_trans.c
index b434c40a99..19361955d1 100644
--- a/libpurple/protocols/qq/qq_trans.c
+++ b/libpurple/protocols/qq/qq_trans.c
@@ -109,11 +109,9 @@ guint32 qq_trans_get_ship(qq_transaction *trans)
 static qq_transaction *trans_create(PurpleConnection *gc, gint fd,
 	guint16 cmd, guint16 seq, guint8 *data, gint data_len, guint32 update_class, guint32 ship32)
 {
-	qq_data *qd;
 	qq_transaction *trans;
 
-	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_val_if_fail(gc != NULL, NULL);
 
 	trans = g_new0(qq_transaction, 1);
 
diff --git a/libpurple/protocols/qq/send_file.c b/libpurple/protocols/qq/send_file.c
index 7bc427836b..2e48e09582 100644
--- a/libpurple/protocols/qq/send_file.c
+++ b/libpurple/protocols/qq/send_file.c
@@ -637,10 +637,8 @@ static void _qq_xfer_cancel(PurpleXfer *xfer)
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	guint16 *seq;
 
 	g_return_if_fail (xfer != NULL);
-	seq = (guint16 *) xfer->data;
 	account = purple_xfer_get_account(xfer);
 	gc = purple_account_get_connection(account);
 
@@ -670,10 +668,8 @@ static void _qq_xfer_recv_init(PurpleXfer *xfer)
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	ft_info *info;
 
-	g_return_if_fail (xfer != NULL && xfer->data != NULL);
-	info = (ft_info *) xfer->data;
+	g_return_if_fail(xfer != NULL);
 	account = purple_xfer_get_account(xfer);
 	gc = purple_account_get_connection(account);
 
@@ -752,7 +748,7 @@ void qq_process_recv_file_accept(guint8 *data, gint data_len, guint32 sender_uid
 	g_return_if_fail (data != NULL && data_len != 0);
 	qd = (qq_data *) gc->proto_data;
 	xfer = qd->xfer;
-	info = (ft_info *) qd->xfer->data;
+	info = (ft_info *) xfer->data;
 
 	if (data_len <= 30 + QQ_CONN_INFO_LEN) {
 		purple_debug_warning("QQ", "Received file reject message is empty\n");
@@ -761,7 +757,7 @@ void qq_process_recv_file_accept(guint8 *data, gint data_len, guint32 sender_uid
 
 	bytes = 18 + 12;	/* skip 30 bytes */
 	qq_get_conn_info(info, data + bytes);
-	_qq_xfer_init_socket(qd->xfer);
+	_qq_xfer_init_socket(xfer);
 
 	_qq_xfer_init_udp_channel(info);
 	_qq_send_packet_file_notifyip(gc, sender_uid);
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index be9382c938..0c1eb33a7d 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -2133,7 +2133,7 @@ static struct mwServiceConference *mw_srvc_conf_new(struct mwSession *s) {
 
 
 static void ft_incoming_cancel(PurpleXfer *xfer) {
-  /* incoming transfer rejected or canceled in-progress */
+  /* incoming transfer rejected or cancelled in-progress */
   struct mwFileTransfer *ft = xfer->data;
   if(ft) mwFileTransfer_reject(ft);
 }
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index 6ecbe5c314..729d6cdc13 100644
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -1395,7 +1395,7 @@ PurpleRoomlist *silcpurple_roomlist_get_list(PurpleConnection *gc)
 	if (sg->roomlist)
 		purple_roomlist_unref(sg->roomlist);
 
-	sg->roomlist_canceled = FALSE;
+	sg->roomlist_cancelled = FALSE;
 
 	sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1429,6 +1429,6 @@ void silcpurple_roomlist_cancel(PurpleRoomlist *list)
 	if (sg->roomlist == list) {
 		purple_roomlist_unref(sg->roomlist);
 		sg->roomlist = NULL;
-		sg->roomlist_canceled = TRUE;
+		sg->roomlist_cancelled = TRUE;
 	}
 }
diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
index df4a338667..fac1fde0e5 100644
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -1455,7 +1455,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
 			int usercount;
 			PurpleRoomlistRoom *room;
 
-			if (sg->roomlist_canceled)
+			if (sg->roomlist_cancelled)
 				break;
 
 			if (error != SILC_STATUS_OK) {
diff --git a/libpurple/protocols/silc/silcpurple.h b/libpurple/protocols/silc/silcpurple.h
index 50a451ed19..937e0cc358 100644
--- a/libpurple/protocols/silc/silcpurple.h
+++ b/libpurple/protocols/silc/silcpurple.h
@@ -85,7 +85,7 @@ typedef struct SilcPurpleStruct {
 	SilcMimeAssembler mimeass;
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
-	unsigned int roomlist_canceled    : 1;
+	unsigned int roomlist_cancelled   : 1;
 	unsigned int chpk                 : 1;
 } *SilcPurple;
 
diff --git a/libpurple/protocols/silc10/chat.c b/libpurple/protocols/silc10/chat.c
index b9c903ef51..d87598f327 100644
--- a/libpurple/protocols/silc10/chat.c
+++ b/libpurple/protocols/silc10/chat.c
@@ -1417,7 +1417,7 @@ PurpleRoomlist *silcpurple_roomlist_get_list(PurpleConnection *gc)
 	if (sg->roomlist)
 		purple_roomlist_unref(sg->roomlist);
 
-	sg->roomlist_canceled = FALSE;
+	sg->roomlist_cancelled = FALSE;
 
 	sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1451,6 +1451,6 @@ void silcpurple_roomlist_cancel(PurpleRoomlist *list)
 	if (sg->roomlist == list) {
 		purple_roomlist_unref(sg->roomlist);
 		sg->roomlist = NULL;
-		sg->roomlist_canceled = TRUE;
+		sg->roomlist_cancelled = TRUE;
 	}
 }
diff --git a/libpurple/protocols/silc10/ops.c b/libpurple/protocols/silc10/ops.c
index f4b42fe3b7..8e3566e486 100644
--- a/libpurple/protocols/silc10/ops.c
+++ b/libpurple/protocols/silc10/ops.c
@@ -1444,7 +1444,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
 			int usercount;
 			PurpleRoomlistRoom *room;
 
-			if (sg->roomlist_canceled)
+			if (sg->roomlist_cancelled)
 				break;
 
 			if (!success) {
diff --git a/libpurple/protocols/silc10/silcpurple.h b/libpurple/protocols/silc10/silcpurple.h
index 86ba056614..a24d8a0b9d 100644
--- a/libpurple/protocols/silc10/silcpurple.h
+++ b/libpurple/protocols/silc10/silcpurple.h
@@ -80,7 +80,7 @@ typedef struct SilcPurpleStruct {
 #endif
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
-	unsigned int roomlist_canceled    : 1;
+	unsigned int roomlist_cancelled   : 1;
 	unsigned int chpk                 : 1;
 } *SilcPurple;
 
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
index 565d5a288a..3a5253adc1 100644
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -317,7 +317,7 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 
 			if (pair->value) {
 				decoded = purple_base64_decode(pair->value, &len);
-				if (len) {
+				if (decoded && len > 0) {
 					tmp = purple_str_binary_to_ascii(decoded, len);
 					purple_debug_info("yahoo", "Got key 197, value = %s\n", tmp);
 					g_free(tmp);
@@ -2863,15 +2863,17 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 	if (base64) {
 		guint32 ip;
 		YahooFriend *f;
-		char *host_ip;
+		char *host_ip, *tmp;
 		struct yahoo_p2p_data *p2p_data;
 
 		decoded = purple_base64_decode(base64, &len);
-		if (len) {
-			char *tmp = purple_str_binary_to_ascii(decoded, len);
-			purple_debug_info("yahoo", "Got P2P service packet (from server): who = %s, ip = %s\n", who, tmp);
-			g_free(tmp);
+		if (decoded == NULL) {
+			purple_debug_info("yahoo","p2p: Unable to decode base64 IP (%s) \n", base64);
+			return;
 		}
+		tmp = purple_str_binary_to_ascii(decoded, len);
+		purple_debug_info("yahoo", "Got P2P service packet (from server): who = %s, ip = %s\n", who, tmp);
+		g_free(tmp);
 
 		ip = strtol((gchar *)decoded, NULL, 10);
 		g_free(decoded);
@@ -3906,7 +3908,6 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 
-	YahooData *yd;
 	const char *game;
 	char *game2;
 	char *t;
@@ -3917,7 +3918,6 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 
 	buddy = (PurpleBuddy *) node;
 	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	yd = (YahooData *) gc->proto_data;
 
 	f = yahoo_friend_find(gc, purple_buddy_get_name(buddy));
 	if (!f)
@@ -4941,7 +4941,6 @@ void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
 	struct yahoo_packet *pkt;
 	const char *group = NULL;
 	char *group2;
-	YahooFriend *f;
 	const char *bname;
 	const char *fed_bname;
 	YahooFederation fed = YAHOO_FEDERATION_NONE;
@@ -4953,7 +4952,6 @@ void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
 	if (!purple_privacy_check(purple_connection_get_account(gc), bname))
 		return;
 
-	f = yahoo_friend_find(gc, bname);
 	fed = yahoo_get_federation_from_name(bname);
 	if (fed != YAHOO_FEDERATION_NONE)
 		fed_bname += 4;
@@ -5216,15 +5214,11 @@ yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd,
 {
 	GHashTable *comp;
 	PurpleConnection *gc;
-	YahooData *yd;
-	int id;
 
 	if (!args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
 	gc = purple_conversation_get_gc(conv);
-	yd = gc->proto_data;
-	id = yd->conf_id;
 	purple_debug_info("yahoo", "Trying to join %s \n", args[0]);
 
 	comp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
diff --git a/libpurple/protocols/yahoo/libymsg.h b/libpurple/protocols/yahoo/libymsg.h
index a6cf03cece..e89ab96ad2 100644
--- a/libpurple/protocols/yahoo/libymsg.h
+++ b/libpurple/protocols/yahoo/libymsg.h
@@ -64,7 +64,7 @@
 
 #define WEBMESSENGER_URL "http://login.yahoo.com/config/login?.src=pg"
 
-#define YAHOO_SMS_CARRIER_URL "http://lookup.msg.vip.mud.yahoo.com"
+#define YAHOO_SMS_CARRIER_URL "http://validate.msg.yahoo.com"
 
 #define YAHOO_USERINFO_URL "http://address.yahoo.com/yab/us?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252"
 #define YAHOOJP_USERINFO_URL "http://address.yahoo.co.jp/yab/jp?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252"
diff --git a/libpurple/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c
index 57bbb84b6b..4d036d9b88 100644
--- a/libpurple/protocols/yahoo/util.c
+++ b/libpurple/protocols/yahoo/util.c
@@ -43,7 +43,7 @@ yahoo_account_use_http_proxy(PurpleConnection *pc)
 	if(proxy_ssl)
 		ppi = purple_proxy_get_setup(account);
 	else
-		ppi = purple_global_proxy_get_info();
+		ppi = purple_proxy_get_setup(NULL);
 
 	type = purple_proxy_info_get_type(ppi);
 
diff --git a/libpurple/protocols/yahoo/yahoo_aliases.c b/libpurple/protocols/yahoo/yahoo_aliases.c
index fe5286fc87..3b0fc1f3d7 100644
--- a/libpurple/protocols/yahoo/yahoo_aliases.c
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c
@@ -145,7 +145,7 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 					if (alias != NULL) {
 						serv_got_alias(gc, yid, alias);
 						purple_debug_info("yahoo", "Fetched alias '%s' (%s)\n", alias, id);
-					} else if (buddy_alias != NULL && strcmp(buddy_alias, "") != 0) {
+					} else if (buddy_alias && *buddy_alias && !g_str_equal(buddy_alias, yid)) {
 					/* Or if we have an alias that Yahoo doesn't, send it up */
 						yahoo_update_alias(gc, yid, buddy_alias);
 						purple_debug_info("yahoo", "Sent updated alias '%s'\n", buddy_alias);
diff --git a/libpurple/protocols/yahoo/yahoo_doodle.c b/libpurple/protocols/yahoo/yahoo_doodle.c
index 277adb74fa..f3f44a2631 100644
--- a/libpurple/protocols/yahoo/yahoo_doodle.c
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c
@@ -372,7 +372,7 @@ void yahoo_doodle_command_got_shutdown(PurpleConnection *gc, const char *from)
 
 	/* TODO Ask if user wants to save picture before the session is closed */
 
-	wb->state = DOODLE_STATE_CANCELED;
+	wb->state = DOODLE_STATE_CANCELLED;
 	purple_whiteboard_destroy(wb);
 }
 
@@ -460,7 +460,7 @@ void yahoo_doodle_end(PurpleWhiteboard *wb)
 
 	/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
 
-	if (gc && wb->state != DOODLE_STATE_CANCELED)
+	if (gc && wb->state != DOODLE_STATE_CANCELLED)
 		yahoo_doodle_command_send_shutdown(gc, wb->who);
 
 	g_free(ds->imv_key);
diff --git a/libpurple/protocols/yahoo/yahoo_doodle.h b/libpurple/protocols/yahoo/yahoo_doodle.h
index 3fda73b771..91329d4595 100644
--- a/libpurple/protocols/yahoo/yahoo_doodle.h
+++ b/libpurple/protocols/yahoo/yahoo_doodle.h
@@ -56,7 +56,7 @@
 #define DOODLE_STATE_REQUESTING  0
 #define DOODLE_STATE_REQUESTED   1
 #define DOODLE_STATE_ESTABLISHED 2
-#define DOODLE_STATE_CANCELED    3
+#define DOODLE_STATE_CANCELLED    3
 
 /* Doodle canvas dimensions */
 #define DOODLE_CANVAS_WIDTH  368
diff --git a/libpurple/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c
index 8f6fe64d5d..71c77d86bc 100644
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
@@ -1235,14 +1235,14 @@ static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *err
 	PurpleXfer *xfer;
 	struct yahoo_xfer_data *xd;
 	PurpleAccount *account;
-	YahooData* yd;
+	PurpleConnection *gc;
 
 	if (!(xfer = data))
 		return;
 	if (!(xd = xfer->data))
 		return;
-	yd = xd->gc->proto_data;
-	account = purple_connection_get_account(xd->gc);
+	gc = xd->gc;
+	account = purple_connection_get_account(gc);
 	if ((source < 0) || (xd->path == NULL) || (xd->host == NULL)) {
 		purple_xfer_error(PURPLE_XFER_RECEIVE, purple_xfer_get_account(xfer),
 			xfer->who, _("Unable to connect."));
@@ -1253,7 +1253,14 @@ static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *err
 	if (xd->txbuflen == 0)
 	{
 		gchar* cookies;
-		cookies = yahoo_get_cookies(xd->gc);
+		YahooData *yd = gc->proto_data;
+
+		/* cookies = yahoo_get_cookies(gc);
+		 * This doesn't seem to be working. The function is returning NULL, which yahoo servers don't like
+		 * For now let us not use this function */
+
+		cookies = g_strdup_printf("Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
+
 		if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED)
 		{
 			if(xd->info_val_249 == 2)
diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
index 892dd4c9e7..0f8a042598 100644
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -617,9 +617,6 @@ void yahoo_process_chat_exit(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *who = NULL;
 	char *room = NULL;
 	GSList *l;
-	YahooData *yd;
-
-	yd = gc->proto_data;
 
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
@@ -638,8 +635,7 @@ void yahoo_process_chat_exit(PurpleConnection *gc, struct yahoo_packet *pkt)
 			purple_conv_chat_remove_user(PURPLE_CONV_CHAT(c), who, NULL);
 
 	}
-	if (room)
-		g_free(room);
+	g_free(room);
 }
 
 void yahoo_process_chat_message(PurpleConnection *gc, struct yahoo_packet *pkt)
diff --git a/libpurple/purple-remote b/libpurple/purple-remote
index 498a5a5f8a..a1dbc86af8 100755
--- a/libpurple/purple-remote
+++ b/libpurple/purple-remote
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import codecs
 import dbus
 import re
 import urllib
@@ -7,6 +8,9 @@ import sys
 
 import xml.dom.minidom 
 
+sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
+sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
+
 xml.dom.minidom.Element.all   = xml.dom.minidom.Element.getElementsByTagName
 
 obj = None
diff --git a/libpurple/request.c b/libpurple/request.c
index 1dd4028170..391e993d8d 100644
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -1399,6 +1399,11 @@ purple_request_action_with_icon_varg(void *handle, const char *title,
 		handles = g_list_append(handles, info);
 
 		return info->ui_handle;
+	} else {
+		/* Fall back on the non-icon request if the UI doesn't support icon
+		 requests */
+		return purple_request_action_varg(handle, title, primary, secondary,
+			default_action, account, who, conv, user_data, action_count, actions);
 	}
 
 	return NULL;
diff --git a/libpurple/stun.c b/libpurple/stun.c
index c6f71da0b4..a6f516155d 100644
--- a/libpurple/stun.c
+++ b/libpurple/stun.c
@@ -105,11 +105,11 @@ static void close_stun_conn(struct stun_conn *sc) {
 }
 
 static void do_callbacks(void) {
-	while(callbacks) {
+	while (callbacks) {
 		StunCallback cb = callbacks->data;
-		if(cb)
+		if (cb)
 			cb(&nattype);
-		callbacks = g_slist_remove(callbacks, cb);
+		callbacks = g_slist_delete_link(callbacks, callbacks);
 	}
 }
 
@@ -280,7 +280,6 @@ static void hbn_listen_cb(int fd, gpointer data) {
 	GSList *hosts = data;
 	struct stun_conn *sc;
 	static struct stun_header hdr_data;
-	int ret;
 
 	if(fd < 0) {
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
@@ -298,15 +297,14 @@ static void hbn_listen_cb(int fd, gpointer data) {
 
 	sc->incb = purple_input_add(fd, PURPLE_INPUT_READ, reply_cb, sc);
 
-	ret = GPOINTER_TO_INT(hosts->data);
-	hosts = g_slist_remove(hosts, hosts->data);
+	hosts = g_slist_delete_link(hosts, hosts);
 	memcpy(&(sc->addr), hosts->data, sizeof(struct sockaddr_in));
 	g_free(hosts->data);
-	hosts = g_slist_remove(hosts, hosts->data);
-	while(hosts) {
-		hosts = g_slist_remove(hosts, hosts->data);
+	hosts = g_slist_delete_link(hosts, hosts);
+	while (hosts) {
+		hosts = g_slist_delete_link(hosts, hosts);
 		g_free(hosts->data);
-		hosts = g_slist_remove(hosts, hosts->data);
+		hosts = g_slist_delete_link(hosts, hosts);
 	}
 
 	hdr_data.type = htons(MSGTYPE_BINDINGREQUEST);
@@ -341,10 +339,10 @@ static void hbn_cb(GSList *hosts, gpointer data, const char *error_message) {
 	}
 
 	if (!purple_network_listen_range(12108, 12208, SOCK_DGRAM, hbn_listen_cb, hosts)) {
-		while(hosts) {
-			hosts = g_slist_remove(hosts, hosts->data);
+		while (hosts) {
+			hosts = g_slist_delete_link(hosts, hosts);
 			g_free(hosts->data);
-			hosts = g_slist_remove(hosts, hosts->data);
+			hosts = g_slist_delete_link(hosts, hosts);
 		}
 
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
diff --git a/libpurple/util.c b/libpurple/util.c
index fe2d9f28ec..b1f519cc79 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -2812,6 +2812,10 @@ purple_program_is_valid(const char *program)
 	progname = g_find_program_in_path(argv[0]);
 	is_valid = (progname != NULL);
 
+	if(purple_debug_is_verbose())
+		purple_debug_info("program_is_valid", "Tested program %s.  %s.\n", program,
+				is_valid ? "Valid" : "Invalid");
+
 	g_strfreev(argv);
 	g_free(progname);
 
@@ -3115,7 +3119,7 @@ purple_str_strip_char(char *text, char thechar)
 		if (text[i] != thechar)
 			text[j++] = text[i];
 
-	text[j++] = '\0';
+	text[j] = '\0';
 }
 
 void
@@ -3794,12 +3798,13 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 		gfud->webdata[gfud->len] = '\0';
 
 		if(!gfud->got_headers) {
-			char *tmp;
+			char *end_of_headers;
 
 			/* See if we've reached the end of the headers yet */
-			if((tmp = strstr(gfud->webdata, "\r\n\r\n"))) {
-				char * new_data;
-				guint header_len = (tmp + 4 - gfud->webdata);
+			end_of_headers = strstr(gfud->webdata, "\r\n\r\n");
+			if (end_of_headers) {
+				char *new_data;
+				guint header_len = (end_of_headers + 4 - gfud->webdata);
 				size_t content_len;
 
 				purple_debug_misc("util", "Response headers: '%.*s'\n",
@@ -3815,7 +3820,7 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 				content_len = parse_content_len(gfud->webdata, header_len);
 				gfud->chunked = content_is_chunked(gfud->webdata, header_len);
 
-				if(content_len == 0) {
+				if (content_len == 0) {
 					/* We'll stick with an initial 8192 */
 					content_len = 8192;
 				} else {
@@ -3824,19 +3829,16 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 
 
 				/* If we're returning the headers too, we don't need to clean them out */
-				if(gfud->include_headers) {
+				if (gfud->include_headers) {
 					gfud->data_len = content_len + header_len;
 					gfud->webdata = g_realloc(gfud->webdata, gfud->data_len);
 				} else {
-					size_t body_len = 0;
-
-					if(gfud->len > (header_len + 1))
-						body_len = (gfud->len - header_len);
+					size_t body_len = gfud->len - header_len;
 
 					content_len = MAX(content_len, body_len);
 
 					new_data = g_try_malloc(content_len);
-					if(new_data == NULL) {
+					if (new_data == NULL) {
 						purple_debug_error("util",
 								"Failed to allocate %" G_GSIZE_FORMAT " bytes: %s\n",
 								content_len, g_strerror(errno));
@@ -3850,9 +3852,8 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 					}
 
 					/* We may have read part of the body when reading the headers, don't lose it */
-					if(body_len > 0) {
-						tmp += 4;
-						memcpy(new_data, tmp, body_len);
+					if (body_len > 0) {
+						memcpy(new_data, end_of_headers + 4, body_len);
 					}
 
 					/* Out with the old... */
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
index edda84a9e0..4351f3d989 100644
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -37,7 +37,6 @@ PURPLE_TOP := $(PIDGIN_TREE_TOP)/libpurple
 PURPLE_PLUGINS_TOP := $(PURPLE_TOP)/plugins
 PURPLE_PERL_TOP := $(PURPLE_PLUGINS_TOP)/perl
 PIDGIN_TOP := $(PIDGIN_TREE_TOP)/pidgin
-PIDGIN_IDLETRACK_TOP := $(PIDGIN_TOP)/win32/IdleTracker
 PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps
 PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins
 PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po
@@ -48,7 +47,6 @@ PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
 PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
 PIDGIN_REVISION_H := $(PIDGIN_TREE_TOP)/package_revision.h
 PIDGIN_REVISION_RAW_TXT := $(PIDGIN_TREE_TOP)/package_revision_raw.txt
-PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll
 PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h
 PURPLE_VERSION_H := $(PURPLE_TOP)/version.h
 PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll
diff --git a/libpurple/win32/libc_interface.c b/libpurple/win32/libc_interface.c
index 90baa4201c..a7d55cf6d6 100644
--- a/libpurple/win32/libc_interface.c
+++ b/libpurple/win32/libc_interface.c
@@ -317,26 +317,26 @@ char* wpurple_strerror(int errornum) {
 	if (errornum > WSABASEERR) {
 		switch(errornum) {
 			case WSAECONNABORTED: /* 10053 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Connection interrupted by other software on your computer."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Connection interrupted by other software on your computer."));
 				break;
 			case WSAECONNRESET: /* 10054 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Remote host closed connection."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Remote host closed connection."));
 				break;
 			case WSAETIMEDOUT: /* 10060 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Connection timed out."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Connection timed out."));
 				break;
 			case WSAECONNREFUSED: /* 10061 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Connection refused."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Connection refused."));
 				break;
 			case WSAEADDRINUSE: /* 10048 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Address already in use."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Address already in use."));
 				break;
 			default:
 				g_snprintf(errbuf, sizeof(errbuf), "Windows socket error #%d", errornum);
 		}
 	} else {
 		const char *tmp = g_strerror(errornum);
-		g_snprintf(errbuf, sizeof(errbuf), tmp);
+		g_snprintf(errbuf, sizeof(errbuf), "%s", tmp);
 	}
 	return errbuf;
 }
diff --git a/libpurple/win32/targets.mak b/libpurple/win32/targets.mak
index 89b912d5f6..e31c2f424a 100644
--- a/libpurple/win32/targets.mak
+++ b/libpurple/win32/targets.mak
@@ -36,9 +36,6 @@ $(PURPLE_PERL_DLL) $(PURPLE_PERL_DLL).a:
 $(PIDGIN_DLL) $(PIDGIN_DLL).a:
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll
 
-$(PIDGIN_IDLETRACK_DLL) $(PIDGIN_IDLETRACK_DLL).a:
-	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) idletrack.dll
-
 $(PIDGIN_EXE):
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe
 
diff --git a/libpurple/win32/win32dep.c b/libpurple/win32/win32dep.c
index d2740dc15f..2c2824f744 100644
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -35,7 +35,7 @@
 static char *app_data_dir = NULL, *install_dir = NULL,
 	*lib_dir = NULL, *locale_dir = NULL;
 
-static HINSTANCE libpurpledll_hInstance = 0;
+static HINSTANCE libpurpledll_hInstance = NULL;
 
 /*
  *  PUBLIC CODE
@@ -77,16 +77,23 @@ FARPROC wpurple_find_and_loadproc(const char *dllname, const char *procedure) {
 	BOOL did_load = FALSE;
 	FARPROC proc = 0;
 
-	if(!(hmod = GetModuleHandle(dllname))) {
+	wchar_t *wc_dllname = g_utf8_to_utf16(dllname, -1, NULL, NULL, NULL);
+
+	if(!(hmod = GetModuleHandleW(wc_dllname))) {
 		purple_debug_warning("wpurple", "%s not already loaded; loading it...\n", dllname);
-		if(!(hmod = LoadLibrary(dllname))) {
-			purple_debug_error("wpurple", "Could not load: %s\n", dllname);
+		if(!(hmod = LoadLibraryW(wc_dllname))) {
+			purple_debug_error("wpurple", "Could not load: %s (%s)\n", dllname,
+				g_win32_error_message(GetLastError()));
+			g_free(wc_dllname);
 			return NULL;
 		}
 		else
 			did_load = TRUE;
 	}
 
+	g_free(wc_dllname);
+	wc_dllname = NULL;
+
 	if((proc = GetProcAddress(hmod, procedure))) {
 		purple_debug_info("wpurple", "This version of %s contains %s\n",
 			dllname, procedure);
@@ -124,7 +131,7 @@ const char *wpurple_install_dir(void) {
 	if (!initialized) {
 		char *tmp = NULL;
 		wchar_t winstall_dir[MAXPATHLEN];
-		if (GetModuleFileNameW(NULL, winstall_dir,
+		if (GetModuleFileNameW(libpurpledll_hInstance, winstall_dir,
 				MAXPATHLEN) > 0) {
 			tmp = g_utf16_to_utf8(winstall_dir, -1,
 				NULL, NULL, NULL);
diff --git a/pidgin.spec.in b/pidgin.spec.in
index faddee0d69..5aa7be6772 100644
--- a/pidgin.spec.in
+++ b/pidgin.spec.in
@@ -46,12 +46,14 @@ BuildRequires: gtk2-devel, libidn-devel
 %if "%{_vendor}" == "suse"
 # For SuSE:
 BuildRequires: gnutls-devel
+%define sslopts "--enable-gnutls=yes --enable-nss=no"
 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
 Requires(pre): gconf2
 Requires(post): gconf2
 Requires(preun): gconf2
 %else
+%define sslopts "--enable-gnutls=no --enable-nss=yes"
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
 Requires(pre): GConf2
@@ -230,6 +232,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
                                     --mandir=%{_mandir} \
                                     --sysconfdir=%{_sysconfdir} \
                                     --disable-schemas-install \
+                                    %{sslopts} \
                                     %{!?_with_vv:--disable-vv} \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{!?_with_avahi:--disable-avahi} \
@@ -471,6 +474,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 01 2010 Stu Tomlinson <stu@nosnilmot.com>
+- Ensure predictable use of SSL libs
+
 * Wed Jun 02 2010 Stu Tomlinson <stu@nosnilmot.com>
 - add an option to build RPMs using --enable-trayicon-compat
   (--with trayiconcompat)
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
index 56731e0cc7..2cabab439b 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -5,9 +5,6 @@ EXTRA_DIST = \
 		Makefile.mingw \
 		pidgin.pc.in \
 		pidgin-uninstalled.pc.in \
-		win32/IdleTracker/Makefile.mingw \
-		win32/IdleTracker/idletrack.c \
-		win32/IdleTracker/idletrack.h \
 		win32/MinimizeToTray.h \
 		win32/MinimizeToTray.c \
 		win32/pidgin_dll_rc.rc.in \
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
index f245022c53..dd4f13285f 100644
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -33,7 +33,6 @@ PURPLE_INCLUDE_PATHS =	\
 
 INCLUDE_PATHS +=	\
 			$(PURPLE_INCLUDE_PATHS) \
-			-I$(PIDGIN_IDLETRACK_TOP) \
 			-I$(PIDGIN_TOP) \
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include/gtk-2.0 \
@@ -45,8 +44,7 @@ INCLUDE_PATHS +=	\
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
-			-L$(PIDGIN_TOP) \
-			-L$(PIDGIN_IDLETRACK_TOP)
+			-L$(PIDGIN_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -121,7 +119,6 @@ PIDGIN_LIBS =	\
 		-lgthread-2.0 \
 		-lpurple \
 		-lz \
-		-lidletrack \
 		-lgtk-win32-2.0 \
 		-latk-1.0 \
 		-lpango-1.0 \
@@ -151,7 +148,6 @@ install_shallow: $(PIDGIN_INSTALL_DIR) $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
 install: install_shallow all
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
-	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) install
 
 win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
 	sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
@@ -159,7 +155,7 @@ win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
 
 $(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
 
-$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
+$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_OBJECTS)
 	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 
 $(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TARGET).dll
@@ -169,7 +165,6 @@ $(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TA
 ## CLEAN RULES
 ##
 clean:
-	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean
 	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
index d18f11bbf5..b2c8152254 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -2468,6 +2468,7 @@ pidgin_accounts_request_authorization(PurpleAccount *account,
 	GtkWidget *alert;
 	GdkPixbuf *prpl_icon;
 	struct auth_request *aa;
+	gboolean have_valid_alias = alias && *alias;
 
 	gc = purple_account_get_connection(account);
 	if (message != NULL && *message == '\0')
@@ -2475,9 +2476,9 @@ pidgin_accounts_request_authorization(PurpleAccount *account,
 
 	buffer = g_strdup_printf(_("%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"),
 				remote_user,
-				(alias != NULL ? " ("  : ""),
-				(alias != NULL ? alias : ""),
-				(alias != NULL ? ")"   : ""),
+				(have_valid_alias ? " ("  : ""),
+				(have_valid_alias ? alias : ""),
+				(have_valid_alias ? ")"   : ""),
 				(id != NULL
 				? id
 				: (purple_connection_get_display_name(gc) != NULL
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 00ab4f34cb..75e0c58ebe 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -3653,6 +3653,9 @@ set_mood_show(void)
  ***************************************************/
 static GtkItemFactoryEntry blist_menu[] =
 {
+/* NOTE: Do not set any accelerator to Control+O. It is mapped by 
+   gtk_blist_key_press_cb to "Get User Info" on the selected buddy. */
+
 	/* Buddies menu */
 	{ N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgin_dialogs_im, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
@@ -3686,7 +3689,7 @@ static GtkItemFactoryEntry blist_menu[] =
 	{ 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 },
-	{ N_("/Tools/Set _Mood"), "<CTL>O", set_mood_show, 0, "<Item>", NULL },
+	{ N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
@@ -3965,7 +3968,6 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 			                                 tmp);
 			g_free(tmp);
 		}
-		count = 0;
 
 		count = purple_blist_get_group_size(group, FALSE);
 		if (count != 0) {
@@ -3976,7 +3978,6 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 			                                 tmp);
 			g_free(tmp);
 		}
-		count = 0;
 
 		tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
 		g_string_append(str, tmp);
@@ -4023,7 +4024,6 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 {
 	PurpleBuddy *buddy = NULL;
 	struct _pidgin_blist_node *gtknode = node->ui_data;
-	struct _pidgin_blist_node *gtkbuddynode = NULL;
 	PurplePlugin *prpl;
 	PurplePluginProtocolInfo *prpl_info;
 	const char *name = NULL;
@@ -4034,11 +4034,9 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 	if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		if(!gtknode->contact_expanded) {
 			buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
-			gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data;
 		}
 	} else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		buddy = (PurpleBuddy*)node;
-		gtkbuddynode = node->ui_data;
 		p = purple_buddy_get_presence(buddy);
 		if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
 			/* This emblem comes from the small emoticon set now,
@@ -4131,7 +4129,6 @@ GdkPixbuf *
 pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 {
 	GdkPixbuf *ret;
-	const char *protoname = NULL;
 	const char *icon = NULL;
 	struct _pidgin_blist_node *gtknode = node->ui_data;
 	struct _pidgin_blist_node *gtkbuddynode = NULL;
@@ -4158,7 +4155,6 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 	if(buddy || chat) {
 		PurpleAccount *account;
 		PurplePlugin *prpl;
-		PurplePluginProtocolInfo *prpl_info;
 
 		if(buddy)
 			account = buddy->account;
@@ -4168,12 +4164,6 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 		prpl = purple_find_prpl(purple_account_get_protocol_id(account));
 		if(!prpl)
 			return NULL;
-
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
-
-		if(prpl_info && prpl_info->list_icon) {
-			protoname = prpl_info->list_icon(account, buddy);
-		}
 	}
 
 	if(buddy) {
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index c766d58b79..3a8edb7033 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -750,9 +750,9 @@ static void
 do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
 {
 	const char *buddy, *message;
-	PidginConversation *gtkconv;
+	PurpleConversation *conv;
 
-	gtkconv = PIDGIN_CONVERSATION(info->conv);
+	conv = info->conv;
 
 	if (resp == GTK_RESPONSE_OK) {
 		buddy   = gtk_entry_get_text(GTK_ENTRY(info->entry));
@@ -761,8 +761,8 @@ do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
 		if (!g_ascii_strcasecmp(buddy, ""))
 			return;
 
-		serv_chat_invite(purple_conversation_get_gc(info->conv),
-						 purple_conv_chat_get_id(PURPLE_CONV_CHAT(info->conv)),
+		serv_chat_invite(purple_conversation_get_gc(conv),
+						 purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 						 message, buddy);
 	}
 
@@ -856,7 +856,6 @@ invite_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	InviteBuddyInfo *info = NULL;
 
 	if (invite_dialog == NULL) {
-		PurpleConnection *gc;
 		PidginWindow *gtkwin;
 		GtkWidget *label;
 		GtkWidget *vbox, *hbox;
@@ -869,7 +868,6 @@ invite_cb(GtkWidget *widget, PidginConversation *gtkconv)
 		info = g_new0(InviteBuddyInfo, 1);
 		info->conv = conv;
 
-		gc        = purple_conversation_get_gc(conv);
 		gtkwin    = pidgin_conv_get_window(gtkconv);
 
 		/* Create the new dialog. */
@@ -1200,12 +1198,10 @@ static void
 menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *win = data;
-	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	GtkIMHtmlToolbar *toolbar;
 
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-	conv    = gtkconv->active_conv;
 	toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image),
@@ -1911,10 +1907,8 @@ static gboolean
 conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 {
 	PidginWindow *win;
-	PurpleConversation *conv;
 	int curconv;
 
-	conv     = gtkconv->active_conv;
 	win      = gtkconv->win;
 	curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
 
@@ -2009,13 +2003,11 @@ conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 static gboolean
 entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data)
 {
-	PidginWindow *win;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 
 	gtkconv  = (PidginConversation *)data;
 	conv     = gtkconv->active_conv;
-	win      = gtkconv->win;
 
 	if (conv_keypress_common(gtkconv, event))
 		return TRUE;
@@ -2350,12 +2342,9 @@ insert_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *position,
 			   gchar *new_text, gint new_text_length, gpointer user_data)
 {
 	PidginConversation *gtkconv = (PidginConversation *)user_data;
-	PurpleConversation *conv;
 
 	g_return_if_fail(gtkconv != NULL);
 
-	conv = gtkconv->active_conv;
-
 	if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
 		return;
 
@@ -2617,7 +2606,6 @@ redraw_icon(gpointer data)
 	PidginConversation *gtkconv = (PidginConversation *)data;
 	PurpleConversation *conv = gtkconv->active_conv;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	GdkPixbuf *buf;
 	GdkPixbuf *scale;
@@ -2628,9 +2616,7 @@ redraw_icon(gpointer data)
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	account = purple_conversation_get_account(conv);
 
-	if(account && account->gc) {
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
-	} else {
+	if (!(account && account->gc)) {
 		gtkconv->u.im->icon_timer = 0;
 		return FALSE;
 	}
@@ -2702,7 +2688,6 @@ remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 	GList *children;
 	GtkWidget *event;
 	PurpleConversation *conv = gtkconv->active_conv;
-	PidginWindow *gtkwin;
 
 	g_return_if_fail(conv != NULL);
 
@@ -2730,8 +2715,6 @@ remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 	gtkconv->u.im->anim = NULL;
 	gtkconv->u.im->iter = NULL;
 	gtkconv->u.im->show_icon = FALSE;
-
-	gtkwin = gtkconv->win;
 }
 
 static void
@@ -3684,13 +3667,10 @@ update_typing_message(PidginConversation *gtkconv, const char *message)
 static void
 update_typing_icon(PidginConversation *gtkconv)
 {
-	PidginWindow *gtkwin;
 	PurpleConvIm *im = NULL;
 	PurpleConversation *conv = gtkconv->active_conv;
 	char *message = NULL;
 
-	gtkwin = gtkconv->win;
-
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 		im = PURPLE_CONV_IM(conv);
 
@@ -3923,7 +3903,7 @@ generate_send_to_items(PidginWindow *win)
 						continue;
 
 					account = purple_buddy_get_account(buddy);
-					if (purple_account_is_connected(account))
+					if (purple_account_is_connected(account) || account == gtkconv->active_conv->account)
 					{
 						/* Use the PurplePresence to get unique buddies. */
 						PurplePresence *presence = purple_buddy_get_presence(buddy);
@@ -5740,10 +5720,8 @@ pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *a
 						time_t mtime)
 {
 	PidginConversation *gtkconv;
-	PidginWindow *win;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info;
 	int gtk_font_options = 0;
 	int gtk_font_options_all = 0;
 	int max_scrollback_lines;
@@ -5830,9 +5808,6 @@ pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *a
 		g_free(tmp);
 	}
 
-	win = gtkconv->win;
-	prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
-
 	line_count = gtk_text_buffer_get_line_count(
 			gtk_text_view_get_buffer(GTK_TEXT_VIEW(
 				gtkconv->imhtml)));
@@ -6263,7 +6238,6 @@ static void
 pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user)
 {
 	PurpleConvChat *chat;
-	PurpleConvChatBuddyFlags flags;
 	PurpleConvChatBuddy *cbuddy;
 	PidginConversation *gtkconv;
 	PidginChatPane *gtkchat;
@@ -6306,8 +6280,6 @@ pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user)
 
 	g_return_if_fail(alias != NULL);
 
-	flags = purple_conv_chat_user_get_flags(chat, user);
-
 	cbuddy = purple_conv_chat_cb_find(chat, user);
 	if (cbuddy)
 		add_chat_buddy_common(conv, cbuddy, NULL);
@@ -6729,7 +6701,6 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 		PurpleConvIm *im = NULL;
 		PurpleAccount *account = purple_conversation_get_account(conv);
 	 	PurpleBuddy *buddy = NULL;
-		PurplePresence *p = NULL;
 		char *markup = NULL;
 		AtkObject *accessibility_obj;
 		/* I think this is a little longer than it needs to be but I'm lazy. */
@@ -6749,7 +6720,6 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 			buddy = purple_find_buddy(account, conv->name);
 			if (buddy) {
-				p = purple_buddy_get_presence(buddy);
 				markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE);
 			} else {
 				markup = title;
@@ -6964,7 +6934,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 	int size = 0;
 
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	PurpleBuddyIcon *icon;
 
@@ -6981,8 +6950,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 		return;
 
 	account = purple_conversation_get_account(conv);
-	if(account && account->gc)
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
 
 	/* Remove the current icon stuff */
 	children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
@@ -8627,7 +8594,7 @@ infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkc
 static gboolean
 notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 {
-	gint nb_x, nb_y, x_rel, y_rel;
+	gint nb_x, nb_y;
 	int tab_clicked;
 	GtkWidget *page;
 	GtkWidget *tab;
@@ -8670,9 +8637,6 @@ notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 	*/
 	gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
 
-	x_rel = e->x_root - nb_x;
-	y_rel = e->y_root - nb_y;
-
 	/* Reset the min/max x/y */
 	win->drag_min_x = 0;
 	win->drag_min_y = 0;
@@ -9239,6 +9203,7 @@ pidgin_conv_set_position_size(PidginWindow *win, int conv_x, int conv_y,
 	if (win && win->window &&
 			!GTK_WIDGET_VISIBLE(win->window) && conv_width != 0) {
 
+#ifdef _WIN32  /* only override window manager placement on Windows */
 		/* ...check position is on screen... */
 		if (conv_x >= gdk_screen_width())
 			conv_x = gdk_screen_width() - 100;
@@ -9251,7 +9216,6 @@ pidgin_conv_set_position_size(PidginWindow *win, int conv_x, int conv_y,
 			conv_y = 100;
 
 		/* ...and move it back. */
-#ifdef _WIN32  /* only override window manager placement on Windows */
 		gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y);
 #endif
 		gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height);
@@ -9503,7 +9467,7 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 
 	gtk_widget_show(gtkconv->menu_tabby);
 
-	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
+	if (conv_type == PURPLE_CONV_TYPE_IM)
 		pidgin_conv_update_buddy_icon(conv);
 
 	/* Build and set conversations tab */
@@ -9630,9 +9594,7 @@ void
 pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	unsigned int index;
-	PurpleConversationType conv_type;
 
-	conv_type = purple_conversation_get_type(gtkconv->active_conv);
 	index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont);
 
 	g_object_ref(gtkconv->tab_cont);
@@ -9965,12 +9927,9 @@ conv_get_group(PidginConversation *conv)
 static void
 conv_placement_by_group(PidginConversation *conv)
 {
-	PurpleConversationType type;
 	PurpleGroup *group = NULL;
 	GList *wl, *cl;
 
-	type = purple_conversation_get_type(conv->active_conv);
-
 	group = conv_get_group(conv);
 
 	/* Go through the list of IMs and find one with this group. */
@@ -10004,12 +9963,10 @@ conv_placement_by_group(PidginConversation *conv)
 static void
 conv_placement_by_account(PidginConversation *conv)
 {
-	PurpleConversationType type;
 	GList *wins, *convs;
 	PurpleAccount *account;
 
 	account = purple_conversation_get_account(conv->active_conv);
-	type = purple_conversation_get_type(conv->active_conv);
 
 	/* Go through the list of IMs and find one with this group. */
 	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c
index 075dfb48b3..88eff55526 100644
--- a/pidgin/gtkdebug.c
+++ b/pidgin/gtkdebug.c
@@ -39,6 +39,11 @@
 
 #ifdef HAVE_REGEX_H
 # include <regex.h>
+#	define USE_REGEX 1
+#else
+#if GLIB_CHECK_VERSION(2,14,0)
+#	define USE_REGEX 1
+#endif
 #endif /* HAVE_REGEX_H */
 
 #include <gdk/gdkkeysyms.h>
@@ -52,7 +57,7 @@ typedef struct
 
 	gboolean paused;
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	GtkWidget *filter;
 	GtkWidget *expression;
 
@@ -60,11 +65,14 @@ typedef struct
 	gboolean highlight;
 
 	guint timer;
-
+#	ifdef HAVE_REGEX_H
 	regex_t regex;
+#	else
+	GRegex *regex;
+#	endif /* HAVE_REGEX_H */
 #else
 	GtkWidget *find;
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 	GtkWidget *filterlevel;
 } DebugWindow;
 
@@ -80,17 +88,17 @@ static const char debug_fg_colors[][8] = {
 static DebugWindow *debug_win = NULL;
 static guint debug_enabled_timer = 0;
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 static void regex_filter_all(DebugWindow *win);
 static void regex_show_all(DebugWindow *win);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 static gint
 debug_window_destroy(GtkWidget *w, GdkEvent *event, void *unused)
 {
 	purple_prefs_disconnect_by_handle(pidgin_debug_get_handle());
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	if(debug_win->timer != 0) {
 		const gchar *text;
 
@@ -99,9 +107,12 @@ debug_window_destroy(GtkWidget *w, GdkEvent *event, void *unused)
 		text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
 	}
-
+#ifdef HAVE_REGEX_H
 	regfree(&debug_win->regex);
-#endif
+#else
+	g_regex_unref(debug_win->regex);
+#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	/* If the "Save Log" dialog is open then close it */
 	purple_request_close_with_handle(debug_win);
@@ -125,7 +136,7 @@ configure_cb(GtkWidget *w, GdkEventConfigure *event, DebugWindow *win)
 	return FALSE;
 }
 
-#ifndef HAVE_REGEX_H
+#ifndef USE_REGEX
 struct _find {
 	DebugWindow *window;
 	GtkWidget *entry;
@@ -206,7 +217,7 @@ find_cb(GtkWidget *w, DebugWindow *win)
 	gtk_widget_show_all(win->find);
 	gtk_widget_grab_focus(f->entry);
 }
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 static void
 save_writefile_cb(void *user_data, const char *filename)
@@ -242,9 +253,9 @@ clear_cb(GtkWidget *w, DebugWindow *win)
 {
 	gtk_imhtml_clear(GTK_IMHTML(win->text));
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	gtk_list_store_clear(win->store);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 }
 
 static void
@@ -252,20 +263,20 @@ pause_cb(GtkWidget *w, DebugWindow *win)
 {
 	win->paused = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(w));
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	if(!win->paused) {
 		if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 			regex_filter_all(win);
 		else
 			regex_show_all(win);
 	}
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 }
 
 /******************************************************************************
  * regex stuff
  *****************************************************************************/
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 static void
 regex_clear_color(GtkWidget *w) {
 	gtk_widget_modify_base(w, GTK_STATE_NORMAL, NULL);
@@ -295,16 +306,18 @@ regex_highlight_clear(DebugWindow *win) {
 static void
 regex_match(DebugWindow *win, const gchar *text) {
 	GtkIMHtml *imhtml = GTK_IMHTML(win->text);
+#ifdef HAVE_REGEX_H
 	regmatch_t matches[4]; /* adjust if necessary */
 	size_t n_matches = sizeof(matches) / sizeof(matches[0]);
-	gchar *plaintext;
 	gint inverted;
+#else
+	GMatchInfo *match_info;
+#endif /* HAVE_REGEX_H */
+	gchar *plaintext;
 
 	if(!text)
 		return;
 
-	inverted = (win->invert) ? REG_NOMATCH : 0;
-
 	/* I don't like having to do this, but we need it for highlighting.  Plus
 	 * it makes the ^ and $ operators work :)
 	 */
@@ -313,9 +326,14 @@ regex_match(DebugWindow *win, const gchar *text) {
 	/* we do a first pass to see if it matches at all.  If it does we append
 	 * it, and work out the offsets to highlight.
 	 */
+#ifdef HAVE_REGEX_H
+	inverted = (win->invert) ? REG_NOMATCH : 0;
 	if(regexec(&win->regex, plaintext, n_matches, matches, 0) == inverted) {
-		GtkTextIter ins;
+#else
+	if(g_regex_match(win->regex, plaintext, 0, &match_info) != win->invert) {
+#endif /* HAVE_REGEX_H */
 		gchar *p = plaintext;
+		GtkTextIter ins;
 		gint i, offset = 0;
 
 		gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &ins,
@@ -327,14 +345,18 @@ regex_match(DebugWindow *win, const gchar *text) {
 		/* If we're not highlighting or the expression is inverted, we're
 		 * done and move on.
 		 */
-		if(!win->highlight || inverted == REG_NOMATCH) {
+		if(!win->highlight || win->invert) {
 			g_free(plaintext);
+#ifndef HAVE_REGEX_H
+			g_match_info_free(match_info);
+#endif
 			return;
 		}
 
 		/* we use a do-while to highlight the first match, and then continue
 		 * if necessary...
 		 */
+#ifdef HAVE_REGEX_H
 		do {
 			size_t m;
 
@@ -357,6 +379,41 @@ regex_match(DebugWindow *win, const gchar *text) {
 
 			p += offset;
 		} while(regexec(&win->regex, p, n_matches, matches, REG_NOTBOL) == inverted);
+#else
+		do
+		{
+			gint m;
+			gint start_pos, end_pos;
+			GtkTextIter ms, me;
+			
+			if (!g_match_info_matches(match_info))
+				break;
+			
+			for (m = 0; m < g_match_info_get_match_count(match_info); m++)
+			{
+				if (m == 1)
+					continue;
+				
+				g_match_info_fetch_pos(match_info, m, &start_pos, &end_pos);
+				
+				if (end_pos == -1)
+					break;
+				
+				gtk_text_buffer_get_iter_at_offset(imhtml->text_buffer, &ms,
+													i + start_pos);
+				gtk_text_buffer_get_iter_at_offset(imhtml->text_buffer, &me,
+													i + end_pos);
+				gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "regex",
+												  &ms, &me);
+				offset = end_pos;
+			}
+			
+			g_match_info_free(match_info);
+			p += offset;
+			i += offset;
+		} while (g_regex_match(win->regex, p, G_REGEX_MATCH_NOTBOL, &match_info) != win->invert);
+		g_match_info_free(match_info);
+#endif /* HAVE_REGEX_H */
 	}
 
 	g_free(plaintext);
@@ -430,9 +487,15 @@ regex_compile(DebugWindow *win) {
 		return;
 	}
 
+#ifdef HAVE_REGEX_H
 	regfree(&win->regex);
-
 	if(regcomp(&win->regex, text, REG_EXTENDED | REG_ICASE) != 0) {
+#else
+	if (win->regex)
+		g_regex_unref(win->regex);
+	win->regex = g_regex_new(text, G_REGEX_EXTENDED | G_REGEX_CASELESS, 0, NULL);
+	if(win->regex == NULL) {
+#endif
 		/* failed to compile */
 		regex_change_color(win->expression, 0xFFFF, 0xAFFF, 0xAFFF);
 		gtk_widget_set_sensitive(win->filter, FALSE);
@@ -616,7 +679,7 @@ filter_level_pref_changed(const char *name, PurplePrefType type, gconstpointer v
 	else
 		regex_show_all(win);
 }
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 static void
 filter_level_changed_cb(GtkWidget *combo, gpointer null)
@@ -702,7 +765,7 @@ debug_window_new(void)
 
 	handle = pidgin_debug_get_handle();
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	/* the list store for all the messages */
 	win->store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
 
@@ -714,7 +777,7 @@ debug_window_new(void)
 	g_signal_connect(G_OBJECT(win->store), "row-changed",
 					 G_CALLBACK(regex_row_changed_cb), win);
 
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	/* Setup the vbox */
 	vbox = gtk_vbox_new(FALSE, 0);
@@ -741,7 +804,7 @@ debug_window_new(void)
 
 		gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
-#ifndef HAVE_REGEX_H
+#ifndef USE_REGEX
 		/* Find button */
 		item = gtk_tool_button_new_from_stock(GTK_STOCK_FIND);
 		gtk_tool_item_set_is_important(item, TRUE);
@@ -752,7 +815,7 @@ debug_window_new(void)
 #endif
 		g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(find_cb), win);
 		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 		/* Save */
 		item = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE);
@@ -790,7 +853,7 @@ debug_window_new(void)
 		g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(pause_cb), win);
 		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 		/* regex stuff */
 		item = gtk_separator_tool_item_new();
 		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
@@ -853,7 +916,7 @@ debug_window_new(void)
 		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/highlight",
 									regex_pref_highlight_cb, win);
 
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 		item = gtk_separator_tool_item_new();
 		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
@@ -880,7 +943,7 @@ debug_window_new(void)
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("Fatal Error"));
 		gtk_combo_box_set_active(GTK_COMBO_BOX(win->filterlevel),
 					purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"));
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filterlevel",
 						filter_level_pref_changed, win);
 #endif
@@ -895,13 +958,13 @@ debug_window_new(void)
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	/* add the tag for regex highlighting */
 	gtk_text_buffer_create_tag(GTK_IMHTML(win->text)->text_buffer, "regex",
 							   "background", "#FFAFAF",
 							   "weight", "bold",
 							   NULL);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	gtk_widget_show_all(win->window);
 
@@ -1002,13 +1065,13 @@ pidgin_debug_init(void)
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/width",  450);
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/height", 250);
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/debug/regex", "");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/filter", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/invert", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/case_insensitive", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/highlight", FALSE);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	purple_prefs_connect_callback(NULL, PIDGIN_PREFS_ROOT "/debug/enabled",
 								debug_enabled_cb, NULL);
@@ -1070,9 +1133,9 @@ static void
 pidgin_debug_print(PurpleDebugLevel level, const char *category,
 					 const char *arg_s)
 {
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	GtkTreeIter iter;
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 	gchar *ts_s;
 	gchar *esc_s, *cat_s, *tmp, *s;
 	const char *mdate;
@@ -1111,14 +1174,14 @@ pidgin_debug_print(PurpleDebugLevel level, const char *category,
 		s = tmp;
 	}
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	/* add the text to the list store */
 	gtk_list_store_append(debug_win->store, &iter);
 	gtk_list_store_set(debug_win->store, &iter, 0, s, 1, level, -1);
-#else /* HAVE_REGEX_H */
+#else /* USE_REGEX */
 	if(!debug_win->paused && level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"))
 		gtk_imhtml_append_text(GTK_IMHTML(debug_win->text), s, 0);
-#endif /* !HAVE_REGEX_H */
+#endif /* !USE_REGEX */
 
 	g_free(s);
 }
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index a14fffd9b9..98c32d2b1d 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -80,14 +80,14 @@ static const struct developer developers[] = {
 	{N_("Ka-Hing Cheung"),                 NULL,                  NULL},
 	{"Sadrul Habib Chowdhury",             NULL,                  NULL},
 	{"Mark 'KingAnt' Doliner",             NULL,                  "mark@kingant.net"},
-	{"Sean Egan",                          NULL,                  "sean.egan@gmail.com"},
 	{"Casey Harkins",                      NULL,                  NULL},
+	{"Ivan Komarov",                       NULL,                  "ivan.komarov@pidgin.im"},
 	{"Gary 'grim' Kramlich",               NULL,                  "grim@pidgin.im"},
 	{"Richard 'rlaager' Laager",           NULL,                  "rlaager@pidgin.im"},
+	{"Marcus 'malu' Lundblad",             NULL,                  NULL},
 	{"Sulabh 'sulabh_m' Mahajan",          NULL,                  NULL},
 	{"Richard 'wabz' Nelson",              NULL,                  NULL},
 	{"Etan 'deryni' Reisner",              NULL,                  NULL},
-	{"Tim 'marv' Ringenbach",              NULL,                  NULL},
 	{"Michael 'Maiku' Ruprecht",           N_("voice and video"), NULL},
 	{"Elliott 'QuLogic' Sales de Andrade", NULL,                  NULL},
 	{"Luke 'LSchiere' Schierer",           N_("support"),         "lschiere@users.sf.net"},
@@ -95,16 +95,14 @@ static const struct developer developers[] = {
 	{"Kevin 'SimGuy' Stange",              N_("webmaster"),       NULL},
 	{"Will 'resiak' Thompson",             NULL,                  NULL},
 	{"Stu 'nosnilmot' Tomlinson",          NULL,                  NULL},
+	{"Jorge 'Masca' Villaseñor",           NULL,                  NULL},
 	{NULL, NULL, NULL}
 };
 
 /* Order: Alphabetical by Last Name */
 static const struct developer patch_writers[] = {
-	{"Marcus 'malu' Lundblad",         NULL,                        NULL},
-	{"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL},
 	{"Peter 'Fmoo' Ruibal",            NULL,                        NULL},
 	{"Gabriel 'Nix' Schulhof",         NULL,                        NULL},
-	{"Jorge 'Masca' Villaseñor",       NULL,                        NULL},
 	{NULL, NULL, NULL}
 };
 
@@ -113,6 +111,7 @@ static const struct developer retired_developers[] = {
 	{"Herman Bloggs",               N_("win32 port"),          "herman@bluedigits.com"},
 	{"Thomas Butter",               NULL,                      NULL},
 	{"Jim Duchek",                  N_("maintainer"),          "jim@linuxpimps.com"},
+	{"Sean Egan",                   NULL,                      "sean.egan@gmail.com"},
 	{"Rob Flynn",                   N_("maintainer"),          NULL},
 	{"Adam Fritzler",               N_("libfaim maintainer"),  NULL},
 	{"Christian 'ChipX86' Hammond", N_("webmaster"),           NULL},
@@ -120,6 +119,7 @@ static const struct developer retired_developers[] = {
 	{"Syd Logan",                   N_("hacker and designated driver [lazy bum]"), NULL},
 	{"Christopher 'siege' O'Brien", NULL,                      "taliesein@users.sf.net"},
 	{"Bartosz Oler",                NULL,                      NULL},
+	{"Tim 'marv' Ringenbach",       NULL,                      NULL},
 	{"Megan 'Cae' Schneider",       N_("support/QA"),          NULL},
 	{"Jim Seymour",                 N_("XMPP"),                NULL},
 	{"Mark Spencer",                N_("original author"),     "markster@marko.net"},
@@ -132,6 +132,7 @@ static const struct developer retired_developers[] = {
 static const struct developer retired_patch_writers[] = {
 	{"Felipe 'shx' Contreras",    NULL, NULL},
 	{"Decklin Foster",            NULL, NULL},
+	{"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL},
 	{"Peter 'Bleeter' Lawler",    NULL, NULL},
 	{"Robert 'Robot101' McQueen", NULL, NULL},
 	{"Benjamin Miller",           NULL, NULL},
@@ -150,7 +151,7 @@ static const struct translator translators[] = {
 	{N_("Bengali"),             "bn", "Israt Jahan", "israt@ankur.org.bd"},
 	{N_("Bengali"),             "bn", "Jamil Ahmed", "jamil@bengalinux.org"},
 	{N_("Bengali"),             "bn", "Samia Nimatullah", "mailsamia2001@yahoo.com"},
-	{N_("Bengali-India"),       "bn", "Runa Bhattacharjee", "runab@fedoraproject.org"},
+	{N_("Bengali-India"),       "bn_IN", "Runa Bhattacharjee", "runab@fedoraproject.org"},
 	{N_("Bosnian"),             "bs", "Lejla Hadzialic", "lejlah@gmail.com"},
 	{N_("Catalan"),             "ca", "Josep Puigdemont", "josep.puigdemont@gmail.com"},
 	{N_("Valencian-Catalan"),   "ca@valencia", "Toni Hermoso", "toniher@softcatala.org"},
@@ -197,6 +198,7 @@ static const struct translator translators[] = {
 	{N_("Kurdish"),             "ku", "Amed Ç. Jiyan", "amedcj@hotmail.com"},
 	{N_("Kurdish"),             "ku", "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
 	{N_("Lao"),                 "lo", "Anousak Souphavah", "anousak@gmail.com"},
+	{N_("Maithili"),            "mai", "Sangeeta Kumari", "sangeeta_0975@yahoo.com"},
 	{N_("Macedonian"),          "mk", "Arangel Angov ", "arangel@linux.net.mk"},
 	{N_("Macedonian"),          "mk", "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
 	{N_("Macedonian"),          "mk", "Jovan Naumovski", "jovan@lugola.net"},
@@ -1288,7 +1290,7 @@ pidgin_dialogs_remove_buddy_cb(PurpleBuddy *buddy)
 
 	purple_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name);
 	/* TODO - Should remove from blist first... then call purple_account_remove_buddy()? */
-	purple_account_remove_buddy(buddy->account, buddy, group);
+	purple_account_remove_buddy(account, buddy, group);
 	purple_blist_remove_buddy(buddy);
 
 	g_free(name);
diff --git a/pidgin/gtkft.c b/pidgin/gtkft.c
index e52f6a86b6..dfc91a51a4 100644
--- a/pidgin/gtkft.c
+++ b/pidgin/gtkft.c
@@ -112,13 +112,10 @@ static void
 get_xfer_info_strings(PurpleXfer *xfer, char **kbsec, char **time_elapsed,
 					  char **time_remaining)
 {
-	PidginXferUiData *data;
 	double kb_sent, kb_rem;
 	double kbps = 0.0;
 	time_t elapsed, now;
 
-	data = PIDGINXFER(xfer);
-
 	if (xfer->end_time != 0)
 		now = xfer->end_time;
 	else
@@ -159,7 +156,7 @@ get_xfer_info_strings(PurpleXfer *xfer, char **kbsec, char **time_elapsed,
 			*time_remaining = g_strdup(_("Finished"));
 		}
 		else if (purple_xfer_is_canceled(xfer)) {
-			*time_remaining = g_strdup(_("Canceled"));
+			*time_remaining = g_strdup(_("Cancelled"));
 		}
 		else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
 			*time_remaining = g_strdup(_("Unknown"));
@@ -995,7 +992,7 @@ pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 									GTK_ICON_SIZE_MENU, NULL);
 
 	if (purple_xfer_is_canceled(xfer))
-		status = _("Canceled");
+		status = _("Cancelled");
 	else
 		status = _("Failed");
 
@@ -1015,7 +1012,6 @@ pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
 {
 	PidginXferUiData *data;
 	char *size_str, *remaining_str;
-	GtkTreeSelection *selection;
 	time_t current_time;
 	GtkTreeIter iter;
 	gboolean valid;
@@ -1066,8 +1062,6 @@ pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
 		g_object_unref(pixbuf);
 	}
 
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree));
-
 	update_title_progress(dialog);
 	if (xfer == dialog->selected_xfer)
 		update_detailed_info(xfer_dialog, xfer);
diff --git a/pidgin/gtkft.h b/pidgin/gtkft.h
index e4703cef55..12f8b380ff 100644
--- a/pidgin/gtkft.h
+++ b/pidgin/gtkft.h
@@ -88,10 +88,10 @@ void pidgin_xfer_dialog_remove_xfer(PidginXferDialog *dialog,
 									 PurpleXfer *xfer);
 
 /**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
  *
  * @param dialog The file transfer dialog.
- * @param xfer   The file transfer that was canceled.
+ * @param xfer   The file transfer that was cancelled.
  */
 void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 									 PurpleXfer *xfer);
diff --git a/pidgin/gtkidle.c b/pidgin/gtkidle.c
index d95bb4ae9e..f5cf624b97 100644
--- a/pidgin/gtkidle.c
+++ b/pidgin/gtkidle.c
@@ -29,7 +29,7 @@
 #else
 # ifdef USE_SCREENSAVER
 #  ifdef _WIN32
-#   include "idletrack.h"
+#   include "gtkwin32dep.h"
 #  else
     /* We're on X11 and not MacOS X with IOKit. */
 #   include <X11/Xlib.h>
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index 24aeb24d10..73acb45007 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -1476,10 +1476,8 @@ imhtml_url_clicked(GtkIMHtml *imhtml, const char *url)
 static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 {
 	GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
-	GtkObjectClass *object_class;
 	GtkBindingSet *binding_set;
 	GObjectClass   *gobject_class;
-	object_class = (GtkObjectClass*) klass;
 	gobject_class = (GObjectClass*) klass;
 	parent_class = g_type_class_ref(GTK_TYPE_TEXT_VIEW);
 	signals[URL_CLICKED] = g_signal_new("url_clicked",
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index cdebda8416..2b36c9c880 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -1205,9 +1205,7 @@ gtk_imhtmltoolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, GtkIMHtml
 /* Boring GTK+ stuff */
 static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class)
 {
-	GtkObjectClass *object_class;
 	GObjectClass   *gobject_class;
-	object_class = (GtkObjectClass*) class;
 	gobject_class = (GObjectClass*) class;
 	parent_class = g_type_class_ref(GTK_TYPE_HBOX);
 	gobject_class->finalize = gtk_imhtmltoolbar_finalize;
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
index 24a347151e..f0deb0c81f 100644
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
 	struct option long_options[] = {
 		{"config",       required_argument, NULL, 'c'},
 		{"debug",        no_argument,       NULL, 'd'},
-		{"force-online", no_argument,       NULL, 'd'},
+		{"force-online", no_argument,       NULL, 'f'},
 		{"help",         no_argument,       NULL, 'h'},
 		{"login",        optional_argument, NULL, 'l'},
 		{"multiple",     no_argument,       NULL, 'm'},
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index 9a7a7422a9..83884fbbb1 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -1367,11 +1367,32 @@ pidgin_notify_uri(const char *uri)
 			command = g_strdup_printf("opera %s", escaped);
 
 	}
+	else if (!strcmp(web_browser, "google-chrome"))
+	{
+		/* Google Chrome doesn't have command-line arguments that control the
+		 * opening of links from external calls.  This is controlled solely from
+		 * a preference within Google Chrome. */
+		command = g_strdup_printf("google-chrome %s", escaped);
+	}
+	else if (!strcmp(web_browser, "chrome"))
+	{
+		/* Chromium doesn't have command-line arguments that control the
+		 * opening of links from external calls.  This is controlled solely from
+		 * a preference within Chromium. */
+		command = g_strdup_printf("chrome %s", escaped);
+	}
+	else if (!strcmp(web_browser, "chromium-browser"))
+	{
+		/* Chromium doesn't have command-line arguments that control the
+		 * opening of links from external calls.  This is controlled solely from
+		 * a preference within Chromium. */
+		command = g_strdup_printf("chromium-browser %s", escaped);
+	}
 	else if (!strcmp(web_browser, "custom"))
 	{
 		const char *web_command;
 
-		web_command = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command");
+		web_command = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command");
 
 		if (web_command == NULL || *web_command == '\0')
 		{
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
index 15d70bf317..c47a0cd125 100644
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -800,5 +800,8 @@ void pidgin_plugin_dialog_show()
 	g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (prefs_plugin_sel), NULL);
 	g_signal_connect(G_OBJECT(plugin_dialog), "response", G_CALLBACK(plugin_dialog_response_cb), sel);
 	gtk_window_set_default_size(GTK_WINDOW(plugin_dialog), 430, 530);
+
+	pidgin_auto_parent_window(plugin_dialog);
+
 	gtk_widget_show_all(plugin_dialog);
 }
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index 1a589d5690..fb468b4f3c 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -194,7 +194,6 @@ add_pounce_to_treeview(GtkListStore *model, PurplePounce *pounce)
 {
 	GtkTreeIter iter;
 	PurpleAccount *account;
-	PurplePounceEvent events;
 	gboolean recurring;
 	const char *pouncer;
 	const char *pouncee;
@@ -202,8 +201,6 @@ add_pounce_to_treeview(GtkListStore *model, PurplePounce *pounce)
 
 	account = purple_pounce_get_pouncer(pounce);
 
-	events = purple_pounce_get_events(pounce);
-
 	pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
 	pouncer = purple_account_get_username(account);
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index e8da8cf67f..b79cdb4df2 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1042,11 +1042,40 @@ prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 }
 
 static GtkWidget *
+add_theme_prefs_combo(GtkWidget *vbox,
+                      GtkSizeGroup *combo_sg, GtkSizeGroup *label_sg,
+                      GtkListStore *theme_store,
+                      GCallback combo_box_cb, gpointer combo_box_cb_user_data, 
+                      const char *label_str, const char *prefs_path,
+                      const char *theme_type)
+{
+	GtkWidget *label;
+	GtkWidget *combo_box = NULL;
+	GtkWidget *themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+
+	label = gtk_label_new(label_str);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_size_group_add_widget(label_sg, label);
+	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
+
+	combo_box = prefs_build_theme_combo_box(theme_store,
+						purple_prefs_get_string(prefs_path),
+						theme_type);
+	g_signal_connect(G_OBJECT(combo_box), "changed",
+						(GCallback)combo_box_cb, combo_box_cb_user_data);
+	gtk_size_group_add_widget(combo_sg, combo_box);
+	gtk_box_pack_start(GTK_BOX(themesel_hbox), combo_box, TRUE, TRUE, 0);
+
+	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+
+	return combo_box;
+}
+
+static GtkWidget *
 theme_page(void)
 {
-	GtkWidget *ret, *vbox;
 	GtkWidget *label;
-	GtkWidget *themesel_hbox;
+	GtkWidget *ret, *vbox;
 	GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -1067,76 +1096,28 @@ theme_page(void)
 	gtk_widget_show(label);
 
 	/* Buddy List Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Buddy List Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	prefs_blist_themes_combo_box = prefs_build_theme_combo_box(prefs_blist_themes,
-						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"),
-						"blist");
-	g_signal_connect(G_OBJECT(prefs_blist_themes_combo_box), "changed",
-						(GCallback)prefs_set_blist_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_blist_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_blist_themes_combo_box, TRUE, TRUE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_blist_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_blist_themes,
+		(GCallback)prefs_set_blist_theme_cb, NULL, 
+		_("Buddy List Theme:"), PIDGIN_PREFS_ROOT "/blist/theme", "blist");
 
 	/* Status Icon Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Status Icon Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	prefs_status_themes_combo_box = prefs_build_theme_combo_box(prefs_status_icon_themes,
-						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"),
-						"icon");
-	g_signal_connect(G_OBJECT(prefs_status_themes_combo_box), "changed",
-						(GCallback)prefs_set_status_icon_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_status_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_status_themes_combo_box, TRUE, TRUE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_status_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_status_icon_themes,
+		(GCallback)prefs_set_status_icon_theme_cb, NULL,
+		_("Status Icon Theme:"), PIDGIN_PREFS_ROOT "/status/icon-theme", "icon");
 
 	/* Sound Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Sound Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	prefs_sound_themes_combo_box = prefs_build_theme_combo_box(prefs_sound_themes,
-						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"),
-						"sound");
-	g_signal_connect(G_OBJECT(prefs_sound_themes_combo_box), "changed",
-						(GCallback)prefs_set_sound_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_sound_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_sound_themes_combo_box, TRUE, TRUE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_sound_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_sound_themes,
+		(GCallback)prefs_set_sound_theme_cb, NULL,
+		_("Sound Theme:"), PIDGIN_PREFS_ROOT "/sound/theme", "sound");
 
 	/* Smiley Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Smiley Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	prefs_smiley_themes_combo_box = prefs_build_theme_combo_box(prefs_smiley_themes,
-						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme"),
-						"smiley");
-	g_signal_connect(G_OBJECT(prefs_smiley_themes_combo_box), "changed",
-						(GCallback)prefs_set_smiley_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_smiley_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_smiley_themes_combo_box, TRUE, TRUE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_smiley_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_smiley_themes,
+		(GCallback)prefs_set_smiley_theme_cb, NULL,
+		_("Smiley Theme:"), PIDGIN_PREFS_ROOT "/smileys/theme", "smiley");
 
 	/* Custom sort so "none" theme is at top of list */
 	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(prefs_smiley_themes),
@@ -1809,9 +1790,10 @@ network_page(void)
 
 	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"),
 			sg, entry, TRUE, NULL);
-
-	pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
+	
+	pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"),
 		"/purple/network/turn_port", 0, 65535, NULL);
+
 	hbox = pidgin_prefs_labeled_entry(vbox, _("Use_rname:"),
 		"/purple/network/turn_username", sg);
 	pidgin_prefs_labeled_password(hbox, _("Pass_word:"),
@@ -1829,7 +1811,7 @@ manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data)
 {
 	const char *program = gtk_entry_get_text(GTK_ENTRY(entry));
 
-	purple_prefs_set_path(PIDGIN_PREFS_ROOT "/browsers/command", program);
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", program);
 
 	/* carry on normally */
 	return FALSE;
@@ -1850,12 +1832,19 @@ get_available_browsers(void)
 		{N_("Netscape"), "netscape"},
 		{N_("Mozilla"), "mozilla"},
 		{N_("Konqueror"), "kfmclient"},
+		{N_("Google Chrome"), "google-chrome"},
+		/* Do not move the line below.  Code below expects gnome-open to be in
+		 * this list immediately after xdg-open! */
 		{N_("Desktop Default"), "xdg-open"},
 		{N_("GNOME Default"), "gnome-open"},
 		{N_("Galeon"), "galeon"},
 		{N_("Firefox"), "firefox"},
 		{N_("Firebird"), "mozilla-firebird"},
-		{N_("Epiphany"), "epiphany"}
+		{N_("Epiphany"), "epiphany"},
+		/* Translators: please do not translate "chromium-browser" here! */
+		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+		/* Translators: please do not translate "chrome" here! */
+		{N_("Chromium (chrome)"), "chrome"}
 	};
 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
 
@@ -1979,7 +1968,7 @@ browser_page(void)
 
 		entry = gtk_entry_new();
 		gtk_entry_set_text(GTK_ENTRY(entry),
-						   purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command"));
+						   purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command"));
 		g_signal_connect(G_OBJECT(entry), "focus-out-event",
 						 G_CALLBACK(manual_browser_set), NULL);
 		hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL);
@@ -2839,8 +2828,8 @@ pidgin_prefs_init(void)
 	/* Browsers */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/browsers");
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/browsers/place", PIDGIN_BROWSER_DEFAULT);
-	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/browsers/command", "");
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "mozilla");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", "");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "xdg-open");
 #endif
 
 	/* Plugins */
@@ -2870,7 +2859,7 @@ pidgin_prefs_init(void)
 void
 pidgin_prefs_update_old(void)
 {
-	const char *str;
+	const char *str = NULL;
 
 	purple_prefs_rename("/gaim/gtk", PIDGIN_PREFS_ROOT);
 
@@ -2886,6 +2875,17 @@ pidgin_prefs_update_old(void)
 	purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors",
 									 PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting");
 
+	/*
+	 * this path pref changed to a string, so migrate.  I know this will break
+	 * things for and confuse users that use multiple versions with the same
+	 * config directory, but I'm not inclined to want to deal with that at the
+	 * moment. -- rekkanoryo
+	 */
+	if((str = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command")) != NULL) {
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", str);
+		purple_prefs_remove(PIDGIN_PREFS_ROOT "/browsers/command");
+	}
+
 	/* this string pref moved into the core, try to be friendly */
 	purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/purple/away/idle_reporting");
 	if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) &&
diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c
index f81dbfa460..4ef648c0d7 100644
--- a/pidgin/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
@@ -362,8 +362,6 @@ pidgin_roomlist_paint_tooltip(GtkWidget *widget, gpointer user_data)
 
 	style = grl->tipwindow->style;
 
-	max_text_width = 0;
-
 	max_text_width = MAX(grl->tip_width, grl->tip_name_width);
 	max_width = TOOLTIP_BORDER + SMALL_SPACE + max_text_width + TOOLTIP_BORDER;
 
diff --git a/pidgin/gtksession.c b/pidgin/gtksession.c
index c9bee6f266..a972865c76 100644
--- a/pidgin/gtksession.c
+++ b/pidgin/gtksession.c
@@ -166,7 +166,7 @@ static gchar **session_make_command(gchar *client_id, gchar *config_dir) {
 	ret[j++] = g_strdup("--display");
 	ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
 
-	ret[j++] = NULL;
+	ret[j] = NULL;
 
 	return ret;
 }
diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c
index 06a041d8a1..e59c082fd7 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -520,9 +520,6 @@ static void delete_foreach(GtkTreeModel *model, GtkTreePath *path,
 		GtkTreeIter *iter, gpointer data)
 {
 	PurpleSmiley *smiley = NULL;
-	SmileyManager *dialog;
-
-	dialog = (SmileyManager*)data;
 
 	gtk_tree_model_get(model, iter,
 			SMILEY, &smiley,
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index 38b62b926c..c315916cb3 100644
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -657,7 +657,6 @@ pidgin_status_box_class_init (PidginStatusBoxClass *klass)
 static void
 pidgin_status_box_refresh(PidginStatusBox *status_box)
 {
-	GtkIconSize icon_size;
 	GtkStyle *style;
 	char aa_color[8];
 	PurpleSavedStatus *saved_status;
@@ -668,8 +667,6 @@ pidgin_status_box_refresh(PidginStatusBox *status_box)
 	gboolean account_status = FALSE;
 	PurpleAccount *acct = (status_box->account) ? status_box->account : status_box->token_status_account;
 
-	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-
 	style = gtk_widget_get_style(GTK_WIDGET(status_box));
 	snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x",
 		 style->text_aa[GTK_STATE_NORMAL].red >> 8,
@@ -969,11 +966,7 @@ add_popular_statuses(PidginStatusBox *statusbox)
 		PurpleSavedStatus *saved = cur->data;
 		const gchar *message;
 		gchar *stripped = NULL;
-		PurpleStatusPrimitive prim;
-		PidginStatusBoxItemType type = PIDGIN_STATUS_BOX_TYPE_POPULAR;
-
-		/* Get an appropriate status icon */
-		prim = purple_savedstatus_get_type(saved);
+		PidginStatusBoxItemType type;
 
 		if (purple_savedstatus_is_transient(saved))
 		{
@@ -982,16 +975,18 @@ add_popular_statuses(PidginStatusBox *statusbox)
 			 * API returns the message when purple_savedstatus_get_title() is
 			 * called, so we don't need to get the message a second time.
 			 */
+			type = PIDGIN_STATUS_BOX_TYPE_POPULAR;
 		}
 		else
 		{
+			type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR;
+
 			message = purple_savedstatus_get_message(saved);
 			if (message != NULL)
 			{
 				stripped = purple_markup_strip_html(message);
 				purple_util_chrreplace(stripped, '\n', ' ');
 			}
-			type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR;
 		}
 
 		pidgin_status_box_add(statusbox, type,
@@ -1074,17 +1069,13 @@ add_account_statuses(PidginStatusBox *status_box, PurpleAccount *account)
 					PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL,
 					purple_status_type_get_name(status_type),
 					NULL,
-					GINT_TO_POINTER(purple_status_type_get_primitive(status_type)));
+					GINT_TO_POINTER(prim));
 	}
 }
 
 static void
 pidgin_status_box_regenerate(PidginStatusBox *status_box, gboolean status_changed)
 {
-	GtkIconSize icon_size;
-
-	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-
 	/* Unset the model while clearing it */
 	gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), NULL);
 	gtk_list_store_clear(status_box->dropdown_store);
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index e629467ab4..34b3a79d1b 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -680,7 +680,6 @@ static AopMenu *
 create_protocols_menu(const char *default_proto_id)
 {
 	AopMenu *aop_menu = NULL;
-	PurplePluginProtocolInfo *prpl_info;
 	PurplePlugin *plugin;
 	GdkPixbuf *pixbuf = NULL;
 	GtkSizeGroup *sg;
@@ -702,7 +701,6 @@ create_protocols_menu(const char *default_proto_id)
 		 p = p->next, i++) {
 
 		plugin = (PurplePlugin *)p->data;
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 
 		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
 			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
@@ -784,8 +782,6 @@ create_account_menu(PurpleAccount *default_account,
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	for (p = list, i = 0; p != NULL; p = p->next, i++) {
-		PurplePlugin *plugin;
-
 		if (show_all)
 			account = (PurpleAccount *)p->data;
 		else {
@@ -799,8 +795,6 @@ create_account_menu(PurpleAccount *default_account,
 			continue;
 		}
 
-		plugin = purple_find_prpl(purple_account_get_protocol_id(account));
-
 		pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
 
 		if (pixbuf) {
@@ -2790,79 +2784,78 @@ gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint column,
 
 
 gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) {
-        int width, height, rowstride, i;
-        unsigned char *pixels;
-        unsigned char *row;
+	int height, rowstride, i;
+	unsigned char *pixels;
+	unsigned char *row;
 
-        if (!gdk_pixbuf_get_has_alpha(pixbuf))
-                return TRUE;
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
+		return TRUE;
 
-        width = gdk_pixbuf_get_width (pixbuf);
-        height = gdk_pixbuf_get_height (pixbuf);
-        rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-        pixels = gdk_pixbuf_get_pixels (pixbuf);
+	height = gdk_pixbuf_get_height (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
 
-        row = pixels;
-        for (i = 3; i < rowstride; i+=4) {
-                if (row[i] < 0xfe)
-                        return FALSE;
-        }
+	row = pixels;
+	for (i = 3; i < rowstride; i+=4) {
+		if (row[i] < 0xfe)
+			return FALSE;
+	}
 
-        for (i = 1; i < height - 1; i++) {
-                row = pixels + (i*rowstride);
-                if (row[3] < 0xfe || row[rowstride-1] < 0xfe) {
-                        return FALSE;
-            }
-        }
+	for (i = 1; i < height - 1; i++) {
+		row = pixels + (i * rowstride);
+		if (row[3] < 0xfe || row[rowstride - 1] < 0xfe) {
+			return FALSE;
+	    }
+	}
 
-        row = pixels + ((height-1) * rowstride);
-        for (i = 3; i < rowstride; i+=4) {
-                if (row[i] < 0xfe)
-                        return FALSE;
-        }
+	row = pixels + ((height - 1) * rowstride);
+	for (i = 3; i < rowstride; i += 4) {
+		if (row[i] < 0xfe)
+			return FALSE;
+	}
 
-        return TRUE;
+	return TRUE;
 }
 
 void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf) {
 	int width, height, rowstride;
-        guchar *pixels;
-        if (!gdk_pixbuf_get_has_alpha(pixbuf))
-                return;
-        width = gdk_pixbuf_get_width(pixbuf);
-        height = gdk_pixbuf_get_height(pixbuf);
-        rowstride = gdk_pixbuf_get_rowstride(pixbuf);
-        pixels = gdk_pixbuf_get_pixels(pixbuf);
-
-        if (width < 6 || height < 6)
-                return;
-        /* Top left */
-        pixels[3] = 0;
-        pixels[7] = 0x80;
-        pixels[11] = 0xC0;
-        pixels[rowstride + 3] = 0x80;
-        pixels[rowstride * 2 + 3] = 0xC0;
-
-        /* Top right */
-        pixels[width * 4 - 1] = 0;
-        pixels[width * 4 - 5] = 0x80;
-        pixels[width * 4 - 9] = 0xC0;
-        pixels[rowstride + (width * 4) - 1] = 0x80;
-        pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-
-        /* Bottom left */
-        pixels[(height - 1) * rowstride + 3] = 0;
-        pixels[(height - 1) * rowstride + 7] = 0x80;
-        pixels[(height - 1) * rowstride + 11] = 0xC0;
-        pixels[(height - 2) * rowstride + 3] = 0x80;
-        pixels[(height - 3) * rowstride + 3] = 0xC0;
-
-        /* Bottom right */
-        pixels[height * rowstride - 1] = 0;
-        pixels[(height - 1) * rowstride - 1] = 0x80;
-        pixels[(height - 2) * rowstride - 1] = 0xC0;
-        pixels[height * rowstride - 5] = 0x80;
-        pixels[height * rowstride - 9] = 0xC0;
+	guchar *pixels;
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
+		return;
+	width = gdk_pixbuf_get_width(pixbuf);
+	height = gdk_pixbuf_get_height(pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
+
+	if (width < 6 || height < 6)
+		return;
+	/* Top left */
+	pixels[3] = 0;
+	pixels[7] = 0x80;
+	pixels[11] = 0xC0;
+	pixels[rowstride + 3] = 0x80;
+	pixels[rowstride * 2 + 3] = 0xC0;
+
+	/* Top right */
+	pixels[width * 4 - 1] = 0;
+	pixels[width * 4 - 5] = 0x80;
+	pixels[width * 4 - 9] = 0xC0;
+	pixels[rowstride + (width * 4) - 1] = 0x80;
+	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+
+	/* Bottom left */
+	pixels[(height - 1) * rowstride + 3] = 0;
+	pixels[(height - 1) * rowstride + 7] = 0x80;
+	pixels[(height - 1) * rowstride + 11] = 0xC0;
+	pixels[(height - 2) * rowstride + 3] = 0x80;
+	pixels[(height - 3) * rowstride + 3] = 0xC0;
+
+	/* Bottom right */
+	pixels[height * rowstride - 1] = 0;
+	pixels[(height - 1) * rowstride - 1] = 0x80;
+	pixels[(height - 2) * rowstride - 1] = 0xC0;
+	pixels[height * rowstride - 5] = 0x80;
+	pixels[height * rowstride - 9] = 0xC0;
 }
 
 const char *pidgin_get_dim_grey_string(GtkWidget *widget) {
diff --git a/pidgin/minidialog.c b/pidgin/minidialog.c
index 75c45d5f31..3de67cbddc 100644
--- a/pidgin/minidialog.c
+++ b/pidgin/minidialog.c
@@ -332,6 +332,7 @@ pidgin_mini_dialog_set_property(GObject *object,
 			break;
 		case PROP_CUSTOM_ICON:
 			gtk_image_set_from_pixbuf(priv->icon, g_value_get_object(value));
+			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 	}
diff --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
index 63a8714130..83185aee83 100644
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -44,7 +44,7 @@
 #define PIDGIN_STOCK_DOWNLOAD        "pidgin-download"
 #define PIDGIN_STOCK_EDIT            "pidgin-edit"
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
-#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
+#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-cancelled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INFO            "pidgin-info"
diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in
index af6de4bd9b..e7c3714783 100644
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -419,6 +419,98 @@ male-fighter2.png   o=>     O=>
 female-fighter.png  o-+     O-+
 yin-yang.png        (%)
 
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+happy.png           :)      :-)
+question.png        :-/     :-\\
+shocked.png         :-O     :O      :-o     :o 
+devil.png           >:)
+angel.png           O:-)    o:-)    0:-)
+sick.png            :-&
+sleepy.png          (:|
+hypnotized.png      @-)
+on-the-phone.png    :)]
+sad.png             :(      :-(
+amorous.png         :x      :-x     :X      :-X
+angry.png           X-(     x-(     X(      x(
+crying.png          :((
+glasses-nerdy.png   :-B     :-b
+quiet.png           :-$
+drool.png           =P~     =p~
+lying.png           :^O     :^o
+call-me.png         :-c
+wink.png            ;)      ;-)
+embarrassed.png     :">
+mean.png            :->     :>
+laugh.png           :))     :-))
+bye.png             =;
+arrogant.png        [-(
+thinking.png        :-?
+waiting.png         :-w     :-W
+at-wits-end.png     ~x(     ~X(
+excited.png         :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
+neutral.png         :|      :-|
+sleeping.png        I-)     i-)     |-)
+clown.png           :o)     :O)
+doh.png             #-o     #-O
+weep.png            :-<
+go-away.png         :-h
+lashes.png          ;;)
+kiss.png            :-*     :*
+confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
+silly.png           8-}
+clap.png            =D>     =d>
+mad-tongue.png      >:P     >:p
+time-out.png        :-t     :-T
+hug-left.png        >:D<    >:d<
+love-over.png       =((
+hot.png             #:-S    #:-s
+rotfl.png           =)) :-j :-J 
+loser.png           L-)     l-)
+party.png           <:-P    <:-p
+nervous.png         :-SS       :-Ss    :-sS    :-ss
+cowboy.png          <):)
+desire.png          8->
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)  :(|)
+
+# Hidden Yahoo emotes
+alien.png           =:)     >-)
+beat-up.png         b-(     B-(
+chicken.png         ~:>
+coffee.png          ~o)     ~O)
+cow.png             3:-O    3:-o
+dance.png           \\:D/   \\:d/
+rose.png            @};-
+dont-know.png       :-L     :-l
+skeleton.png        8-X     8-x
+lamp.png            *-:)
+monkey.png          :(|)
+coins.png           $-)
+peace.png           :)>-
+pig.png             :@)
+pray.png            [-o<    [-O<
+pumpkin.png         (~~)
+shame.png           [-X     [-x
+flag.png            **==
+clover.png          %%-
+musical-note.png    :-"
+giggle.png          ;))
+worship.png         ^:)^
+star.png            (*)
+waving.png          >:/
+talktohand.png      :-@
+
+# Only available after activating the Yahoo! Fighter IMVironment
+male-fighter1.png   o->     O->
+male-fighter2.png   o=>     O=>
+female-fighter.png  o-+     O-+
+yin-yang.png        (%)
+
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
@@ -428,7 +520,7 @@ confused.png	    :Z
 glasses-nerdy.png   B)
 bulgy-eyes.png	    %)
 freaked-out.png	    :E
-smile.png	    :)      :-)
+happy.png	    :)      :-)
 amorous.png	    :X
 laugh.png	    :))
 mohawk.png	    -:
diff --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am
index cfc18e4c30..af06ecce1b 100644
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am
@@ -34,7 +34,6 @@ SMILEYS = \
     confused.png \
     console.png \
     cold.png \
-    cool.png \
     cross.png \
     crying.png \
     devil.png \
@@ -44,7 +43,6 @@ SMILEYS = \
     excruciating.png \
     eyeroll.png \
     girl.png \
-    grin.png \
     happy.png \
     hug-left.png \
     hug-right.png \
@@ -77,6 +75,7 @@ SMILEYS = \
     star.png \
     stressed.png \
     thinking.png \
+    thunder.png \
     tongue.png \
     tv.png \
     uhm-yeah.png \
diff --git a/pidgin/pixmaps/emotes/small/16/cool.png b/pidgin/pixmaps/emotes/small/16/cool.png
deleted file mode 100644
index ef1c870b2a..0000000000
--- a/pidgin/pixmaps/emotes/small/16/cool.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/glasses-cool.png b/pidgin/pixmaps/emotes/small/16/glasses-cool.png
new file mode 100644
index 0000000000..d6207f3de4
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/glasses-cool.png
diff --git a/pidgin/pixmaps/emotes/small/16/grin.png b/pidgin/pixmaps/emotes/small/16/grin.png
deleted file mode 100644
index 76251d6c9e..0000000000
--- a/pidgin/pixmaps/emotes/small/16/grin.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in
index 9421ebf161..cba32b4378 100644
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in
@@ -1,5 +1,5 @@
 _Name=Small
-_Description=Smaller versions of the default smilies
+_Description=Smaller versions of the default smileys
 Icon=wink.png
 Author=Hylke Bons
 
@@ -13,10 +13,12 @@ wink.png            ;-)     ;)
 tongue.png          :P      :p      :-P     :-p
 shocked.png         =-O     =-o
 kiss.png            :-*
+glasses-cool.png    8-)
 embarrassed.png     :-[
 crying.png          :'(     :'-(
 thinking.png        :-/     :-\\
 angel.png           O:-)    o:-)
+shut-mouth.png      :-X
 
 
 [XMPP]
@@ -29,18 +31,23 @@ wink.png            ;-)     ;)      ;^)
 tongue.png          :P      :p      :-P     :-p
 shocked.png         =-O     =-o     :-O     :-o
 kiss.png            :kiss:  :-*
+glasses-cool.png    8-)     B-)
 embarrassed.png     :-[
 crying.png          :'-(    :'(
 thinking.png        :-/     :-\\
 angel.png           O:-)    o:-)
+shut-mouth.png      :-X
 
 # Following XEP-0038 + GTalk
 angry.png           >:-(    >:(     X-(    x-(
+rose.png            @->--   :rose:
 phone.png           :telephone:
+lamp.png            :jabber:
 in_love.png         :heart: :love:  <3
 musical-note.png    :music:
 beer.png            :beer:
 coffee.png          :coffee:
+star.png            :star:
 
 # Others
 neutral.png         :|      :-|
@@ -61,6 +68,8 @@ embarrassed.png     :-[
 angel.png           O:-)
 thinking.png        :-\\    :-/
 crying.png          :'(
+shut-mouth.png      :-X
+glasses-cool.png    8-)
 
 
 # Following Windows Live Messenger 8.1
@@ -70,6 +79,7 @@ excited.png         :D      :d      :-D     :-d
 wink.png            ;)      ;-)
 shocked.png         :-O     :-o     :O      :o
 tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    (H)     (h)
 angry.png           :@      :-@
 embarrassed.png     :$      :-$
 confused.png        :S      :s      :-S     :-s
@@ -79,21 +89,28 @@ neutral.png         :|      :-|
 devil.png           (6)
 angel.png           (A)     (a)
 in_love.png         (L)     (l)
+star.png            (*)
 musical-note.png    (8)
+rose.png            (F)     (f)
 kiss.png            (K)     (k)
 camera.png          (P)     (p)
+lamp.png            (I)     (i)
 coffee.png          (C)     (c)
 phone.png           (T)     (t)
 hug-left.png        ({)
 hug-right.png       (})
 beer.png            (B)     (b)
+boy.png             (Z)     (z)
+girl.png            (X)     (x)
 sarcastic.png       ^o)
 sick.png            +o(
 plate.png           (pl)
 mobile.png          (mp)
 dont-know.png       :^)
 thinking.png        *-)
+thunder.png         (li)
 party.png           <:o)
+eyeroll.png         8-)
 sleepy.png          |-) 
 
 # Hidden MSN emotes
@@ -106,28 +123,37 @@ console.png			(xx)    (XX)
 shocked.png         /:O      /jy       /surprised
 party.png           /8-)     /dy       /revel
 crying.png          /:<      /ll       /cry
+shut-mouth.png      /:X      /bz       /shut_mouth
 sleeping.png        /:Z      /shui     /sleep
 embarrassed.png     /:-|     /gg       /embarassed
+pissed-off.png      /:@      /fn       /pissed_off
 excited.png         /:D      /cy       /toothy_smile
 happy.png           /:)      /wx       /small_smile
 sad.png             /:(      /ng       /sad
+glasses-cool.png    /:+      /kuk      /cool
 sick.png            /:T      /tu       /vomit
 sleepy.png          /|-)     /kun      /sleepy
 hot.png             /:L      /sweat
 question.png        /?       /yiw      /question
+excruciating.png    /:8      /zhem     /excrutiating
 afraid.png          /shake   /fad      /shake
 amorous.png         /love    /aiq      /love
 search.png          /find    /zhao     /search
 hug-left.png        /hug     /yb       /hug
+lamp.png            /!       /dp       /lightbulb
+thunder.png         /li      /shd      /lightning
 musical-note.png    /music   /yy       /music
 coffee.png          /coffee  /kf       /coffee
 hungry.png          /eat     /fan      /eat
+rose.png            /rose    /mg       /rose
 kiss.png            /kiss    /wen      /kiss
 in_love.png         /heart   /xin      /heart
 meeting.png         /meeting /hy       /meeting
 phone.png           /phone   /dh       /phone
 tv.png              /TV      /ds       /TV
 angry.png           /<O>     /oh       /angry
+girl.png            /<00>    /nv       /woman
+boy.png             /<11>    /nan      /man
 
 
 # Following ICQ 6.0
@@ -146,9 +172,12 @@ kiss.png            :-{} :-*
 embarrassed.png     :-[
 devil.png           ]:->
 angel.png           O:-)
+rose.png            @}->--
+shut-mouth.png      :-X     :X      :-x     :x
 thinking.png        :-\\    :-/
 beer.png            *DRINK*
 excited.png         :-D     :D
+glasses-cool.png    8-)
 amorous.png         *IN\ LOVE*
 
 
@@ -165,17 +194,21 @@ sad.png             :(      :-(
 amorous.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
+drool.png           =P~     =p~
+lying.png           :^O     :^o
 wink.png            ;)      ;-)
 embarrassed.png     :">
 mean.png            :->     :>
 thinking.png        :-?
 excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
 sleeping.png        I-)     i-)     |-)
 kiss.png            :-*     :*
 confused.png        :-S     :-s
 sarcastic.png       /:)
+eyeroll.png         8-|
 hug-left.png        >:D<    >:d<
 hot.png             #:-S    #:-s
 party.png           <:-P    <:-p
@@ -183,38 +216,48 @@ nervous.png         :-SS	:-Ss	:-sS	:-ss
 
 # Hidden Yahoo emotes
 coffee.png          ~o)     ~O)
+rose.png            @};-
 dont-know.png       :-L     :-l
+lamp.png            *-:)
 shame.png           [-X     [-x
 musical-note.png    :-"
+star.png            (*)
 
 # Following Yahoo! Messenger 8.1
 [Yahoo JAPAN]
-smile.png           :)      :-)
+happy.png           :)      :-)
 question.png        :-/     :-\\
-shock.png           :-O     :O      :-o     :o 
+shocked.png         :-O     :O      :-o     :o 
 devil.png           >:)
 angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
-yawn.png            (:|
+sleepy.png          (:|
 sad.png             :(      :-(
+amorous.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
 wink.png            ;)      ;-)
 thinking.png        :-?
-smile-big.png       :D      :-D     :d      :-d
+excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
-sleepy.png          I-)     i-)     |-)
+sleeping.png        I-)     i-)     |-)
 kiss.png            :-*     :*
 confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
 hug-left.png        >:D<    >:d<
 party.png           <:-P    <:-p
 
 # Hidden Yahoo emotes
 coffee.png          ~o)     ~O)
+rose.png            @};-
 dont-know.png       :-L     :-l
+lamp.png            *-:)
 shame.png           [-X     [-x
 musical-note.png    :-"
+star.png            (*)
 
 
 # Following MySpaceIM Beta 1.0.697.0
@@ -222,10 +265,13 @@ musical-note.png    :-"
 excited.png  	    :D      :-D
 devil.png	    }:)
 confused.png	    :Z
+happy.png	    :)      :-)
 amorous.png	    :X
+pirate.png	    P)
 shocked.png	    :O
 neutral.png	    :|
 tongue.png	    :P      :p
+pissed-off.png	    B|
 wink.png	    ;-)     ;)
 sad.png		    :[
 kiss.png            :x
@@ -240,7 +286,7 @@ neutral.png         :-|     :|
 shocked.png         :-O     :O
 tongue.png          :-P     :P
 embarrassed.png     :-$     :$
-cool.png            8-)
+glasses-cool.png    8-)
 in_love.png         (H)
 rose.png            (F)
 ### Added in v3.0
@@ -252,7 +298,7 @@ kiss.png            (x)
 lamp.png            (i)
 pissed-off.png      :e      :-e
 shut-mouth.png      :-x     :x
-grumpy.png          (z)
+thunder.png         (z)
 coffee.png          (U)
 mrgreen.png         (G)
 ### Added in v5.0
@@ -265,7 +311,7 @@ thinking.png        :-?     :?
 drool.png           :-~     :~
 sleeping.png        :-z     :z
 lying.png           :L)
-nerdy.png           8-|     8|
+glasses-nerdy.png   8-|     8|
 pirate.png          P-)
 ### Added in v5.9.7
 bored.png           :-[     :[
diff --git a/pidgin/pixmaps/emotes/small/16/thunder.png b/pidgin/pixmaps/emotes/small/16/thunder.png
new file mode 100644
index 0000000000..51a3b81640
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/thunder.png
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
index 4ef25907df..6ef1754def 100644
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -73,10 +73,19 @@ install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
+THEMEEDIT_SRC = themeedit.c themeedit-icon.c
+THEMEEDIT_OBJECTS = $(THEMEEDIT_SRC:%.c=%.o)
+
+themeedit.dll: $(THEMEEDIT_OBJECTS)
+	$(CC) -shared $(THEMEEDIT_OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
+
 %.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
 	$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
 
+
+include $(PIDGIN_COMMON_RULES)
+
 plugins: \
 		convcolors.dll \
 		extplacement.dll \
@@ -89,6 +98,7 @@ plugins: \
 		relnot.dll \
 		sendbutton.dll \
 		spellchk.dll \
+		themeedit.dll \
 		timestamp_format.dll \
 		timestamp.dll \
 		xmppconsole.dll
diff --git a/pidgin/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c
index 6a334b476a..3b7e23645a 100644
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c
@@ -54,8 +54,7 @@ delete_win_cb(GtkWidget *w, GdkEvent *event, GevoAddBuddyDialog *dialog)
 
 	gevo_addrbooks_model_unref(dialog->addrbooks);
 
-	if (dialog->username != NULL)
-		g_free(dialog->username);
+	g_free(dialog->username);
 
 	g_free(dialog);
 
@@ -289,7 +288,7 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 	{
 		EContact *contact = E_CONTACT(c->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -299,9 +298,11 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
 		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
 		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL)
+			msns == NULL && icqs == NULL && novells == NULL &&
+			ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -320,6 +321,7 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 
@@ -365,7 +367,7 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 	{
 		EContact *contact = E_CONTACT(l->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -381,9 +383,11 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
 		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
 		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL)
+			msns == NULL && icqs == NULL && novells == NULL &&
+			ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -402,6 +406,7 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 }
diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 9213328cfd..8f97a7df8f 100644
--- a/pidgin/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
@@ -111,6 +111,8 @@ gevo_prpl_get_field(PurpleAccount *account, PurpleBuddy *buddy)
 		protocol_field = E_CONTACT_IM_JABBER;
 	else if (!strcmp(protocol_id, "prpl-novell"))
 		protocol_field = E_CONTACT_IM_GROUPWISE;
+	else if (!strcmp(protocol_id, "prpl-gg"))
+		protocol_field = E_CONTACT_IM_GADUGADU;
 
 	return protocol_field;
 }
diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 848ad38aff..2317e95b7b 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -125,6 +125,7 @@ update_buddies_from_contact(EContact *contact)
 	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
 	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
 	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
 }
 
 static void
diff --git a/pidgin/plugins/gevolution/new_person_dialog.c b/pidgin/plugins/gevolution/new_person_dialog.c
index 08aa7715f1..30682f0ce1 100644
--- a/pidgin/plugins/gevolution/new_person_dialog.c
+++ b/pidgin/plugins/gevolution/new_person_dialog.c
@@ -153,6 +153,8 @@ add_cb(GtkWidget *w, GevoNewPersonDialog *dialog)
 			field = E_CONTACT_IM_MSN;
 		else if (!strcmp(im_service, "prpl-novell"))
 			field = E_CONTACT_IM_GROUPWISE;
+		else if (!strcmp(im_service, "prpl-gg"))
+			field = E_CONTACT_IM_GADUGADU;
 
 		if (field > 0)
 		{
@@ -202,8 +204,7 @@ add_cb(GtkWidget *w, GevoNewPersonDialog *dialog)
 	if (name != NULL)
 		e_contact_name_free(name);
 
-	if (full_name != NULL)
-		g_free(full_name);
+	g_free(full_name);
 
 	delete_win_cb(NULL, NULL, dialog);
 }
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
index fc68e56233..1e0a38aa8d 100644
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -303,7 +303,6 @@ static int
 attach_signals(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = NULL;
-	PidginWindow *gtkwin = NULL;
 	GSList *imhtml_ids = NULL, *entry_ids = NULL;
 	guint id;
 
@@ -313,8 +312,6 @@ attach_signals(PurpleConversation *conv)
 		return 0;
 	}
 
-	gtkwin  = gtkconv->win;
-
 	if (purple_prefs_get_bool("/plugins/gtk/X11/notify/notify_focus")) {
 		/* TODO should really find a way to make this work no matter
 		 * where the focus is inside the conv window, without having
@@ -358,13 +355,11 @@ static void
 detach_signals(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = NULL;
-	PidginWindow *gtkwin = NULL;
 	GSList *ids = NULL, *l;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (!gtkconv)
 		return;
-	gtkwin  = gtkconv->win;
 
 	ids = purple_conversation_get_data(conv, "notify-imhtml-signals");
 	for (l = ids; l != NULL; l = l->next)
@@ -650,7 +645,6 @@ static void
 apply_method()
 {
 	GList *convs;
-	PidginWindow *purplewin = NULL;
 
 	for (convs = purple_get_conversations(); convs != NULL;
 	     convs = convs->next) {
@@ -659,7 +653,6 @@ apply_method()
 		/* remove notifications */
 		unnotify(conv, FALSE);
 
-		purplewin = PIDGIN_CONVERSATION(conv)->win;
 		if (GPOINTER_TO_INT(purple_conversation_get_data(conv, "notify-message-count")) != 0)
 			/* reattach appropriate notifications */
 			notify(conv, FALSE);
diff --git a/pidgin/plugins/themeedit-icon.c b/pidgin/plugins/themeedit-icon.c
index 8b074fb150..252423f7d4 100644
--- a/pidgin/plugins/themeedit-icon.c
+++ b/pidgin/plugins/themeedit-icon.c
@@ -106,9 +106,16 @@ static PidginStatusIconTheme *
 create_icon_theme(GtkWidget *window)
 {
 	int s, i, j;
-	char *dirname = "/tmp";   /* FIXME */
-	PidginStatusIconTheme *theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon",
-				"author", getlogin(),
+	const char *dirname = g_get_tmp_dir();
+	PidginStatusIconTheme *theme;
+	const char *author;
+#ifndef _WIN32
+	author = getlogin();
+#else
+	author = "user";
+#endif
+	theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon",
+				"author", author,
 				"directory", dirname,
 				NULL);
 
diff --git a/pidgin/plugins/themeedit.c b/pidgin/plugins/themeedit.c
index 5179fbe2a4..0290d36075 100644
--- a/pidgin/plugins/themeedit.c
+++ b/pidgin/plugins/themeedit.c
@@ -268,8 +268,14 @@ pidgin_blist_theme_edit(PurplePluginAction *unused)
 
 	theme = pidgin_blist_get_theme();
 	if (!theme) {
+		const char *author;
+#ifndef _WIN32
+		author = getlogin();
+#else
+		author = "user";
+#endif
 		theme = g_object_new(PIDGIN_TYPE_BLIST_THEME, "type", "blist",
-				"author", getlogin(),
+				"author", author,
 				NULL);
 		pidgin_blist_set_theme(theme);
 	}
diff --git a/pidgin/plugins/vvconfig.c b/pidgin/plugins/vvconfig.c
index b5489b747f..d125703c7c 100644
--- a/pidgin/plugins/vvconfig.c
+++ b/pidgin/plugins/vvconfig.c
@@ -28,6 +28,9 @@
 
 #include <gst/interfaces/propertyprobe.h>
 
+/* container window for showing a stand-alone configurator */
+static GtkWidget *window = NULL;
+
 static PurpleMediaElementInfo *old_video_src = NULL, *old_video_sink = NULL,
 		*old_audio_src = NULL, *old_audio_sink = NULL;
 
@@ -502,6 +505,59 @@ plugin_load(PurplePlugin *plugin)
 	return TRUE;
 }
 
+static void
+config_destroy(GtkObject *w, gpointer nul)
+{
+	purple_debug_info("vvconfig", "closing vv configuration window\n");
+	window = NULL;
+}
+
+static void
+config_close(GtkObject *w, gpointer nul)
+{
+	gtk_widget_destroy(GTK_WIDGET(window));
+}
+
+static void
+show_config(PurplePluginAction *action)
+{
+	if (!window) {
+		GtkWidget *vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+		GtkWidget *hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
+		GtkWidget *config_frame = get_plugin_config_frame(NULL);
+		GtkWidget *close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+		
+		gtk_container_add(GTK_CONTAINER(vbox), config_frame);
+		gtk_container_add(GTK_CONTAINER(vbox), hbox);
+		window = pidgin_create_window(_("Voice/Video Settings"),
+			PIDGIN_HIG_BORDER, NULL, TRUE);
+		g_signal_connect(G_OBJECT(window), "destroy", 
+			G_CALLBACK(config_destroy), NULL);
+		g_signal_connect(G_OBJECT(close), "clicked",
+		    G_CALLBACK(config_close), NULL);
+		gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, PIDGIN_HIG_BORDER);
+		gtk_container_add(GTK_CONTAINER(window), vbox);
+		gtk_widget_show(GTK_WIDGET(close));
+		gtk_widget_show(GTK_WIDGET(vbox));
+		gtk_widget_show(GTK_WIDGET(hbox));
+	}
+	gtk_window_present(GTK_WINDOW(window));
+}
+
+
+static GList *
+actions(PurplePlugin *plugin, gpointer context)
+{
+	GList *l = NULL;
+	PurplePluginAction *act = NULL;
+
+	act = purple_plugin_action_new(_("Voice and Video Settings"),
+		show_config);
+	l = g_list_append(l, act);
+
+	return l;
+}
+
 static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
@@ -525,32 +581,32 @@ static PidginPluginUiInfo ui_info = {
 
 static PurplePluginInfo info =
 {
-	PURPLE_PLUGIN_MAGIC,			/**< magic		*/
-	PURPLE_MAJOR_VERSION,			/**< major version	*/
-	PURPLE_MINOR_VERSION,			/**< minor version	*/
-	PURPLE_PLUGIN_STANDARD,			/**< type		*/
-	PIDGIN_PLUGIN_TYPE,			/**< ui_requirement	*/
-	0,					/**< flags		*/
-	NULL,					/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,		/**< priority		*/
-
-	"gtk-maiku-vvconfig",			/**< id			*/
-	N_("Voice/Video Settings"),		/**< name		*/
-	DISPLAY_VERSION,			/**< version		*/
-	N_("Configure your microphone and webcam."), /**< summary	*/
+	PURPLE_PLUGIN_MAGIC,                         /**< magic          */
+	PURPLE_MAJOR_VERSION,                        /**< major version  */
+	PURPLE_MINOR_VERSION,                        /**< minor version  */
+	PURPLE_PLUGIN_STANDARD,                      /**< type           */
+	PIDGIN_PLUGIN_TYPE,                          /**< ui_requirement */
+	0,                                           /**< flags          */
+	NULL,                                        /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                     /**< priority       */
+
+	"gtk-maiku-vvconfig",                        /**< id             */
+	N_("Voice/Video Settings"),                  /**< name           */
+	DISPLAY_VERSION,                             /**< version        */
+	N_("Configure your microphone and webcam."), /**< summary        */
 	N_("Configure microphone and webcam "
-	   "settings for voice/video calls."),	/**< description	*/
-	"Mike Ruprecht <cmaiku@gmail.com>",	/**< author		*/
-	PURPLE_WEBSITE,				/**< homepage		*/
-
-	plugin_load,				/**< load		*/
-	plugin_unload,				/**< unload		*/
-	NULL,					/**< destroy		*/
-
-	&ui_info,				/**< ui_info		*/
-	NULL,					/**< extra_info		*/
-	NULL,					/**< prefs_info		*/
-	NULL,					/**< actions		*/
+	   "settings for voice/video calls."),       /**< description    */
+	"Mike Ruprecht <cmaiku@gmail.com>",          /**< author         */
+	PURPLE_WEBSITE,                              /**< homepage       */
+
+	plugin_load,                                 /**< load           */
+	plugin_unload,                               /**< unload         */
+	NULL,                                        /**< destroy        */
+
+	&ui_info,                                    /**< ui_info        */
+	NULL,                                        /**< extra_info     */
+	NULL,                                        /**< prefs_info     */
+	actions,                                     /**< actions        */
 
 	/* padding */
 	NULL,
diff --git a/pidgin/plugins/win32/winprefs/winprefs.c b/pidgin/plugins/win32/winprefs/winprefs.c
index 57326c9807..62564de38e 100644
--- a/pidgin/plugins/win32/winprefs/winprefs.c
+++ b/pidgin/plugins/win32/winprefs/winprefs.c
@@ -193,7 +193,7 @@ winprefs_set_autostart(GtkWidget *w) {
 	char *runval = NULL;
 
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		runval = g_strdup_printf("%s" G_DIR_SEPARATOR_S "pidgin.exe", wpurple_install_dir());
+		runval = g_strdup_printf("\"%s" G_DIR_SEPARATOR_S "pidgin.exe\"", wpurple_install_dir());
 
 	if(!wpurple_write_reg_string(HKEY_CURRENT_USER, RUNKEY, "Pidgin", runval)
 		/* For Win98 */
diff --git a/pidgin/win32/IdleTracker/Makefile.mingw b/pidgin/win32/IdleTracker/Makefile.mingw
deleted file mode 100644
index 8395da1411..0000000000
--- a/pidgin/win32/IdleTracker/Makefile.mingw
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for idletrack
-#
-
-PIDGIN_TREE_TOP := ../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-TARGET = idletrack
-
-##
-##  SOURCES, OBJECTS
-##
-
-C_SRC =	idletrack.c
-
-OBJECTS = $(C_SRC:%.c=%.o)
-
-include $(PIDGIN_COMMON_RULES)
-
-##
-## TARGET DEFINITIONS
-##
-
-.PHONY: all install clean
-
-all: $(TARGET).dll
-
-install: $(PIDGIN_INSTALL_DIR)
-	cp $(TARGET).dll $(PIDGIN_INSTALL_DIR)
-
-##
-## BUILD DLL
-##
-
-$(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
-
-##
-## CLEAN RULES
-##
-
-clean:
-	rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
-
-include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/win32/IdleTracker/idletrack.c b/pidgin/win32/IdleTracker/idletrack.c
deleted file mode 100644
index a273963bcf..0000000000
--- a/pidgin/win32/IdleTracker/idletrack.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  idletrack.c
- *
- *  Authors: mrgentry @ http://www.experts-exchange.com
- *           Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: February, 2003
- *  Description: Track user inactivity.
- *
- *  Andrew Whewell <awhewell@users.sourceforge.net> - 25th June 2004. Added
- *  support for GetLastInputInfo under Windows 2000 and above. This avoids having
- *  IDLETRACK.DLL hook itself into every process on the machine, which makes
- *  upgrades easier. The hook mechanism is also used by key loggers, so not
- *  using hooks doesn't put the willys up programs that keep an eye out for
- *  loggers.
- *
- *  Windows 9x doesn't have GetLastInputInfo - when Purple runs on these machines
- *  the code silently falls back onto the old hooking scheme.
- */
-#define _WIN32_WINNT 0x0500
-#include "idletrack.h"
-
-#define EXPORT __declspec(dllexport)
-
-static HANDLE hMapObject = NULL;
-static DWORD *lastTime = NULL;
-static HHOOK keyHook = NULL;
-static HHOOK mouseHook = NULL;
-static HINSTANCE g_hInstance = NULL;
-static POINT g_point;
-
-/* GetLastInputInfo address and module - if g_GetLastInputInfo == NULL then
- * we fall back on the old "hook the world" method. GetLastInputInfo was brought
- * in with Windows 2000 so Windows 9x will still hook everything.
- */
-typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *);
-static HMODULE g_user32 = NULL;
-static GETLASTINPUTINFO g_GetLastInputInfo = NULL;
-
-static DWORD* setup_shared_mem() {
-	BOOL fInit;
-
-	/* Set up the shared memory. */
-	hMapObject = CreateFileMapping((HANDLE) 0xFFFFFFFF, /* use paging file        */
-								   NULL,                /* no security attributes */
-								   PAGE_READWRITE,      /* read/write access      */
-								   0,                   /* size: high 32-bits     */
-								   sizeof(DWORD),       /* size: low 32-bits      */
-								   "timermem");         /* name of map object     */
-
-	if(hMapObject == NULL)
-		return NULL;
-
-	/* The first process to attach initializes memory. */
-	fInit = (GetLastError() != ERROR_ALREADY_EXISTS);
-
-	/* Get a pointer to the file-mapped shared memory. */
-	lastTime = (DWORD*) MapViewOfFile(hMapObject,     /* object to map view of    */
-									  FILE_MAP_WRITE, /* read/write access        */
-									  0,              /* high offset:  map from   */
-									  0,              /* low offset:   beginning  */
-									  0);             /* default: map entire file */
-
-	if(lastTime == NULL)
-		return NULL;
-
-	*lastTime = GetTickCount();
-
-	return lastTime;
-}
-
-
-static LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) {
-	if(!(code < 0)) {
-		if(lastTime == NULL)
-			lastTime = setup_shared_mem();
-
-		if(lastTime)
-			*lastTime = GetTickCount();
-	}
-	return CallNextHookEx(keyHook, code, wParam, lParam);
-}
-
-
-static LRESULT CALLBACK MouseProc(int code, WPARAM wParam, LPARAM lParam) {
-	/* We need to verify that the Mouse pointer has actually moved. */
-	if(!(code < 0) &&
-			!((g_point.x == ((MOUSEHOOKSTRUCT*) lParam)->pt.x) &&
-			(g_point.y == ((MOUSEHOOKSTRUCT*) lParam)->pt.y))) {
-		g_point.x = ((MOUSEHOOKSTRUCT*) lParam)->pt.x;
-		g_point.y = ((MOUSEHOOKSTRUCT*) lParam)->pt.y;
-
-		if(lastTime == NULL)
-			lastTime = setup_shared_mem();
-
-		if(lastTime)
-			*lastTime = GetTickCount();
-	}
-	return CallNextHookEx(mouseHook, code, wParam, lParam);
-}
-
-
-EXPORT DWORD winpidgin_get_lastactive() {
-	DWORD result = 0;
-
-	/* If we have GetLastInputInfo then use it, otherwise use the hooks*/
-	if(g_GetLastInputInfo != NULL) {
-		LASTINPUTINFO lii;
-		memset(&lii, 0, sizeof(lii));
-		lii.cbSize = sizeof(lii);
-		if(g_GetLastInputInfo(&lii)) {
-			result = lii.dwTime;
-		}
-	} else {
-		if(lastTime == NULL)
-			lastTime = setup_shared_mem();
-
-		if(lastTime)
-			result = *lastTime;
-	}
-
-	return result;
-}
-
-
-EXPORT BOOL winpidgin_set_idlehooks() {
-	/* Is GetLastInputInfo available?*/
-	g_user32 = LoadLibrary("user32.dll");
-	if(g_user32) {
-		g_GetLastInputInfo = (GETLASTINPUTINFO) GetProcAddress(g_user32, "GetLastInputInfo");
-	}
-
-	/* If we couldn't find GetLastInputInfo then fall back onto the hooking scheme*/
-	if(g_GetLastInputInfo == NULL) {
-		/* Set up the shared memory.*/
-		lastTime = setup_shared_mem();
-		if(lastTime == NULL)
-			return FALSE;
-		*lastTime = GetTickCount();
-
-	/* Set up the keyboard hook.*/
-		keyHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, g_hInstance, 0);
-		if(keyHook == NULL) {
-			UnmapViewOfFile(lastTime);
-			CloseHandle(hMapObject);
-			return FALSE;
-		}
-
-		/* Set up the mouse hook.*/
-		mouseHook = SetWindowsHookEx(WH_MOUSE, MouseProc, g_hInstance, 0);
-		if(mouseHook == NULL) {
-			UnhookWindowsHookEx(keyHook);
-			UnmapViewOfFile(lastTime);
-			CloseHandle(hMapObject);
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-
-EXPORT void winpidgin_remove_idlehooks() {
-	if(g_user32 != NULL)
-		FreeLibrary(g_user32);
-	if(keyHook)
-		UnhookWindowsHookEx(keyHook);
-	if(mouseHook)
-		UnhookWindowsHookEx(mouseHook);
-	if(lastTime)
-		UnmapViewOfFile(lastTime);
-	if(hMapObject)
-		CloseHandle(hMapObject);
-}
-
-/* suppress gcc "no previous prototype" warning */
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved);
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) {
-	switch(dwReason) {
-		case DLL_PROCESS_ATTACH:
-			g_hInstance = hInstance;
-			g_point.x = 0;
-			g_point.y = 0;
-			break;
-		case DLL_PROCESS_DETACH:
-			break;
-	}
-	return TRUE;
-}
diff --git a/pidgin/win32/IdleTracker/idletrack.h b/pidgin/win32/IdleTracker/idletrack.h
deleted file mode 100644
index 718a4427b8..0000000000
--- a/pidgin/win32/IdleTracker/idletrack.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * idletrack.h
- */
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-DWORD winpidgin_get_lastactive(void);
-BOOL winpidgin_set_idlehooks(void);
-void winpidgin_remove_idlehooks(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
index 5e5b7fc2ca..649e8a2594 100644
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -43,7 +43,6 @@
 #include "network.h"
 
 #include "resource.h"
-#include "idletrack.h"
 #include "zlib.h"
 #include "untar.h"
 
@@ -52,7 +51,9 @@
 #include "gtkconv.h"
 #include "gtkconn.h"
 #include "util.h"
+#ifdef USE_GTKSPELL
 #include "wspell.h"
+#endif
 
 /*
  *  GLOBALS
@@ -377,15 +378,19 @@ winpidgin_conv_im_blink(PurpleAccount *account, const char *who, char **message,
 
 void winpidgin_init(HINSTANCE hint) {
 	FARPROC proc;
+	gchar *exchndl_dll_path;
 
 	purple_debug_info("winpidgin", "winpidgin_init start\n");
 
 	exe_hInstance = hint;
 
-	proc = wpurple_find_and_loadproc("exchndl.dll", "SetLogFile");
+	exchndl_dll_path = g_build_filename(wpurple_install_dir(), "exchndl.dll", NULL);
+	proc = wpurple_find_and_loadproc(exchndl_dll_path, "SetLogFile");
+	g_free(exchndl_dll_path);
+	exchndl_dll_path = NULL;
 	if (proc) {
 		gchar *debug_dir, *locale_debug_dir;
-		
+
 		debug_dir = g_build_filename(purple_user_dir(), "pidgin.RPT", NULL);
 		locale_debug_dir = g_locale_from_utf8(debug_dir, -1, NULL, NULL, NULL);
 
@@ -397,11 +402,9 @@ void winpidgin_init(HINSTANCE hint) {
 		g_free(locale_debug_dir);
 	}
 
-	/* IdleTracker Initialization */
-	if(!winpidgin_set_idlehooks())
-		purple_debug_error("winpidgin", "Failed to initialize idle tracker\n");
-
+#ifdef USE_GTKSPELL
 	winpidgin_spell_init();
+#endif
 	purple_debug_info("winpidgin", "GTK+ :%u.%u.%u\n",
 		gtk_major_version, gtk_minor_version, gtk_micro_version);
 
@@ -429,9 +432,6 @@ void winpidgin_cleanup(void) {
 	if(messagewin_hwnd)
 		DestroyWindow(messagewin_hwnd);
 
-	/* Idle tracker cleanup */
-	winpidgin_remove_idlehooks();
-
 }
 
 /* DLL initializer */
@@ -535,5 +535,18 @@ void winpidgin_ensure_onscreen(GtkWidget *win) {
 				   (winR.right - winR.left),
 				   (winR.bottom - winR.top), TRUE);
 	}
+
+}
+
+DWORD winpidgin_get_lastactive() {
+	DWORD result = 0;
+
+	LASTINPUTINFO lii;
+	memset(&lii, 0, sizeof(lii));
+	lii.cbSize = sizeof(lii);
+	if (GetLastInputInfo(&lii))
+		result = lii.dwTime;
+
+	return result;
 }
 
diff --git a/pidgin/win32/gtkwin32dep.h b/pidgin/win32/gtkwin32dep.h
index a0f64e0aca..3584334e0c 100644
--- a/pidgin/win32/gtkwin32dep.h
+++ b/pidgin/win32/gtkwin32dep.h
@@ -39,6 +39,7 @@ void winpidgin_shell_execute(const char *target, const char *verb, const char *c
 void winpidgin_ensure_onscreen(GtkWidget *win);
 void winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags);
 void winpidgin_window_flash(GtkWindow *window, gboolean flash);
+DWORD winpidgin_get_lastactive(void);
 
 /* init / cleanup */
 void winpidgin_init(HINSTANCE);
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
index ab4e50c602..ed0d78546b 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -268,7 +268,7 @@ Section $(GTKSECTIONTITLE) SecGtk
   DetailPrint "Downloading GTK+ Runtime ... ($R2)"
   NSISdl::download /TIMEOUT=10000 $R2 $R1
   Pop $R0
-  StrCmp $R0 "cancel" done
+  ;StrCmp $R0 "cancel" done
   StrCmp $R0 "success" +2
     MessageBox MB_RETRYCANCEL "$(PIDGINGTKDOWNLOADERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
 
@@ -304,6 +304,7 @@ Section $(PIDGINSECTIONTITLE) SecPidgin
     WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$INSTDIR\Gtk\bin"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\pidgin.exe"
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
@@ -317,6 +318,7 @@ Section $(PIDGINSECTIONTITLE) SecPidgin
   pidgin_hkcu:
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\pidgin.exe"
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
@@ -532,18 +534,24 @@ Section Uninstall
     Delete "$INSTDIR\ca-certs\AOL_Member_CA.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Class3.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Root.pem"
+    Delete "$INSTDIR\ca-certs\Deutsche_Telekom_Root_CA_2.pem"
     Delete "$INSTDIR\ca-certs\Entrust.net_Secure_Server_CA.pem"
     Delete "$INSTDIR\ca-certs\Equifax_Secure_CA.pem"
     Delete "$INSTDIR\ca-certs\Equifax_Secure_Global_eBusiness_CA-1.pem"
+    Delete "$INSTDIR\ca-certs\Go_Daddy_Class_2_CA.pem"
     Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Internet_Authority.pem"
+    Delete "$INSTDIR\ca-certs\Microsoft_Internet_Authority_2010.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem"
+    Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority_2010.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
     Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem"
+    Delete "$INSTDIR\ca-certs\Thawte_Primary_Root_CA.pem"
     Delete "$INSTDIR\ca-certs\ValiCert_Class_2_VA.crt"
     Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_International_Server_Class_3_CA.pem"
@@ -593,6 +601,7 @@ Section Uninstall
     Delete "$INSTDIR\plugins\ssl.dll"
     Delete "$INSTDIR\plugins\statenotify.dll"
     Delete "$INSTDIR\plugins\tcl.dll"
+    Delete "$INSTDIR\plugins\themeedit.dll"
     Delete "$INSTDIR\plugins\ticker.dll"
     Delete "$INSTDIR\plugins\timestamp.dll"
     Delete "$INSTDIR\plugins\timestamp_format.dll"
@@ -619,7 +628,6 @@ Section Uninstall
     RMDir "$INSTDIR\spellcheck\lib"
     RMDir "$INSTDIR\spellcheck"
     Delete "$INSTDIR\freebl3.dll"
-    Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libjabber.dll"
     Delete "$INSTDIR\libnspr4.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
diff --git a/pidgin/win32/untar.c b/pidgin/win32/untar.c
index 2f6d338a7c..db1fa1bd4e 100644
--- a/pidgin/win32/untar.c
+++ b/pidgin/win32/untar.c
@@ -578,7 +578,8 @@ static int untar_block(Uchar_t *blk) {
  */
 int untar(const char *filename, const char* destdir, untar_opt options) {
 	int ret=1;
-	char curdir[_MAX_PATH];
+	wchar_t curdir[_MAX_PATH];
+	wchar_t *w_destdir;
 	untarops = options;
 	/* open the archive */
 	inname = filename;
@@ -589,13 +590,15 @@ int untar(const char *filename, const char* destdir, untar_opt options) {
 		return 0;
 	}
 
+	w_destdir = g_utf8_to_utf16(destdir, -1, NULL, NULL, NULL);
+
 	/* Set current directory */
-	if(!GetCurrentDirectory(_MAX_PATH, curdir)) {
+	if(!GetCurrentDirectoryW(_MAX_PATH, curdir)) {
 		untar_error("Could not get current directory (error %lu).\n", GetLastError());
 		fclose(infp);
 		return 0;
 	}
-	if(!SetCurrentDirectory(destdir)) {
+	if(!SetCurrentDirectoryW(w_destdir)) {
 		untar_error("Could not set current directory to (error %lu): %s\n", GetLastError(), destdir);
 		fclose(infp);
 		return 0;
@@ -614,12 +617,14 @@ int untar(const char *filename, const char* destdir, untar_opt options) {
 			fclose(outfp);
 			outfp = NULL;
 		}
-		if(!SetCurrentDirectory(curdir)) {
+		if(!SetCurrentDirectoryW(curdir)) {
 			untar_error("Could not set current dir back to original (error %lu).\n", GetLastError());
 			ret=0;
 		}
 	}
 
+	g_free(w_destdir);
+
 	/* close the archive file. */
 	fclose(infp);
 
diff --git a/pidgin/win32/winpidgin.c b/pidgin/win32/winpidgin.c
index 8135ceeea1..c0186c32cf 100644
--- a/pidgin/win32/winpidgin.c
+++ b/pidgin/win32/winpidgin.c
@@ -605,9 +605,9 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 		char *lpszCmdLine, int nCmdShow) {
 	wchar_t errbuf[512];
 	wchar_t pidgin_dir[MAX_PATH];
+	wchar_t *pidgin_dir_start = NULL;
 	wchar_t exe_name[MAX_PATH];
 	HMODULE hmod;
-	wchar_t *tmp;
 	wchar_t *wtmp;
 	int pidgin_argc;
 	char **pidgin_argv; /* This is in utf-8 */
@@ -672,14 +672,14 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 	if (GetModuleFileNameW(NULL, pidgin_dir, MAX_PATH) != 0) {
 
 		/* primitive dirname() */
-		tmp = wcsrchr(pidgin_dir, L'\\');
+		pidgin_dir_start = wcsrchr(pidgin_dir, L'\\');
 
-		if (tmp) {
+		if (pidgin_dir_start) {
 			HMODULE hmod;
-			tmp[0] = L'\0';
+			pidgin_dir_start[0] = L'\0';
 
 			/* tmp++ will now point to the executable file name */
-			wcscpy(exe_name, tmp + 1);
+			wcscpy(exe_name, pidgin_dir_start + 1);
 
 			wcscat(pidgin_dir, L"\\exchndl.dll");
 			if ((hmod = LoadLibraryW(pidgin_dir))) {
@@ -702,7 +702,8 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 				proc = GetProcAddress(hmod, "SetDebugInfoDir");
 				if (proc) {
 					char *pidgin_dir_ansi = NULL;
-					tmp[0] = L'\0';
+					/* Restore pidgin_dir to point to where the executable is */
+					pidgin_dir_start[0] = L'\0';
 					i = WideCharToMultiByte(CP_ACP, 0, pidgin_dir,
 						-1, NULL, 0, NULL, NULL);
 					if (i != 0) {
@@ -728,7 +729,8 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 
 			}
 
-			tmp[0] = L'\0';
+			/* Restore pidgin_dir to point to where the executable is */
+			pidgin_dir_start[0] = L'\0';
 		}
 	} else {
 		DWORD dw = GetLastError();
@@ -763,9 +765,14 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 			return 0;
 
 	/* Now we are ready for Pidgin .. */
-	if ((hmod = LoadLibraryW(L"pidgin.dll")))
+	wcscat(pidgin_dir, L"\\pidgin.dll");
+	if ((hmod = LoadLibraryW(pidgin_dir)))
 		pidgin_main = (LPFNPIDGINMAIN) GetProcAddress(hmod, "pidgin_main");
 
+	/* Restore pidgin_dir to point to where the executable is */
+	if (pidgin_dir_start)
+		pidgin_dir_start[0] = L'\0';
+
 	if (!pidgin_main) {
 		DWORD dw = GetLastError();
 		BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND);
diff --git a/pidgin/win32/wspell.c b/pidgin/win32/wspell.c
index 2e3cdcc93f..317c67eab7 100644
--- a/pidgin/win32/wspell.c
+++ b/pidgin/win32/wspell.c
@@ -22,6 +22,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#ifdef USE_GTKSPELL
 #include <windows.h>
 #include <string.h>
 #include <stdlib.h>
@@ -73,28 +78,33 @@ void              (*wpidginspell_recheck_all)             (GtkSpell*) = wgtkspel
 static void load_gtkspell() {
 	UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
 	gchar *tmp, *tmp2;
+
 	const char *path = g_getenv("PATH");
 	tmp = g_build_filename(wpurple_install_dir(), "spellcheck", NULL);
-	tmp2 = g_strdup_printf("%s%s%s", (path ? path : ""),
+	tmp2 = g_strdup_printf("%s%s%s", tmp,
 		(path ? G_SEARCHPATH_SEPARATOR_S : ""),
-		tmp);
+		(path ? path : ""));
 	g_free(tmp);
 	g_setenv("PATH", tmp2, TRUE);
+	g_free(tmp2);
 
+	tmp = g_build_filename(wpurple_install_dir(), "spellcheck", GTKSPELL_DLL, NULL);
 	/* Suppress error popups */
-	wpidginspell_new_attach_proxy = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_new_attach" );
+	wpidginspell_new_attach_proxy = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_new_attach" );
 	if (wpidginspell_new_attach_proxy) {
-		wpidginspell_get_from_text_view = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_get_from_text_view");
-		wpidginspell_detach = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_detach");
-		wpidginspell_set_language = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_set_language");
-		wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_recheck_all");
+		wpidginspell_get_from_text_view = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_get_from_text_view");
+		wpidginspell_detach = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_detach");
+		wpidginspell_set_language = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_set_language");
+		wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_recheck_all");
 	} else {
-		purple_debug_warning("wspell", "Couldn't load gtkspell (%s) \n", GTKSPELL_DLL);
+		purple_debug_warning("wspell", "Couldn't load gtkspell (%s) \n", tmp);
 		/*wpidginspell_new_attach = wgtkspell_new_attach;*/
 	}
+	g_free(tmp);
 	SetErrorMode(old_error_mode);
 }
 
 void winpidgin_spell_init() {
 	load_gtkspell();
 }
+#endif
diff --git a/po/ChangeLog b/po/ChangeLog
index 9943047f77..c670535467 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,28 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.6
+
+version 2.7.5
+	* German translation updated (Björn Voigt, Jochen Kemnade)
+	* Romanian translation updated (MiÅŸu Moldovan)
+
+version 2.7.4
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Simplified) translation updated (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Gideon van Melle)
+	* Hebrew translation updated (Shalom Craimer)
+	* Kannada translation updated (Shankar Prasad, Kannada Translation team)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Maithili translation added (Sangeeta Kumari)
+	* Polish translation updated (Piotr DrÄ…g)
+	* Tamil translation updated (I. Felix)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
+
 version 2.7.3
 	* Bengali translation updated (Jamil Ahmed)
 	* Chinese (Simplified) translation updated (Aron Xu)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 98483dcef5..e88d0a2629 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -106,7 +106,6 @@ libpurple/protocols/jabber/usermood.c
 libpurple/protocols/jabber/usernick.c
 libpurple/protocols/jabber/xdata.c
 libpurple/protocols/msn/contact.c
-libpurple/protocols/msn/dialog.c
 libpurple/protocols/msn/error.c
 libpurple/protocols/msn/group.h
 libpurple/protocols/msn/msg.c
@@ -117,6 +116,7 @@ libpurple/protocols/msn/oim.c
 libpurple/protocols/msn/servconn.c
 libpurple/protocols/msn/session.c
 libpurple/protocols/msn/slp.c
+libpurple/protocols/msn/slpcall.c
 libpurple/protocols/msn/state.c
 libpurple/protocols/msn/switchboard.c
 libpurple/protocols/msn/userlist.c
@@ -135,7 +135,9 @@ libpurple/protocols/myspace/user.c
 libpurple/protocols/myspace/zap.c
 libpurple/protocols/novell/nmuser.c
 libpurple/protocols/novell/novell.c
+libpurple/protocols/oscar/authorization.c
 libpurple/protocols/oscar/clientlogin.c
+libpurple/protocols/oscar/encoding.c
 libpurple/protocols/oscar/family_chatnav.c
 libpurple/protocols/oscar/family_icbm.c
 libpurple/protocols/oscar/family_locate.c
@@ -147,6 +149,8 @@ libpurple/protocols/oscar/oft.c
 libpurple/protocols/oscar/oscar.c
 libpurple/protocols/oscar/peer.c
 libpurple/protocols/oscar/util.c
+libpurple/protocols/oscar/userinfo.c
+libpurple/protocols/oscar/visibility.c
 libpurple/protocols/qq/buddy_info.c
 libpurple/protocols/qq/buddy_list.c
 libpurple/protocols/qq/buddy_memo.c
diff --git a/po/af.po b/po/af.po
index c416f4ef73..7605ace26e 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2010-05-11 00:19+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
@@ -529,7 +529,6 @@ msgstr "Bevestig sertifikaatskrapping"
 msgid "Certificate Manager"
 msgstr "Sertifikaatbestuurder"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Gasheernaam"
 
@@ -802,7 +801,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Wag vir oordrag om te begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Gekanselleer"
 
 msgid "Failed"
@@ -1694,7 +1693,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Die sertifikaat het verval en moet nié as geldig beskou word nie."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4721,11 +4723,20 @@ msgstr "XMPP-protokolinprop"
 msgid "Domain"
 msgstr "Domein"
 
-msgid "Require SSL/TLS"
-msgstr "Vereis SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Vereis magtiging"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Dwing ou SSL (poort 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Gebruikerinligting vir %s nie beskikbaar nie"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Verbinding teruggestel"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Laat skoonteksstawing oor ongeënkripteerde strome toe"
@@ -5922,7 +5933,8 @@ msgstr "Die PIN is ongeldig. Dit moet slegs syfers [0-9] bevat."
 msgid "The two PINs you entered do not match."
 msgstr "Die twee PIN-kodes wat gegee is stem nie ooreen nie."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Die naam wat gegee is, is ongeldig."
 
 msgid ""
@@ -6015,10 +6027,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Koppel tans..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Die naam wat gegee is, is ongeldig."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [7-10]."
 
@@ -6870,6 +6878,15 @@ msgstr "Bedieneradres"
 msgid "Server port"
 msgstr "Bedienerpoort"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Magtig my gerus sodat ek u by my vriendelys kan voeg."
+
+msgid "No reason given."
+msgstr "Geen rede gegee nie."
+
+msgid "Authorization Denied Message:"
+msgstr "Magtiging gewyer-boodskap:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Onverwagte respons van %s ontvang: %s"
@@ -6905,6 +6922,25 @@ msgstr "AOL laat nie toe dat u skermnaam hier gestaaf word nie"
 msgid "Error requesting %s"
 msgstr "Fout met aanvra van %s"
 
+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 ""
+"(Kon nie hierdie boodskap ontvang nie.  Die vriend met wie u praat, gebruik "
+"waarskynlik 'n ander enkodering as verwag.  Indien u weet watter enkodering "
+"hy gebruik, kan u dit in die gevorderde rekeningopsies van u AIM/ICQ-"
+"rekening spesifiseer.)"
+
+#, 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 ""
+"(Kon nie hierdie boodskap ontvang nie.  Óf u en %s het verskillende "
+"enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
+
 msgid "Could not join chat room"
 msgstr "Kon nie by geselsie aansluit nie"
 
@@ -7120,95 +7156,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Lêer %s is %s, wat groter as die maksimum grootte %s is."
 
-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 ""
-"(Kon nie hierdie boodskap ontvang nie.  Die vriend met wie u praat, gebruik "
-"waarskynlik 'n ander enkodering as verwag.  Indien u weet watter enkodering "
-"hy gebruik, kan u dit in die gevorderde rekeningopsies van u AIM/ICQ-"
-"rekening spesifiseer.)"
-
-#, 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 ""
-"(Kon nie hierdie boodskap ontvang nie.  Óf u en %s het verskillende "
-"enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Vriendikoon"
-
-msgid "Voice"
-msgstr "Stem"
-
-msgid "AIM Direct IM"
-msgstr "AIM- direkte kitsboodskap"
-
-msgid "Get File"
-msgstr "Kry lêer"
-
-msgid "Games"
-msgstr "Speletjies"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Invoegsels"
-
-msgid "Send Buddy List"
-msgstr "Stuur vriendelys"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ- direkte koppeling"
-
-msgid "AP User"
-msgstr "AP-gebruiker"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilis"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ-bedienerherleiding"
-
-msgid "Old ICQ UTF8"
-msgstr "Ou ICQ-UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian-enkripsie"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sekuriteit geaktiveer"
-
-msgid "Video Chat"
-msgstr "Videogeselsies"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Lewende video"
-
-msgid "Camera"
-msgstr "Kammera"
-
-msgid "Screen Sharing"
-msgstr "Skermdeling"
-
 msgid "Free For Chat"
 msgstr "Beskikbaar vir geselsies"
 
@@ -7239,15 +7186,6 @@ msgstr "By die werk"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr "IP-adres"
-
-msgid "Warning Level"
-msgstr "Waarskuwingvlak"
-
-msgid "Buddy Comment"
-msgstr "Vriendkommentaar"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Kan nie aan stawingbediener koppel nie: %s"
@@ -7345,15 +7283,6 @@ msgstr "Wagwoord gestuur"
 msgid "Unable to initialize connection"
 msgstr "Kan nie verbinding inisialiseer nie"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Magtig my gerus sodat ek u by my vriendelys kan voeg."
-
-msgid "No reason given."
-msgstr "Geen rede gegee nie."
-
-msgid "Authorization Denied Message:"
-msgstr "Magtiging gewyer-boodskap:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7471,60 +7400,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis vir 'n onbekende rede."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis vir 'n onbekende rede."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Gebruikerinligting nie beskikbaar nie: %s"
-
-msgid "Online Since"
-msgstr "Aanlyn sedert"
-
-msgid "Member Since"
-msgstr "Lid sedert"
-
-msgid "Capabilities"
-msgstr "Vermoëns"
-
 msgid "Your AIM connection may be lost."
 msgstr "U AIM-koppeling is dalk ontkoppel."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
-"karakters bevat.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "U is uit geselsiekamer %s ontkoppel."
 
-msgid "Mobile Phone"
-msgstr "Selfoon"
-
-msgid "Personal Web Page"
-msgstr "Persoonlike webblad"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Ekstra inligting"
-
-msgid "Zip Code"
-msgstr "Poskode"
-
-msgid "Work Information"
-msgstr "Werkinligting"
-
-msgid "Division"
-msgstr "Afdeling"
-
-msgid "Position"
-msgstr "Posisie"
-
-msgid "Web Page"
-msgstr "Webblad"
-
 msgid "Pop-Up Message"
 msgstr "Opspring-boodskap"
 
@@ -7801,7 +7683,8 @@ msgstr "gebruikernaam-formatering kan net hoofletters en spasies verander."
 msgid "Change Address To:"
 msgstr "Verander adres na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>u wag nie vir magtiging nie</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7840,6 +7723,14 @@ msgstr "Konfigureer kitsboodskapaanstuur (web)"
 msgid "Set Privacy Options..."
 msgstr "Stel privaatheidopsies..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Wys vriende_lys"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Uitnodigings"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
@@ -7856,9 +7747,6 @@ msgstr "Wys vriende wat op magtiging wag"
 msgid "Search for Buddy by Email Address..."
 msgstr "Soek vir vriend met e-posadres..."
 
-msgid "Search for Buddy by Information"
-msgstr "Soek vir vriend met inligting"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Gebruiker is nie aangemeld nie"
@@ -7968,6 +7856,165 @@ msgstr "Tou vol"
 msgid "Not while on AOL"
 msgstr "Nie terwyl op AOL nie"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Vriendikoon"
+
+msgid "Voice"
+msgstr "Stem"
+
+msgid "AIM Direct IM"
+msgstr "AIM- direkte kitsboodskap"
+
+msgid "Get File"
+msgstr "Kry lêer"
+
+msgid "Games"
+msgstr "Speletjies"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Invoegsels"
+
+msgid "Send Buddy List"
+msgstr "Stuur vriendelys"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ- direkte koppeling"
+
+msgid "AP User"
+msgstr "AP-gebruiker"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilis"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-bedienerherleiding"
+
+msgid "Old ICQ UTF8"
+msgstr "Ou ICQ-UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-enkripsie"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sekuriteit geaktiveer"
+
+msgid "Video Chat"
+msgstr "Videogeselsies"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Lewende video"
+
+msgid "Camera"
+msgstr "Kammera"
+
+msgid "Screen Sharing"
+msgstr "Skermdeling"
+
+msgid "IP Address"
+msgstr "IP-adres"
+
+msgid "Warning Level"
+msgstr "Waarskuwingvlak"
+
+msgid "Buddy Comment"
+msgstr "Vriendkommentaar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Gebruikerinligting nie beskikbaar nie: %s"
+
+msgid "Mobile Phone"
+msgstr "Selfoon"
+
+msgid "Personal Web Page"
+msgstr "Persoonlike webblad"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Ekstra inligting"
+
+msgid "Zip Code"
+msgstr "Poskode"
+
+msgid "Work Information"
+msgstr "Werkinligting"
+
+msgid "Division"
+msgstr "Afdeling"
+
+msgid "Position"
+msgstr "Posisie"
+
+msgid "Web Page"
+msgstr "Webblad"
+
+msgid "Online Since"
+msgstr "Aanlyn sedert"
+
+msgid "Member Since"
+msgstr "Lid sedert"
+
+msgid "Capabilities"
+msgstr "Vermoëns"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Lyk of aanlyn is"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Lyk of aanlyn is"
+
+msgid "Appear Offline"
+msgstr "Lyk of vanlyn is"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Lyk of vanlyn is"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "U is geskop: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"U kan magtiging van hierdie vriende weer aanvra, deur op hulle te regskliek "
+"en \"Vra weer magtiging aan\" te kies."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Sigbaar"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Uitnodigings"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Waterdraer"
 
@@ -8151,8 +8198,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u vereis magtiging"
 
 msgid "Add buddy question"
@@ -10392,18 +10439,12 @@ msgstr "Uit"
 msgid "Not on server list"
 msgstr "Nie op bedienerlys nie"
 
-msgid "Appear Online"
-msgstr "Lyk of aanlyn is"
-
 msgid "Appear Permanently Offline"
 msgstr "Lyk of permanent vanlyn is"
 
 msgid "Presence"
 msgstr "Teenwoordigheid"
 
-msgid "Appear Offline"
-msgstr "Lyk of vanlyn is"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Moenie lyk of permanent vanlyn is nie"
 
@@ -10949,27 +10990,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Verbinding deur ander sagtware op u rekenaar onderbreek."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Afgeleë gasheer het die koppeling gesluit."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbinding het uitgetel."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbinding geweier."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adres word reeds gebruik."
 
@@ -11118,6 +11154,10 @@ msgstr ""
 "U kan na hierdie venster terugkeer in die Vriendelys-venster by <b>Rekeninge-"
 ">Voeg by/Wysig</b> om rekeninge by te voeg, te wysig of te verwyder"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Agtergrondkleur"
@@ -11371,6 +11411,8 @@ msgstr "Boodskap (opsioneel)"
 msgid "Edit User Mood"
 msgstr "Redigeer gebruikerstemming"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "_Vriende"
@@ -12115,9 +12157,6 @@ msgstr "steun"
 msgid "webmaster"
 msgstr "webmeester"
 
-msgid "Senior Contributor/QA"
-msgstr "Seniorbydraer/gehaltebeheerder"
-
 msgid "win32 port"
 msgstr "win32-weergawe"
 
@@ -12143,6 +12182,9 @@ msgstr "oorspronklike outeur"
 msgid "lead developer"
 msgstr "hoofprogrammeerder"
 
+msgid "Senior Contributor/QA"
+msgstr "Seniorbydraer/gehaltebeheerder"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13496,6 +13538,10 @@ msgstr "Aanstuurbediener (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-bediener:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Poort:"
+
 msgid "Use_rname:"
 msgstr "Geb_ruikernaam:"
 
@@ -13517,6 +13563,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Werkskermverstek"
 
@@ -13535,6 +13586,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -14066,7 +14125,8 @@ msgstr "geen"
 msgid "Small"
 msgstr "Klein"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Kleiner weergawes van die verstek gesiggies"
 
 msgid "Response Probability:"
@@ -15098,6 +15158,10 @@ msgstr "T_oestel"
 msgid "Voice/Video Settings"
 msgstr "Stem-/video-opstelling"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Stem-/video-opstelling"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15224,7 +15288,7 @@ msgstr "Stuur en ontvang rou XMPP-stanzas."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15357,6 +15421,25 @@ msgstr "Besoek die WinPidgin-webblad"
 msgid "You do not have permission to uninstall this application."
 msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vereis SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Dwing ou SSL (poort 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Die naam wat gegee is, is ongeldig."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
+#~ "karakters bevat.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Soek vir vriend met inligting"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Die sertifikaat is nog nie geldig nie."
 
@@ -15698,15 +15781,6 @@ msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
 #~ "afkomstig te wees.  Dit kan beteken dat u nie tans aan die diens gekoppel "
 #~ "is wat u dink nie."
 
-#~ msgid "You canceled the transfer of %s"
-#~ msgstr "U het die oordrag van %s gekanselleer"
-
-#~ msgid "%s canceled the transfer of %s"
-#~ msgstr "%s het die oordrag van %s gekanselleer"
-
-#~ msgid "%s canceled the file transfer"
-#~ msgstr "%s het die lêeroordrag gekanselleer"
-
 #~ msgid "Join/Part Hiding Configuration"
 #~ msgstr "Opstelling vir in- en uitgaanversteking"
 
@@ -16079,9 +16153,6 @@ msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Verbinding gesluit (skrif)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Verbinding teruggestel"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Kon nie vanaf sok lees nie: %s"
 
@@ -16292,7 +16363,7 @@ msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kon nie %s vir skryf open nie!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
 
 #~ msgid "Could not connect for transfer."
@@ -16384,9 +16455,6 @@ msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "U [%d] is by groep \"%d\" gevoeg"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Gebruikerinligting vir %s nie beskikbaar nie"
-
 #~ msgid "Primary Information"
 #~ msgstr "Primêre inligting"
 
diff --git a/po/am.po b/po/am.po
index e3c938968e..b9f82a1e8c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -550,7 +550,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "የአባት ስ��"
@@ -812,7 +811,7 @@ msgid "Waiting for transfer to begin"
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ተወ�"
 
 #, fuzzy
@@ -1744,7 +1743,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4774,12 +4775,20 @@ msgstr ""
 msgid "Domain"
 msgstr "ትእዛ�"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "የቢሮ መረጃ�"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "ተገና�ቷ�"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -6050,7 +6059,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -6152,9 +6161,6 @@ msgstr "ተገና�ቷ�"
 msgid "Connecting..."
 msgstr "ተገና�ቷ�"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -7034,6 +7040,15 @@ msgstr "የቤት አድራሻ�"
 msgid "Server port"
 msgstr "ሰርቨር�"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -7065,6 +7080,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "መድረክን አስወ�ድ"
@@ -7296,95 +7324,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr "ጨዋታዎች"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-#, fuzzy
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#, fuzzy
-msgid "Hiptop"
-msgstr "ታሪክ"
-
-msgid "Security Enabled"
-msgstr ""
-
-#, fuzzy
-msgid "Video Chat"
-msgstr "�ሪ"
-
-#, fuzzy
-msgid "iChat AV"
-msgstr "�ሪ"
-
-msgid "Live Video"
-msgstr ""
-
-#, fuzzy
-msgid "Camera"
-msgstr "ስ�"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "እስክሪን ስ�"
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7418,17 +7357,6 @@ msgstr "አዲስ"
 msgid "At lunch"
 msgstr ""
 
-#, fuzzy
-msgid "IP Address"
-msgstr "አድራሻ�"
-
-msgid "Warning Level"
-msgstr ""
-
-#, fuzzy
-msgid "Buddy Comment"
-msgstr "የቢሮ መረጃ�"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ተገና�ቷ�"
@@ -7518,15 +7446,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr "ተገና�ቷ�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7622,69 +7541,14 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "User information not available: %s"
-msgstr "የቢሮ መረጃ�"
-
-#, fuzzy
-msgid "Online Since"
-msgstr "ኦንላይን"
-
-msgid "Member Since"
-msgstr ""
-
-#, fuzzy
-msgid "Capabilities"
-msgstr ""
-"\n"
-"<b>�ኔታ�</b>"
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
 #, fuzzy
-msgid "Mobile Phone"
-msgstr "የሞቢ� ስ�ክ�"
-
-#, fuzzy
-msgid "Personal Web Page"
-msgstr "ድረ-ገጽ�"
-
-#. aim_userinfo_t
-#. strip_html_tags
-#, fuzzy
-msgid "Additional Information"
-msgstr "የቢሮ መረጃ�"
-
-msgid "Zip Code"
-msgstr ""
-
-#, fuzzy
-msgid "Work Information"
-msgstr "የቢሮ መረጃ�"
-
-msgid "Division"
-msgstr ""
-
-#, fuzzy
-msgid "Position"
-msgstr "ቦታ�"
-
-#, fuzzy
-msgid "Web Page"
-msgstr "ድረ-ገጽ�"
-
-#, fuzzy
 msgid "Pop-Up Message"
 msgstr "አዲስ መ�እክት"
 
@@ -7932,7 +7796,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "የቤት አድራሻ�"
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7972,6 +7836,13 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr "ተጨማሪ �ርጫዎች አሳይ"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "��ክትን በሌላ ስ� አስቀ�ጥ..."
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7989,10 +7860,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr "የቢሮ መረጃ�"
 
-#, fuzzy
-msgid "Search for Buddy by Information"
-msgstr "የቢሮ መረጃ�"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -8096,6 +7963,180 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "ጨዋታዎች"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+#, fuzzy
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#, fuzzy
+msgid "Hiptop"
+msgstr "ታሪክ"
+
+msgid "Security Enabled"
+msgstr ""
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "�ሪ"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "�ሪ"
+
+msgid "Live Video"
+msgstr ""
+
+#, fuzzy
+msgid "Camera"
+msgstr "ስ�"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "እስክሪን ስ�"
+
+#, fuzzy
+msgid "IP Address"
+msgstr "አድራሻ�"
+
+msgid "Warning Level"
+msgstr ""
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "የቢሮ መረጃ�"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "የቢሮ መረጃ�"
+
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "የሞቢ� ስ�ክ�"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "ድረ-ገጽ�"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "የቢሮ መረጃ�"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "የቢሮ መረጃ�"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "ቦታ�"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "ድረ-ገጽ�"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "ኦንላይን"
+
+msgid "Member Since"
+msgstr ""
+
+#, fuzzy
+msgid "Capabilities"
+msgstr ""
+"\n"
+"<b>�ኔታ�</b>"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Appear Offline"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ኦንላይን"
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8313,7 +8354,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10567,10 +10608,6 @@ msgid "Not on server list"
 msgstr "ሰርቨርን የለ�"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "ኦንላይን"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "ኦንላይን"
 
@@ -10579,10 +10616,6 @@ msgid "Presence"
 msgstr "�ርጫዎች"
 
 #, fuzzy
-msgid "Appear Offline"
-msgstr "ኦንላይን"
-
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "ኦንላይን"
 
@@ -11127,27 +11160,25 @@ msgstr ""
 "%s� %s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "ተገና�ቷ�"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "መድረክን አስወ�ድ"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "ተገና�ቷ�"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -11294,6 +11325,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11576,6 +11611,8 @@ msgstr "የጌ� ማ�ሪያ"
 msgid "Edit User Mood"
 msgstr "ተጠቃሚ መርጫዎች"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -12407,9 +12444,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -12438,6 +12472,9 @@ msgstr " የመጀመሪያ� ሚስጢራዊ ቃ�"
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13838,6 +13875,10 @@ msgid "_TURN server:"
 msgstr "ሰርቨር�"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "�ርት�"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "ተጠቃሚ� (_U)"
 
@@ -13860,6 +13901,11 @@ msgstr "ሞዚላ"
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "አጥ�"
@@ -13880,6 +13926,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -14455,7 +14509,7 @@ msgstr "�ን�"
 msgid "Small"
 msgstr "ኢሜይ�"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15512,6 +15566,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15638,7 +15695,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15766,6 +15823,10 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "የቢሮ መረጃ�"
+
+#, fuzzy
 #~ msgid "Nick Name"
 #~ msgstr "ቅጽ� ስ�"
 
@@ -16006,10 +16067,6 @@ msgstr ""
 #~ msgstr "መድረክን አስወ�ድ"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "ተገና�ቷ�"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr " የመጀመሪያ� ሚስጢራዊ ቃ�"
 
diff --git a/po/ar.po b/po/ar.po
index a4c773572a..4acd70babf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2008-11-01 17:41+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -525,7 +525,6 @@ msgstr "أكّد حذ� الشهادة"
 msgid "Certificate Manager"
 msgstr "مدير الشّهادات"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "اسم المضي�"
 
@@ -791,7 +790,7 @@ msgstr "ق�"
 msgid "Waiting for transfer to begin"
 msgstr "�ي انتظار بدء النقل"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "أ�لغ�يَ"
 
 msgid "Failed"
@@ -1676,7 +1675,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "سلسلة الشهادة المقدّمة ل� %s غير صحيحة."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4772,11 +4773,20 @@ msgstr "ملحقة بروتوكول XMPP"
 msgid "Domain"
 msgstr "النطاق"
 
-msgid "Require SSL/TLS"
-msgstr "يتطلب SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "اشترط التصريح"
 
-msgid "Force old (port 5223) SSL"
-msgstr "ا�رض استخدام SSL القديم (من�ذ 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "معلومات المستخدم %s غير متاحة"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "ص��ّ�ر الاتصال"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "اسمح بالاستيثاق بالنص الصريح عبر تيارات غير م�عمّاة"
@@ -6048,7 +6058,7 @@ msgid "The two PINs you entered do not match."
 msgstr "كلمات السر الجديدة غير مطابقة."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "م�تاح SecurID المدخل غير صالح."
 
 msgid ""
@@ -6151,10 +6161,6 @@ msgid "Connecting..."
 msgstr "يتّصل"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "م�تاح SecurID المدخل غير صالح."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "م�تاح SecurID المدخل غير صالح."
 
@@ -7037,6 +7043,15 @@ msgstr "عنوان الخادوم"
 msgid "Server port"
 msgstr "من�ذ الخادوم"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "من �ضلك صرّح لي بإضا�تك إلى قائمة أصدقائي."
+
+msgid "No reason given."
+msgstr "لا سبب معطى."
+
+msgid "Authorization Denied Message:"
+msgstr "رسالة منع التصريح:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
@@ -7070,6 +7085,24 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "خطأ أثناء استجلاء %s"
 
+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)"
+
+#, 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 يستخدم عميلا به علات.)"
+
 msgid "Could not join chat room"
 msgstr "تعذّر الانضمام لقناة الدردشة"
 
@@ -7303,94 +7336,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "المل� %s حجمه %s و هو ما يزيد على الحجم الأقصى %s."
 
-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)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "أيقونة الصديق"
-
-msgid "Voice"
-msgstr "صوت"
-
-msgid "AIM Direct IM"
-msgstr "تراسل AIM �وري مباشر"
-
-msgid "Get File"
-msgstr "اجلب مل�ا"
-
-msgid "Games"
-msgstr "ألعاب"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "إضا�ات"
-
-msgid "Send Buddy List"
-msgstr "أرسل قائمة الأصدقاء"
-
-msgid "ICQ Direct Connect"
-msgstr "اتصال ICQ مباشر"
-
-msgid "AP User"
-msgstr "مستخدم AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr "ممر خادوم ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 القديم"
-
-msgid "Trillian Encryption"
-msgstr "تعمية Trillian "
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr "الأمن م��عّل"
-
-msgid "Video Chat"
-msgstr "دردشة بال�يديو"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "�يديو مباشر"
-
-msgid "Camera"
-msgstr "كاميرا"
-
-msgid "Screen Sharing"
-msgstr "مشاركة الشاشة"
-
 msgid "Free For Chat"
 msgstr "متاح للدردشة"
 
@@ -7426,15 +7371,6 @@ msgstr "الشبكة"
 msgid "At lunch"
 msgstr "خرجت للغداء"
 
-msgid "IP Address"
-msgstr "عنوان IP"
-
-msgid "Warning Level"
-msgstr "مستوى التحذير"
-
-msgid "Buddy Comment"
-msgstr "تعليق الصديق"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7535,15 +7471,6 @@ msgstr "أ�رس�لت كلمة السر"
 msgid "Unable to initialize connection"
 msgstr "تعذّر استبداء الاتصال"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "من �ضلك صرّح لي بإضا�تك إلى قائمة أصدقائي."
-
-msgid "No reason given."
-msgstr "لا سبب معطى."
-
-msgid "Authorization Denied Message:"
-msgstr "رسالة منع التصريح:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7675,58 +7602,13 @@ msgstr[3] "�قدت %hu رسائل من %s لسبب مجهول."
 msgstr[4] "�قدت %hu رسالة من %s لسبب مجهول."
 msgstr[5] "�قدت %hu رسالة من %s لسبب مجهول."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "معلومات المستخدم غير متو�رة: %s"
-
-msgid "Online Since"
-msgstr "متصل منذ"
-
-msgid "Member Since"
-msgstr "عضو منذ"
-
-msgid "Capabilities"
-msgstr "الإمكانات"
-
 msgid "Your AIM connection may be lost."
 msgstr "قد ينقطع اتصالك مع AIM."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[تعذّر عرض رسالة من هذا المستخدم لأنها تحوي حرو�ا غير صالحة.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "تمّ �صلك عن غر�ة الدردشة %s."
 
-msgid "Mobile Phone"
-msgstr "الهات� المحمول"
-
-msgid "Personal Web Page"
-msgstr "ص�حة و�ب الشخصية"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "معلومات إضا�ية"
-
-msgid "Zip Code"
-msgstr "الرمز البريدي"
-
-msgid "Work Information"
-msgstr "معلومات العمل"
-
-msgid "Division"
-msgstr "القسم"
-
-msgid "Position"
-msgstr "الموضع"
-
-msgid "Web Page"
-msgstr "ص�حة الو�ب"
-
 msgid "Pop-Up Message"
 msgstr "رسالة منبثقة"
 
@@ -8000,7 +7882,8 @@ msgstr "تنسيق اسم المستخدم يمكنه �قط تغيير حالة
 msgid "Change Address To:"
 msgstr "غيّر العنوان إلى:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>لست �ي انتظار تصريحات</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8039,6 +7922,14 @@ msgstr "اضبط تمرير التراسل ال�وري  (و�ب)"
 msgid "Set Privacy Options..."
 msgstr "حدد خيارات الخصوصية..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "اعرض _قائمة الأصدقاء"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "قائمة الدعوة"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "أكّد الحساب"
@@ -8055,9 +7946,6 @@ msgstr "اعرض الأصدقاء الذين ينتظرون تصريحات"
 msgid "Search for Buddy by Email Address..."
 msgstr "ابحث عن صديق بواسطة عنوان البريد الإلكتروني..."
 
-msgid "Search for Buddy by Information"
-msgstr "ابحث عن صديق بواسطة المعلومات"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "لم يل�ج المستخدم"
@@ -8166,6 +8054,165 @@ msgstr "الطابور ممتليء"
 msgid "Not while on AOL"
 msgstr "غير ممكن أثناء التواجد على AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "أيقونة الصديق"
+
+msgid "Voice"
+msgstr "صوت"
+
+msgid "AIM Direct IM"
+msgstr "تراسل AIM �وري مباشر"
+
+msgid "Get File"
+msgstr "اجلب مل�ا"
+
+msgid "Games"
+msgstr "ألعاب"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "إضا�ات"
+
+msgid "Send Buddy List"
+msgstr "أرسل قائمة الأصدقاء"
+
+msgid "ICQ Direct Connect"
+msgstr "اتصال ICQ مباشر"
+
+msgid "AP User"
+msgstr "مستخدم AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr "ممر خادوم ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 القديم"
+
+msgid "Trillian Encryption"
+msgstr "تعمية Trillian "
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "الأمن م��عّل"
+
+msgid "Video Chat"
+msgstr "دردشة بال�يديو"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "�يديو مباشر"
+
+msgid "Camera"
+msgstr "كاميرا"
+
+msgid "Screen Sharing"
+msgstr "مشاركة الشاشة"
+
+msgid "IP Address"
+msgstr "عنوان IP"
+
+msgid "Warning Level"
+msgstr "مستوى التحذير"
+
+msgid "Buddy Comment"
+msgstr "تعليق الصديق"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "معلومات المستخدم غير متو�رة: %s"
+
+msgid "Mobile Phone"
+msgstr "الهات� المحمول"
+
+msgid "Personal Web Page"
+msgstr "ص�حة و�ب الشخصية"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "معلومات إضا�ية"
+
+msgid "Zip Code"
+msgstr "الرمز البريدي"
+
+msgid "Work Information"
+msgstr "معلومات العمل"
+
+msgid "Division"
+msgstr "القسم"
+
+msgid "Position"
+msgstr "الموضع"
+
+msgid "Web Page"
+msgstr "ص�حة الو�ب"
+
+msgid "Online Since"
+msgstr "متصل منذ"
+
+msgid "Member Since"
+msgstr "عضو منذ"
+
+msgid "Capabilities"
+msgstr "الإمكانات"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ابد متصلا"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ابد متصلا"
+
+msgid "Appear Offline"
+msgstr "أظهر غير متصل"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "أظهر غير متصل"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "لقد طردك %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"يمكنك إعادة طلب التصريح من هؤلاء الأصدقاء عن طريق النقر باليمين عليهم و "
+"اختيار \"أع�د طلب التصريح.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "مرئي"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "قائمة الدعوة"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "الدّلو"
 
@@ -8350,7 +8397,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "اشترط التصريح"
 
 #, fuzzy
@@ -10620,18 +10667,12 @@ msgstr "خرج"
 msgid "Not on server list"
 msgstr "ليس على قائمة الخادوم"
 
-msgid "Appear Online"
-msgstr "ابد متصلا"
-
 msgid "Appear Permanently Offline"
 msgstr "ابد غير متصل للأبد"
 
 msgid "Presence"
 msgstr "التواجد"
 
-msgid "Appear Offline"
-msgstr "أظهر غير متصل"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "لا تظهر غير متصل للأبد"
 
@@ -11206,27 +11247,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "ق�وطع الاتصال من برمجيات على حاسوبك."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "المستضي� البعيد أغلق الاتصال."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "انتهت مهلة الاتصال."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "ر���ض الاتصال."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "العنوان مستخدم بال�عل."
 
@@ -11372,6 +11408,10 @@ msgstr ""
 "يمكنك دائما الرجوع إلى هذه النا�ذة لإضا�ة أو تحرير أو إزالة الحسابات عن طريق "
 "<b>حسابات⇦أد�ر الحسابات</b> �ي نا�ذة قائمة الأصدقاء"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s يود إضا�ة %s إلى قائمة أصدقاءه%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "لون الخل�ية"
@@ -11646,6 +11686,8 @@ msgstr "الك�نية (اختياري)"
 msgid "Edit User Mood"
 msgstr "حرر مزاج المستخدم"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/الأ_صدقاء"
@@ -12421,9 +12463,6 @@ msgstr "دعم"
 msgid "webmaster"
 msgstr "مشر� الموقع"
 
-msgid "Senior Contributor/QA"
-msgstr "م�ساهم متقدم/التحقق من الجودة"
-
 msgid "win32 port"
 msgstr "نسخة ويندوز"
 
@@ -12449,6 +12488,9 @@ msgstr "المؤل� الأصلي"
 msgid "lead developer"
 msgstr "المطوّر الرئيسي"
 
+msgid "Senior Contributor/QA"
+msgstr "م�ساهم متقدم/التحقق من الجودة"
+
 msgid "Afrikaans"
 msgstr "أ�ريكانية"
 
@@ -13832,6 +13874,10 @@ msgid "_TURN server:"
 msgstr "خادوم ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_من�ذ:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "اسم المستخدم:"
 
@@ -13854,6 +13900,11 @@ msgstr "موزيلا"
 msgid "Konqueror"
 msgstr "كونكرر"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "مبدئي سطح المكتب"
 
@@ -13872,6 +13923,14 @@ msgstr "�َيَرب�رد"
 msgid "Epiphany"
 msgstr "إب��َني"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "يدوي"
 
@@ -14427,7 +14486,7 @@ msgstr "بدون"
 msgid "Small"
 msgstr "البريد الإلكتروني"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15487,6 +15546,10 @@ msgstr "الجهاز"
 msgid "Voice/Video Settings"
 msgstr "حرّر الخصائص"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "حرّر الخصائص"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15615,7 +15678,7 @@ msgstr "أرس�ل و استقبل أبيات XMPP خام."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "ت�يد هذه الملحقة �ي تنقيح خواديم و عملاء XMPXMPPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15746,6 +15809,24 @@ msgstr "قم بزيارة ص�حة بدجن على الو�ب"
 msgid "You do not have permission to uninstall this application."
 msgstr "لا تملك الصلاحيات لتثبيت هذا التطبيق."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "يتطلب SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ا�رض استخدام SSL القديم (من�ذ 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "م�تاح SecurID المدخل غير صالح."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[تعذّر عرض رسالة من هذا المستخدم لأنها تحوي حرو�ا غير صالحة.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ابحث عن صديق بواسطة المعلومات"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "سلسلة الشهادة المقدّمة ل� %s غير صحيحة."
@@ -16321,9 +16402,6 @@ msgstr "لا تملك الصلاحيات لتثبيت هذا التطبيق."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "أ�غل�ق الاتصال (تدري الكتابة)"
 
-#~ msgid "Connection reset"
-#~ msgstr "ص��ّ�ر الاتصال"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "عطل �ي القراءة من المقبس: %s"
 
@@ -16584,7 +16662,7 @@ msgstr "لا تملك الصلاحيات لتثبيت هذا التطبيق."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "لايمكن �تح %s للكتابة!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "�شل ارسال المل�: من المحتمل أن المستقب�ل ألغى العملية."
 
 #~ msgid "Could not connect for transfer."
@@ -16611,9 +16689,6 @@ msgstr "لا تملك الصلاحيات لتثبيت هذا التطبيق."
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "ملحقة بروتوكول TOC"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "معلومات المستخدم %s غير متاحة"
-
 #~ msgid "%s Options"
 #~ msgstr "خيارات %s"
 
diff --git a/po/as.po b/po/as.po
index a846ca155d..b12a9053bf 100644
--- a/po/as.po
+++ b/po/as.po
@@ -789,7 +789,7 @@ msgstr "ৰখক"
 msgid "Waiting for transfer to begin"
 msgstr "বিনিময়ৰ আৰম�ভত অপেক�ষা কৰা হৈছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল কৰা হৈছে"
 
 msgid "Failed"
diff --git a/po/az.po b/po/az.po
index 94f1c86d38..b87d444199 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2004-06-28 14:03+0300\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -548,7 +548,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Soyad:"
@@ -809,7 +808,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1747,7 +1746,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4749,12 +4750,20 @@ msgstr "IRC Protokolu �lavəsi"
 msgid "Domain"
 msgstr "Rumın Dili"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Bağlantı problemi"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -6003,7 +6012,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -6102,9 +6111,6 @@ msgstr "Transfer üçün bağlana bilmədi."
 msgid "Connecting..."
 msgstr "_Yenidən bağlan"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6974,6 +6980,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -7005,6 +7020,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "MOTD göstərilə bilmir"
 
+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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Transfer üçün bağlana bilmədi."
@@ -7241,90 +7269,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "�laqə Timsalı"
-
-msgid "Voice"
-msgstr "Səs"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr ""
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Ləqəb"
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7359,15 +7303,6 @@ msgstr "Şəbəkə"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr ""
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Transfer üçün bağlana bilmədi."
@@ -7458,15 +7393,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr "Bağlanıla bilmədi"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7562,58 +7488,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "User information not available: %s"
-msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr ""
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-msgid "Position"
-msgstr "Mövqe"
-
-msgid "Web Page"
-msgstr "Veb Səhifəsi"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up İsmarış"
 
@@ -7858,7 +7739,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7898,6 +7779,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr "Daha çox seçim göstər"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "_Alias..."
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Hesabın Qeyri-Fəallıq Vaxtını Seç"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7914,9 +7803,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -8020,6 +7906,163 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "�laqə Timsalı"
+
+msgid "Voice"
+msgstr "Səs"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Ləqəb"
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr "Mövqe"
+
+msgid "Web Page"
+msgstr "Veb Səhifəsi"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Xətdə"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Xətdə"
+
+msgid "Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Xətdə"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Bu söhbət üçün bir alias bildir."
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8232,7 +8275,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10449,10 +10492,6 @@ msgstr "Kompüterdən Kənarda"
 msgid "Not on server list"
 msgstr "Verici siyahısında deyil"
 
-#, fuzzy
-msgid "Appear Online"
-msgstr "Xətdə"
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
@@ -10460,9 +10499,6 @@ msgstr ""
 msgid "Presence"
 msgstr "Seçimlər"
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -11009,27 +11045,26 @@ msgid " (%s)"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "_Yenidən bağlan"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Bağlantı bacarılmadı"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Bağlantı problemi"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "O fayl onsuz da mövcuddur"
 
@@ -11176,6 +11211,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11455,6 +11494,8 @@ msgstr "İsmarış Bildirişi"
 msgid "Edit User Mood"
 msgstr "İstifadəçi Otaqları"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/�la_qələr"
@@ -12280,9 +12321,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -12308,6 +12346,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13731,6 +13772,10 @@ msgid "_TURN server:"
 msgstr "Verici"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_İstifadəçi Adı:"
 
@@ -13753,6 +13798,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Sil"
@@ -13773,6 +13823,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -14342,7 +14400,7 @@ msgstr "Hər kimsə"
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15428,6 +15486,10 @@ msgstr "Avadanlıq"
 msgid "Voice/Video Settings"
 msgstr "Mühit Qurğularını İşlət"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Mühit Qurğularını İşlət"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15553,7 +15615,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15923,10 +15985,6 @@ msgstr ""
 #~ msgstr "Bağlantı bacarılmadı"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Bağlantı problemi"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "MOTD göstərilə bilmir"
 
@@ -16008,7 +16066,7 @@ msgstr ""
 #~ msgid "Invalid Groupname"
 #~ msgstr "Səhv istifadəçi adı."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi."
 
 #~ msgid "Could not connect for transfer."
@@ -16024,9 +16082,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC Protokol �lavəsi"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
-
 #~ msgid "%s Options"
 #~ msgstr "%s Seçimləri"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index c10eaa0757..272c1f6388 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2008-03-29 21:08+0200\n"
 "Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
 "Language-Team: Belarusian Latin <be-latin.open-tran.eu>\n"
@@ -529,7 +529,6 @@ msgstr "Paćvierdź vydaleńnie sertyfikatu"
 msgid "Certificate Manager"
 msgstr "KiraÅ­nik sertyfikataÅ­"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nazva hostu"
 
@@ -801,7 +800,7 @@ msgstr "Spyni"
 msgid "Waiting for transfer to begin"
 msgstr "Čakańnie pa�atku pierada�y"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulavanaja"
 
 msgid "Failed"
@@ -1695,7 +1694,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "�ancuh sertyfikatu, padadzienaha dla %s, niapravilny."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4774,11 +4775,20 @@ msgstr "Plugin pratakołu XMPP"
 msgid "Domain"
 msgstr "Damen"
 
-msgid "Require SSL/TLS"
-msgstr "Vymahaj SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Vymahaj aÅ­taryzacyi"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Prymusova ŭžyj stary (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Źviestki ab karystalniku %s niedastupnyja"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Pieraŭruchamleńie spału�eńnia"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dazvol aŭtaryzacyju prostym tekstam praź niešyfravanyja kanały"
@@ -6069,7 +6079,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Novyja paroli adroźnivajucca."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Akreśleny klu� SecurID niapravilny."
 
 msgid ""
@@ -6176,10 +6186,6 @@ msgid "Connecting..."
 msgstr "Spału�eńnie"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Akreśleny klu� SecurID niapravilny."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Akreśleny klu� SecurID niapravilny."
 
@@ -7070,6 +7076,16 @@ msgstr "Adras servera"
 msgid "Server port"
 msgstr "Port servera"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Kali łaska, aŭtaryzuj mianie, kab ja moh dadać ciabie ŭ svoj śpis siabroŭ."
+
+msgid "No reason given."
+msgstr "Pry�yna nie akreślenaja."
+
+msgid "Authorization Denied Message:"
+msgstr "Paviedamleńnie ab admovie aŭtaryzacyi:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Atrymany nie�akany adkaz HTTP ad servera."
@@ -7103,6 +7119,25 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Pamyłka zapytu znaku ŭvachodu"
 
+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 ""
+"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Siabra, ź jakim ty "
+"razmaŭlaješ, mabyć, užyvaje inšaje, nie�akanaje kadavańnie. Kali ty "
+"viedaješ, jakim kadavańniem jon karystajecca, možaš akreślić jaho ŭ "
+"pašyranych opcyjach dla kontu AIM/ICQ.)"
+
+#, 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 ""
+"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Albo ty j %s abrali "
+"roznyja kadavańni, albo %s karystajecca prablemnym klijentam.)"
+
 msgid "Could not join chat room"
 msgstr "Niemah�yma dału�ycca da hutarki ŭ pakoi"
 
@@ -7337,96 +7372,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fajł %s - heta %s, pamier katoraha pieravyšaje maksymum dla %s."
 
-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 ""
-"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Siabra, ź jakim ty "
-"razmaŭlaješ, mabyć, užyvaje inšaje, nie�akanaje kadavańnie. Kali ty "
-"viedaješ, jakim kadavańniem jon karystajecca, možaš akreślić jaho ŭ "
-"pašyranych opcyjach dla kontu AIM/ICQ.)"
-
-#, 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 ""
-"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Albo ty j %s abrali "
-"roznyja kadavańni, albo %s karystajecca prablemnym klijentam.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona siabra"
-
-msgid "Voice"
-msgstr "Hołas"
-
-msgid "AIM Direct IM"
-msgstr "Prostaje spału�eńnie AIM"
-
-msgid "Get File"
-msgstr "Atrymaj fajł"
-
-msgid "Games"
-msgstr "Hulni"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Dadatki"
-
-msgid "Send Buddy List"
-msgstr "Dašli śpis siabroŭ"
-
-msgid "ICQ Direct Connect"
-msgstr "Prostaje spału�eńnie ICQ"
-
-msgid "AP User"
-msgstr "Karystalnik AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Retranślacyja servera ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Stary UTF8 dla ICQ"
-
-msgid "Trillian Encryption"
-msgstr "Šyfravańnie Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Biaśpieka ŭklu�anaja"
-
-msgid "Video Chat"
-msgstr "Videahutarka"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Žyvoje videa"
-
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nazva karystalnika"
-
 msgid "Free For Chat"
 msgstr "Volny dla hutarki"
 
@@ -7462,15 +7407,6 @@ msgstr "Sietka"
 msgid "At lunch"
 msgstr "Adyjšoŭ pajeści"
 
-msgid "IP Address"
-msgstr "IP Adras"
-
-msgid "Warning Level"
-msgstr "Uzrovień aściarohi"
-
-msgid "Buddy Comment"
-msgstr "Kamentar siabra"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7572,16 +7508,6 @@ msgstr "Parol dasłany"
 msgid "Unable to initialize connection"
 msgstr "Niemah�yma inicyjavać spału�eńnie"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Kali łaska, aŭtaryzuj mianie, kab ja moh dadać ciabie ŭ svoj śpis siabroŭ."
-
-msgid "No reason given."
-msgstr "Pry�yna nie akreślenaja."
-
-msgid "Authorization Denied Message:"
-msgstr "Paviedamleńnie ab admovie aŭtaryzacyi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7699,60 +7625,13 @@ msgstr[0] "Ty zhubiŭ %hu paviedamleńnie ad %s ź nieviadomaj pry�yny."
 msgstr[1] "Ty zhubiŭ %hu paviedamleńni ad %s ź nieviadomaj pry�yny."
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s ź nieviadomaj pry�yny."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Źviestki ab karystalniku niedastupnyja: %s"
-
-msgid "Online Since"
-msgstr "Spału�any ad"
-
-msgid "Member Since"
-msgstr "Udzielni�aje ad"
-
-msgid "Capabilities"
-msgstr "Mah�ymaści"
-
 msgid "Your AIM connection may be lost."
 msgstr "Tvajo spału�eńnie AIM moža zhubicca."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Niemah�yma pakazać paviedamleńnie ad hetaha karystalnika, bo jano ŭtrymvaje "
-"niapravilnyja znaki.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ty adłu�yŭsia ad pakoju hutarki %s."
 
-msgid "Mobile Phone"
-msgstr "Mabilny telefon"
-
-msgid "Personal Web Page"
-msgstr "Pryvatnaja sieciÅ­naja staronka"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dadatkovyja źviestki"
-
-msgid "Zip Code"
-msgstr "Zip kod"
-
-msgid "Work Information"
-msgstr "Pracoŭnyja źviestki"
-
-msgid "Division"
-msgstr "Padzieł"
-
-msgid "Position"
-msgstr "Pasada"
-
-msgid "Web Page"
-msgstr "SieciÅ­naja staronka"
-
 msgid "Pop-Up Message"
 msgstr "Vypłyŭnoje paviedamleńnie"
 
@@ -8046,7 +7925,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Źmiani adras na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ty nie �akaješ aŭtaryzacyi</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8085,6 +7965,14 @@ msgstr "Skanfihuruj pieranakiravańnie IM (u siecivie)"
 msgid "Set Privacy Options..."
 msgstr "Akreśl opcyi tajemnaści..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Pakažy śpis siabroŭ"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Śpis zaprašeńniaŭ"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Paćvierdź kont"
@@ -8101,9 +7989,6 @@ msgstr "Pakažy siabroŭ, što �akajuć aŭtaryzacyi"
 msgid "Search for Buddy by Email Address..."
 msgstr "Å ukaj siabra pavodle adrasu email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Šukaj siabra pavodle źviestak"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Karystalnik nie ŭvajšoŭ"
@@ -8212,6 +8097,166 @@ msgstr "ÄŒarha zapoÅ­nienaja"
 msgid "Not while on AOL"
 msgstr "Nie, pakul na AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona siabra"
+
+msgid "Voice"
+msgstr "Hołas"
+
+msgid "AIM Direct IM"
+msgstr "Prostaje spału�eńnie AIM"
+
+msgid "Get File"
+msgstr "Atrymaj fajł"
+
+msgid "Games"
+msgstr "Hulni"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Dadatki"
+
+msgid "Send Buddy List"
+msgstr "Dašli śpis siabroŭ"
+
+msgid "ICQ Direct Connect"
+msgstr "Prostaje spału�eńnie ICQ"
+
+msgid "AP User"
+msgstr "Karystalnik AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Retranślacyja servera ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Stary UTF8 dla ICQ"
+
+msgid "Trillian Encryption"
+msgstr "Šyfravańnie Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Biaśpieka ŭklu�anaja"
+
+msgid "Video Chat"
+msgstr "Videahutarka"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Žyvoje videa"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nazva karystalnika"
+
+msgid "IP Address"
+msgstr "IP Adras"
+
+msgid "Warning Level"
+msgstr "Uzrovień aściarohi"
+
+msgid "Buddy Comment"
+msgstr "Kamentar siabra"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Źviestki ab karystalniku niedastupnyja: %s"
+
+msgid "Mobile Phone"
+msgstr "Mabilny telefon"
+
+msgid "Personal Web Page"
+msgstr "Pryvatnaja sieciÅ­naja staronka"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dadatkovyja źviestki"
+
+msgid "Zip Code"
+msgstr "Zip kod"
+
+msgid "Work Information"
+msgstr "Pracoŭnyja źviestki"
+
+msgid "Division"
+msgstr "Padzieł"
+
+msgid "Position"
+msgstr "Pasada"
+
+msgid "Web Page"
+msgstr "SieciÅ­naja staronka"
+
+msgid "Online Since"
+msgstr "Spału�any ad"
+
+msgid "Member Since"
+msgstr "Udzielni�aje ad"
+
+msgid "Capabilities"
+msgstr "Mah�ymaści"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Źjaŭlajsia ŭ sietcy"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Źjaŭlajsia ŭ sietcy"
+
+msgid "Appear Offline"
+msgstr "Budź pa-za sietkaj"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Budź pa-za sietkaj"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ciabie kiknuli z %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Ty možaš pierazapytać aŭtaryzacyi ŭ hetych siabroŭ, praz pravy klik i "
+"abraÅ­Å¡y \"Pierazapytaj aÅ­taryzacyi\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Niaba�ny"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Śpis zaprašeńniaŭ"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "VadaliÅ­"
 
@@ -8412,7 +8457,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Vymahaj aÅ­taryzacyi"
 
 #, fuzzy
@@ -10704,18 +10749,12 @@ msgstr "Hulaju"
 msgid "Not on server list"
 msgstr "Niama ŭ śpisie z servera"
 
-msgid "Appear Online"
-msgstr "Źjaŭlajsia ŭ sietcy"
-
 msgid "Appear Permanently Offline"
 msgstr "Budź stała pa-za sietkaj"
 
 msgid "Presence"
 msgstr "Prysutnaść"
 
-msgid "Appear Offline"
-msgstr "Budź pa-za sietkaj"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nia budź stała pa-za sietkaj"
 
@@ -11278,27 +11317,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Spału�eńnie pierabitaje inšaj prahramaj z tvajho kamputara."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Addaleny kamputar za�yniŭ spału�eńnie."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Termin �akańnia spału�eńnia skon�yŭsia."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Admoŭlenaje spału�eńnie."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Hetaja nazva hutarki ŭžo zaniataja"
 
@@ -11448,6 +11483,10 @@ msgstr ""
 "Ty zmožaš viarnucca da hetaha vakna, kab dadać, adredahavać albo vydalić "
 "konty praz <b>Konty->Dadaj/Redahuj</b> u vaknie Åšpisu siabroÅ­"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s cho�a dadać %s u svoj śpis siabroŭ%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Fonavy koler"
@@ -11724,6 +11763,8 @@ msgstr "Alias (nieabaviazkovy)"
 msgid "Edit User Mood"
 msgstr "Redahuj nastroj karystalnika"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Siabry"
@@ -12498,9 +12539,6 @@ msgstr "padtrymka"
 msgid "webmaster"
 msgstr "raspracoŭš�yk i webmajstar"
 
-msgid "Senior Contributor/QA"
-msgstr "Važki ŭdzielnik/QA"
-
 msgid "win32 port"
 msgstr "port na win32"
 
@@ -12526,6 +12564,9 @@ msgstr "pieršy aŭtar"
 msgid "lead developer"
 msgstr "hałoŭny raspracoŭš�yk"
 
+msgid "Senior Contributor/QA"
+msgstr "Važki ŭdzielnik/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13920,6 +13961,10 @@ msgid "_TURN server:"
 msgstr "ST_UN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Nazva karystalnika:"
 
@@ -13942,6 +13987,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Zmoŭ�any ŭ asiarodździ"
 
@@ -13960,6 +14010,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Samastojna"
 
@@ -14527,7 +14585,7 @@ msgstr "niama"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15607,6 +15665,10 @@ msgstr "Pryłada"
 msgid "Voice/Video Settings"
 msgstr "Redahuj nałady"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Redahuj nałady"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15736,7 +15798,7 @@ msgstr "Dasyłaj i atrymvaj suvoryja strofy XMPP."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15867,6 +15929,26 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vymahaj SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Prymusova ŭžyj stary (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Akreśleny klu� SecurID niapravilny."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Niemah�yma pakazać paviedamleńnie ad hetaha karystalnika, bo jano "
+#~ "Å­trymvaje niapravilnyja znaki.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Šukaj siabra pavodle źviestak"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "�ancuh sertyfikatu, padadzienaha dla %s, niapravilny."
@@ -16450,9 +16532,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Spału�eńnie za�ynienaje (zapis)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Pieraŭruchamleńie spału�eńnia"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Pamyłka �ytańnia z sokietu: %s"
 
@@ -16704,7 +16783,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Niemah�yma ad�ynić %s dziela zapisu!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Pamyłka pierada�y fajłu; aperacyja, mabyć, anulavanaja z taho boku."
 
 #~ msgid "Could not connect for transfer."
@@ -16728,9 +16807,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "Plugin pratakołu TOC"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Źviestki ab karystalniku %s niedastupnyja"
-
 #~ msgid "%s Options"
 #~ msgstr "Opcyi %s"
 
diff --git a/po/bg.po b/po/bg.po
index d69fbfcfd4..c5966297fc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin-1.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2007-02-12 00:46+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <kaladan@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -557,7 +557,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Хо�т"
 
@@ -820,7 +819,7 @@ msgstr "Зареждане при �тартиране"
 msgid "Waiting for transfer to begin"
 msgstr "Изчакване прена��нето да започне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отказан"
 
 msgid "Failed"
@@ -1771,7 +1770,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4797,12 +4798,20 @@ msgstr "Модул за протокола MSN"
 msgid "Domain"
 msgstr "румън�ки"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Запитване за разрешение"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "��ма налични данни за %s"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Използване на �тари� SSL"
+msgid "Connection security"
+msgstr "Връзката е прекъ�ната"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -6083,7 +6092,7 @@ msgid "The two PINs you entered do not match."
 msgstr "�овите пароли не �ъвпадат."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "�овото форматиране е неправилно."
 
 msgid ""
@@ -6189,10 +6198,6 @@ msgid "Connecting..."
 msgstr "Свързване"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "�овото форматиране е неправилно."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "�овото форматиране е неправилно."
 
@@ -7086,6 +7091,15 @@ msgstr "Сървър"
 msgid "Server port"
 msgstr "Порт"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Мол� да получа разрешение да ви добав� в �пи�ъка �и � познати."
+
+msgid "No reason given."
+msgstr "��ма по�очена причина."
+
+msgid "Authorization Denied Message:"
+msgstr "Съобщение за отказано разрешение:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "�еправилен отговор от �ървъра."
@@ -7120,6 +7134,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "�еу�пех при �вързването"
@@ -7358,90 +7385,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Икона на познат"
-
-msgid "Voice"
-msgstr "Гла�"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr "Приемане на файл"
-
-msgid "Games"
-msgstr "Игри"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr "Изпращане на �пи�ъка � познати"
-
-msgid "ICQ Direct Connect"
-msgstr "Директна връзка � ICQ"
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr "�ихили�т"
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr "Криптиране на Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr "�ктивиране на защитата"
-
-msgid "Video Chat"
-msgstr "Видео разговор"
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr "Живо видео"
-
-msgid "Camera"
-msgstr "Камера"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Име или номер в ICQ"
-
 msgid "Free For Chat"
 msgstr "Свободен за разговор"
 
@@ -7477,15 +7420,6 @@ msgstr "Мрежа"
 msgid "At lunch"
 msgstr "�а об�д"
 
-msgid "IP Address"
-msgstr "IP адре�"
-
-msgid "Warning Level"
-msgstr "�ива на предупреждение"
-
-msgid "Buddy Comment"
-msgstr "Коментар за при�тел"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "�е може да бъде у�тановена връзка за тран�фер."
@@ -7589,15 +7523,6 @@ msgstr "Паролата е изпратена"
 msgid "Unable to initialize connection"
 msgstr "�е може да бъде у�тановена нова връзка."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Мол� да получа разрешение да ви добав� в �пи�ъка �и � познати."
-
-msgid "No reason given."
-msgstr "��ма по�очена причина."
-
-msgid "Authorization Denied Message:"
-msgstr "Съобщение за отказано разрешение:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7702,59 +7627,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Вие пропу�нахте %hu от %s �ъобщение по неизве�тни причини."
 msgstr[1] "Вие пропу�нахте %hu от %s �ъобщени� по неизве�тни причини."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "��ма налични данни за потребител�: %s"
-
-msgid "Online Since"
-msgstr "Включен от"
-
-msgid "Member Since"
-msgstr "Член от"
-
-msgid "Capabilities"
-msgstr "Възможно�ти"
-
 msgid "Your AIM connection may be lost."
 msgstr "Връзката ви � AIM по в��ка веро�тно�т прекъ�на."
 
-#. The conversion failed!
-#, fuzzy
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "Вие пропу�нахте %hu �ъобщение от %s, тъй като то беше невалидно."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "Мобилен телефон"
-
-msgid "Personal Web Page"
-msgstr "Лична �траница в Интернет"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Допълнителни данни"
-
-msgid "Zip Code"
-msgstr "Пощен�ки код"
-
-msgid "Work Information"
-msgstr "Служебна информаци�"
-
-msgid "Division"
-msgstr "Отдел"
-
-msgid "Position"
-msgstr "Позици�"
-
-msgid "Web Page"
-msgstr "Интернет адре�"
-
 msgid "Pop-Up Message"
 msgstr "Из�качащо �ъобщение"
 
@@ -8038,7 +7917,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Пром�на адре�а на:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>не чакате разрешение</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8080,6 +7960,14 @@ msgstr "�а�тройване на препращането на �ъобщен
 msgid "Set Privacy Options..."
 msgstr "Показване на повече възможно�ти"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Показване на �пи�ъка � при�тели"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Спи�ък � поканени"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Потвърждение за абонамент"
@@ -8099,9 +7987,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr "Тър�ене на потребител по електронен адре�..."
 
-msgid "Search for Buddy by Information"
-msgstr "Тър�ене на потребител по неговите данни"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Потребител�т не е вл�зъл"
@@ -8209,6 +8094,166 @@ msgstr "Опашката е запълнена"
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Икона на познат"
+
+msgid "Voice"
+msgstr "Гла�"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "Приемане на файл"
+
+msgid "Games"
+msgstr "Игри"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr "Изпращане на �пи�ъка � познати"
+
+msgid "ICQ Direct Connect"
+msgstr "Директна връзка � ICQ"
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr "�ихили�т"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr "Криптиране на Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "�ктивиране на защитата"
+
+msgid "Video Chat"
+msgstr "Видео разговор"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr "Живо видео"
+
+msgid "Camera"
+msgstr "Камера"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Име или номер в ICQ"
+
+msgid "IP Address"
+msgstr "IP адре�"
+
+msgid "Warning Level"
+msgstr "�ива на предупреждение"
+
+msgid "Buddy Comment"
+msgstr "Коментар за при�тел"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "��ма налични данни за потребител�: %s"
+
+msgid "Mobile Phone"
+msgstr "Мобилен телефон"
+
+msgid "Personal Web Page"
+msgstr "Лична �траница в Интернет"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Допълнителни данни"
+
+msgid "Zip Code"
+msgstr "Пощен�ки код"
+
+msgid "Work Information"
+msgstr "Служебна информаци�"
+
+msgid "Division"
+msgstr "Отдел"
+
+msgid "Position"
+msgstr "Позици�"
+
+msgid "Web Page"
+msgstr "Интернет адре�"
+
+msgid "Online Since"
+msgstr "Включен от"
+
+msgid "Member Since"
+msgstr "Член от"
+
+msgid "Capabilities"
+msgstr "Възможно�ти"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "Appear Offline"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s ви изрита: (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "�евидим"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Спи�ък � поканени"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8426,7 +8471,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Запитване за разрешение"
 
 #, fuzzy
@@ -10689,10 +10734,6 @@ msgid "Not on server list"
 msgstr "�е е в �пи�ъка на �ървърите"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Изключен"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Изключен"
 
@@ -10701,10 +10742,6 @@ msgid "Presence"
 msgstr "�а�тройки"
 
 #, fuzzy
-msgid "Appear Offline"
-msgstr "Изключен"
-
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Изключен"
 
@@ -11254,27 +11291,26 @@ msgid " (%s)"
 msgstr "%s и�ка да ви изпрати %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "��ма �ъобщение за ден�, �вързано � тази връзка."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Прекъ�ване на връзката"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Връзката е прекъ�ната"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Това име вече �е използва от н�кой друг"
 
@@ -11419,6 +11455,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Потребител�т %s (%s) и�ка да добави %s в �пи�ъка � при�телите �и."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11702,6 +11742,8 @@ msgstr "П�евдоним на контакт"
 msgid "Edit User Mood"
 msgstr "Режими на потребител�"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Познати"
@@ -12518,9 +12560,6 @@ msgstr "поддръжка"
 msgid "webmaster"
 msgstr "Разработчик и уебма�тър"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "порт за win32"
 
@@ -12548,6 +12587,9 @@ msgstr "оригинален автор"
 msgid "lead developer"
 msgstr "Главен разработчик"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13987,6 +14029,10 @@ msgid "_TURN server:"
 msgstr "ST_UN �ървър:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Порт:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Потребител�ко _име:"
 
@@ -14009,6 +14055,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Прием_ане на �тандартните на�тройки"
@@ -14028,6 +14079,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ръчно"
 
@@ -14605,7 +14664,7 @@ msgstr "(без име)"
 msgid "Small"
 msgstr "Е-поща"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15699,6 +15758,10 @@ msgstr "У�трой�тво"
 msgid "Voice/Video Settings"
 msgstr "Използване на на�тройките от �редата"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Използване на на�тройките от �редата"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15833,7 +15896,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15965,6 +16028,23 @@ msgid "You do not have permission to uninstall this application."
 msgstr "��мате права да деин�талирате тази програма."
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Използване на �тари� SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "�овото форматиране е неправилно."
+
+#, fuzzy
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "Вие пропу�нахте %hu �ъобщение от %s, тъй като то беше невалидно."
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Тър�ене на потребител по неговите данни"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "�овото форматиране е неправилно."
 
@@ -16374,10 +16454,6 @@ msgstr "Ð�Ñ�мате права да деинÑ�талирате тази проÐ
 #~ msgstr "Връзката е прекъ�ната"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Връзката е прекъ�ната"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Грешка при четенето от socket."
 
@@ -16574,7 +16650,7 @@ msgstr "Ð�Ñ�мате права да деинÑ�талирате тази проÐ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s не може да бъде отворен за запи�!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "�еу�пешен прено� на файла. Получател�т веро�тно е отказал получаването."
 
@@ -16596,9 +16672,6 @@ msgstr "Ð�Ñ�мате права да деинÑ�талирате тази проÐ
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "Модул за протокола TOC"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "��ма налични данни за %s"
-
 #~ msgid "%s Options"
 #~ msgstr "%s на�тройки"
 
diff --git a/po/bn.po b/po/bn.po
index 54a5102468..114aea68cc 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 02:34-0400\n"
-"PO-Revision-Date: 2010-07-25 13:37+0600\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-08-17 13:37+0600\n"
 "Last-Translator: israt <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "Language: bn\n"
@@ -259,7 +259,6 @@ msgstr "স�বয়ংক�রিয়-যোগদান"
 msgid "Add Chat"
 msgstr "আড�ডা যোগ"
 
-# tihi
 msgid "You can edit more information from the context menu later."
 msgstr "আপনি পরবর�তীতে প�রাসঙ�গিক-মেন� থেকে আরও তথ�য সম�পাদনা করতে পারেন।"
 
@@ -278,7 +277,6 @@ msgstr "দলের নাম দিন"
 msgid "Edit Chat"
 msgstr "আড�ডা সম�পাদনা"
 
-# tihi
 msgid "Please Update the necessary fields."
 msgstr "অন�গ�রহ করে প�রয়োজনীয় ক�ষেত�রগ�লো হালনাগাদ কর�ন।"
 
@@ -303,7 +301,6 @@ msgstr "বন�ধ� পাউন�স যোগ"
 msgid "Send File"
 msgstr "ফাইল প�রেরণ"
 
-# Samia: Complete
 msgid "Blocked"
 msgstr "ব�লক করা"
 
@@ -320,16 +317,12 @@ msgstr "প�নরায় নামকরণ"
 msgid "Set Alias"
 msgstr "ডাকনাম নির�ধারণ"
 
-# tithi
-# রিসেট �র জায়গায় প�নঃনির�ধারণ
 msgid "Enter empty string to reset the name."
 msgstr "নামটি প�নঃনির�ধারণ করতে ফা�কা স�ট�রিং দিন।"
 
-# ***
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "�ই পরিচিতি অপসারণ করার ফলে পরিচিতির সব বন�ধ�রাও অপসারিত হবে"
 
-# tihi
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "�ই দলটি অপসারণ করলে দলের সব বন�ধ�রাও অপসারিত হবে"
 
@@ -351,11 +344,9 @@ msgstr "বন�ধ� তালিকা"
 msgid "Place tagged"
 msgstr "স�থান ট�যাগ করা হয়েছে"
 
-# ***
 msgid "Toggle Tag"
 msgstr "ট�যাগ টগল কর�ন"
 
-# ***
 msgid "View Log"
 msgstr "লগ প�রদর�শন"
 
@@ -468,7 +459,7 @@ msgid "Alphabetically"
 msgstr "বর�ণান�ক�রমিকভাবে"
 
 msgid "By Log Size"
-msgstr "কার�যবিবরনীর আকার অন�যায়ী"
+msgstr "কার�যবিবরণীর আকার অন�যায়ী"
 
 msgid "Buddy"
 msgstr "বন�ধ�"
@@ -482,15 +473,12 @@ msgstr "দলবদ�ধকরণ"
 msgid "Certificate Import"
 msgstr "সার�টিফিকেট ইমপোর�ট"
 
-# তিথি
 msgid "Specify a hostname"
 msgstr "হোস�টের নাম উল�লেখ কর�ন"
 
-# tithi
 msgid "Type the host name this certificate is for."
 msgstr "�ই সার�টিফিকেটের হোস�ট নাম টাইপ কর�ন।"
 
-# mark2
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -499,19 +487,15 @@ msgstr ""
 "%s ফাইল ইমপোর�ট করা সম�ভব হয়নি।\n"
 "নিশ�চিত কর�ন যে ফাইলটি পঠনযোগ�য �বং PEM বিন�যাসের।\n"
 
-# tithi
 msgid "Certificate Import Error"
 msgstr "সার�টিফিকেট ইমপোর�ট করায় ত�র�টি"
 
-# tithi
 msgid "X.509 certificate import failed"
 msgstr "X.509 সার�টিফিকেট ইমপোর�ট করতে ব�যর�থ"
 
 msgid "Select a PEM certificate"
 msgstr "�কটি PEM সার�টিফিকেট নির�বাচন কর�ন"
 
-# tithi
-# ***
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -520,15 +504,12 @@ msgstr ""
 "%s ফাইলে �ক�সপোর�ট করতে ব�যর�থ।\n"
 "পরীক�ষা কর�ন আপনার টার�গেট পাথে লেখার অন�মতি আছে কি না\n"
 
-# tithi
 msgid "Certificate Export Error"
 msgstr "সার�টিফিকেট �ক�সপোর�ট করায় ত�র�টি"
 
-# tithi
 msgid "X.509 certificate export failed"
 msgstr "X.509 সার�টিফিকেট �ক�সপোর�ট করতে ব�যর�থ"
 
-# tithi
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 সার�টিফিকেট �ক�সপোর�ট"
 
@@ -536,7 +517,6 @@ msgstr "PEM X.509 সার�টিফিকেট �ক�সপোর�ট"
 msgid "Certificate for %s"
 msgstr "%s-�র সার�টিফিকেট"
 
-# tithi
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -549,24 +529,19 @@ msgstr ""
 "SHA1 ফিঙ�গারপ�রিন�ট:\n"
 "%s"
 
-# tithi
 msgid "SSL Host Certificate"
 msgstr "SSL হোস�ট সার�টিফিকেট"
 
-# tithi
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "%s �র জন�য সার�টিফিকেট কি সত�যিই ম�ছে ফেলতে চান?"
 
-# tithi
 msgid "Confirm certificate delete"
 msgstr "সার�টিফিকেট ম�ছে ফেলা নিশ�চিত কর�ন"
 
-# tithi
 msgid "Certificate Manager"
 msgstr "সার�টিফিকেট ব�যবস�থাপক"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "হোস�ট-নাম"
 
@@ -579,7 +554,7 @@ msgstr "বন�ধ"
 
 #, c-format
 msgid "%s (%s)"
-msgstr "%1$s (%2$s)"
+msgstr "%s (%s)"
 
 #, c-format
 msgid "%s disconnected."
@@ -600,14 +575,12 @@ msgstr ""
 msgid "Re-enable Account"
 msgstr "অ�যাকাউন�ট প�নরায় সক�রিয়করণ"
 
-# ***
 msgid "No such command."
 msgstr "�মন কোনো কমান�ড নেই।"
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "সিনট�যাক�স ত�র�টি:  আপনি � কমান�ডে ভ�ল সংখ�যক আর�গ�মেন�ট টাইপ করেছেন।"
 
-# ***
 msgid "Your command failed for an unknown reason."
 msgstr "�কটি অজানা কারণে আপনার কমান�ড ব�যর�থ হয়েছে।"
 
@@ -625,11 +598,11 @@ msgstr "বারà§�তা পাঠানো যায়নি, কারণ à
 
 #, c-format
 msgid "%s (%s -- %s)"
-msgstr "%1$s (%2$s -- %3$s)"
+msgstr "%s (%s -- %s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr "%1$s [%2$s]"
+msgstr "%s [%s]"
 
 #, c-format
 msgid ""
@@ -642,7 +615,6 @@ msgstr ""
 msgid "You have left this chat."
 msgstr "আপনি �ই  আড�ডা ত�যাগ করেছেন।"
 
-# tithi
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
@@ -657,9 +629,8 @@ msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "কথোপকথন সংরক�ষণ বন�ধ করা হয়েছে। ভবিষ�যতে বার�তা লগ করা হবে না।"
 
-# ***
 msgid "Send To"
-msgstr "�খানে প�রেরণ"
+msgstr "যেখানে প�রেরণ করা হবে"
 
 msgid "Conversation"
 msgstr "কথোপকথন"
@@ -676,14 +647,12 @@ msgstr "বন�ধ� পাউন�স যোগ..."
 msgid "Invite..."
 msgstr "আমন�ত�রণ..."
 
-# mark3
 msgid "Enable Logging"
 msgstr "লগ সক�রিয়করণ"
 
 msgid "Enable Sounds"
 msgstr "শব�দ সক�রিয়করণ"
 
-# Translated by sadia
 msgid "You are not connected."
 msgstr "আপনি সংয�ক�ত নন।"
 
@@ -693,14 +662,12 @@ msgstr "<AUTO-REPLY>"
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "%d ব�যবহারকারীর তালিকা:...\n"
-msgstr[1] "%d ব�যবহারকারীগণের তালিকা:\n"
+msgstr[0] "%d ব�যবহারকারীর তালিকা:\n"
+msgstr[1] "%d ব�যবহারকারীর তালিকা:\n"
 
-# Translated by sadia
 msgid "Supported debug options are: plugins version"
 msgstr "সমর�থিত ডিবাগ অপশন: প�লাগইন সংস�করণ "
 
-# ***
 msgid "No such command (in this context)."
 msgstr "�মন কোনো কমান�ড নেই (�ই প�রসঙ�গে)।"
 
@@ -747,25 +714,25 @@ msgstr "help &lt;command&gt;: �কটি নির�দিষ�ট কমা
 
 # tithi
 msgid "users:  Show the list of users in the chat."
-msgstr "users: আড�ডায় ব�যবহারকারীদের তালিকা দেখানো হবে।"
+msgstr "ব�যবহারকারী: আড�ডায় ব�যবহারকারীদের তালিকা দেখানো হবে।"
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: প�লাগইনের উইন�ডো দেখান।"
+msgstr "প�লাগিন: প�লাগইনের উইন�ডো দেখান।"
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: বন�ধ�-তালিকা দেখান।"
+msgstr "বন�ধ�-তালিকা: বন�ধ�-তালিকা দেখান।"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: অ�যাকাউন�টের উইন�ডো দেখান।"
+msgstr "অ�যাকাউন�ট: অ�যাকাউন�টের উইন�ডো দেখান।"
 
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: ডিবাগ উইন�ডো দেখান।"
+msgstr "ডিবাগ উইন�ডো: ডিবাগ উইন�ডো দেখান।"
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: পছন�দসমূহের উইন�ডো দেখান।"
+msgstr "পছন�দসমূহ: পছন�দসমূহের উইন�ডো দেখান।"
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: savedstatuses উইন�ডোটি দেখান।"
+msgstr "অবস�থা: সংরক�ষিত অবস�থা উইন�ডোটি দেখান।"
 
 # fix me tithi
 msgid ""
@@ -843,7 +810,8 @@ msgstr "স�থগিত"
 msgid "Waiting for transfer to begin"
 msgstr "স�থানান�তর শ�র� করার জন�য অপেক�ষা করা হচ�ছে"
 
-msgid "Canceled"
+#, fuzzy
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 # mark6
@@ -1159,7 +1127,7 @@ msgid "Recurring"
 msgstr "প�নরাবৃত�ত"
 
 msgid "Cannot create pounce"
-msgstr "পাউন�স তৈরী করা সম�ভব হয়নি"
+msgstr "পাউন�স তৈরি করা সম�ভব হয়নি"
 
 msgid "You do not have any accounts."
 msgstr "আপনার কোনো অ�যাকাউন�ট নেই।"
@@ -1782,9 +1750,13 @@ msgstr ""
 "সার�টিফিকেটটি �খনও কার�যকর নয়। আপনার কম�পিউটারের সময় �বং তারিখ ঠিক আছে কিনা "
 "পরীক�ষা কর�ন।"
 
-# Translated by sadia
-msgid "The certificate has expired and should not be considered valid."
-msgstr "সার�টিফিকেটটি মেয়াদউত�তীর�ণ �বং বৈধ হিসেবে বিবেচনা করা উচিত নয়। "
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"সার�টিফিকেটটি �খনও কার�যকর নয়। আপনার কম�পিউটারের সময় �বং তারিখ ঠিক আছে কিনা "
+"পরীক�ষা কর�ন।"
 
 # Translated by sadia
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2000,7 +1972,7 @@ msgstr "কোনো নাম নেই"
 
 # ***
 msgid "Unable to create new resolver process\n"
-msgstr "নত�ন রিসলভার প�রসেস তৈরী করতে ব�যর�থ\n"
+msgstr "নত�ন রিসলভার প�রসেস তৈরি করতে ব�যর�থ\n"
 
 msgid "Unable to send request to resolver process\n"
 msgstr "রিসলভার প�রসেসে অন�রোধ পাঠাতে ব�যর�থ\n"
@@ -2508,7 +2480,7 @@ msgstr ""
 "(শ�ধ�মাত�র যখন প�রেরকের সঙ�গে কোনো কথোপকথন হয়নি)"
 
 msgid "Create a new directory for each user"
-msgstr "প�রত�যেক ব�যবহারকারীর জন�য �কটি নত�ন ডিরেক�টরি তৈরী করা হবে"
+msgstr "প�রত�যেক ব�যবহারকারীর জন�য �কটি নত�ন ডিরেক�টরি তৈরি করা হবে"
 
 msgid "Notes"
 msgstr "নোট"
@@ -5002,12 +4974,20 @@ msgid "Domain"
 msgstr "ডোমেইন"
 
 # tithi
-msgid "Require SSL/TLS"
-msgstr "SSL/TSL প�রয়োজন"
+#, fuzzy
+msgid "Require encryption"
+msgstr "অন�মোদন প�রয়োজন"
 
-# tithi
-msgid "Force old (port 5223) SSL"
-msgstr "প�রাতন (পোর�ট 5223) SSL প�রয়োগ বাধ�য করা হবে"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ব�যবহারকারীর তথ�য পাওয়া যাচ�ছে না: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "সংযোগ সময়কাল উত�তীর�ণ"
 
 # tithi
 msgid "Allow plaintext auth over unencrypted streams"
@@ -5089,7 +5069,7 @@ msgid "Error in chat %s"
 msgstr "%s আড�ডায় ত�র�টি"
 
 msgid "Create New Room"
-msgstr "নত�ন আসর তৈরী"
+msgstr "নত�ন আসর তৈরি"
 
 # tithi
 msgid ""
@@ -6094,7 +6074,7 @@ msgid "Homepage"
 msgstr "প�রধান পাতা"
 
 msgid "The user has not created a public profile."
-msgstr "ব�যবহারকারী কোনো পাবলিক প�রোফাইল তৈরী করেনি।"
+msgstr "ব�যবহারকারী কোনো পাবলিক প�রোফাইল তৈরি করেনি।"
 
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
@@ -6374,8 +6354,8 @@ msgstr "আপনি যে দà§�টি PIN পà§�রবেশ করিয়েà
 #
 #
 # Translated by sadia
-msgid "The name you entered is invalid."
-msgstr "আপনি যে নাম প�রবেশ করিয়েছেন তা অকার�যকর।"
+msgid "The Display Name you entered is invalid."
+msgstr "আপনি যে নাম প�রবেশ করেছেন তা অকার�যকর।"
 
 # Translated by sadia
 msgid ""
@@ -6492,13 +6472,6 @@ msgstr "সংয�ক�ত করা হচ�ছে..."
 # tithi
 #
 #
-# Translated by sadia
-msgid "The Display Name you entered is invalid."
-msgstr "আপনি যে নাম প�রবেশ করেছেন তা অকার�যকর।"
-
-# tithi
-#
-#
 #
 #
 # Translated by sadia
@@ -6748,7 +6721,7 @@ msgstr "ফাইল স�থানান�তরে ত�র�টি "
 
 # Translated by sadia
 msgid "Cannot create MultiMx room"
-msgstr "MultiMx ঘর তৈরী করা যাচ�ছে না"
+msgstr "MultiMx ঘর তৈরি করা যাচ�ছে না"
 
 # Translated by sadia
 msgid "MultiMx Invitation Error"
@@ -7354,7 +7327,7 @@ msgid ""
 "list (%s)."
 msgstr ""
 "আপনার বন�ধ� তালিকায় %s কে যোগ করতে ব�যর�থ। সার�ভার প�রান�তের তালিকায় (%s) ফোল�ডার "
-"তৈরীর সময় ত�র�টি দেখা দিয়েছে।"
+"তৈরির সময় ত�র�টি দেখা দিয়েছে।"
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -7480,6 +7453,18 @@ msgstr "সার�ভারের ঠিকানা"
 msgid "Server port"
 msgstr "সার�ভারের পোর�ট"
 
+# tithi
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"অন�গ�রহ করে আমাকে অন�মোদন দিন যেন আমি আপনাকে আমার বন�ধ� তালিকায় য�ক�ত করতে পারি।"
+
+msgid "No reason given."
+msgstr "কোনো কারণ দর�শানো হয়নি।"
+
+# tithi
+msgid "Authorization Denied Message:"
+msgstr "অন�মোদন প�রত�যাখ�যান:"
+
 # Translated by sadia
 #, c-format
 msgid "Received unexpected response from %s: %s"
@@ -7521,6 +7506,26 @@ msgstr "AOL à¦�খানে আপনার সà§�কà§�রিন নামেà¦
 msgid "Error requesting %s"
 msgstr "%s অন�রোধে ত�র�টি"
 
+# tithi
+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 অ�যাকাউন�টের উচ�চপর�যায়ের অপশনে তা উল�লেখ করতে পারেন।)"
+
+# tithi
+#, 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 �র ক�লায়েন�টটি ত�র�টিপূর�ণ।)"
+
 msgid "Could not join chat room"
 msgstr "আড�ডার আসরে য�ক�ত হওয়া সম�ভব হয়নি"
 
@@ -7781,106 +7786,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ফাইল %1$s হলো %2$s, যা সর�বোচ�চ আকার %3$s থেকে বেশী।"
 
 # tithi
-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 অ�যাকাউন�টের উচ�চপর�যায়ের অপশনে তা উল�লেখ করতে পারেন।)"
-
-# tithi
-#, 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
-msgid "Buddy Icon"
-msgstr "বন�ধ� আইকন"
-
-# tithi
-msgid "Voice"
-msgstr "কন�ঠ"
-
-# tithi
-msgid "AIM Direct IM"
-msgstr "AIM সরাসরি IM"
-
-msgid "Get File"
-msgstr "ফাইল সংগ�রহ"
-
-msgid "Games"
-msgstr "খেলা"
-
-# snigdha
-#
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "��যাড-ইন"
-
-msgid "Send Buddy List"
-msgstr "বন�ধ� তালিকা প�রেরণ করা হবে"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ সরাসরি সংযোগ"
-
-msgid "AP User"
-msgstr "AP ব�যবহারকারী"
-
-# tithi
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "নাস�তিবাদী"
-
-# tithi
-msgid "ICQ Server Relay"
-msgstr "ICQ সার�ভার রিলে"
-
-# tithi
-msgid "Old ICQ UTF8"
-msgstr "প�রাতন ICQ UTF8"
-
-# tithi
-msgid "Trillian Encryption"
-msgstr "Trillian �নক�রিপশন"
-
-# tithi
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "হিপটপ"
-
-msgid "Security Enabled"
-msgstr "নিরাপত�তা সক�রিয়"
-
-msgid "Video Chat"
-msgstr "ভিডিও আড�ডা"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-# tithi
-msgid "Live Video"
-msgstr "সরাসরি ভিডিও"
-
-msgid "Camera"
-msgstr "ক�যামেরা"
-
-msgid "Screen Sharing"
-msgstr "স�ক�রীন শেয়ারকরণ"
-
-# tithi
 msgid "Free For Chat"
 msgstr "মোটেই ব�যস�ত নয়, আড�ডা দেয়া যায়"
 
@@ -7918,16 +7823,6 @@ msgstr "কাজে"
 msgid "At lunch"
 msgstr "দ�প�রে খাওয়ার জন�য বাইরে"
 
-msgid "IP Address"
-msgstr "IP ঠিকানা"
-
-# tithi
-msgid "Warning Level"
-msgstr "সতর�কতা স�তর"
-
-msgid "Buddy Comment"
-msgstr "বন�ধ�র মন�তব�য"
-
 # fix me tithi
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -8050,18 +7945,6 @@ msgid "Unable to initialize connection"
 msgstr "সংযোগ আরম�ভ করতে ব�যর�থ"
 
 # tithi
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"অন�গ�রহ করে আমাকে অন�মোদন দিন যেন আমি আপনাকে আমার বন�ধ� তালিকায় য�ক�ত করতে পারি।"
-
-msgid "No reason given."
-msgstr "কোনো কারণ দর�শানো হয়নি।"
-
-# tithi
-msgid "Authorization Denied Message:"
-msgstr "অন�মোদন প�রত�যাখ�যান:"
-
-# tithi
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8182,69 +8065,14 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "আপনি অজ�ঞাত কারণে %2$s থেকে %1$huটি বার�তা হারিয়েছেন।"
 msgstr[1] "আপনি অজ�ঞাত কারণে %2$s থেকে %1$huটি বার�তা হারিয়েছেন।"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ব�যবহারকারীর তথ�য পাওয়া যাচ�ছে না: %s"
-
-msgid "Online Since"
-msgstr "যখন থেকে অনলাইনে"
-
-# tithi
-msgid "Member Since"
-msgstr "যখন থেকে সদস�য"
-
-# tithi
-msgid "Capabilities"
-msgstr "ক�ষমতা"
-
 # tithi
 msgid "Your AIM connection may be lost."
 msgstr "আপনার AIM সংযোগ হয়তো বিচ�ছিন�ন হয়েছে।"
 
-# tithi
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[�ই ব�যবহারকারী থেকে �কটি বার�তা প�রদর�শন করতে ব�যর�থ কারণ �টি অকার�যকর বর�ণচিহ�ন "
-"ধারণ করেছিল।]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "আপনাকে %s আড�ডার আসর থেকে বিচ�ছিন�ন করা হয়েছে।"
 
-# tithi
-msgid "Mobile Phone"
-msgstr "মোবাইল ফোন"
-
-# tithi
-msgid "Personal Web Page"
-msgstr "ব�যক�তিগত ওয়েব পেইজ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "অতিরিক�ত তথ�য"
-
-# tithi
-msgid "Zip Code"
-msgstr "জিপ কোড"
-
-msgid "Work Information"
-msgstr "কাজের তথ�য"
-
-# tithi
-msgid "Division"
-msgstr "বিভাগ"
-
-msgid "Position"
-msgstr "অবস�থান"
-
-# tithi
-msgid "Web Page"
-msgstr "ওয়েব পেইজ"
-
 msgid "Pop-Up Message"
 msgstr "পপ-আপ বার�তা"
 
@@ -8556,9 +8384,8 @@ msgstr "বà§�যবহারকারীর নামের শà§�ধà§�মাà
 msgid "Change Address To:"
 msgstr "ঠিকানা পরিবর�তন কর�ন:"
 
-# tithi
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>আপনি অন�মোদনের জন�য অপেক�ষা করছেন না</i>"
+msgid "you are not waiting for authorization"
+msgstr "আপনি অন�মোদনের জন�য অপেক�ষা করছেন না"
 
 # tithi
 msgid "You are awaiting authorization from the following buddies"
@@ -8603,6 +8430,14 @@ msgstr "IM ফরওয়ার�ডিং কনফিগারেশন (ওয
 msgid "Set Privacy Options..."
 msgstr "গোপনীয়তার অপশন নির�ধারণ ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "বন�ধ� তালিকা প�রদর�শন (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "আমন�ত�রন তালিকা"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "অ�যাকাউন�ট নিশ�চিতকরণ"
@@ -8623,10 +8458,6 @@ msgstr "অনà§�মোদন অপেকà§�ষমান বনà§�ধà§�দেà
 msgid "Search for Buddy by Email Address..."
 msgstr "ইমেইল ঠিকানার মাধ�যমে বন�ধ� অন�সন�ধান..."
 
-# tithi
-msgid "Search for Buddy by Information"
-msgstr "তথ�য মাধ�যমে বন�ধ� অন�সন�ধান "
-
 msgid "Use clientLogin"
 msgstr "clientLogin ব�যবহার"
 
@@ -8756,6 +8587,188 @@ msgstr "কিউ পরিপূর�ণ"
 msgid "Not while on AOL"
 msgstr "AOL � থাকা অবস�থায় নয়"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "বন�ধ� আইকন"
+
+# tithi
+msgid "Voice"
+msgstr "কন�ঠ"
+
+# tithi
+msgid "AIM Direct IM"
+msgstr "AIM সরাসরি IM"
+
+msgid "Get File"
+msgstr "ফাইল সংগ�রহ"
+
+msgid "Games"
+msgstr "খেলা"
+
+# snigdha
+#
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "��যাড-ইন"
+
+msgid "Send Buddy List"
+msgstr "বন�ধ� তালিকা প�রেরণ করা হবে"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ সরাসরি সংযোগ"
+
+msgid "AP User"
+msgstr "AP ব�যবহারকারী"
+
+# tithi
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "নাস�তিবাদী"
+
+# tithi
+msgid "ICQ Server Relay"
+msgstr "ICQ সার�ভার রিলে"
+
+# tithi
+msgid "Old ICQ UTF8"
+msgstr "প�রাতন ICQ UTF8"
+
+# tithi
+msgid "Trillian Encryption"
+msgstr "Trillian �নক�রিপশন"
+
+# tithi
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "হিপটপ"
+
+msgid "Security Enabled"
+msgstr "নিরাপত�তা সক�রিয়"
+
+msgid "Video Chat"
+msgstr "ভিডিও আড�ডা"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+# tithi
+msgid "Live Video"
+msgstr "সরাসরি ভিডিও"
+
+msgid "Camera"
+msgstr "ক�যামেরা"
+
+msgid "Screen Sharing"
+msgstr "স�ক�রীন শেয়ারকরণ"
+
+msgid "IP Address"
+msgstr "IP ঠিকানা"
+
+# tithi
+msgid "Warning Level"
+msgstr "সতর�কতা স�তর"
+
+msgid "Buddy Comment"
+msgstr "বন�ধ�র মন�তব�য"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "ব�যবহারকারীর তথ�য পাওয়া যাচ�ছে না: %s"
+
+# tithi
+msgid "Mobile Phone"
+msgstr "মোবাইল ফোন"
+
+# tithi
+msgid "Personal Web Page"
+msgstr "ব�যক�তিগত ওয়েব পেইজ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "অতিরিক�ত তথ�য"
+
+# tithi
+msgid "Zip Code"
+msgstr "জিপ কোড"
+
+msgid "Work Information"
+msgstr "কাজের তথ�য"
+
+# tithi
+msgid "Division"
+msgstr "বিভাগ"
+
+msgid "Position"
+msgstr "অবস�থান"
+
+# tithi
+msgid "Web Page"
+msgstr "ওয়েব পেইজ"
+
+msgid "Online Since"
+msgstr "যখন থেকে অনলাইনে"
+
+# tithi
+msgid "Member Since"
+msgstr "যখন থেকে সদস�য"
+
+# tithi
+msgid "Capabilities"
+msgstr "ক�ষমতা"
+
+# tithi
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "অনলাইনে দেখান"
+
+# tithi
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "অনলাইনে দেখান"
+
+msgid "Appear Offline"
+msgstr "অফলাইনে দেখান"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "অফলাইনে দেখান"
+
+# Kick =  তিরস�কার
+# OR  পদাঘাত
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "MultiMX হতে আপনাকে তিরস�কার করা হয়েছে।"
+
+# tithi
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"আপনি বন�ধ� তলিকায় ডান ক�লিক করে �বং‌ \"অন�মোদনের জন�য প�নরায় অন�রোধ\" নির�বাচন করে "
+"তাদের থেকে আবার অন�মোদন চাইতে পারেন।"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "দৃশ�যমান"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "আমন�ত�রন তালিকা"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 # tithi
 msgid "Aquarius"
 msgstr "ক�ম�ভ রাশি"
@@ -8954,8 +8967,8 @@ msgid "Your request was rejected."
 msgstr "আপনার অন�রোধটি অন�মোদন করা যায়নি।"
 
 # tithi
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u �র সত�যতা যাচাই করা প�রয়োজন"
 
 msgid "Add buddy question"
@@ -9129,7 +9142,7 @@ msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"নোট, আপনি যদি �টি তৈরী করে থাকেন, \n"
+"নোট, আপনি যদি �টি তৈরি করে থাকেন, \n"
 "�ই অপারেশনটি অবশেষে �ই Qunটি অপসারণ করবে।"
 
 # tithi
@@ -10355,7 +10368,7 @@ msgid "Connection timed out"
 msgstr "সংযোগের সময় উত�তীর�ন"
 
 msgid "Creating connection failed"
-msgstr "সংযোগ তৈরীতে ব�যর�থ"
+msgstr "সংযোগ তৈরিতে ব�যর�থ"
 
 msgid "File transfer session does not exist"
 msgstr "ফাইল স�থানান�তর সেশন বিদ�যমান নয়"
@@ -10631,7 +10644,7 @@ msgstr "কী বিনিময় ব�যর�থ হয়েছে"
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"বিচ�ছিন�ন সেশনটি প�নরায় শ�র� করতে ব�যর�থ। অন�গ�রহ করে নত�ন সংযোগ তৈরী করতে 'প�নঃসংযোগ' "
+"বিচ�ছিন�ন সেশনটি প�নরায় শ�র� করতে ব�যর�থ। অন�গ�রহ করে নত�ন সংযোগ তৈরি করতে 'প�নঃসংযোগ' "
 "চাপ�ন।"
 
 # tithi
@@ -10738,7 +10751,7 @@ msgid "Passphrases do not match"
 msgstr "পাসফ�রেজ মিলছে না"
 
 msgid "Key Pair Generation failed"
-msgstr "কী য�গল তৈরী করতে ব�যর�থ"
+msgstr "কী য�গল তৈরি করতে ব�যর�থ"
 
 msgid "Key length"
 msgstr "কী-�র দৈর�ঘ�য"
@@ -10813,7 +10826,7 @@ msgstr ""
 "join &lt;channel&gt; [&lt;password&gt;]:  �ই নেটওয়ার�কের �কটি আড�ডায় যোগ দিন"
 
 msgid "list:  List channels on this network"
-msgstr "list:  �ই নেটওয়ার�কের চ�যানেলের তালিকা তৈরী করে"
+msgstr "তালিকা:  �ই নেটওয়ার�কের চ�যানেলের তালিকা তৈরি করে"
 
 # fix -me tithi
 msgid "whois &lt;nick&gt;:  View nick's information"
@@ -10989,7 +11002,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC কী য�গল তৈরি করা হচ�ছে..."
 
 msgid "Unable to create SILC key pair"
-msgstr "SILC কী য�গল তৈরী করা সম�ভব হয়নি"
+msgstr "SILC কী য�গল তৈরি করা সম�ভব হয়নি"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -11156,13 +11169,13 @@ msgid "Unable to load SILC key pair: %s"
 msgstr "SILC কী য�গল লোড করা সম�ভব হয়নি: %s"
 
 msgid "Unable to create connection"
-msgstr "সংযোগ তৈরী করতে ব�যর�থ"
+msgstr "সংযোগ তৈরি করতে ব�যর�থ"
 
 msgid "Unknown server response"
 msgstr "অজানা সার�ভার উত�তর"
 
 msgid "Unable to create listen socket"
-msgstr "লিসেন সকেট তৈরী করতে ব�যর�থ"
+msgstr "লিসেন সকেট তৈরি করতে ব�যর�থ"
 
 # tihi
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -11451,19 +11464,12 @@ msgid "Not on server list"
 msgstr "সার�ভার তালিকায় নেই"
 
 # tithi
-msgid "Appear Online"
-msgstr "অনলাইনে দেখান"
-
-# tithi
 msgid "Appear Permanently Offline"
 msgstr "স�থায়ীভাবে অফলাইনে দেখান"
 
 msgid "Presence"
 msgstr "উপস�থিতি"
 
-msgid "Appear Offline"
-msgstr "অফলাইনে দেখান"
-
 # tithi
 msgid "Don't Appear Permanently Offline"
 msgstr "স�থায়ীভাবে অফলাইনে দেখানো হবে না"
@@ -11801,7 +11807,7 @@ msgstr "আলোকসম�পাত"
 
 #, c-format
 msgid "Unable to create socket: %s"
-msgstr "সকেট তৈরী করতে ব�যর�থ: %s"
+msgstr "সকেট তৈরি করতে ব�যর�থ: %s"
 
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
@@ -11875,7 +11881,7 @@ msgid "%s has invited %s to the chat room %s\n"
 msgstr "%1$s %2$s কে %3$s আড�ডার আসরে আমন�ত�রন জানিয়েছে\n"
 
 msgid "Accept chat invitation?"
-msgstr "আড�ডার আমন�ত�রন গ�রহণ করবেন?"
+msgstr "আড�ডার আমন�ত�রন কি গ�রহণ করবেন?"
 
 #. Shortcut
 msgid "Shortcut"
@@ -11958,7 +11964,7 @@ msgid "%x %X"
 msgstr "%x %X"
 
 msgid "Calculating..."
-msgstr "গননা করা হচ�ছে..."
+msgstr "গণনা করা হচ�ছে..."
 
 msgid "Unknown."
 msgstr "অজানা।"
@@ -11999,7 +12005,6 @@ msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
 msgstr[1] "%d মিনিট"
 
-# tithi
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s খ�লতে ব�যর�থ: অনেকবার রিডিরেক�ট করা হয়েছে"
@@ -12019,7 +12024,7 @@ msgid ""
 "server may be trying something malicious."
 msgstr ""
 "%s �র বিষয়বস�ত� ধারণ করার মতো মেমরি বরাদ�দ করতে ব�যর�থ। ওয়েব সার�ভারটি সম�ভবত "
-"বিদ�বেষপরায়ণ কিছ� করার চেষ�টা করছে।"
+"অন�মোদনহীন কিছ� করার চেষ�টা করছে।"
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -12044,28 +12049,23 @@ msgstr " (%s)"
 
 # tithi
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr "আপনার কম�পিউটারের অন�যান�য সফটওয়�যার দ�বারা সংযোগ বাধাগ�রস�থ হয়েছে। "
+msgstr "আপনার কম�পিউটারের অন�যান�য সফটওয়�যার দ�বারা সংযোগ পেতে বাধাগ�রস�থ হয়েছে।"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "দূরবর�তী হোস�ট সংযোগ বন�ধ করেছে।"
 
 # fix me tithi
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "সংযোগের সময়উত�তীর�ণ হয়ে গেছে।"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "সংযোগ প�রত�যাখাত হয়েছে"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "ঠিকানাটি ইতিমধ�যে ব�যবহৃত হচ�ছে।"
 
@@ -12082,7 +12082,6 @@ msgstr ""
 "আপনার %1$s পড়ার সময় �কটি ত�র�টির দেখা দেয়েছে। ফাইলটি লোড করা হয়নি, �বং প�রনো "
 "ফাইলটি %2$s~ � নামান�তর করা হয়েছে।"
 
-# Translated by sadia
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
@@ -12100,13 +12099,13 @@ msgid "Login Options"
 msgstr "লগইনের অপশন"
 
 msgid "Pro_tocol:"
-msgstr "প�রটোকল (_t):"
+msgstr "প�রোটোকল (_t):"
 
 msgid "_Username:"
 msgstr "ব�যবহারকারীর নাম (_U):"
 
 msgid "Remember pass_word"
-msgstr "পাসওয়ার�ড স�মরণ রাখা হবে (_w)"
+msgstr "পাসওয়ার�ড মনে রাখা হবে (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
@@ -12118,7 +12117,6 @@ msgstr "স�থানীয় ডাকনাম (_L):"
 msgid "New _mail notifications"
 msgstr "নত�ন মেইলের ঘোষনা (_m)"
 
-# tithi
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
 msgstr "�ই অ�যাকাউন�টের জন�য �ই বন�ধ� আইকন ব�যবহার করা হবে (_i):"
@@ -12220,6 +12218,10 @@ msgstr ""
 "আপনি প�নরায় �ই উইন�ডোতে ফিরে আসতে পারেন �বং \"অ�যাকাউন�ট\" মেন�র \"অ�যাকাউন�ট "
 "নিয়ন�ত�রন\" উইন�ডো থেকে নত�ন অ�যাকাউন�ট যোগ, সম�পাদনা বা অপসারণ করতে পারেন।"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s তার বন�ধ� তালিকায় (%s) কে যোগ করতে চায় %s%s �ই বন�ধ� তালিকায়"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "পটভূমির রং"
@@ -12467,24 +12469,23 @@ msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "আপনি বর�তমানে �মন কোনো অ�যাকাউন�টে য�ক�ত নন যা �ই বন�ধ�কে যোগ করতে পারে।"
 
-# fix me tithi
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
 msgid "Unknown node type"
 msgstr "অজানা নোডের ধরন"
 
-# snigdha
 msgid "Please select your mood from the list"
 msgstr "অন�গ�রহ করে তালিকা থেকে আপনার ম�ড নির�বাচন কর�ন"
 
-# snigdha
 msgid "Message (optional)"
 msgstr "বার�তা (�চ�ছিক)"
 
 msgid "Edit User Mood"
 msgstr "ব�যবহাকারীর ম�ড সম�পাদনা"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/বন�ধ�গণ (_B)"
@@ -12645,10 +12646,10 @@ msgstr "দার�ণ"
 
 # fix- me tithi
 msgid "Rockin'"
-msgstr "Rockin'"
+msgstr "রকিং"
 
 msgid "Total Buddies"
-msgstr "মোট বন�ধ�"
+msgstr "আমার যত বন�ধ�"
 
 # fix me tithi
 #, c-format
@@ -12681,7 +12682,6 @@ msgstr "/বন�ধ�গণ/আড�ডা যোগ..."
 msgid "/Buddies/Add Group..."
 msgstr "/বন�ধ�গণ/দল যোগ..."
 
-# Snigdha গোপনতার �র জায়গায় গোপনীয়তা হবে
 msgid "/Tools/Privacy"
 msgstr "/ট�ল/গোপনীয়তা"
 
@@ -12720,7 +12720,6 @@ msgstr "প�নঃসক�রিয় করা হবে"
 msgid "SSL FAQs"
 msgstr "SSL FAQ"
 
-# tithi
 msgid "Welcome back!"
 msgstr "প�নরায় স�বাগতম!"
 
@@ -12784,7 +12783,6 @@ msgstr "বন�ধ� যোগ কর�ন।\n"
 msgid "Buddy's _username:"
 msgstr "বন�ধ�র নাম (_u):"
 
-# and this
 msgid "(Optional) A_lias:"
 msgstr "ডাকনাম (�চ�ছিক) (_l):"
 
@@ -12812,16 +12810,9 @@ msgstr "ডাকনাম (_l):"
 msgid "_Group:"
 msgstr "দল (_G):"
 
-# tithi
-#
-#
-#
-#
-# Translated by sadia
 msgid "Auto_join when account connects."
 msgstr "অ�যাকাউন�ট সংয�ক�ত হলে স�বয়ংক�রিয়ভাবে যোগ দেয়া হবে। (_j)"
 
-# tithi
 msgid "_Remain in chat after window is closed."
 msgstr "উইন�ডো বন�ধ হবার পরেও আড�ডায় থাক�ন (_R)।"
 
@@ -12840,7 +12831,6 @@ msgstr "<PurpleMain>/অ�যাকাউন�ট/"
 msgid "_Edit Account"
 msgstr "অ�যাকাউন�ট সম�পাদনা (_E)"
 
-# snigdhaসেট �র জায়গায় নির�ধারণ
 msgid "Set _Mood..."
 msgstr "ম�ড নির�ধারণ...(_M)"
 
@@ -12856,7 +12846,6 @@ msgstr "/ট�ল"
 msgid "/Buddies/Sort Buddies"
 msgstr "/বন�ধ�/বন�ধ�দের সাজান"
 
-# tithi
 msgid "Type the host name for this certificate."
 msgstr "�ই সার�টিফিকেটের হোস�ট নাম টাইপ কর�ন।"
 
@@ -12923,7 +12912,6 @@ msgstr "সà§�বনিরà§�বাচিত আইকন নিরà§�ধারà
 msgid "Change Size"
 msgstr "আকার পরিবর�তন করা হবে"
 
-# tithi
 msgid "Show All"
 msgstr "সব প�রদর�শন করা হবে"
 
@@ -12934,7 +12922,6 @@ msgstr "/কথোপকথন (_C)"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/কথোপকথন/নত�ন বার�তা... (_M)"
 
-# Translated by sadia
 msgid "/Conversation/Join a _Chat..."
 msgstr "/কথোপকথন/আড�ডায় যোগ দিন... (_C)"
 
@@ -12947,7 +12934,6 @@ msgstr "/কথোপকথন/লগ প�রদর�শন (_L)"
 msgid "/Conversation/_Save As..."
 msgstr "/কথোপকথন/নত�ন নামে সংরক�ষণ... (_S)"
 
-# fix me tithi
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/কথোপকথন/স�ক�রলব�যাক অপসারণ (_r)"
 
@@ -13259,10 +13245,6 @@ msgstr "সমর�থন"
 msgid "webmaster"
 msgstr "ওয়েবমাস�টার"
 
-# tithi
-msgid "Senior Contributor/QA"
-msgstr "সিনিয়র অংশগ�রহণকারী/QA"
-
 msgid "win32 port"
 msgstr "win32 পোর�ট"
 
@@ -13290,6 +13272,10 @@ msgid "lead developer"
 msgstr "প�রধান ডেভেলপার"
 
 # tithi
+msgid "Senior Contributor/QA"
+msgstr "সিনিয়র অংশগ�রহণকারী/QA"
+
+# tithi
 msgid "Afrikaans"
 msgstr "আফ�রিকান"
 
@@ -14245,9 +14231,10 @@ msgid ""
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
-"উল�লিখিত অ�যাকাউন�ট সক�রিয় করা হবে (�চ�ছিক আর�গ�মেন�টের নাম\\n                      "
-"ব�যবহার করার জন�য অ�যাকাউন�ট উল�লেখ করা হবে, কমা দ�বারা পৃথককৃত।"
-"\\n                      �টা ছাড়া শ�ধ�মাত�র প�রথম অ�যাকাউন�টটি সক�রিয় করা হবে)। "
+"উল�লিখিত অ�যাকাউন�ট সক�রিয় করা হবে (�চ�ছিক আর�গ�মেন�টের নাম\n"
+"                      ব�যবহার করার জন�য অ�যাকাউন�ট উল�লেখ করা হবে, কমা দ�বারা "
+"পৃথককৃত।\n"
+"                      �টা ছাড়া শ�ধ�মাত�র প�রথম অ�যাকাউন�টটি সক�রিয় করা হবে)। "
 
 # Translated by sadia
 msgid "X display to use"
@@ -14288,13 +14275,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "প�রস�থান করছে কারণ আরেকটি libpurple ক�লায়েন�ট ইতিমধ�যে চলছে।\n"
 
-#, fuzzy
 msgid "_Media"
-msgstr "/মিডিয়া (_M)"
+msgstr "মিডিয়া (_M)"
 
-#, fuzzy
 msgid "_Hangup"
-msgstr "কল শেষ কর�ন"
+msgstr "হ�যাংআপ (_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14748,6 +14733,10 @@ msgstr "রিলে সার�ভার (TURN)"
 msgid "_TURN server:"
 msgstr "TURN সার�ভার: (_T)"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "পোর�ট (_P):"
+
 # Translated by sadia
 msgid "Use_rname:"
 msgstr "ব�যবহারকারীর নাম: (_r)"
@@ -14772,6 +14761,11 @@ msgstr "মজিলা"
 msgid "Konqueror"
 msgstr "কনকোয়েরার"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "পূর�বনির�ধারিত ডেস�কটপ "
 
@@ -14790,6 +14784,14 @@ msgstr "ফায়ারবার�ড"
 msgid "Epiphany"
 msgstr "ইপিফ�যানি"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "সহায়িকা"
 
@@ -15363,7 +15365,8 @@ msgstr "কোনোটি নয়"
 msgid "Small"
 msgstr "ছোট"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ডিফল�ট স�মাইলিগ�লোর ছোট সংস�করণ"
 
 # tithi
@@ -16450,6 +16453,11 @@ msgid "Voice/Video Settings"
 msgstr "ভয়েস/ভিডিও সেটিংসমূহ  "
 
 # Translated by sadia
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ভয়েস/ভিডিও সেটিংসমূহ  "
+
+# Translated by sadia
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16587,7 +16595,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "�ই প�লাগইনটি XMPP সার�ভার বা ক�লায়েন�ট ডিবাগ করার জন�য কার�যকর।"
 
 # snigdha
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16628,12 +16636,10 @@ msgstr "ডেক�সটপে পিজিনের জন�য �কটি
 msgid "Debug Symbols (for reporting crashes)"
 msgstr "চিহ�নগ�লোকে ডিবাগ করা হবে (ক�র�যাশের রিপোর�ট করার জন�য)"
 
-# snigdha
 #. Installer Subsection Text
 msgid "Desktop"
 msgstr "ডেস�কটপ"
 
-# snigdha
 #. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
@@ -16644,7 +16650,6 @@ msgstr ""
 "আবশ�যকীয়; যদি বার বার চেষ�টাও ব�যর�থ হয় তবে আপনি http://pidgin.im/download/"
 "windows/ হতে 'অফলাইন ইনস�টলার' ব�যবহার  কর�ন।"
 
-# snigdha
 #. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
@@ -16653,7 +16658,6 @@ msgstr ""
 "ডিবাগ চিহ�ন($R2) ইন�সটল করার সময় ত�র�টি ঘটেছে।$\\rযদি বার বার চেষ�টাও ব�যর�থ হয় "
 "তবে, আপনি http://pidgin.im/download/windows/ হতে 'অফলাইন ইনস�টলার' ব�যবহার কর�ন।"
 
-# snigdha
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
@@ -16666,7 +16670,6 @@ msgstr ""
 "%20Pidgin#manual_win32_spellcheck_installation তে স�বনির�ধারিত ইনস�টলেশনের "
 "নির�দেশনা দেয়া আছে।"
 
-# snigdha
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
 msgstr "GTK+ রানটাইম (যদি অন�পস�থিত থাকে তবে আবশ�যকীয়)"
@@ -16680,7 +16683,6 @@ msgstr "লোকালাইজেশন"
 msgid "Next >"
 msgstr "পরবর�তী >"
 
-# snigdha
 #. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "পিজিন তাৎক�ষণিক বার�তা ক�লায়েন�ট (আবশ�যকীয়)"
@@ -16754,6 +16756,37 @@ msgstr "পিজিনের ওয়েব পেজ দেখ�ন"
 msgid "You do not have permission to uninstall this application."
 msgstr "আপনার �ই অ�যাপ�লিকেশনটি আনইন�সটল করার অন�মতি নেই।"
 
+# Translated by sadia
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "সার�টিফিকেটটি মেয়াদউত�তীর�ণ �বং বৈধ হিসেবে বিবেচনা করা উচিত নয়। "
+
+# tithi
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TSL প�রয়োজন"
+
+# tithi
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "প�রাতন (পোর�ট 5223) SSL প�রয়োগ বাধ�য করা হবে"
+
+# tithi
+#
+#
+# Translated by sadia
+#~ msgid "The name you entered is invalid."
+#~ msgstr "আপনি যে নাম প�রবেশ করিয়েছেন তা অকার�যকর।"
+
+# tithi
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[�ই ব�যবহারকারী থেকে �কটি বার�তা প�রদর�শন করতে ব�যর�থ কারণ �টি অকার�যকর বর�ণচিহ�ন "
+#~ "ধারণ করেছিল।]"
+
+# tithi
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "তথ�য মাধ�যমে বন�ধ� অন�সন�ধান "
+
 #~ msgid "/Media/_Hangup"
 #~ msgstr "/মিডিয়া/কল শেষ কর�ন (_H)"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 6357aa423c..d3d8a842fd 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2010-02-18 11:24+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
@@ -527,7 +527,6 @@ msgstr "সার�টিফিকেট ম�ছে ফেলার অন�
 msgid "Certificate Manager"
 msgstr "সার�টিফিকেট ম�যানেজার"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "হোস�ট-নেম"
 
@@ -795,7 +794,7 @@ msgstr "বন�ধ"
 msgid "Waiting for transfer to begin"
 msgstr "পরিবহণ আরম�ভে অপেক�ষা চলছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 msgid "Failed"
@@ -1681,7 +1680,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "সার�টিফিকেটের মেয়াদ পূর�ণ হয়েছে ও বর�তমানে বৈধ নয়।"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4713,11 +4715,20 @@ msgstr "XMPP প�রোটোকল প�লাগ-ইন"
 msgid "Domain"
 msgstr "ডোমেইন"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS প�রয়োজন"
+#, fuzzy
+msgid "Require encryption"
+msgstr "অন�মোদন আবশ�যক"
 
-msgid "Force old (port 5223) SSL"
-msgstr "বাধ�যতামূলকভাবে প�রোনো (পোর�ট ৫২২৩) SSL ব�যবহার করা হবে"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ব�যবহারকারীর তথ�য উপলব�ধ নয়: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "সংযোগের সময়সীমা"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�নক�রিপ�ট না করা স�ট�রিমের মাধ�যমে প�লেইন-টেক�সট অন�মোদনের অন�মতি প�রদান করা হবে"
@@ -5966,7 +5977,8 @@ msgstr "উলà§�লিখিত PIN বৈধ নয়। à¦�ই কà§�ষেতà
 msgid "The two PINs you entered do not match."
 msgstr "উল�লিখিত PIN দ�টির মধ�যে গরমিল।"
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "উল�লিখিত নাম বৈধ নয়।"
 
 msgid ""
@@ -6061,10 +6073,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "সংযোগ করা হচ�ছে..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "উল�লিখিত নাম বৈধ নয়।"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "উল�লিখিত PIN-র দৈর�ঘ�য বৈধ নয় [7-10]।"
 
@@ -6915,6 +6923,15 @@ msgstr "সার�ভারের ঠিকানা"
 msgid "Server port"
 msgstr "সার�ভারের পোর�ট"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "আমার বন�ধ� তালিকায় যোগ করার জন�য অন�গ�রহ করে আমাকে অন�মোদন কর�ন।"
+
+msgid "No reason given."
+msgstr "কোনো কারণ উল�লেখ করা হয়নি।"
+
+msgid "Authorization Denied Message:"
+msgstr "অন�মোদন প�রত�যাখ�যানের বার�তা:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s থেকে অপ�রত�যাশিত প�রত�য�ত�তোর প�রাপ�ত হয়েছে: %s"
@@ -6953,6 +6970,24 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "%s-র অন�রোধ জানাতে ত�র�টি: %s"
 
+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 অ�যাকাউন�টের উন�নত বিকল�পের মধ�যে তা নির�ধারণ কর�ন।)"
+
+#, 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 দ�বারা ব�যবহৃত ক�লায়েন�ট প�রোগ�রামটির মধ�যে কিছ� সমস�যা রয়েছে।)"
+
 msgid "Could not join chat room"
 msgstr "চ�যাট র�মে সংযোগ করা যায়নি"
 
@@ -7183,94 +7218,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s ফাইলটির মাপ হল %s। �টি সর�বাধিক অন�মোদিত মাপ %s-র থেকে বেশি।"
 
-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 অ�যাকাউন�টের উন�নত বিকল�পের মধ�যে তা নির�ধারণ কর�ন।)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "বন�ধ�র প�রতীক"
-
-msgid "Voice"
-msgstr "ধ�বনি"
-
-msgid "AIM Direct IM"
-msgstr "AIM-র সরাসরি IM"
-
-msgid "Get File"
-msgstr "ফাইল প�রাপ�ত কর�ন"
-
-msgid "Games"
-msgstr "খেলা"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "অতিরিক�ত-সামগ�রী"
-
-msgid "Send Buddy List"
-msgstr "বন�ধ�র তালিকা পাঠিয়ে দিন"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ সরাসরি সংযোগ"
-
-msgid "AP User"
-msgstr "AP ব�যবহারকারী"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ সার�ভার রিলে"
-
-msgid "Old ICQ UTF8"
-msgstr "প�রোনো ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian �নক�রিপশন"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "নিরাপত�তা ব�যবস�থা সক�রিয় রয়েছে"
-
-msgid "Video Chat"
-msgstr "ভিডিওর মাধ�যমে আলাপন"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "সরাসরি ভিডিও প�রচার"
-
-msgid "Camera"
-msgstr "ক�যামেরা"
-
-msgid "Screen Sharing"
-msgstr "পর�দার যৌথ ব�যবহার"
-
 msgid "Free For Chat"
 msgstr "আলাপনের জন�য উপলব�ধ রয়েছেন"
 
@@ -7306,15 +7253,6 @@ msgstr "নেটওয়ার�ক"
 msgid "At lunch"
 msgstr "মধ�যাহ�নভোজের জন�য গেছি"
 
-msgid "IP Address"
-msgstr "IP ঠিকানা"
-
-msgid "Warning Level"
-msgstr "সতর�কতার মাত�রা"
-
-msgid "Buddy Comment"
-msgstr "বন�ধ�র মন�তব�য"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "অন�মোদনের সার�ভারের সাথে সংযোগ স�থাপন করা সম�ভব নয়: %s"
@@ -7413,15 +7351,6 @@ msgstr "পাসওয়ার�ড পাঠানো হয়েছে"
 msgid "Unable to initialize connection"
 msgstr "সংযোগ আরম�ভ করতে ব�যর�থ"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "আমার বন�ধ� তালিকায় যোগ করার জন�য অন�গ�রহ করে আমাকে অন�মোদন কর�ন।"
-
-msgid "No reason given."
-msgstr "কোনো কারণ উল�লেখ করা হয়নি।"
-
-msgid "Authorization Denied Message:"
-msgstr "অন�মোদন প�রত�যাখ�যানের বার�তা:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7550,60 +7479,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%hu-টি বার�তা %s থেকে প�রাপ�ত হয়েছে, কিন�ত� অজানা কারণের ফলে সেটি গৃহীত হয়নি।"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ব�যবহারকারীর তথ�য উপলব�ধ নয়: %s"
-
-msgid "Online Since"
-msgstr "অনলাইন অবস�থার অবকাল"
-
-msgid "Member Since"
-msgstr "সদস�যতার অবকাল"
-
-msgid "Capabilities"
-msgstr "ক�ষমতা"
-
 msgid "Your AIM connection may be lost."
 msgstr "সম�ভবত AIM সংযোগ বন�ধ হয়ে গিয়েছে।"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[বার�তার মধ�যে অবৈধ অক�ষর অন�তর�ভ�ক�ত থাকার ফলে �ই ব�যবহারকারী থেকে প�রাপ�ত বার�তা "
-"প�রদর�শন করা সম�ভব হয়নি।]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s চ�যাট-র�ম থেকে আপনাকে বিচ�ছিন�ন করা হয়েছে।"
 
-msgid "Mobile Phone"
-msgstr "মোবাইল ফোন"
-
-msgid "Personal Web Page"
-msgstr "ব�যক�তিগত ওয়েব-পেজ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "অতিরিক�ত তথ�য"
-
-msgid "Zip Code"
-msgstr "পিন/জিপ কোড"
-
-msgid "Work Information"
-msgstr "কর�ম সংক�রান�ত তথ�য"
-
-msgid "Division"
-msgstr "বিভাগ"
-
-msgid "Position"
-msgstr "অবস�থান"
-
-msgid "Web Page"
-msgstr "ওয়েব পেজ"
-
 msgid "Pop-Up Message"
 msgstr "পপ-আপ বার�তা"
 
@@ -7881,7 +7763,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "পরিবর�তিত ঠিকানা:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>আপনি অন�মোদনের অপেক�ষা করছেন না</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7920,6 +7803,14 @@ msgstr "IM ফরওয়ারà§�ডিং কনফিগার করà§�ন (à¦
 msgid "Set Privacy Options..."
 msgstr "গোপনীয়তা সম�পর�কিত বিকল�প নির�ধারণ কর�ন..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "বন�ধ�দের তালিকা প�রদর�শন করা হবে (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "আমন�ত�রিতদের তালিকা"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "অ�যাকাউন�ট নিশ�চিত কর�ন"
@@ -7936,9 +7827,6 @@ msgstr "অনà§�মোদনের অপেকà§�ষারত বনà§�ধà§�à
 msgid "Search for Buddy by Email Address..."
 msgstr "ই-মেইল ঠিকানা সহযোগে বন�ধ� অন�সন�ধান কর�ন..."
 
-msgid "Search for Buddy by Information"
-msgstr "তথ�য দ�বারা বন�ধ� অন�সন�ধান কর�ন"
-
 msgid "Use clientLogin"
 msgstr "clientLogin ব�যবহার করা হবে"
 
@@ -8047,6 +7935,165 @@ msgstr "সারি পূর�ণ হয়ে গিয়েছে"
 msgid "Not while on AOL"
 msgstr "AOL-� উপস�থিত থাকাকালীন নয়"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "বন�ধ�র প�রতীক"
+
+msgid "Voice"
+msgstr "ধ�বনি"
+
+msgid "AIM Direct IM"
+msgstr "AIM-র সরাসরি IM"
+
+msgid "Get File"
+msgstr "ফাইল প�রাপ�ত কর�ন"
+
+msgid "Games"
+msgstr "খেলা"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "অতিরিক�ত-সামগ�রী"
+
+msgid "Send Buddy List"
+msgstr "বন�ধ�র তালিকা পাঠিয়ে দিন"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ সরাসরি সংযোগ"
+
+msgid "AP User"
+msgstr "AP ব�যবহারকারী"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ সার�ভার রিলে"
+
+msgid "Old ICQ UTF8"
+msgstr "প�রোনো ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian �নক�রিপশন"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "নিরাপত�তা ব�যবস�থা সক�রিয় রয়েছে"
+
+msgid "Video Chat"
+msgstr "ভিডিওর মাধ�যমে আলাপন"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "সরাসরি ভিডিও প�রচার"
+
+msgid "Camera"
+msgstr "ক�যামেরা"
+
+msgid "Screen Sharing"
+msgstr "পর�দার যৌথ ব�যবহার"
+
+msgid "IP Address"
+msgstr "IP ঠিকানা"
+
+msgid "Warning Level"
+msgstr "সতর�কতার মাত�রা"
+
+msgid "Buddy Comment"
+msgstr "বন�ধ�র মন�তব�য"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ব�যবহারকারীর তথ�য উপলব�ধ নয়: %s"
+
+msgid "Mobile Phone"
+msgstr "মোবাইল ফোন"
+
+msgid "Personal Web Page"
+msgstr "ব�যক�তিগত ওয়েব-পেজ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "অতিরিক�ত তথ�য"
+
+msgid "Zip Code"
+msgstr "পিন/জিপ কোড"
+
+msgid "Work Information"
+msgstr "কর�ম সংক�রান�ত তথ�য"
+
+msgid "Division"
+msgstr "বিভাগ"
+
+msgid "Position"
+msgstr "অবস�থান"
+
+msgid "Web Page"
+msgstr "ওয়েব পেজ"
+
+msgid "Online Since"
+msgstr "অনলাইন অবস�থার অবকাল"
+
+msgid "Member Since"
+msgstr "সদস�যতার অবকাল"
+
+msgid "Capabilities"
+msgstr "ক�ষমতা"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "অন-লাইন উপস�থিতি প�রকাশ কর�ন"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "অন-লাইন উপস�থিতি প�রকাশ কর�ন"
+
+msgid "Appear Offline"
+msgstr "অফ-লাইন অবস�থায় চল�ন"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "অফ-লাইন অবস�থায় চল�ন"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "আপনাকে বিতাড়ণ করা হয়েছে: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"সংশ�লিষ�ট বন�ধ�দেরকে অন�মোদনের অন�রোধ প�নরায় জানানোর জন�য তাদের নামের উপর মাউসের ডান-"
+"দিকের বাটন ক�লিক কর�ন ও \"অন�মোদনের জন�য প�নরায় অন�রোধ কর�ন\" নির�বাচন কর�ন।"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "দৃশ�যমান"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "আমন�ত�রিতদের তালিকা"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "ক�ম�ভ"
 
@@ -8225,8 +8272,8 @@ msgstr "আপনার অনà§�রোধ গà§�রহণ করা হয়েà¦
 msgid "Your request was rejected."
 msgstr "আপনার অন�রোধ প�রত�যাখ�যান করা হয়েছে।"
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u-র ক�ষেত�রে তথ�য যাচাই করা আবশ�যক"
 
 msgid "Add buddy question"
@@ -10445,18 +10492,12 @@ msgstr "বাইরে বেরিয়েছি"
 msgid "Not on server list"
 msgstr "সার�ভারের তালিকা অন�পস�থিত"
 
-msgid "Appear Online"
-msgstr "অন-লাইন উপস�থিতি প�রকাশ কর�ন"
-
 msgid "Appear Permanently Offline"
 msgstr "স�থায়ীরূপে অফ-লাইন অবস�থা নির�ধারণ কর�ন"
 
 msgid "Presence"
 msgstr "উপস�থিতি"
 
-msgid "Appear Offline"
-msgstr "অফ-লাইন অবস�থায় চল�ন"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "স�থায়ীরূপে অফ-লাইন অবস�থা ধার�য করা হবে না"
 
@@ -11001,27 +11042,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "কম�পিউটারের অন�য কোনো সফ�টওয়�যার দ�বারা সংযোগে ব�যাঘাত সৃষ�টি করা হয়েছে।"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "দূরবর�তী হোস�ট দ�বারা সংযোগ বন�ধ করা হয়েছে।"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "সংযোগের সময়সীমা উত�তীর�ণ হয়েছে।"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "সংযোগ প�রত�যাখ�যান করা হয়েছে।"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "ঠিকানা বর�তমানে ব�যবহৃত হচ�ছে।"
 
@@ -11170,6 +11206,10 @@ msgstr ""
 "'বন�ধ�দের তালিকা' শীর�ষক উইন�ডো থেকে <b>অ�যাকাউন�ট->অ�যাকাউন�ট পরিচালনা</b> নির�বাচন "
 "করে �ই উইন�ডোতে প�রত�যাবর�তন করে অ�যাকাউন�ট যোগ, সম�পাদনা অথবা অপসারণ করা যাবে।"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s, %s-কে নিজের বন�ধ� রূপে গ�রহণ করতে ইচ�ছ�ক%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "পটভূমির রং"
@@ -11426,6 +11466,8 @@ msgstr "উপনাম (�চ�ছিক)"
 msgid "Edit User Mood"
 msgstr "ব�যবহারকারীর মেজাজ সম�পাদনা কর�ন"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/বন�ধ� (_B)"
@@ -12180,9 +12222,6 @@ msgstr "সমর�থন"
 msgid "webmaster"
 msgstr "ওয়েব-মাস�টার"
 
-msgid "Senior Contributor/QA"
-msgstr "প�রবীণ অংশগ�রহণকারী/পরীক�ষক"
-
 msgid "win32 port"
 msgstr "win32 পোর�ট"
 
@@ -12208,6 +12247,9 @@ msgstr "মূল লেখক"
 msgid "lead developer"
 msgstr "প�রধান ডিভেলপার"
 
+msgid "Senior Contributor/QA"
+msgstr "প�রবীণ অংশগ�রহণকারী/পরীক�ষক"
+
 msgid "Afrikaans"
 msgstr "আফ�রিকান�স"
 
@@ -13557,6 +13599,10 @@ msgstr "রিলে সার�ভার (TURN)"
 msgid "_TURN server:"
 msgstr "TURN সার�ভার: (_T)"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "পোর�ট: (_P)"
+
 msgid "Use_rname:"
 msgstr "ব�যবহারকারীর নাম: (_r)"
 
@@ -13578,6 +13624,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ডেস�কটপের ডিফল�ট মান"
 
@@ -13596,6 +13647,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ব�যবহারকারী দ�বারা"
 
@@ -14135,7 +14194,8 @@ msgstr "শূণ�য"
 msgid "Small"
 msgstr "ক�ষ�দ�র"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ডিফল�ট হাসিম�খের ক�ষ�দ�র সংস�করণ"
 
 msgid "Response Probability:"
@@ -15166,6 +15226,10 @@ msgstr "ডিভাইস (_e)"
 msgid "Voice/Video Settings"
 msgstr "Voice/Video Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Voice/Video Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15294,7 +15358,7 @@ msgstr "Raw XMPP অন�চ�ছেদ প�রেরণ ও প�রাপ
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "XMPP সার�ভার বা ক�লায়েন�ট-�র ত�র�টি খো�জার জন�য �ই প�লাগ-ইন ব�যবহার করা যায়"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15424,6 +15488,25 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS প�রয়োজন"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "বাধ�যতামূলকভাবে প�রোনো (পোর�ট ৫২২৩) SSL ব�যবহার করা হবে"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "উল�লিখিত নাম বৈধ নয়।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[বার�তার মধ�যে অবৈধ অক�ষর অন�তর�ভ�ক�ত থাকার ফলে �ই ব�যবহারকারী থেকে প�রাপ�ত বার�তা "
+#~ "প�রদর�শন করা সম�ভব হয়নি।]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "তথ�য দ�বারা বন�ধ� অন�সন�ধান কর�ন"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "সার�টিফিকেট বর�তমানে বৈধ নয়।"
 
diff --git a/po/bs.po b/po/bs.po
index 7fd6951908..7c31ad9f97 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2005-10-27 16:55-0400\n"
 "Last-Translator: Lejla Hadialic <lejlah@gmail.com>\n"
 "Language-Team: bs <LL@li.org>\n"
@@ -549,7 +549,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Host otišao"
@@ -822,7 +821,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Cekanje na pocetak transfera"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkazano"
 
 msgid "Failed"
@@ -1781,7 +1780,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4920,12 +4921,20 @@ msgstr "MSN protokol plugin"
 msgid "Domain"
 msgstr "Rumunski"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Zahtjev za autorizaciju"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Koristi TLS, ako je dostupan"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Natjeraj stari SSL"
+msgid "Connection security"
+msgstr "Konekcija zatvorena"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dozvoli autentikaciju cistog teksta preko nekriptovanih tokova"
@@ -6258,7 +6267,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Nove lozinke se ne slažu."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Ukucani SecurID je pogrešan."
 
 msgid ""
@@ -6366,10 +6375,6 @@ msgid "Connecting..."
 msgstr "Spajanje"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Ukucani SecurID je pogrešan."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Ukucani SecurID je pogrešan."
 
@@ -7282,6 +7287,15 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Autorizujte me, tako da Vas ja mogu dodati na moju listu prijatelja."
+
+msgid "No reason given."
+msgstr "Nema razloga"
+
+msgid "Authorization Denied Message:"
+msgstr "Poruka o odbijanju autorizacije:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Pogrešan odgovor od servera."
@@ -7315,6 +7329,21 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Greška pri kreiranju konekcije"
 
+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 ""
+
+#, 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 ""
+"(Pojavila se greška prilikom primanja ove poruke. Prijatelj sa kojim pricate "
+"vjerovatno ima klijenta sa bug-om.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Nemoguce spajanje"
@@ -7556,92 +7585,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(Pojavila se greška prilikom primanja ove poruke. Prijatelj sa kojim pricate "
-"vjerovatno ima klijenta sa bug-om.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikonica prijatelja"
-
-msgid "Voice"
-msgstr "Glas"
-
-msgid "AIM Direct IM"
-msgstr "AIM direktna IM"
-
-msgid "Get File"
-msgstr "Uzmi datoteku"
-
-msgid "Games"
-msgstr "Igre"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Dodaci"
-
-msgid "Send Buddy List"
-msgstr "Pošalji listu prijatelja"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktna veza"
-
-msgid "AP User"
-msgstr "AP korisnik"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ server relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Stari ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian enkripcija"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sigurnost omogucena"
-
-msgid "Video Chat"
-msgstr "Video chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video uživo"
-
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Korisnicko ime"
-
 msgid "Free For Chat"
 msgstr "Slobodan/a za chat"
 
@@ -7677,15 +7620,6 @@ msgstr "Mreža"
 msgid "At lunch"
 msgstr "Na rucku"
 
-msgid "IP Address"
-msgstr "IP adresa"
-
-msgid "Warning Level"
-msgstr "Upozoravajuci nivo"
-
-msgid "Buddy Comment"
-msgstr "Komentar prijatelja"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Nije bilo moguce se spojiti za transfer."
@@ -7790,15 +7724,6 @@ msgstr "Lozinka poslana"
 msgid "Unable to initialize connection"
 msgstr "Nije moguce kreirati novu konekciju."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autorizujte me, tako da Vas ja mogu dodati na moju listu prijatelja."
-
-msgid "No reason given."
-msgstr "Nema razloga"
-
-msgid "Authorization Denied Message:"
-msgstr "Poruka o odbijanju autorizacije:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7910,60 +7835,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Propustili ste %hu poruku od %s iz nepoznatog razloga."
 msgstr[1] "Propustili ste %hu poruke od %s iz nepoznatog razloga."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Korisnicke informacije nisu dostupne: %s"
-
-msgid "Online Since"
-msgstr "Prijavljen vec"
-
-msgid "Member Since"
-msgstr "Clan vec od"
-
-msgid "Capabilities"
-msgstr "Mogucnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaša AIM konekcija može biti izgubljena."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nije moguce prikazati poruku ovog korisnika, jer nije sadržavala korektne "
-"karaktere.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Niste više spojeni sa chat sobom %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-msgid "Personal Web Page"
-msgstr "Vaša web stranica"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatne informacije"
-
-msgid "Zip Code"
-msgstr "Poštanski broj"
-
-msgid "Work Information"
-msgstr "Informacije o poslu"
-
-msgid "Division"
-msgstr "Odjeljenje"
-
-msgid "Position"
-msgstr "Pozicija"
-
-msgid "Web Page"
-msgstr "Web stranica"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up poruka"
 
@@ -8254,7 +8132,8 @@ msgstr "Mijenjanje imena podrazumjeva samo velicinu slova i whitespace."
 msgid "Change Address To:"
 msgstr "Promjena adrese na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne cekate na autorizaciju<i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8298,6 +8177,14 @@ msgstr "Konfiguriši IM prosljedivanje (URL)"
 msgid "Set Privacy Options..."
 msgstr "Postavi privatnost za:"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lista prijatelja"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista pozivnica"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdi account"
@@ -8317,9 +8204,6 @@ msgstr "Prikaži ocekujuce autorizacije prijatelja"
 msgid "Search for Buddy by Email Address..."
 msgstr "Traži prijatelja preko emaila..."
 
-msgid "Search for Buddy by Information"
-msgstr "Traži prijatelja preko informacija"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Korisnik nije tu"
@@ -8427,6 +8311,167 @@ msgstr "Popunjen red cekanja"
 msgid "Not while on AOL"
 msgstr "Ne dok na AOL-u"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikonica prijatelja"
+
+msgid "Voice"
+msgstr "Glas"
+
+msgid "AIM Direct IM"
+msgstr "AIM direktna IM"
+
+msgid "Get File"
+msgstr "Uzmi datoteku"
+
+msgid "Games"
+msgstr "Igre"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Dodaci"
+
+msgid "Send Buddy List"
+msgstr "Pošalji listu prijatelja"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktna veza"
+
+msgid "AP User"
+msgstr "AP korisnik"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ server relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Stari ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian enkripcija"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sigurnost omogucena"
+
+msgid "Video Chat"
+msgstr "Video chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video uživo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Korisnicko ime"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "Upozoravajuci nivo"
+
+msgid "Buddy Comment"
+msgstr "Komentar prijatelja"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Korisnicke informacije nisu dostupne: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+msgid "Personal Web Page"
+msgstr "Vaša web stranica"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatne informacije"
+
+msgid "Zip Code"
+msgstr "Poštanski broj"
+
+msgid "Work Information"
+msgstr "Informacije o poslu"
+
+msgid "Division"
+msgstr "Odjeljenje"
+
+msgid "Position"
+msgstr "Pozicija"
+
+msgid "Web Page"
+msgstr "Web stranica"
+
+msgid "Online Since"
+msgstr "Prijavljen vec"
+
+msgid "Member Since"
+msgstr "Clan vec od"
+
+msgid "Capabilities"
+msgstr "Mogucnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Izgledaj offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Izgledaj offline"
+
+msgid "Appear Offline"
+msgstr "Izgledaj offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Izgledaj offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Možete tražiti zahtjev za ponovnom autorizacijom od prijatelja, tako što "
+"cete na njih desno-kliknuti i izabrati \"Ponovni zahtjev autorizacije.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Nevidljiv"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista pozivnica"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8646,7 +8691,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Zahtjev za autorizaciju"
 
 #, fuzzy
@@ -10999,10 +11044,6 @@ msgid "Not on server list"
 msgstr "Nije na server listi"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Izgledaj offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj offline"
 
@@ -11010,9 +11051,6 @@ msgstr "Izgledaj offline"
 msgid "Presence"
 msgstr "Postavke"
 
-msgid "Appear Offline"
-msgstr "Izgledaj offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj offline"
@@ -11589,27 +11627,26 @@ msgid " (%s)"
 msgstr "%s na %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "%s je zatvorio prozor za konverzaciju."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Konekcijski timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Konekcija zatvorena"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Ta datoteka vec postoji"
 
@@ -11761,6 +11798,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -12052,6 +12093,8 @@ msgstr "Alias kontakt"
 msgid "Edit User Mood"
 msgstr "Korisnicki modusi"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Prijatelji"
@@ -12889,9 +12932,6 @@ msgstr "podrška"
 msgid "webmaster"
 msgstr "razvijatelj &webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12919,6 +12959,9 @@ msgstr "originalni autor"
 msgid "lead developer"
 msgstr "Glavni razvijatelj"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14378,6 +14421,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Korisnik:"
 
@@ -14400,6 +14447,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Prihvati standardne postavke"
@@ -14420,6 +14472,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manuelno"
 
@@ -15005,7 +15065,7 @@ msgstr "Bilo ko"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16118,6 +16178,10 @@ msgstr "Uredaj"
 msgid "Voice/Video Settings"
 msgstr "Koristi Environmental postavke"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Koristi Environmental postavke"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16252,7 +16316,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16384,6 +16448,24 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Natjeraj stari SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Ukucani SecurID je pogrešan."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Nije moguce prikazati poruku ovog korisnika, jer nije sadržavala "
+#~ "korektne karaktere.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Traži prijatelja preko informacija"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Ukucani SecurID je pogrešan."
 
@@ -16819,10 +16901,6 @@ msgstr ""
 #~ msgstr "Konekcija zatvorena"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Konekcija zatvorena"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Greška pri citanju socketa."
 
@@ -17049,7 +17127,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nije bilo moguce otvoriti %s za pisanje!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala."
 
 #~ msgid "Could not connect for transfer."
@@ -18401,9 +18479,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber protokol plugin"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Koristi TLS, ako je dostupan"
-
 #~ msgid "Hidden"
 #~ msgstr "Sakriven"
 
diff --git a/po/ca.po b/po/ca.po
index beeb4c3295..30da5c8d88 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-01 08:49+0200\n"
-"PO-Revision-Date: 2010-08-01 08:46+0200\n"
+"POT-Creation-Date: 2010-11-20 09:55+0100\n"
+"PO-Revision-Date: 2010-11-20 10:19+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "Language: ca\n"
@@ -557,7 +557,6 @@ msgstr "Confirmació de la supressió"
 msgid "Certificate Manager"
 msgstr "Gestor de certificats"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ordinador"
 
@@ -834,7 +833,7 @@ msgstr "Atura"
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 msgid "Failed"
@@ -1728,8 +1727,12 @@ msgstr ""
 "El certificat encara no és vàlid. Comproveu que la data i l'hora de "
 "l'ordinador siguin correctes."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"El certificat ha vençut i s'ha de considerar invàlid. Comproveu que la data "
+"i l'hora de l'ordinador siguin correctes."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4774,11 +4777,17 @@ msgstr "Connector per al protocol XMPP"
 msgid "Domain"
 msgstr "Domini"
 
-msgid "Require SSL/TLS"
-msgstr "Requereix SSL/TLS"
+msgid "Require encryption"
+msgstr "Requereix xifratge"
+
+msgid "Use encryption if available"
+msgstr "Empra xifratge si està disponible"
+
+msgid "Use old-style SSL"
+msgstr "Empra SSL antic"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Força l'antic port SSL (5223)"
+msgid "Connection security"
+msgstr "Seguretat de la connexió"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxos sense xifrar"
@@ -4885,15 +4894,6 @@ msgstr "Us han fet fora (%s)"
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "S'ha produït un error en el flux de transferència de dades en banda\n"
-
-msgid "Transfer was closed."
-msgstr "La transferència s'ha tancat."
-
-msgid "Failed to open in-band bytestream"
-msgstr "No s'ha pogut obrir el fluxe de transferència de dades en banda"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5213,25 +5213,6 @@ msgstr "Error en afegir un amic"
 msgid "The username specified does not exist."
 msgstr "El nom d'usuari especificat no existeix."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problema de sincronització de la llista d'amics a %s (%s)"
-
-#, 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 de la llista local està dins el grup «%s», però no a la llista del "
-"servidor. Voleu afegir aquest amic?"
-
-#, 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 és a la llista local però no a la del servidor. Voleu afegir aquest amic?"
-
 msgid "Unable to parse message"
 msgstr "No s'ha pogut analitzar el missatge"
 
@@ -5402,6 +5383,25 @@ msgstr "Codi d'error desconegut %d"
 msgid "MSN Error: %s\n"
 msgstr "Error d'MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Problema de sincronització de la llista d'amics a %s (%s)"
+
+#, 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 de la llista local està dins el grup «%s», però no a la llista del "
+"servidor. Voleu afegir aquest amic?"
+
+#, 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 és a la llista local però no a la del servidor. Voleu afegir aquest amic?"
+
 msgid "Other Contacts"
 msgstr "Altres contactes"
 
@@ -5455,12 +5455,24 @@ msgstr "El vostre nom amistós nou d'MSN és massa llarg."
 msgid "Set friendly name for %s."
 msgstr "Establiu el nom amistós de %s."
 
-msgid "Set your friendly name."
-msgstr "Establiu el vostre nom amistós."
+msgid "Set Friendly Name"
+msgstr "Estableix el nom amistós"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Aquest és el nom amb el que els amics de l'MSN us veuran."
 
+msgid "This Location"
+msgstr "Aquesta ubicació"
+
+msgid "This is the name that identifies this location"
+msgstr "Aquest és el nom que identifica aquesta ubicació"
+
+msgid "Other Locations"
+msgstr "Altres ubicacions"
+
+msgid "You can sign out from other locations here"
+msgstr "Podeu desconnectar-vos d'altres ubicacions aquí"
+
 msgid "Set your home phone number."
 msgstr "Estableix el número de telèfon de casa."
 
@@ -5547,6 +5559,9 @@ msgstr "Títol oficial"
 msgid "Set Friendly Name..."
 msgstr "Estableix el nom amistós..."
 
+msgid "View Locations..."
+msgstr "Mostra les ubicacions..."
+
 msgid "Set Home Phone Number..."
 msgstr "Estableix el número de telèfon de casa..."
 
@@ -5936,8 +5951,8 @@ msgstr "Fora esmorzant"
 
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
-"És possible que no s'hagi pogut enviar el missatge perquè el temps ha "
-"expirat:"
+"És possible que no s'hagi pogut enviar el missatge perquè el temps d'espera "
+"ha vençut:"
 
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
@@ -6953,6 +6968,16 @@ msgstr "Adreça del servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Si us plau, autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
+
+msgid "No reason given."
+msgstr "No s'ha indicat cap motiu."
+
+msgid "Authorization Denied Message:"
+msgstr "Missatge de denegació de l'autorització:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "S'ha rebut una resposta inesperada de %s: %s"
@@ -6969,6 +6994,13 @@ msgstr ""
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"A la configuració del compte heu requerit que es xifri, però un dels "
+"servidors no ho implementa."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -6989,6 +7021,26 @@ msgstr "AOL no permet que us autentiqueu amb aquest nom d'usuari aquí"
 msgid "Error requesting %s"
 msgstr "S'ha produït un error en sol·licitar %s"
 
+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 ""
+"(S'ha produït un error en rebre aquest missatge. L'amic amb qui parleu "
+"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
+"codificació que fa servir, podeu especificar-la a les opcions avançades del "
+"compte AIM/ICQ.)"
+
+#, 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'ha produït un error en rebre aquest missatge. És molt possible que %s "
+"empri una codificació diferent a la vostra, o que %s tingui un client "
+"defectuós)"
+
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
 
@@ -7205,96 +7257,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fitxer %s és %s, que és més gran que la mida màxima de %s."
 
-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 ""
-"(S'ha produït un error en rebre aquest missatge. L'amic amb qui parleu "
-"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
-"codificació que fa servir, podeu especificar-la a les opcions avançades del "
-"compte AIM/ICQ.)"
-
-#, 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'ha produït un error en rebre aquest missatge. És molt possible que %s "
-"empri una codificació diferent a la vostra, o que %s tingui un client "
-"defectuós)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona de l'amic"
-
-msgid "Voice"
-msgstr "Veu"
-
-msgid "AIM Direct IM"
-msgstr "MI AIM directes"
-
-msgid "Get File"
-msgstr "Aconsegueix el fitxer"
-
-msgid "Games"
-msgstr "Jocs"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Afegits"
-
-msgid "Send Buddy List"
-msgstr "Envia la llista d'amics"
-
-msgid "ICQ Direct Connect"
-msgstr "Connexió directa a ICQ"
-
-msgid "AP User"
-msgstr "Usuari AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "Servidor repetidor d'ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Antic ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Xifrat Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Seguretat habilitada"
-
-msgid "Video Chat"
-msgstr "Xat de vídeo"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vídeo en directe"
-
-msgid "Camera"
-msgstr "Càmera"
-
-msgid "Screen Sharing"
-msgstr "Compartició de pantalla"
-
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
@@ -7325,15 +7287,6 @@ msgstr "A la feina"
 msgid "At lunch"
 msgstr "Dinant"
 
-msgid "IP Address"
-msgstr "Adreça IP"
-
-msgid "Warning Level"
-msgstr "Nivell d'avís"
-
-msgid "Buddy Comment"
-msgstr "Comentari de l'amic"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "No s'ha pogut connectar al servidor d'autenticació: %s"
@@ -7362,6 +7315,13 @@ msgstr ""
 "noms d'usuari han de ser adreces de correu vàlides, o començar amb una "
 "lletra i contenir només lletres, nombres o espais, o només nombres."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"A la configuració del compte heu requerit que es xifri, però el vostre "
+"sistema no ho implementa."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7433,16 +7393,6 @@ msgstr "S'ha enviat la contrasenya"
 msgid "Unable to initialize connection"
 msgstr "No s'ha pogut inicialitzar la connexió"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Si us plau, autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
-
-msgid "No reason given."
-msgstr "No s'ha indicat cap motiu."
-
-msgid "Authorization Denied Message:"
-msgstr "Missatge de denegació de l'autorització:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7555,60 +7505,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Heu perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "La informació de l'usuari no està disponible: %s"
-
-msgid "Online Since"
-msgstr "En línia des de"
-
-msgid "Member Since"
-msgstr "Membre des de"
-
-msgid "Capabilities"
-msgstr "Capacitats"
-
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia caràcters "
-"invàlids.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Se us ha desconnectat de la conversa %s."
 
-msgid "Mobile Phone"
-msgstr "Telèfon mòbil"
-
-msgid "Personal Web Page"
-msgstr "Pàgina web personal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informació addicional"
-
-msgid "Zip Code"
-msgstr "Codi postal"
-
-msgid "Work Information"
-msgstr "Informació de la feina"
-
-msgid "Division"
-msgstr "Divisió"
-
-msgid "Position"
-msgstr "Posició"
-
-msgid "Web Page"
-msgstr "Pàgina web"
-
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
@@ -7885,8 +7788,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>no esteu esperant cap autorització</i>"
+msgid "you are not waiting for authorization"
+msgstr "no esteu esperant cap autorització"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Esteu esperant l'autorització dels següents amics"
@@ -7924,6 +7827,12 @@ msgstr "Configura el reenviament de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Estableix les opcions de privadesa..."
 
+msgid "Show Visible List"
+msgstr "Mostra la llista visible"
+
+msgid "Show Invisible List"
+msgstr "Mostra la llista invisible"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirma el compte"
@@ -7940,8 +7849,8 @@ msgstr "Mostra els amics pendents d'autorització"
 msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
-msgid "Search for Buddy by Information"
-msgstr "Cerca un amic per la informació"
+msgid "Don't use encryption"
+msgstr "No empris xifratge"
 
 msgid "Use clientLogin"
 msgstr "Empra clientLogin"
@@ -8053,6 +7962,161 @@ msgstr "Cua plena"
 msgid "Not while on AOL"
 msgstr "No es pot fer mentre estigui a AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona de l'amic"
+
+msgid "Voice"
+msgstr "Veu"
+
+msgid "AIM Direct IM"
+msgstr "MI AIM directes"
+
+msgid "Get File"
+msgstr "Aconsegueix el fitxer"
+
+msgid "Games"
+msgstr "Jocs"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Afegits"
+
+msgid "Send Buddy List"
+msgstr "Envia la llista d'amics"
+
+msgid "ICQ Direct Connect"
+msgstr "Connexió directa a ICQ"
+
+msgid "AP User"
+msgstr "Usuari AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Servidor repetidor d'ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Antic ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Xifrat Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguretat habilitada"
+
+msgid "Video Chat"
+msgstr "Xat de vídeo"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en directe"
+
+msgid "Camera"
+msgstr "Càmera"
+
+msgid "Screen Sharing"
+msgstr "Compartició de pantalla"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr "Nivell d'avís"
+
+msgid "Buddy Comment"
+msgstr "Comentari de l'amic"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "La informació de l'usuari no està disponible: %s"
+
+msgid "Mobile Phone"
+msgstr "Telèfon mòbil"
+
+msgid "Personal Web Page"
+msgstr "Pàgina web personal"
+
+#. aim_userinfo_t
+#. use_html_status
+msgid "Additional Information"
+msgstr "Informació addicional"
+
+msgid "Zip Code"
+msgstr "Codi postal"
+
+msgid "Work Information"
+msgstr "Informació de la feina"
+
+msgid "Division"
+msgstr "Divisió"
+
+msgid "Position"
+msgstr "Posició"
+
+msgid "Web Page"
+msgstr "Pàgina web"
+
+msgid "Online Since"
+msgstr "En línia des de"
+
+msgid "Member Since"
+msgstr "Membre des de"
+
+msgid "Capabilities"
+msgstr "Capacitats"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Simula estar en línia"
+
+msgid "Don't Appear Online"
+msgstr "Mostra estar en línia"
+
+msgid "Appear Offline"
+msgstr "Mostra estar fora de línia"
+
+msgid "Don't Appear Offline"
+msgstr "No mostris estar fora de línia"
+
+msgid "you have no buddies on this list"
+msgstr "no teniu cap amic en aquesta llista"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Podeu afegir un amic a aquesta llista fent clic al botó secundari i "
+"seleccionant «%s»"
+
+msgid "Visible List"
+msgstr "Llista visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+"Aquests amics podran veure el vostre estat quan canvieu al mode «invisible»"
+
+msgid "Invisible List"
+msgstr "Llista invisible"
+
+msgid "These buddies will always see you as offline"
+msgstr "Aquests amics us veuran sempre fora de línia"
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -8233,8 +8297,8 @@ msgid "Your request was rejected."
 msgstr "S'ha rebutjat la vostra sol·licitud."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "Cal verificació per a %u"
+msgid "%u requires verification: %s"
+msgstr "%u requereix verificació: %s"
 
 # Nota: títol de finestra
 msgid "Add buddy question"
@@ -10465,18 +10529,12 @@ msgstr "Ha marxat"
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-msgid "Appear Online"
-msgstr "Simula estar en línia"
-
 msgid "Appear Permanently Offline"
 msgstr "Simula estar permanentment fora de línia"
 
 msgid "Presence"
 msgstr "Presència"
 
-msgid "Appear Offline"
-msgstr "Simula estar fora de línia"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "No simulis estar permanentment fora de línia"
 
@@ -11033,27 +11091,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Algun altre programari de l'ordinador ha interromput la connexió."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'ordinador remot ha tancat la connexió."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "La connexió ha expirat."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "S'ha refusat la connexió."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Aquesta adreça ja s'està fent servir"
 
@@ -11203,6 +11256,10 @@ msgstr ""
 "partir del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
 "d'amics."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "L'usuari %s%s%s%s us vol afegir (%s) a la seva llista d'amics%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color de fons"
@@ -11459,6 +11516,8 @@ msgstr "Missatge (opcional)"
 msgid "Edit User Mood"
 msgstr "Edita l'estat d'ànim"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Amics"
@@ -12209,9 +12268,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "administrador del web"
 
-msgid "Senior Contributor/QA"
-msgstr "Col·laborador veterà/CQ"
-
 msgid "win32 port"
 msgstr "adaptació a win32"
 
@@ -12238,6 +12294,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolupador principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Col·laborador veterà/CQ"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -12371,6 +12430,9 @@ msgstr "Kurd"
 msgid "Lao"
 msgstr "Lasià"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Macedoni"
 
@@ -13610,6 +13672,9 @@ msgstr "Servidor repetidor (TURN)"
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
+msgid "_UDP Port:"
+msgstr "Port _UDP:"
+
 msgid "Use_rname:"
 msgstr "Nom d'_usuari:"
 
@@ -13631,6 +13696,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Valor predeterminat de l'escriptori"
 
@@ -13649,6 +13719,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14188,7 +14266,7 @@ msgstr "cap"
 msgid "Small"
 msgstr "Petites"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Versions més petites de les emoticones per defecte"
 
 msgid "Response Probability:"
@@ -15229,6 +15307,9 @@ msgstr "D_ispositiu"
 msgid "Voice/Video Settings"
 msgstr "Configuració del so/vídeo"
 
+msgid "Voice and Video Settings"
+msgstr "Configuració de la veu i el vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15360,7 +15441,7 @@ msgstr "Envia i rep blocs XMPP en brut."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors o clients XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15506,6 +15587,38 @@ msgstr "Visita la pàgina web de Pidgin per Windows"
 msgid "You do not have permission to uninstall this application."
 msgstr "No tens permís per desinstal.lar aquesta aplicació."
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr ""
+#~ "S'ha produït un error en el flux de transferència de dades en banda\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "La transferència s'ha tancat."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "No s'ha pogut obrir el fluxe de transferència de dades en banda"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Establiu el vostre nom amistós."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "El certificat ha vençut i no s'hauria de considerar vàlid."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requereix SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Força l'antic port SSL (5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia "
+#~ "caràcters invàlids.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cerca un amic per la informació"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "El nom que heu introduït no és vàlid."
 
@@ -15969,9 +16082,6 @@ msgstr "No tens permís per desinstal.lar aquesta aplicació."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "S'ha tancat la connexió (escrivint)"
 
-#~ msgid "Connection reset"
-#~ msgstr "S'ha reiniciat la connexió"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "S'ha produït un error en llegir del sòcol: %s"
 
@@ -16054,9 +16164,6 @@ msgstr "No tens permís per desinstal.lar aquesta aplicació."
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
 
-#~ msgid "User Location"
-#~ msgstr "Ubicació de l'usuari"
-
 #~ msgid "User Avatar"
 #~ msgstr "Avatar de l'usuari"
 
@@ -16326,7 +16433,7 @@ msgstr "No tens permís per desinstal.lar aquesta aplicació."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 #~ "l'altra banda."
@@ -17268,9 +17375,6 @@ msgstr "No tens permís per desinstal.lar aquesta aplicació."
 #~ msgid "TCP port"
 #~ msgstr "Port TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Port UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibratge de característiques"
 
@@ -17308,9 +17412,6 @@ msgstr "No tens permís per desinstal.lar aquesta aplicació."
 #~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si "
 #~ "està disponible» en les propietats del compte"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Empra TLS si està disponible"
-
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "S'ha perdut la connexió amb el servidor, però no se'n sap el motiu."
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index b2df8220a4..4b27d21631 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -33,14 +33,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-02 09:57-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2010-08-01 08:46+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. Translators may want to transliterate the name.
@@ -336,8 +336,7 @@ msgstr ""
 "En suprimir este contacte, també se suprimiran tots els amics que hi haja"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-"En suprimir este grup, també se suprimiran tots els amics que hi haja"
+msgstr "En suprimir este grup, també se suprimiran tots els amics que hi haja"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -557,7 +556,6 @@ msgstr "Confirmació de la supressió"
 msgid "Certificate Manager"
 msgstr "Gestor de certificats"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ordinador"
 
@@ -596,8 +594,7 @@ msgstr "No existeix l'orde."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta "
-"orde."
+"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta orde."
 
 msgid "Your command failed for an unknown reason."
 msgstr "L'orde ha fallat per motius desconeguts."
@@ -769,8 +766,8 @@ msgstr ""
 "de les diferents classes de missatge en les finestres de conversa.<br>    "
 "&lt;classe&gt;: receive (rep), send (envia), highlight (ressalta), action "
 "(acció), timestamp (marca de temps)<br>    &lt;primer pla/fons&gt;: black "
-"(negre), red (roig), green (verd), blue (blau), white (blanc), gray "
-"(gris), darkgray (gris fosc), magenta, cyan (cian), default (per defecte)"
+"(negre), red (roig), green (verd), blue (blau), white (blanc), gray (gris), "
+"darkgray (gris fosc), magenta, cyan (cian), default (per defecte)"
 "<br><br>EXEMPLE:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
@@ -834,7 +831,7 @@ msgstr "Atura"
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 msgid "Failed"
@@ -893,8 +890,8 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Els xats només es registraran si s'habilita la preferència «Registra tots els "
-"xats»."
+"Els xats només es registraran si s'habilita la preferència «Registra tots "
+"els xats»."
 
 msgid "No logs were found"
 msgstr "No s'ha trobat cap registre"
@@ -1728,8 +1725,13 @@ msgstr ""
 "El certificat encara no és vàlid. Comproveu que la data i l'hora de "
 "l'ordinador siguen correctes."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"El certificat encara no és vàlid. Comproveu que la data i l'hora de "
+"l'ordinador siguen correctes."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -2188,8 +2190,7 @@ msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un "
-"terminal."
+"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Si l'orde especificada ha de gestionar URL «aim»"
@@ -2742,8 +2743,8 @@ msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"Afig una línia nova abans de cada missatge de manera que, en les "
-"finestres de conversa, els missatges apareixen sota el nom d'usuari."
+"Afig una línia nova abans de cada missatge de manera que, en les finestres "
+"de conversa, els missatges apareixen sota el nom d'usuari."
 
 msgid "Offline Message Emulation"
 msgstr "Emulació de missatge de fora de línia"
@@ -2811,8 +2812,7 @@ msgid ""
 msgstr ""
 "Vos permet forçar que les contrasenyes siguen d'un sol ús per a comptes dels "
 "quals no s'alcen les contrasenyes.\n"
-"Nota: per poder fer servir això, cal que no s'alce la contrasenya del "
-"compte."
+"Nota: per poder fer servir això, cal que no s'alce la contrasenya del compte."
 
 #. *< type
 #. *< ui_requirement
@@ -2839,8 +2839,8 @@ msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Fa que apareguen finestres de conversa així que altres usuaris vos comencen a "
-"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
+"Fa que apareguen finestres de conversa així que altres usuaris vos comencen "
+"a enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
 
 msgid "You feel a disturbance in the force..."
 msgstr "Sentireu un certa pertorbació en la força..."
@@ -3676,8 +3676,8 @@ msgid ""
 "must be a channel operator to do this."
 msgstr ""
 "devoice &lt;sobrenom1&gt; [sobrenom2] ...:  treu l'estat de veu a algú, "
-"prevenint que parlin al canal si este està moderat (+m). Heu de ser "
-"operador del canal per poder fer això."
+"prevenint que parlin al canal si este està moderat (+m). Heu de ser operador "
+"del canal per poder fer això."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
@@ -4774,11 +4774,20 @@ msgstr "Connector per al protocol XMPP"
 msgid "Domain"
 msgstr "Domini"
 
-msgid "Require SSL/TLS"
-msgstr "Requereix SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Requereix autorització"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Empra TLS si està disponible"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Força l'antic port SSL (5223)"
+#, fuzzy
+msgid "Connection security"
+msgstr "S'ha reiniciat la connexió"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxos sense xifrar"
@@ -5496,8 +5505,7 @@ msgstr "No hi ha text blocat per este compte."
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
-"Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
+msgstr "Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "Este compte no té el correu habilitat."
@@ -6476,8 +6484,8 @@ msgstr "Gestor d'URL myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
-"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este "
-"URL myim."
+"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este URL "
+"myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Habiliteu el compte MySpaceIM adequat i proveu-ho de nou."
@@ -6771,8 +6779,7 @@ msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Esta versió d'avaluació no permet que entren més de deu usuaris a la "
-"vegada"
+"Esta versió d'avaluació no permet que entren més de deu usuaris a la vegada"
 
 msgid "The user is either offline or you are blocked"
 msgstr "L'usuari està fora de línia o bé esteu blocat"
@@ -6788,8 +6795,8 @@ msgstr "No s'ha pogut entrar: %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de l'usuari "
-"(%s)."
+"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de "
+"l'usuari (%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6807,8 +6814,8 @@ msgstr "No s'ha pogut convidar l'usuari (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència (%"
-"s)."
+"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6854,8 +6861,8 @@ msgstr "No s'ha pogut suprimir %s de la llista de privadesa (%s)."
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
-"No s'han pogut canviar els paràmetres de privadesa en la part del servidor (%"
-"s)."
+"No s'han pogut canviar els paràmetres de privadesa en la part del servidor "
+"(%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
@@ -6953,6 +6960,16 @@ msgstr "Adreça del servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Per favor, autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
+
+msgid "No reason given."
+msgstr "No s'ha indicat cap motiu."
+
+msgid "Authorization Denied Message:"
+msgstr "Missatge de denegació de l'autorització:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "S'ha rebut una resposta inesperada de %s: %s"
@@ -6989,6 +7006,25 @@ msgstr "AOL no permet que vos autentiqueu amb este nom d'usuari ací"
 msgid "Error requesting %s"
 msgstr "S'ha produït un error en sol·licitar %s"
 
+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 ""
+"(S'ha produït un error en rebre este missatge. L'amic amb qui parleu "
+"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
+"codificació que fa servir, podeu especificar-la a les opcions avançades del "
+"compte AIM/ICQ.)"
+
+#, 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'ha produït un error en rebre este missatge. És molt possible que %s empri "
+"una codificació diferent a la vostra, o que %s tinga un client defectuós)"
+
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
 
@@ -7196,8 +7232,8 @@ 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 vos ha intentat enviar un fitxer %s, però ara mateix només permetem enviar "
-"fitxers de fins a %s a través de MI directa. Proveu-ho fent servir la "
+"%s vos ha intentat enviar un fitxer %s, però ara mateix només permetem "
+"enviar fitxers de fins a %s a través de MI directa. Proveu-ho fent servir la "
 "transferència de fitxers.\n"
 
 # FIXME
@@ -7205,96 +7241,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fitxer %s és %s, que és més gran que la mida màxima de %s."
 
-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 ""
-"(S'ha produït un error en rebre este missatge. L'amic amb qui parleu "
-"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
-"codificació que fa servir, podeu especificar-la a les opcions avançades del "
-"compte AIM/ICQ.)"
-
-#, 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'ha produït un error en rebre este missatge. És molt possible que %s "
-"empri una codificació diferent a la vostra, o que %s tinga un client "
-"defectuós)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona de l'amic"
-
-msgid "Voice"
-msgstr "Veu"
-
-msgid "AIM Direct IM"
-msgstr "MI AIM directes"
-
-msgid "Get File"
-msgstr "Aconsegueix el fitxer"
-
-msgid "Games"
-msgstr "Jocs"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Afegits"
-
-msgid "Send Buddy List"
-msgstr "Envia la llista d'amics"
-
-msgid "ICQ Direct Connect"
-msgstr "Connexió directa a ICQ"
-
-msgid "AP User"
-msgstr "Usuari AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "Servidor repetidor d'ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Antic ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Xifrat Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Seguretat habilitada"
-
-msgid "Video Chat"
-msgstr "Xat de vídeo"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vídeo en directe"
-
-msgid "Camera"
-msgstr "Càmera"
-
-msgid "Screen Sharing"
-msgstr "Compartició de pantalla"
-
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
@@ -7325,15 +7271,6 @@ msgstr "A la faena"
 msgid "At lunch"
 msgstr "Dinant"
 
-msgid "IP Address"
-msgstr "Adreça IP"
-
-msgid "Warning Level"
-msgstr "Nivell d'avís"
-
-msgid "Buddy Comment"
-msgstr "Comentari de l'amic"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "No s'ha pogut connectar al servidor d'autenticació: %s"
@@ -7358,9 +7295,9 @@ msgid ""
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"No s'ha pogut entrar com a %s perquè este nom d'usuari no és vàlid. Els "
-"noms d'usuari han de ser adreces de correu vàlides, o començar amb una "
-"lletra i contindre només lletres, nombres o espais, o només nombres."
+"No s'ha pogut entrar com a %s perquè este nom d'usuari no és vàlid. Els noms "
+"d'usuari han de ser adreces de correu vàlides, o començar amb una lletra i "
+"contindre només lletres, nombres o espais, o només nombres."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7433,16 +7370,6 @@ msgstr "S'ha enviat la contrasenya"
 msgid "Unable to initialize connection"
 msgstr "No s'ha pogut inicialitzar la connexió"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Per favor, autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
-
-msgid "No reason given."
-msgstr "No s'ha indicat cap motiu."
-
-msgid "Authorization Denied Message:"
-msgstr "Missatge de denegació de l'autorització:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7555,60 +7482,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Heu perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "La informació de l'usuari no està disponible: %s"
-
-msgid "Online Since"
-msgstr "En línia des de"
-
-msgid "Member Since"
-msgstr "Membre des de"
-
-msgid "Capabilities"
-msgstr "Capacitats"
-
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[No s'ha pogut mostrar el missatge d'este usuari perquè contenia caràcters "
-"invàlids.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Se vos ha desconnectat de la conversa %s."
 
-msgid "Mobile Phone"
-msgstr "Telèfon mòbil"
-
-msgid "Personal Web Page"
-msgstr "Pàgina web personal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informació addicional"
-
-msgid "Zip Code"
-msgstr "Codi postal"
-
-msgid "Work Information"
-msgstr "Informació de la faena"
-
-msgid "Division"
-msgstr "Divisió"
-
-msgid "Position"
-msgstr "Posició"
-
-msgid "Web Page"
-msgstr "Pàgina web"
-
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
@@ -7885,7 +7765,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>no esteu esperant cap autorització</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7895,8 +7776,8 @@ msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre "
-"amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
+"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre amb "
+"el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
 msgid "Find Buddy by Email"
 msgstr "Troba un amic per l'adreça de correu"
@@ -7924,6 +7805,14 @@ msgstr "Configura el reenviament de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Estableix les opcions de privadesa..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostra la _llista d'amics"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Llista de convidats"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirma el compte"
@@ -7940,9 +7829,6 @@ msgstr "Mostra els amics pendents d'autorització"
 msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
-msgid "Search for Buddy by Information"
-msgstr "Cerca un amic per la informació"
-
 msgid "Use clientLogin"
 msgstr "Empra clientLogin"
 
@@ -8053,6 +7939,165 @@ msgstr "Cua plena"
 msgid "Not while on AOL"
 msgstr "No es pot fer mentre estiga a AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona de l'amic"
+
+msgid "Voice"
+msgstr "Veu"
+
+msgid "AIM Direct IM"
+msgstr "MI AIM directes"
+
+msgid "Get File"
+msgstr "Aconsegueix el fitxer"
+
+msgid "Games"
+msgstr "Jocs"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Afegits"
+
+msgid "Send Buddy List"
+msgstr "Envia la llista d'amics"
+
+msgid "ICQ Direct Connect"
+msgstr "Connexió directa a ICQ"
+
+msgid "AP User"
+msgstr "Usuari AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Servidor repetidor d'ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Antic ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Xifrat Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguretat habilitada"
+
+msgid "Video Chat"
+msgstr "Xat de vídeo"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en directe"
+
+msgid "Camera"
+msgstr "Càmera"
+
+msgid "Screen Sharing"
+msgstr "Compartició de pantalla"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr "Nivell d'avís"
+
+msgid "Buddy Comment"
+msgstr "Comentari de l'amic"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "La informació de l'usuari no està disponible: %s"
+
+msgid "Mobile Phone"
+msgstr "Telèfon mòbil"
+
+msgid "Personal Web Page"
+msgstr "Pàgina web personal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informació addicional"
+
+msgid "Zip Code"
+msgstr "Codi postal"
+
+msgid "Work Information"
+msgstr "Informació de la faena"
+
+msgid "Division"
+msgstr "Divisió"
+
+msgid "Position"
+msgstr "Posició"
+
+msgid "Web Page"
+msgstr "Pàgina web"
+
+msgid "Online Since"
+msgstr "En línia des de"
+
+msgid "Member Since"
+msgstr "Membre des de"
+
+msgid "Capabilities"
+msgstr "Capacitats"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Simula estar en línia"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Simula estar en línia"
+
+msgid "Appear Offline"
+msgstr "Simula estar fora de línia"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Simula estar fora de línia"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Vos han fet fora d'este MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre amb "
+"el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Llista de convidats"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -8232,8 +8277,8 @@ msgstr "S'ha acceptat la vostra sol·licitud."
 msgid "Your request was rejected."
 msgstr "S'ha rebutjat la vostra sol·licitud."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "Cal verificació per a %u"
 
 # Nota: títol de finestra
@@ -8429,7 +8474,8 @@ msgstr "No s'ha pogut entrar al Qun %u, administrat per %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>L'administrador %2$u vos ha permés unir-vos al Qun %1$u per %3$s</b>"
+msgstr ""
+"<b>L'administrador %2$u vos ha permés unir-vos al Qun %1$u per %3$s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -8559,7 +8605,8 @@ msgstr "i més, per favor feu-m'ho saber... gràcies!!!))"
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>I tothom que ho ha fet possible...<i><br>\n"
 
-msgid "<i>Feel free to join vos!</i> :)"
+#, fuzzy
+msgid "<i>Feel free to join us!</i> :)"
 msgstr "<i>No dubteu a col·laborar amb nosaltres!</i> :)"
 
 #, c-format
@@ -9879,8 +9926,7 @@ msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;tema nou&gt;]: mostra o canvia el tema"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
+msgstr "join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
 
 msgid "list:  List channels on this network"
 msgstr "list:  llista els canals en esta xarxa"
@@ -10299,8 +10345,8 @@ msgstr "Connector per al protocol Yahoo! del Japó"
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
-"%s vos ha enviat una invitació a la seua càmera web, però això encara no està "
-"implementat."
+"%s vos ha enviat una invitació a la seua càmera web, però això encara no "
+"està implementat."
 
 msgid "Your SMS was not delivered"
 msgstr "No s'ha enviat l'SMS"
@@ -10317,14 +10363,15 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista "
-"pel següent motiu:\n"
+"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra "
+"llista pel següent motiu:\n"
 "%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista."
+"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra "
+"llista."
 
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
@@ -10465,18 +10512,12 @@ msgstr "Ha marxat"
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-msgid "Appear Online"
-msgstr "Simula estar en línia"
-
 msgid "Appear Permanently Offline"
 msgstr "Simula estar permanentment fora de línia"
 
 msgid "Presence"
 msgstr "Presència"
 
-msgid "Appear Offline"
-msgstr "Simula estar fora de línia"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "No simulis estar permanentment fora de línia"
 
@@ -10553,8 +10594,7 @@ msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Si voleu veure este perfil, haureu de visitar este enllaç amb el "
-"navegador:"
+"Si voleu veure este perfil, haureu de visitar este enllaç amb el navegador:"
 
 msgid "Yahoo! ID"
 msgstr "Identificador de Yahoo!"
@@ -10596,9 +10636,9 @@ msgid ""
 "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 ""
-"No s'ha pogut obtindre el perfil de l'usuari. El més segur és que l'usuari no "
-"existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. Si "
-"sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
+"No s'ha pogut obtindre el perfil de l'usuari. El més segur és que l'usuari "
+"no existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. "
+"Si sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
 
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
@@ -10626,8 +10666,8 @@ msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"S'ha produït un error desconegut. Potser caldrà que eixiu i espereu uns "
-"cinc minuts abans d'intentar tornar a entrar a la sala de xat"
+"S'ha produït un error desconegut. Potser caldrà que eixiu i espereu uns cinc "
+"minuts abans d'intentar tornar a entrar a la sala de xat"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -10707,13 +10747,11 @@ msgstr ""
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"inst &lt;instància&gt;: especifica la instància a fer servir en esta "
-"classe"
+"inst &lt;instància&gt;: especifica la instància a fer servir en esta classe"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"topic &lt;instància&gt;: especifica la instància a fer servir en esta "
-"classe"
+"topic &lt;instància&gt;: especifica la instància a fer servir en esta classe"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
@@ -11033,27 +11071,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Algun altre programari de l'ordinador ha interromput la connexió."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'ordinador remot ha tancat la connexió."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "La connexió ha expirat."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "S'ha refusat la connexió."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Esta adreça ja s'està fent servir"
 
@@ -11199,10 +11232,14 @@ msgstr ""
 "voleu que el %s es connecte amb més comptes de missatgeria instantània (MI), "
 "torneu a prémer <b>Afig</b> fins a configurar-los tots.\n"
 "\n"
-"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a "
-"partir del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
+"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a partir "
+"del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
 "d'amics."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "L'usuari %s%s%s%s vol afegir %s a la seua llista d'amics%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color de fons"
@@ -11336,8 +11373,8 @@ msgid ""
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 "En fusionar estos contactes fareu que compartisquen una mateixa entrada en "
-"la llista d'amics i en la finestra de conversa. Més avant els podreu "
-"separar amb l'opció 'Expandeix' del menú contextual del contacte."
+"la llista d'amics i en la finestra de conversa. Més avant els podreu separar "
+"amb l'opció 'Expandeix' del menú contextual del contacte."
 
 msgid "Please update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
@@ -11459,6 +11496,8 @@ msgstr "Missatge (opcional)"
 msgid "Edit User Mood"
 msgstr "Edita l'estat d'ànim"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Amics"
@@ -12209,9 +12248,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "administrador del web"
 
-msgid "Senior Contributor/QA"
-msgstr "Col·laborador veterà/CQ"
-
 msgid "win32 port"
 msgstr "adaptació a win32"
 
@@ -12238,6 +12274,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolupador principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Col·laborador veterà/CQ"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -12494,8 +12533,8 @@ msgid ""
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "El %s és un client de missatgeria basat en libpurple que permet connectar-"
 "vos a diferents serveis de missatgeria instantània al mateix temps. El %s "
@@ -12528,11 +12567,11 @@ msgid ""
 "<br/>"
 msgstr ""
 "<font size=\"4\"><b>Ajuda d'altres usuaris del Pidgin</b>:</font> <a href="
-"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta és una llista "
-"de correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta és una llista de "
+"correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
 "\">arxiu</a>)<br/>No vos podem ajudar amb connectors d'altres proveïdors.<br/"
-">En esta llista s'hi empra principalment l'<b>anglés</b>. Podeu escriure-"
-"hi en un altre idioma, però és possible que les respostes no siguen de gaire "
+">En esta llista s'hi empra principalment l'<b>anglés</b>. Podeu escriure-hi "
+"en un altre idioma, però és possible que les respostes no siguen de gaire "
 "ajuda.<br/>"
 
 #, c-format
@@ -12934,8 +12973,8 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Esta emoticona està inhabilitada perquè hi ha una emoticona "
-"personalitzada per esta drecera:\n"
+"Esta emoticona està inhabilitada perquè hi ha una emoticona personalitzada "
+"per esta drecera:\n"
 " %s"
 
 msgid "Smile!"
@@ -13058,16 +13097,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa a %s iniciada a "
 "les %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Esteu segur que voleu suprimir permanentment el registre del sistema iniciat "
 "a les %s?"
@@ -13173,8 +13212,7 @@ msgstr ""
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
-"Ara s'eixirà atès que ja hi ha un altre client del libpurple executant-"
-"se.\n"
+"Ara s'eixirà atès que ja hi ha un altre client del libpurple executant-se.\n"
 
 msgid "_Media"
 msgstr "_Medi"
@@ -13609,6 +13647,10 @@ msgstr "Servidor repetidor (TURN)"
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "Port UDP"
+
 msgid "Use_rname:"
 msgstr "Nom d'_usuari:"
 
@@ -13630,6 +13672,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Valor predeterminat de l'escriptori"
 
@@ -13648,6 +13695,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -13962,7 +14017,8 @@ msgstr "Estat per a %s"
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de diferent."
+"Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de "
+"diferent."
 
 msgid "Custom Smiley"
 msgstr "Emoticona personalitzada"
@@ -14042,8 +14098,8 @@ 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 ""
-"Podeu enviar esta imatge com una transferència de fitxer, incrustar-la en "
-"el missatge, o emprar-la com a icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, incrustar-la en el "
+"missatge, o emprar-la com a icona d'amic per a este usuari."
 
 msgid "Set as buddy icon"
 msgstr "Estableix com a icona de l'amic"
@@ -14061,15 +14117,15 @@ msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com "
-"a icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com a "
+"icona d'amic per a este usuari."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per "
-"a este usuari."
+"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per a "
+"este usuari."
 
 #. 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
@@ -14186,7 +14242,8 @@ msgstr "cap"
 msgid "Small"
 msgstr "Petites"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versions més petites de les emoticones per defecte"
 
 msgid "Response Probability:"
@@ -15227,6 +15284,10 @@ msgstr "D_ispositiu"
 msgid "Voice/Video Settings"
 msgstr "Configuració del so/vídeo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Configuració del so/vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15266,7 +15327,8 @@ msgstr "_Transparència de la finestra de la llista d'amics"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
-"Treu la transparència de la finestra de la llista d'amics en obtindre el focus"
+"Treu la transparència de la finestra de la llista d'amics en obtindre el "
+"focus"
 
 #. *< type
 #. *< ui_requirement
@@ -15290,8 +15352,8 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Este connector habilita la transparència variables en finestres de "
-"conversa, i la llista d'amics.\n"
+"Este connector habilita la transparència variables en finestres de conversa, "
+"i la llista d'amics.\n"
 "\n"
 "* Nota: este connector requereix Windows 2000 o superior."
 
@@ -15358,7 +15420,7 @@ msgstr "Envia i rep blocs XMPP en brut."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este connector és útil per a depurar servidors o clients XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15421,13 +15483,13 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 "S'ha produït un error en instal·lar el corrector ortogràfic ($R3).$\\rSi "
 "falla en reintentar-ho, podeu seguir les instruccions d'instal·lació manual "
-"d'ací: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"d'ací: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
@@ -15504,6 +15566,25 @@ msgstr "Visita la pàgina web de Pidgin per Windows"
 msgid "You do not have permission to uninstall this application."
 msgstr "No tens permís per desinstal.lar esta aplicació."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requereix SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Força l'antic port SSL (5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[No s'ha pogut mostrar el missatge d'este usuari perquè contenia "
+#~ "caràcters invàlids.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cerca un amic per la informació"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "El nom que heu introduït no és vàlid."
 
@@ -15967,9 +16048,6 @@ msgstr "No tens permís per desinstal.lar esta aplicació."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "S'ha tancat la connexió (escrivint)"
 
-#~ msgid "Connection reset"
-#~ msgstr "S'ha reiniciat la connexió"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "S'ha produït un error en llegir del sòcol: %s"
 
@@ -16324,7 +16402,7 @@ msgstr "No tens permís per desinstal.lar esta aplicació."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 #~ "l'altra banda."
@@ -17266,9 +17344,6 @@ msgstr "No tens permís per desinstal.lar esta aplicació."
 #~ msgid "TCP port"
 #~ msgstr "Port TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Port UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibratge de característiques"
 
@@ -17303,11 +17378,8 @@ msgstr "No tens permís per desinstal.lar esta aplicació."
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
-#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si està "
-#~ "disponible» en les propietats del compte"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Empra TLS si està disponible"
+#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si "
+#~ "està disponible» en les propietats del compte"
 
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "S'ha perdut la connexió amb el servidor, però no se'n sap el motiu."
diff --git a/po/cs.po b/po/cs.po
index 1ff6ad8eda..abfc923dc5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
-"PO-Revision-Date: 2010-08-01 18:18+0100\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-10-15 17:26+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
@@ -524,7 +524,6 @@ msgstr "Potvrzení smazání certifikátu"
 msgid "Certificate Manager"
 msgstr "Správce certifikátů"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Název po�íta�e"
 
@@ -793,7 +792,7 @@ msgstr "Zastavit"
 msgid "Waiting for transfer to begin"
 msgstr "Čekám na za�átek přenosu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Zrušeno"
 
 msgid "Failed"
@@ -1681,8 +1680,12 @@ msgid ""
 "are accurate."
 msgstr "Certifikát je neplatný. Zkontrolujte datum a �as po�íta�e."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Certifikát vypršel a neměl by být považován za platný."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Platnost certifikátu vypršela a neměl by být považován za platný. "
+"Zkontrolujte datum a �as po�íta�e."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4687,11 +4690,17 @@ msgstr "Zásuvný modul protokolu XMPP"
 msgid "Domain"
 msgstr "Doména"
 
-msgid "Require SSL/TLS"
-msgstr "Vyžadovat SSL/TLS"
+msgid "Require encryption"
+msgstr "Vyžadovat šifrování"
+
+msgid "Use encryption if available"
+msgstr "Používat šifrování, pokud je k dispozici"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vnutit staré SSL (port 5223)"
+msgid "Use old-style SSL"
+msgstr "Použít SSL (starý styl)"
+
+msgid "Connection security"
+msgstr "Bezpe�nost spojení"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Povolit textovou autentizaci po nešifrovaných proudech"
@@ -6806,6 +6815,16 @@ msgstr "Adresa serveru"
 msgid "Server port"
 msgstr "Port serveru"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Autorizujte mě prosím, abych vás mohl přidat do svého seznamu kamarádů."
+
+msgid "No reason given."
+msgstr "Neudán žádný důvod."
+
+msgid "Authorization Denied Message:"
+msgstr "Zpráva odmítnutí autorizace:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Přijata neo�ekávaná odpově� od %s: %s"
@@ -6841,6 +6860,24 @@ msgstr "AOL neumožňuje ověřit jméno tady"
 msgid "Error requesting %s"
 msgstr "Chyba žádosti %s"
 
+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 ""
+"(Při přijímání této zprávy došlo k chybě. Kamarád, se kterým mluvíte, "
+"pravděpodobně používá neo�ekávané kódování. Pokud víte, které kódování "
+"používá, můžete to zadat v pokro�ilých možnostech svého ú�tu AIM/ICQ.)"
+
+#, 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 ""
+"(Při přijímání této zprávy došlo k chybě. Bu� máte vy a %s zvolena jiná "
+"kódování, nebo má %s klienta s chybami.)"
+
 msgid "Could not join chat room"
 msgstr "Nemohu se připojit k chatu"
 
@@ -7054,94 +7091,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Soubor %s je %s, což je větší než maximální velikost %s."
 
-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 ""
-"(Při přijímání této zprávy došlo k chybě. Kamarád, se kterým mluvíte, "
-"pravděpodobně používá neo�ekávané kódování. Pokud víte, které kódování "
-"používá, můžete to zadat v pokro�ilých možnostech svého ú�tu AIM/ICQ.)"
-
-#, 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 ""
-"(Při přijímání této zprávy došlo k chybě. Bu� máte vy a %s zvolena jiná "
-"kódování, nebo má %s klienta s chybami.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona kamaráda"
-
-msgid "Voice"
-msgstr "Hlas"
-
-msgid "AIM Direct IM"
-msgstr "AIM Přímé IM"
-
-msgid "Get File"
-msgstr "Získat soubor"
-
-msgid "Games"
-msgstr "Hry"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Přídavky"
-
-msgid "Send Buddy List"
-msgstr "Odeslat seznam kamarádů"
-
-msgid "ICQ Direct Connect"
-msgstr "Přímé spojení ICQ"
-
-msgid "AP User"
-msgstr "Uživatel AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Relay ICQ serveru"
-
-msgid "Old ICQ UTF8"
-msgstr "Staré ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Šifrování Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Zabezpe�ení povoleno"
-
-msgid "Video Chat"
-msgstr "Video Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Živé video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Sdílení obrazovky"
-
 msgid "Free For Chat"
 msgstr "Volný pro chat"
 
@@ -7172,15 +7121,6 @@ msgstr "V práci"
 msgid "At lunch"
 msgstr "Na obědě"
 
-msgid "IP Address"
-msgstr "IP adresa"
-
-msgid "Warning Level"
-msgstr "Úroveň varování"
-
-msgid "Buddy Comment"
-msgstr "Poznámka o kamarádovi"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Nemohu se připojit k autentiza�nímu serveru: %s"
@@ -7276,16 +7216,6 @@ msgstr "Heslo odesláno"
 msgid "Unable to initialize connection"
 msgstr "Nemohu inicializovat spojení"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Autorizujte mě prosím, abych vás mohl přidat do svého seznamu kamarádů."
-
-msgid "No reason given."
-msgstr "Neudán žádný důvod."
-
-msgid "Authorization Denied Message:"
-msgstr "Zpráva odmítnutí autorizace:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7416,60 +7346,13 @@ msgstr[0] "Přišli jste o %hu zprávu od %s z neznámého důvodu."
 msgstr[1] "Přišli jste o %hu zprávy od %s z neznámého důvodu."
 msgstr[2] "Přišli jste o %hu zpráv od %s z neznámého důvodu."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informace o uživateli nejsou k dispozici: %s"
-
-msgid "Online Since"
-msgstr "Odpojen od"
-
-msgid "Member Since"
-msgstr "ÄŒlen od"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaše spojení AIM může být přerušeno."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
-"znaky.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z místnosti chatu %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilní telefon"
-
-msgid "Personal Web Page"
-msgstr "Osobní WWW stránka"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Přídavné informace"
-
-msgid "Zip Code"
-msgstr "PSČ"
-
-msgid "Work Information"
-msgstr "Pracovní informace"
-
-msgid "Division"
-msgstr "Oddělení"
-
-msgid "Position"
-msgstr "Pozice"
-
-msgid "Web Page"
-msgstr "WWW stránka"
-
 msgid "Pop-Up Message"
 msgstr "Vyskakovací zpráva"
 
@@ -7749,8 +7632,8 @@ msgstr "Formátování jména uživatele může změnit jen velikost písmen a m
 msgid "Change Address To:"
 msgstr "Změnit adresu na:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>ne�ekáte na autorizaci</i>"
+msgid "you are not waiting for authorization"
+msgstr "ne�ekáte na autorizaci"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Čekáte na autorizaci od následujících kamarádů:"
@@ -7788,6 +7671,14 @@ msgstr "Nastavit předávání IM (web)"
 msgid "Set Privacy Options..."
 msgstr "Nastavit možnosti soukromí..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Zobrazit seznam _kamarádů"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Seznam pozvaných"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdit ú�et"
@@ -7804,9 +7695,6 @@ msgstr "Zobrazit kamarády �ekající na autorizaci"
 msgid "Search for Buddy by Email Address..."
 msgstr "Hledat kamaráda podle emailové adresy..."
 
-msgid "Search for Buddy by Information"
-msgstr "Hledat kamaráda podle informací"
-
 msgid "Use clientLogin"
 msgstr "Použít clientLogin"
 
@@ -7915,6 +7803,165 @@ msgstr "Fronta plná"
 msgid "Not while on AOL"
 msgstr "Ne když na AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona kamaráda"
+
+msgid "Voice"
+msgstr "Hlas"
+
+msgid "AIM Direct IM"
+msgstr "AIM Přímé IM"
+
+msgid "Get File"
+msgstr "Získat soubor"
+
+msgid "Games"
+msgstr "Hry"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Přídavky"
+
+msgid "Send Buddy List"
+msgstr "Odeslat seznam kamarádů"
+
+msgid "ICQ Direct Connect"
+msgstr "Přímé spojení ICQ"
+
+msgid "AP User"
+msgstr "Uživatel AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Relay ICQ serveru"
+
+msgid "Old ICQ UTF8"
+msgstr "Staré ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Šifrování Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Zabezpe�ení povoleno"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Živé video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Sdílení obrazovky"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "Úroveň varování"
+
+msgid "Buddy Comment"
+msgstr "Poznámka o kamarádovi"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informace o uživateli nejsou k dispozici: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilní telefon"
+
+msgid "Personal Web Page"
+msgstr "Osobní WWW stránka"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Přídavné informace"
+
+msgid "Zip Code"
+msgstr "PSČ"
+
+msgid "Work Information"
+msgstr "Pracovní informace"
+
+msgid "Division"
+msgstr "Oddělení"
+
+msgid "Position"
+msgstr "Pozice"
+
+msgid "Web Page"
+msgstr "WWW stránka"
+
+msgid "Online Since"
+msgstr "Odpojen od"
+
+msgid "Member Since"
+msgstr "ÄŒlen od"
+
+msgid "Capabilities"
+msgstr "Schopnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Vypadat připojen"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Vypadat připojen"
+
+msgid "Appear Offline"
+msgstr "Vypadat odpojen"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Vypadat odpojen"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Byl jste vykopnut z MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Můžete znovu požádat o autorizaci od těchto kamarádů kliknutím na ně pravým "
+"tla�ítkem a zvolením \"Znovu požádat o autorizaci.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Viditelný"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Seznam pozvaných"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnář"
 
@@ -8094,8 +8141,8 @@ msgid "Your request was rejected."
 msgstr "Požadavek byl odmítnut."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u vyžaduje ověření"
+msgid "%u requires verification: %s"
+msgstr "%u vyžaduje ověření: %s"
 
 msgid "Add buddy question"
 msgstr "Přidat otázku kamaráda"
@@ -10287,18 +10334,12 @@ msgstr "Å el jsem ven"
 msgid "Not on server list"
 msgstr "Není na seznamu serveru"
 
-msgid "Appear Online"
-msgstr "Vypadat připojen"
-
 msgid "Appear Permanently Offline"
 msgstr "Vypadat vždy odpojen"
 
 msgid "Presence"
 msgstr "Přítomnost"
 
-msgid "Appear Offline"
-msgstr "Vypadat odpojen"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nevypadat vždy odpojen"
 
@@ -10851,27 +10892,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Připojení porušeno jiným softwarem na po�íta�i."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Vzdálený po�íta� ukon�il připojení."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Spojení vypršel �as."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Spojení odmítnuto."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresa se již používá"
 
@@ -11019,6 +11055,10 @@ msgstr ""
 "Můžete se do tohoto okna vrátit a přidávat, upravovat nebo odstraňovat ú�ty "
 "přes <b>Ú�ty->Spravovat</b> v okně seznamu kamarádů."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s chce tě (%s) přidat do svého seznamu kamarádů%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Barva pozadí"
@@ -11273,6 +11313,8 @@ msgstr "Zpráva (nepovinná)"
 msgid "Edit User Mood"
 msgstr "Upravit náladu uživatele"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kamarádi"
@@ -12018,9 +12060,6 @@ msgstr "podpora"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior přispěvatel/QA"
-
 msgid "win32 port"
 msgstr "port na win32"
 
@@ -12046,6 +12085,9 @@ msgstr "původní autor"
 msgid "lead developer"
 msgstr "vedoucí vývojář"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior přispěvatel/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -12826,7 +12868,7 @@ msgid "_Horizontal rule"
 msgstr "_Vodorovná �ára"
 
 msgid "_Smile!"
-msgstr "Ú_směv!"
+msgstr "_Smajlík!"
 
 msgid "_Attention!"
 msgstr "Vyžádat pozornost!"
@@ -13382,6 +13424,9 @@ msgstr "Server pro přenos (TURN)"
 msgid "_TURN server:"
 msgstr "Server _TURN:"
 
+msgid "_UDP Port:"
+msgstr "_UDP Port:"
+
 msgid "Use_rname:"
 msgstr "Jméno _uživatele:"
 
@@ -13403,6 +13448,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Výchozí prostředí"
 
@@ -13421,6 +13471,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Ru�ní"
 
@@ -13952,7 +14010,7 @@ msgstr "žádné"
 msgid "Small"
 msgstr "Malý"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Menší verze výchozích smajlíků"
 
 msgid "Response Probability:"
@@ -14970,6 +15028,9 @@ msgstr "Z_ařízení"
 msgid "Voice/Video Settings"
 msgstr "Nastavení Hlasu/Videa"
 
+msgid "Voice and Video Settings"
+msgstr "Nastavení Hlasu a Videa"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15098,7 +15159,7 @@ msgstr "Přijímat a odesílat přímo sekce XMPP."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Tento zásuvný modul je užite�ný pro ladění serverů nebo klientů XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15238,6 +15299,25 @@ msgstr "Navštívit Pidgin Web Page"
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Certifikát vypršel a neměl by být považován za platný."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vyžadovat SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vnutit staré SSL (port 5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
+#~ "znaky.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Hledat kamaráda podle informací"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "Zadaný jméno není platné"
 
@@ -15835,9 +15915,6 @@ msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Spojení uzavřeno (zápis)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Spojení přerušeno"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Chyba při �tení ze socketu: %s"
 
@@ -16042,7 +16119,7 @@ msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nemohu otevřít %s pro zápis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
 
 #~ msgid "Could not connect for transfer."
@@ -16616,9 +16693,6 @@ msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 #~ msgid "TCP port"
 #~ msgstr "Port TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Port UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Kalibrace funkcí"
 
@@ -16826,9 +16900,6 @@ msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 #~ msgid "Server couldn't authenticate you without a password"
 #~ msgstr "Server vás nemohl bez hesla autentizovat"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Používat TLS, pokud je k dispozici"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
 
diff --git a/po/da.po b/po/da.po
index 582e77a1e7..78453660b8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2009-02-23 18:17+0100\n"
 "Last-Translator: Peter Bach <bach.peter@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -540,7 +540,6 @@ msgstr "Bekræft sletning af certifikat"
 msgid "Certificate Manager"
 msgstr "Certifikathåndtering"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Værtsnavn"
 
@@ -812,7 +811,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overførsel skal starte"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annulleret"
 
 msgid "Failed"
@@ -1704,7 +1703,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4769,11 +4770,20 @@ msgstr "XMPP-protokoludvidelsesmodul"
 msgid "Domain"
 msgstr "Domæne"
 
-msgid "Require SSL/TLS"
-msgstr "Kræv SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Kræv godkendelse"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Tving gammel (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Brug TLS hvis tilgængelig"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Forbindelse lukket"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillad godkendelse i klartekst over ukrypterede strømme"
@@ -6037,7 +6047,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Nye adgangskoder er ikke ens."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
 msgid ""
@@ -6145,10 +6155,6 @@ msgid "Connecting..."
 msgstr "Tilslutter"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "SecurID-nøglen du indtastede er ugyldig."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
@@ -7028,6 +7034,15 @@ msgstr "Serveradresse"
 msgid "Server port"
 msgstr "Server port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Venligst godkend mig, så jeg kan tilføje dig til min venneliste."
+
+msgid "No reason given."
+msgstr "Ingen grund givet."
+
+msgid "Authorization Denied Message:"
+msgstr "Besked for nægtelse af godkendelses anmodning:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Modtog ugyldigt HTTP-svar fra server."
@@ -7061,6 +7076,25 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Fejl ved oprettelse af forbindelse"
 
+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 ""
+"(Der opstod en fejl ved modtagelse af denne besked. Vennen du taler med "
+"bruger måske en anden indkodning end forventet. Hvis du kender indkodningen, "
+"som han bruger, kan du angive den i avancerede kontoindstillinger for din "
+"AIM/ICQ-konto.)"
+
+#, 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 ""
+"(Der opstod en fejl ved modtagelse af denne besked. Enten har du eller %s "
+"valgt forskellige indkodninger, eller har %s en fejlramt klient.)"
+
 msgid "Could not join chat room"
 msgstr "Kunne ikke tilslutte samtalerum"
 
@@ -7296,95 +7330,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Filen %s er %s, som er større end den maksimale størrelse på %s."
 
-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 ""
-"(Der opstod en fejl ved modtagelse af denne besked. Vennen du taler med "
-"bruger måske en anden indkodning end forventet. Hvis du kender indkodningen, "
-"som han bruger, kan du angive den i avancerede kontoindstillinger for din "
-"AIM/ICQ-konto.)"
-
-#, 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 ""
-"(Der opstod en fejl ved modtagelse af denne besked. Enten har du eller %s "
-"valgt forskellige indkodninger, eller har %s en fejlramt klient.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Venneikon"
-
-msgid "Voice"
-msgstr "Tale"
-
-msgid "AIM Direct IM"
-msgstr "AIM direkte besked"
-
-msgid "Get File"
-msgstr "Modtag fil"
-
-msgid "Games"
-msgstr "Spil"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Udvidelser"
-
-msgid "Send Buddy List"
-msgstr "Send venneliste"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ direkte forbindelse"
-
-msgid "AP User"
-msgstr "AP Bruger"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Send gennem server"
-
-msgid "Old ICQ UTF8"
-msgstr "Gammel ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian kryptering"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sikkerhedsaktiveret"
-
-msgid "Video Chat"
-msgstr "Videosamtale"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Skærmdeling"
-
 msgid "Free For Chat"
 msgstr "Fri til samtale"
 
@@ -7420,15 +7365,6 @@ msgstr "Netværk"
 msgid "At lunch"
 msgstr "Ude til frokost"
 
-msgid "IP Address"
-msgstr "IP-adresse"
-
-msgid "Warning Level"
-msgstr "Advarselsniveau"
-
-msgid "Buddy Comment"
-msgstr "Vennekommentar"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7532,15 +7468,6 @@ msgstr "Adgangskode sendt"
 msgid "Unable to initialize connection"
 msgstr "Kunne ikke initialisere forbindelse"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Venligst godkend mig, så jeg kan tilføje dig til min venneliste."
-
-msgid "No reason given."
-msgstr "Ingen grund givet."
-
-msgid "Authorization Denied Message:"
-msgstr "Besked for nægtelse af godkendelses anmodning:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7659,60 +7586,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s pga. en ukendt årsag."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s pga. en ukendt årsag."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Bruger oplysninger er ikke tilgængelige: %s"
-
-msgid "Online Since"
-msgstr "Tilkoblet siden"
-
-msgid "Member Since"
-msgstr "Medlem siden"
-
-msgid "Capabilities"
-msgstr "Klient understøtter"
-
 msgid "Your AIM connection may be lost."
 msgstr "Din AIM forbindelse kan være afbrudt."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Ude af stand til at vise en besked fra denne bruger, fordi den indeholdte "
-"ugyldige bogstaver.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til samtalerum %s afbrudt."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Personlig hjemmeside"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Yderligere information"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Arbejds information"
-
-msgid "Division"
-msgstr "Afdeling"
-
-msgid "Position"
-msgstr "Stilling"
-
-msgid "Web Page"
-msgstr "Hjemmeside"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up besked"
 
@@ -7996,7 +7876,8 @@ msgstr "Brugernavn formatering kan kun ændre store/små bogstaver og mellemrum.
 msgid "Change Address To:"
 msgstr "Ændr adresse til:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>du venter ikke på godkendelse</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8035,6 +7916,14 @@ msgstr "Konfigurér beskedvideresendelse (internet)"
 msgid "Set Privacy Options..."
 msgstr "Sæt privatlivsindstillinger..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vis venne_liste"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Inviteringsliste"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bekræft Konto"
@@ -8051,9 +7940,6 @@ msgstr "Vis venner der afventer godkendelse"
 msgid "Search for Buddy by Email Address..."
 msgstr "Søg efter ven udfra e-postadresse..."
 
-msgid "Search for Buddy by Information"
-msgstr "Søg efter ven udfra oplysninger"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Bruger er ikke logget ind"
@@ -8163,6 +8049,165 @@ msgstr "Kø fuld"
 msgid "Not while on AOL"
 msgstr "Ikke samtidig med AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Venneikon"
+
+msgid "Voice"
+msgstr "Tale"
+
+msgid "AIM Direct IM"
+msgstr "AIM direkte besked"
+
+msgid "Get File"
+msgstr "Modtag fil"
+
+msgid "Games"
+msgstr "Spil"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Udvidelser"
+
+msgid "Send Buddy List"
+msgstr "Send venneliste"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direkte forbindelse"
+
+msgid "AP User"
+msgstr "AP Bruger"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Send gennem server"
+
+msgid "Old ICQ UTF8"
+msgstr "Gammel ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian kryptering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sikkerhedsaktiveret"
+
+msgid "Video Chat"
+msgstr "Videosamtale"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skærmdeling"
+
+msgid "IP Address"
+msgstr "IP-adresse"
+
+msgid "Warning Level"
+msgstr "Advarselsniveau"
+
+msgid "Buddy Comment"
+msgstr "Vennekommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Bruger oplysninger er ikke tilgængelige: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Personlig hjemmeside"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Yderligere information"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Arbejds information"
+
+msgid "Division"
+msgstr "Afdeling"
+
+msgid "Position"
+msgstr "Stilling"
+
+msgid "Web Page"
+msgstr "Hjemmeside"
+
+msgid "Online Since"
+msgstr "Tilkoblet siden"
+
+msgid "Member Since"
+msgstr "Medlem siden"
+
+msgid "Capabilities"
+msgstr "Klient understøtter"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Virk tilkoblet"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Virk tilkoblet"
+
+msgid "Appear Offline"
+msgstr "Virk afkoblet"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Virk afkoblet"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du er blevet smidt ud af %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan anmode om ny godkendelse fra disse venner ved at højreklikke på dem "
+"og vælge \"Anmod om ny godkendelse\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synlig"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Inviteringsliste"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vandmand"
 
@@ -8345,8 +8390,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u kræver godkendelse"
 
 msgid "Add buddy question"
@@ -10573,18 +10618,12 @@ msgstr "Trådt udenfor"
 msgid "Not on server list"
 msgstr "Ikke på server liste"
 
-msgid "Appear Online"
-msgstr "Virk tilkoblet"
-
 msgid "Appear Permanently Offline"
 msgstr "Virk permanent afkoblet"
 
 msgid "Presence"
 msgstr "Tilstedeværelse"
 
-msgid "Appear Offline"
-msgstr "Virk afkoblet"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Virk ikke permanent afkoblet"
 
@@ -11131,27 +11170,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Forbindelse afbrudt af andet software på din computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjernværten har lukket forbindelsen."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Forbindelsen overskred tidsgrænsen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Forbindelse afvist."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Addressen er allerede i brug."
 
@@ -11300,6 +11334,10 @@ msgstr ""
 "Du kan vende tilbage til dette vindue for at tilføje, redigere eller fjerne "
 "konti fra <b>Konti->Kontihåndtering</b> i venneliste-vinduet"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s vil tilføje %s til hans eller hendes venneliste%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Baggrundsfarve"
@@ -11576,6 +11614,8 @@ msgstr "Alias (valgfri)"
 msgid "Edit User Mood"
 msgstr "Redigér bruger humør"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Venner"
@@ -12344,9 +12384,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "internetudvikler"
 
-msgid "Senior Contributor/QA"
-msgstr "Seniorbidrager/QA"
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12372,6 +12409,9 @@ msgstr "oprindelig forfatter"
 msgid "lead developer"
 msgstr "hovedudvikler"
 
+msgid "Senior Contributor/QA"
+msgstr "Seniorbidrager/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13746,6 +13786,10 @@ msgid "_TURN server:"
 msgstr "ST_UN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "UDP port"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Brugernavn:"
 
@@ -13768,6 +13812,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Standardskrivebord"
 
@@ -13786,6 +13835,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Andet program"
 
@@ -14340,7 +14397,8 @@ msgstr "intet"
 msgid "Small"
 msgstr "Lille"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre udgaver af standardsmileyerne"
 
 msgid "Response Probability:"
@@ -15417,6 +15475,10 @@ msgstr "Enhed"
 msgid "Voice/Video Settings"
 msgstr "Redigér indstillinger"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Redigér indstillinger"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15548,7 +15610,7 @@ msgstr ""
 "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller "
 "klienter."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15682,6 +15744,26 @@ msgstr "Besøg Pidgin's hjemmeside"
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikke tilladelse til at afinstallere dette program."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Kræv SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Tving gammel (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "SecurID-nøglen du indtastede er ugyldig."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Ude af stand til at vise en besked fra denne bruger, fordi den "
+#~ "indeholdte ugyldige bogstaver.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Søg efter ven udfra oplysninger"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
@@ -16283,9 +16365,6 @@ msgstr "Du har ikke tilladelse til at afinstallere dette program."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Forbindelse lukket (skrivning)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Forbindelse lukket"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Fejl under læsning fra sokkel: %s"
 
@@ -16489,7 +16568,7 @@ msgstr "Du har ikke tilladelse til at afinstallere dette program."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kunne ikke åbne %s til skrivning!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt."
 
 #~ msgid "Could not connect for transfer."
@@ -17382,9 +17461,6 @@ msgstr "Du har ikke tilladelse til at afinstallere dette program."
 #~ msgid "TCP port"
 #~ msgstr "TCP port"
 
-#~ msgid "UDP port"
-#~ msgstr "UDP port"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Funktionalitets justering"
 
@@ -17536,9 +17612,6 @@ msgstr "Du har ikke tilladelse til at afinstallere dette program."
 #~ "Server kræevr TLS/SSL til logind.  Vælg \"Brug TLS hvis tilgængeligt\" i "
 #~ "kontoegenskaber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Brug TLS hvis tilgængelig"
-
 #~ msgid "_Authorize"
 #~ msgstr "_Godkend"
 
diff --git a/po/de.po b/po/de.po
index 0293db1821..e6be1e57f5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-01 00:18+0200\n"
-"PO-Revision-Date: 2010-08-01 00:16+0200\n"
-"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
+"POT-Creation-Date: 2010-11-17 09:26+0100\n"
+"PO-Revision-Date: 2010-11-17 09:19+0100\n"
+"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
+"Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Translators may want to transliterate the name.
@@ -534,7 +534,6 @@ msgstr "Bestätigung des Löschens des Zertifikats"
 msgid "Certificate Manager"
 msgstr "Zertifikat-Manager"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Rechnername"
 
@@ -813,7 +812,7 @@ msgstr "Stopp"
 msgid "Waiting for transfer to begin"
 msgstr "Warte auf den Beginn der Dateiübertragung"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Abgebrochen"
 
 msgid "Failed"
@@ -1710,9 +1709,12 @@ msgstr ""
 "Das Zertifikat ist nicht mehr gültig.  Überprüfen Sie, ob Datum und Zeit "
 "Ihres Computers stimmen."
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
-"Das Zertifikat ist abgelaufen und sollte nicht als gültig angesehen werden."
+"Das Zertifikat ist abgelaufen und sollte nicht mehr als gültig betrachtet "
+"werden.  Überprüfen Sie, ob Datum und Zeit Ihres Computers stimmen."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4723,9 +4725,9 @@ msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"role &lt;owner|admin|member|outcast|none&gt; [Spitzname1] [Spitzname2] ...: "
-"Benutzer mit einer Rolle für den Raum erfragen oder Benutzern eine Rolle "
-"zuweisen."
+"role &lt;moderator|participant|visitor|none&gt; [Spitzname1] "
+"[Spitzname2] ...: Benutzer mit einer Rolle für den Raum erfragen oder "
+"Benutzern eine Rolle zuweisen."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4772,11 +4774,17 @@ msgstr "XMPP-Protokoll-Plugin"
 msgid "Domain"
 msgstr "Domain"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS voraussetzen"
+msgid "Require encryption"
+msgstr "Verschlüsselung fordern"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Erzwinge altes SSL (Port 5223)"
+msgid "Use encryption if available"
+msgstr "Verschlüsselung benutzen, wenn verfügbar"
+
+msgid "Use old-style SSL"
+msgstr "Alte SSL-Methode verwenden"
+
+msgid "Connection security"
+msgstr "Verbindungssicherheit"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
@@ -4883,15 +4891,6 @@ msgstr "Hinausgeworfen (%s)"
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Bei der In-Band-Bytestrom-Ãœbertragung trat ein Fehler auf\n"
-
-msgid "Transfer was closed."
-msgstr "Ãœbertragung wurde geschlossen."
-
-msgid "Failed to open in-band bytestream"
-msgstr "Öffnen des In-Band-Bytestroms fehlgeschlagen"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5211,26 +5210,6 @@ msgstr "Fehler beim Hinzufügen des Buddys"
 msgid "The username specified does not exist."
 msgstr "Der angegebene Benutzername existiert nicht."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Fehler bei der Buddy-Listen-Synchronisation bei %s (%s)"
-
-#, 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 auf der lokalen Liste ist in der Gruppe „%s“, aber nicht auf der "
-"Serverliste. Möchten Sie, dass der Buddy hinzugefügt wird?"
-
-#, 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 ist auf der lokalen Liste, aber nicht auf der Serverliste. Möchten Sie, "
-"dass der Buddy hinzugefügt wird?"
-
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
@@ -5402,6 +5381,26 @@ msgstr "Unbekannter Fehlercode %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN-Fehler: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Fehler bei der Buddy-Listen-Synchronisation bei %s (%s)"
+
+#, 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 auf der lokalen Liste ist in der Gruppe „%s“, aber nicht auf der "
+"Serverliste. Möchten Sie, dass der Buddy hinzugefügt wird?"
+
+#, 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 ist auf der lokalen Liste, aber nicht auf der Serverliste. Möchten Sie, "
+"dass der Buddy hinzugefügt wird?"
+
 msgid "Other Contacts"
 msgstr "Andere Kontakte"
 
@@ -5456,12 +5455,24 @@ msgstr "Ihr neuer MSN-Benutzername zu lang."
 msgid "Set friendly name for %s."
 msgstr "Setze Spitznamen für %s."
 
-msgid "Set your friendly name."
-msgstr "Setze Ihren Spitznamen."
+msgid "Set Friendly Name"
+msgstr "Setze Spitznamen"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Das ist der Name, den andere MSN-Buddys von Ihren sehen."
 
+msgid "This Location"
+msgstr "Dieser Ort"
+
+msgid "This is the name that identifies this location"
+msgstr "Das ist der Name, der diesen Ort identifiziert"
+
+msgid "Other Locations"
+msgstr "Andere Orte"
+
+msgid "You can sign out from other locations here"
+msgstr "Sie können andere Orte von hier abmelden"
+
 msgid "Set your home phone number."
 msgstr "Setze Ihre private Telefonnummer."
 
@@ -5548,6 +5559,9 @@ msgstr "Dienststellenbezeichnung"
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
+msgid "View Locations..."
+msgstr "Orte betrachten..."
+
 msgid "Set Home Phone Number..."
 msgstr "Setze private Telefonnummer..."
 
@@ -6801,8 +6815,8 @@ msgstr "Anmeldung nicht möglich: %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen (%"
-"s)."
+"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6820,8 +6834,8 @@ msgstr "Kann den Benutzer nicht einladen (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen (%"
-"s)."
+"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6965,6 +6979,16 @@ msgstr "Server-Adresse"
 msgid "Server port"
 msgstr "Server-Port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Bitte autorisiere mich damit ich Dich zu meiner Buddy-Liste hinzufügen kann."
+
+msgid "No reason given."
+msgstr "Kein Grund angegeben."
+
+msgid "Authorization Denied Message:"
+msgstr "Nachricht für die Ablehnung der Autorisierung:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Unerwartete Antwort von %s erhalten: %s"
@@ -6981,6 +7005,13 @@ msgstr ""
 "versuchen Sie es noch einmal. Wenn Sie es weiter versuchen, müssen Sie sogar "
 "noch länger warten."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"Sie haben Verschlüsselung in Ihren Kontoeinstellungen gefordert, aber einer "
+"der Server unterstützt keine Verschlüsselung."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7001,6 +7032,25 @@ msgstr "AOL erlaubt Ihnen nicht, sich hier mit Ihrem Benutzernamen anzumelden"
 msgid "Error requesting %s"
 msgstr "Fehler beim Anfordern von %s"
 
+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 ""
+"(Es gab einen Fehler beim Empfang dieser Nachricht.  Der Buddy mit dem Sie "
+"sprechen verwendet vermutlich ein anderes Encoding als erwartet.  Wenn Sie "
+"wissen, welches Encoding er benutzt, können Sie dies in den erweiterten "
+"Kontenoptionen für Ihr AIM-/ICQ-Konto angeben.)"
+
+#, 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 ""
+"(Es gab einen Fehler beim Empfang dieser Nachricht.  Entweder benutzen Sie "
+"und %s ein unterschiedliches Encoding oder %s hat einen fehlerhaften Client.)"
+
 msgid "Could not join chat room"
 msgstr "Konnte Chatraum nicht betreten"
 
@@ -7218,96 +7268,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datei %s (%s) ist größer als die maximale Größe von %s."
 
-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 ""
-"(Es gab einen Fehler beim Empfangen dieser Nachricht.  Der Buddy, mit dem "
-"Sie sich unterhalten benutzt wahrscheinlich eine andere Kodierung als "
-"erwartet.  Wenn Sie wissen, welche Kodierung er benutzt, können Sie diese in "
-"den erweiterten Konto-Optionen Ihres AIM/ICQ-Kontos angeben.)"
-
-#, 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 ""
-"(Es gab einen Fehler beim Empfang dieser Nachricht.  Entweder haben Sie und %"
-"s unterschiedliche Kodierungen gesetzt oder %s hat einen fehlerhaften "
-"Client.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy-Icon"
-
-msgid "Voice"
-msgstr "Stimme"
-
-msgid "AIM Direct IM"
-msgstr "AIM direkte Nachricht"
-
-msgid "Get File"
-msgstr "Datei abrufen"
-
-msgid "Games"
-msgstr "Spiele"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Zusätze"
-
-msgid "Send Buddy List"
-msgstr "Buddy-Liste senden"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ direkte Verbindung"
-
-msgid "AP User"
-msgstr "AP Benutzer"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Altes ICQ UTF-8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian-Verschlüsselung"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sicherheit aktiviert"
-
-msgid "Video Chat"
-msgstr "Video-Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live-Video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Gemeinsamer Bildschirm"
-
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
@@ -7338,15 +7298,6 @@ msgstr "Bei der Arbeit"
 msgid "At lunch"
 msgstr "Zur Mittagspause"
 
-msgid "IP Address"
-msgstr "IP-Adresse"
-
-msgid "Warning Level"
-msgstr "Warnstufe"
-
-msgid "Buddy Comment"
-msgstr "Buddy-Kommentar"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Verbindung zum Authentifizierungsserver nicht möglich: %s"
@@ -7376,6 +7327,13 @@ msgstr ""
 "Buchstaben beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten "
 "oder nur aus Ziffern bestehen."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Sie haben Verschlüsselung in Ihren Kontoeinstellungen gefordert, aber Ihr "
+"System unterstützt keine Verschlüsselung."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7446,17 +7404,6 @@ msgstr "Passwort gesendet"
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
-"kann."
-
-msgid "No reason given."
-msgstr "Kein Grund angegeben."
-
-msgid "Authorization Denied Message:"
-msgstr "Nachricht für die Ablehnung der Autorisierung:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7582,60 +7529,13 @@ msgstr[0] ""
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Benutzerinformation nicht verfügbar: %s"
-
-msgid "Online Since"
-msgstr "Online seit"
-
-msgid "Member Since"
-msgstr "Mitglied seit"
-
-msgid "Capabilities"
-msgstr "Fähigkeiten"
-
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
-"Zeichen enthält.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
 
-msgid "Mobile Phone"
-msgstr "Handynummer"
-
-msgid "Personal Web Page"
-msgstr "Persönliche Webseite"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Zusätzliche Informationen"
-
-msgid "Zip Code"
-msgstr "PLZ"
-
-msgid "Work Information"
-msgstr "Information (Arbeit)"
-
-msgid "Division"
-msgstr "Abteilung"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Webseite"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
@@ -7922,8 +7822,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
+msgid "you are not waiting for authorization"
+msgstr "Sie warten derzeit auf keine Autorisierungen"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
@@ -7962,6 +7862,12 @@ msgstr "Konfiguriere IM-Weiterleitung (Web)"
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
+msgid "Show Visible List"
+msgstr "Zeige Liste „Immer sichtbar“"
+
+msgid "Show Invisible List"
+msgstr "Zeige Liste „Immer unsichtbar“"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
@@ -7978,8 +7884,8 @@ msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 msgid "Search for Buddy by Email Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-msgid "Search for Buddy by Information"
-msgstr "Suche Buddy nach Information"
+msgid "Don't use encryption"
+msgstr "Keine Verschlüsselung benutzen"
 
 msgid "Use clientLogin"
 msgstr "clientLogin benutzen"
@@ -8089,6 +7995,160 @@ msgstr "Warteschlange voll"
 msgid "Not while on AOL"
 msgstr "Nicht solange bei AOL angemeldet"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy-Icon"
+
+msgid "Voice"
+msgstr "Stimme"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direkte Nachricht"
+
+msgid "Get File"
+msgstr "Datei holen"
+
+msgid "Games"
+msgstr "Spiele"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ-Xtraz"
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Buddy-Liste senden"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direkte Verbindung"
+
+msgid "AP User"
+msgstr "AP-Benutzer"
+
+msgid "ICQ RTF"
+msgstr "ICQ-RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-Server-Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Altes ICQ UTF-8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-Verschlüsselung"
+
+msgid "ICQ UTF8"
+msgstr "ICQ-UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sicherheit aktiviert"
+
+msgid "Video Chat"
+msgstr "Video-Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live-Video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Gemeinsamer Bildschirm"
+
+msgid "IP Address"
+msgstr "IP-Adresse"
+
+msgid "Warning Level"
+msgstr "Warnstufe"
+
+msgid "Buddy Comment"
+msgstr "Buddy-Kommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Benutzerinformation nicht verfügbar: %s"
+
+msgid "Mobile Phone"
+msgstr "Handynummer"
+
+msgid "Personal Web Page"
+msgstr "Persönliche Webseite"
+
+#. aim_userinfo_t
+#. use_html_status
+msgid "Additional Information"
+msgstr "Zusätzliche Informationen"
+
+msgid "Zip Code"
+msgstr "Postleitzahl"
+
+msgid "Work Information"
+msgstr "Berufsinformationen"
+
+msgid "Division"
+msgstr "Abteilung"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Webseite"
+
+msgid "Online Since"
+msgstr "Online seit"
+
+msgid "Member Since"
+msgstr "Mitglied seit"
+
+msgid "Capabilities"
+msgstr "Fähigkeiten"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Online erscheinen"
+
+msgid "Don't Appear Online"
+msgstr "Nicht online erscheinen"
+
+msgid "Appear Offline"
+msgstr "Offline erscheinen"
+
+msgid "Don't Appear Offline"
+msgstr "Nicht offline erscheinen"
+
+msgid "you have no buddies on this list"
+msgstr "Sie haben keine Buddys in dieser Liste"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Sie können einen Buddy zu dieser Liste hinzufügen, wenn Sie den Buddy mit "
+"einem Rechtsklick anklicken und „%s“ auswählen."
+
+msgid "Visible List"
+msgstr "Liste \"Immer sichtbar\""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr "Diese Buddys werden Ihren Status sehen, wenn Sie „unsichtbar“ sind"
+
+msgid "Invisible List"
+msgstr "Liste \"Immer unsichtbar\""
+
+msgid "These buddies will always see you as offline"
+msgstr "Für diese Buddys werden Sie immer als offline angezeigt"
+
 msgid "Aquarius"
 msgstr "Wassermann"
 
@@ -8268,8 +8328,8 @@ msgid "Your request was rejected."
 msgstr "Ihre Anfrage wurde abgelehnt."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u erfordert Autorisierung"
+msgid "%u requires verification: %s"
+msgstr "%u erfordert Überprüfung: %s"
 
 msgid "Add buddy question"
 msgstr "Buddy-Frage hinzufügen"
@@ -8462,8 +8522,8 @@ msgstr "Dem Qun %u, moderiert von admin %u, konnte nicht beigetreten werden"
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
-"<b>Das Betreten des Qun %u wurde vom Admin bestätigt wegen by admin %u for %"
-"s</b>"
+"<b>Das Betreten des Qun %u wurde vom Admin bestätigt wegen by admin %u for "
+"%s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -10508,18 +10568,12 @@ msgstr "Hinausgegangen"
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-msgid "Appear Online"
-msgstr "Online erscheinen"
-
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
 msgid "Presence"
 msgstr "Präsenz"
 
-msgid "Appear Offline"
-msgstr "Offline erscheinen"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent offline erscheinen"
 
@@ -11074,29 +11128,24 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 "Die Verbindung wurde von einer anderen Software auf Ihrem Computer "
 "unterbrochen."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Der entfernte Host hat die Verbindung beendet."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbindung abgelehnt."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresse wird bereits benutzt."
 
@@ -11247,6 +11296,11 @@ msgstr ""
 "Listenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s möchte Sie (%s) zu seiner oder ihrer Buddy-Liste hinzufügen%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
@@ -11506,6 +11560,8 @@ msgstr "Nachricht (optional)"
 msgid "Edit User Mood"
 msgstr "Benutzerstimmung ändern"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddys"
@@ -11947,7 +12003,7 @@ msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
 msgid "/Conversation/View _Log"
-msgstr "/Unterhaltung/Betrachte _Mitschnitt"
+msgstr "/Unterhaltung/_Mitschnitt anzeigen"
 
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/S_peichern als..."
@@ -12040,7 +12096,7 @@ msgid "/Conversation"
 msgstr "/Unterhaltung"
 
 msgid "/Conversation/View Log"
-msgstr "/Unterhaltung/Betrachte Mitschnitt"
+msgstr "/Unterhaltung/Mitschnitt anzeigen"
 
 msgid "/Conversation/Media/Audio Call"
 msgstr "/Unterhaltung/Medien/Audio-Anruf"
@@ -12255,9 +12311,6 @@ msgstr "Support"
 msgid "webmaster"
 msgstr "Webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior-Beitragender/QA"
-
 msgid "win32 port"
 msgstr "Win32 Portierung"
 
@@ -12283,6 +12336,9 @@ msgstr "Originalautor"
 msgid "lead developer"
 msgstr "Hauptentwickler"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior-Beitragender/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -12415,6 +12471,9 @@ msgstr "Kurdisch"
 msgid "Lao"
 msgstr "Laotisch"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Makedonisch"
 
@@ -12535,8 +12594,8 @@ msgid ""
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s ist ein Nachrichtendienst, basierend auf libpurple, der die Verbindung zu "
 "mehreren Nachrichtendiensten gleichzeitig unterstützt.  %s wird in C "
@@ -13108,16 +13167,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung in %s, gestartet am %s, "
 "permanent löschen?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Wollen Sie wirklich den Systemmitschnitt, gestartet am %s, permanent löschen?"
 
@@ -13648,6 +13707,9 @@ msgstr "Relay-Server (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-Server:"
 
+msgid "_UDP Port:"
+msgstr "_UDP-Port:"
+
 msgid "Use_rname:"
 msgstr "_Benutzername:"
 
@@ -13669,6 +13731,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop-Standard"
 
@@ -13687,6 +13754,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manuell"
 
@@ -14228,7 +14303,7 @@ msgstr "keine"
 msgid "Small"
 msgstr "Klein"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Kleinere Versionen der Default-Smileys"
 
 msgid "Response Probability:"
@@ -15268,6 +15343,9 @@ msgstr "G_erät"
 msgid "Voice/Video Settings"
 msgstr "Sprach-/Video-Einstellungen"
 
+msgid "Voice and Video Settings"
+msgstr "Sprach- und Video-Einstellungen"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15397,7 +15475,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15460,13 +15538,13 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 "Fehler beim Installieren der Rechtschreibkontrolle ($R3).$\\rFalls ein "
 "erneuter Versuch fehlschlägt, finden Sie Anweisungen zur manuellen "
-"Installation unter: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"Installation unter: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
@@ -15545,3 +15623,12 @@ msgstr "Besuchen Sie die Pidgin-Webseite"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
+
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "Bei der In-Band-Bytestrom-Ãœbertragung trat ein Fehler auf\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "Ãœbertragung wurde geschlossen."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "Öffnen des In-Band-Bytestroms fehlgeschlagen"
diff --git a/po/dz.po b/po/dz.po
index 774bf7a676..5c6a40ddde 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2006-11-09 17:11+0530\n"
 "Last-Translator: wangmo sherpa <rinwanshe@yahoo.com>\n"
 "Language-Team:  <pgeygel@dit.gov.bt>\n"
@@ -547,7 +547,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ཧོསཊི་ནེམ�"
 
@@ -818,7 +817,7 @@ msgstr "གཞི་སྒྲིག"
 msgid "Waiting for transfer to begin"
 msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ�"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ཆ་མེད་བ�ང་ཡི�"
 
 msgid "Failed"
@@ -1764,7 +1763,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4883,11 +4884,20 @@ msgstr "ཨེམ་ཨེསི་ཨེན་ གནད་སྤེལ་ལà½
 msgid "Domain"
 msgstr "རོ་མ་ནི་ཡཱན"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "དབང་སྤྲོད་དགོས་མ�ོ་བས�"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "�ོབ་ཚུགས་པ་ཅིན་ ཊི་ཨེལ་ཨེསི་འདི་ ལག་ལེན་འ�བ�"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "ཨེསི་ཨེསི་ཨེལ་ (འདྲེན་ལམ་ ༥༢༢༣) རྙིངམ་བང་བཙོང་�"
+#, fuzzy
+msgid "Connection security"
+msgstr "མ�ུད་ལམ་སླར་སྒྲིག"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ཚུའི་ལྟག་ལས་ ཚིག་ཡིག་ཉག་ར�ྱང་གི་གནང་བ་བྱིན་བཅུག"
@@ -6186,7 +6196,7 @@ msgid "The two PINs you entered do not match."
 msgstr "ཆོག་ཡིག་གསརཔ་ཚུ་མི་མ�ུན་པས�"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "མ�འ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས�"
 
 msgid ""
@@ -6290,10 +6300,6 @@ msgid "Connecting..."
 msgstr "མ�ུད་དོ�"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "མ�འ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས�"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "མ�འ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས�"
 
@@ -7203,6 +7209,15 @@ msgstr "སར་བར་ �་བྱང་�"
 msgid "Server port"
 msgstr "སར་བར་ འདྲེན་ལམ�"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ང་ལུ་དབང་སྤྲོད་འབད་གནང་ དེ་ལས་ང་གིས་ �ྱོད་ངེ་གི་ཆ་རོགས་�ོ་ཡིག་ནང་�་ས�ོང་འབད་ཚུགས�"
+
+msgid "No reason given."
+msgstr "རྒྱུ་མཚན་མ་བཀོད་པས�"
+
+msgid "Authorization Denied Message:"
+msgstr "དབང་སྤྲོད་ཉན་མ་བ�ུབ་པའི་འཕྲིན་དོན:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་�ོབ་ཡོདཔ�"
@@ -7236,6 +7251,25 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+"(འ་ནི་འཕྲིན་དོན་ལེན་པའི་ས�བས་སུ་འཛོལ་བ་གཅིག་འདུག  �ྱོད་ཀྱིས་ ད་ལྟོ་�་སླབ་ཡོད་མི་ཆ་རོགས་འདི་ རེ་བ་"
+"བས�ྱེད་ཡོད་མི་མེད་པར་སོ་སོ་ཨིན་ཀོ་ཌིང་གཅིག་ལག་ལེན་འ�བ་དོ་འོང་ནི་མས�  �ྱོད་ཀྱིས་ �ོ་གིས་ལག་ལེན་འ�བ་སྟེ་"
+"ཡོད་མི་ ཨིན་ཀོ་ཌིང་འདི་ཤེས་པ་ཅིན་འདི་ མ�ོ་རིམ་རྩིས་�ོ་ནང་ལུ་ �ྱོད་རའི་ ཨེ་ཨའི་ཨེམ་/ཨའི་སི་ཀིའུ་དོན་ལུ་ "
+"གསལ་བཀོད་འབད་བ�ུབ་ཨིན�)"
+
+#, 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 ""
+"(འཕྲིན་དོན་འདི་�ོབ་ད་ལུ་ འཛོལ་བ་འདུག  �ྱོད་ཀྱིས་�་སླབ་མི་ ཆ་རོགས་འདི་ལུ་ ར�ྱེན་ཅན་གྱི་ཞབས་�ོག་སྤྱོད་མི་"
+"བཟུམ་ཅིག་འདུག)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "མ�ུད་མ་ཚུགས�"
@@ -7474,96 +7508,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ཡིག་སྣོད་ %s འདི་ %s གི་ ཚད་མང་མ�འ་ལས་སྦོམ་མའི་ %s ཨིན�"
 
-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 ""
-"(འ་ནི་འཕྲིན་དོན་ལེན་པའི་ས�བས་སུ་འཛོལ་བ་གཅིག་འདུག  �ྱོད་ཀྱིས་ ད་ལྟོ་�་སླབ་ཡོད་མི་ཆ་རོགས་འདི་ རེ་བ་"
-"བས�ྱེད་ཡོད་མི་མེད་པར་སོ་སོ་ཨིན་ཀོ་ཌིང་གཅིག་ལག་ལེན་འ�བ་དོ་འོང་ནི་མས�  �ྱོད་ཀྱིས་ �ོ་གིས་ལག་ལེན་འ�བ་སྟེ་"
-"ཡོད་མི་ ཨིན་ཀོ་ཌིང་འདི་ཤེས་པ་ཅིན་འདི་ མ�ོ་རིམ་རྩིས་�ོ་ནང་ལུ་ �ྱོད་རའི་ ཨེ་ཨའི་ཨེམ་/ཨའི་སི་ཀིའུ་དོན་ལུ་ "
-"གསལ་བཀོད་འབད་བ�ུབ་ཨིན�)"
-
-#, 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 ""
-"(འཕྲིན་དོན་འདི་�ོབ་ད་ལུ་ འཛོལ་བ་འདུག  �ྱོད་ཀྱིས་�་སླབ་མི་ ཆ་རོགས་འདི་ལུ་ ར�ྱེན་ཅན་གྱི་ཞབས་�ོག་སྤྱོད་མི་"
-"བཟུམ་ཅིག་འདུག)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "ཆ་རོགས་ཀྱི་ངོས་དཔར�"
-
-msgid "Voice"
-msgstr "ས�ད�"
-
-msgid "AIM Direct IM"
-msgstr "ཨེ་ཨའི་ཨེམ་ �ད་ཀར་ ཨའི་ཨེམ�"
-
-msgid "Get File"
-msgstr "ཡིག་སྣོད་ལེན�"
-
-msgid "Games"
-msgstr "རྩེདམོ་ཚུ�"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "�་ས�ོང-་ཨའི་ཨེན་ཨེསི�"
-
-msgid "Send Buddy List"
-msgstr "ཆ་རོགས་ཀྱི་�ོ་ཡིག་ག�ང་�"
-
-msgid "ICQ Direct Connect"
-msgstr "ཨའི་སི་ཀིའུ་ �ད་ཀར་མ�ུད�"
-
-msgid "AP User"
-msgstr "ཨེ་པི་ ལག་ལེན་པ�"
-
-msgid "ICQ RTF"
-msgstr "ཨའི་སི་ཀིའུ་ ཨར་ཊི་ཨེཕ�"
-
-msgid "Nihilist"
-msgstr "ནཱི་ཧི་ལིསཊི�"
-
-msgid "ICQ Server Relay"
-msgstr "ཨའི་སི་ཀིའུ་ སར་བར་ བརྒྱུད་སྤྲོད�"
-
-msgid "Old ICQ UTF8"
-msgstr "རྙིངམ་ ཨའི་སི་ཀིའུ་ ཡུ་ཊི་ཨེཕ༨"
-
-msgid "Trillian Encryption"
-msgstr "ཊིལིཡེན་ གསང་བཟོ�"
-
-msgid "ICQ UTF8"
-msgstr "རྙིངམ་ ཨའི་སི་ཀིའུ་ ཡུ་ཊི་ཨེཕ༨"
-
-msgid "Hiptop"
-msgstr "ཧིབ་ཊོབ�"
-
-msgid "Security Enabled"
-msgstr "མ�འ་བཙན་ལྕོགས་ཅན་བཟོ་ཡི�"
-
-msgid "Video Chat"
-msgstr "�ི་ཌིའོ་ �་སླབ�"
-
-msgid "iChat AV"
-msgstr "ཨའི་ཅེཊ་ ཨེ་�ི�"
-
-msgid "Live Video"
-msgstr "མངོན་མ�ོང་ �ི་ཌིའོ�"
-
-msgid "Camera"
-msgstr "པར་ཆས�"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "གསལ་གཞི་མིང་�"
-
 msgid "Free For Chat"
 msgstr "�་སླབ་ནི་ དལ�་ཨིན�"
 
@@ -7599,15 +7543,6 @@ msgstr "ཡོངས་འབྲེལ�"
 msgid "At lunch"
 msgstr "དགུང་ལྟོ་བཟའ་བར�"
 
-msgid "IP Address"
-msgstr "ཨའི་པི་�་བྱང་�"
-
-msgid "Warning Level"
-msgstr "ཉེན་བརྡའི་གནས་རིམ�"
-
-msgid "Buddy Comment"
-msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད�"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7713,15 +7648,6 @@ msgstr "ཆོག་ཡིག་བ�ང་ཡི�"
 msgid "Unable to initialize connection"
 msgstr "མ�ུད་ལམ་གསར་བས�ྲུན་འབད་མ་ཚུགསཔ�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "ང་ལུ་དབང་སྤྲོད་འབད་གནང་ དེ་ལས་ང་གིས་ �ྱོད་ངེ་གི་ཆ་རོགས་�ོ་ཡིག་ནང་�་ས�ོང་འབད་ཚུགས�"
-
-msgid "No reason given."
-msgstr "རྒྱུ་མཚན་མ་བཀོད་པས�"
-
-msgid "Authorization Denied Message:"
-msgstr "དབང་སྤྲོད་ཉན་མ་བ�ུབ་པའི་འཕྲིན་དོན:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7843,59 +7769,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ་ %hu འཕྲིན་དོན་འདི་%sལས་ བྱིག་ཡར་སོ་ནུག  "
 msgstr[1] "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ  �ྱོད་ཀྱིས%huའཕྲིན་དོན་ཚུ %sལས བྱིག་ཡར་སོ་ནུག "
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ལག་ལེན་པའི་བརྡ་དོན་%sའདི་�ོབ་མི་ཚུགས�"
-
-msgid "Online Since"
-msgstr "ལས་ཚུར་ གློག་�ོག"
-
-msgid "Member Since"
-msgstr "ལས་ཚུར་ འ�ུས་མི�"
-
-msgid "Capabilities"
-msgstr "ལྕོགས་གྲུབ�"
-
 msgid "Your AIM connection may be lost."
 msgstr "�ྱོད་ཀྱི་ ཨེ་ཨའི་ཨེམ་ མ�ུད་ལམ་འདི་བརླག་ག�ོར་ཞུགས་ཞུགསཔ་འོང་�"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[ནང་ན་ལུ་ ནུས་མེད་ཀྱི་ཡིག་འབྲུ་ཚུ་ཡོདཔ་ལས་  ལག་ལེན་པ་འདི་ལས་ འཕྲིན་དོན་བཀྲམ་སྟོན་འབད་མ་ཚུགས�]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�ྱོད་  �་སླབ་�ང་མིག་%sནང་ལས་ མ�ུད་ལམ་བ�ོག་ད་ནུག"
 
-msgid "Mobile Phone"
-msgstr "འགྲུལ་འཕྲིན�"
-
-msgid "Personal Web Page"
-msgstr "རང་དོན་གྱི་ �ེབ་ཤོག་ལེབ�"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "�་ས�ོང་ཅན་གྱི་བརྡ་དོན�"
-
-msgid "Zip Code"
-msgstr "གནས་ཡུལ་གྱི་ཨང་རྟགས�"
-
-msgid "Work Information"
-msgstr "ལཱ་གི་བརྡ་དོན�"
-
-msgid "Division"
-msgstr "སྡེ་ཚན�"
-
-msgid "Position"
-msgstr "གནས་ས�"
-
-msgid "Web Page"
-msgstr "�ེབ་ཤོག་ལེབ�"
-
 msgid "Pop-Up Message"
 msgstr "པོཔ་-ཨཔ་ འཕྲིན་དོན�"
 
@@ -8180,7 +8060,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "�་བྱང་ འ་ནི་ལུ བསྒྱུར་བཅོས་ར�ྱབས:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>�ྱོད་ དབང་སྤྲོད་ཀྱི་དོན་ལུ་  བསྒུག་མི་སྡོད་པས�</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8223,6 +8104,14 @@ msgstr "ཨའི་ཨེམ་ གདོང་བསà¾�ྱོད་འབདà¼
 msgid "Set Privacy Options..."
 msgstr "སྒེར་གཙང་གདམ་�་ཚུ་གཞི་སྒྲིག་འབད�..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ཆ་རོགས་ཀྱི་�ོ་ཡིགས་སྟོན�"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "�ོ་ཡིག་མགྲོན་བརྡ་འབད�"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "རྩིས་�ོ་ངེས་ག�ན་བཟོ�"
@@ -8239,9 +8128,6 @@ msgstr "དབང་སྤྲོད་བསྒུག་བཞིན་དུའ
 msgid "Search for Buddy by Email Address..."
 msgstr "གློག་འཕྲིན་�་བྱང་གིས་�ོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད�..."
 
-msgid "Search for Buddy by Information"
-msgstr "བརྡ་དོན་གྱི་�ོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད�"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "ལག་ལེན་པ་འདི་ནང་བས�ྱོད་མ་འབད་བས�"
@@ -8351,6 +8237,166 @@ msgstr "གྲལ་རིམ་གང་�"
 msgid "Not while on AOL"
 msgstr "ཨེ་ཨོ་ཨེལ་གྱི་ས�བས་སུ་ མེན�"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ཆ་རོགས་ཀྱི་ངོས་དཔར�"
+
+msgid "Voice"
+msgstr "ས�ད�"
+
+msgid "AIM Direct IM"
+msgstr "ཨེ་ཨའི་ཨེམ་ �ད་ཀར་ ཨའི་ཨེམ�"
+
+msgid "Get File"
+msgstr "ཡིག་སྣོད་ལེན�"
+
+msgid "Games"
+msgstr "རྩེདམོ་ཚུ�"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "�་ས�ོང-་ཨའི་ཨེན་ཨེསི�"
+
+msgid "Send Buddy List"
+msgstr "ཆ་རོགས་ཀྱི་�ོ་ཡིག་ག�ང་�"
+
+msgid "ICQ Direct Connect"
+msgstr "ཨའི་སི་ཀིའུ་ �ད་ཀར་མ�ུད�"
+
+msgid "AP User"
+msgstr "ཨེ་པི་ ལག་ལེན་པ�"
+
+msgid "ICQ RTF"
+msgstr "ཨའི་སི་ཀིའུ་ ཨར་ཊི་ཨེཕ�"
+
+msgid "Nihilist"
+msgstr "ནཱི་ཧི་ལིསཊི�"
+
+msgid "ICQ Server Relay"
+msgstr "ཨའི་སི་ཀིའུ་ སར་བར་ བརྒྱུད་སྤྲོད�"
+
+msgid "Old ICQ UTF8"
+msgstr "རྙིངམ་ ཨའི་སི་ཀིའུ་ ཡུ་ཊི་ཨེཕ༨"
+
+msgid "Trillian Encryption"
+msgstr "ཊིལིཡེན་ གསང་བཟོ�"
+
+msgid "ICQ UTF8"
+msgstr "རྙིངམ་ ཨའི་སི་ཀིའུ་ ཡུ་ཊི་ཨེཕ༨"
+
+msgid "Hiptop"
+msgstr "ཧིབ་ཊོབ�"
+
+msgid "Security Enabled"
+msgstr "མ�འ་བཙན་ལྕོགས་ཅན་བཟོ་ཡི�"
+
+msgid "Video Chat"
+msgstr "�ི་ཌིའོ་ �་སླབ�"
+
+msgid "iChat AV"
+msgstr "ཨའི་ཅེཊ་ ཨེ་�ི�"
+
+msgid "Live Video"
+msgstr "མངོན་མ�ོང་ �ི་ཌིའོ�"
+
+msgid "Camera"
+msgstr "པར་ཆས�"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "གསལ་གཞི་མིང་�"
+
+msgid "IP Address"
+msgstr "ཨའི་པི་�་བྱང་�"
+
+msgid "Warning Level"
+msgstr "ཉེན་བརྡའི་གནས་རིམ�"
+
+msgid "Buddy Comment"
+msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད�"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ལག་ལེན་པའི་བརྡ་དོན་%sའདི་�ོབ་མི་ཚུགས�"
+
+msgid "Mobile Phone"
+msgstr "འགྲུལ་འཕྲིན�"
+
+msgid "Personal Web Page"
+msgstr "རང་དོན་གྱི་ �ེབ་ཤོག་ལེབ�"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "�་ས�ོང་ཅན་གྱི་བརྡ་དོན�"
+
+msgid "Zip Code"
+msgstr "གནས་ཡུལ་གྱི་ཨང་རྟགས�"
+
+msgid "Work Information"
+msgstr "ལཱ་གི་བརྡ་དོན�"
+
+msgid "Division"
+msgstr "སྡེ་ཚན�"
+
+msgid "Position"
+msgstr "གནས་ས�"
+
+msgid "Web Page"
+msgstr "�ེབ་ཤོག་ལེབ�"
+
+msgid "Online Since"
+msgstr "ལས་ཚུར་ གློག་�ོག"
+
+msgid "Member Since"
+msgstr "ལས་ཚུར་ འ�ུས་མི�"
+
+msgid "Capabilities"
+msgstr "ལྕོགས་གྲུབ�"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "གློག་�ོག་འབྱུང་�"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "གློག་�ོག་འབྱུང་�"
+
+msgid "Appear Offline"
+msgstr "ཨོཕ་ལ་ཡིན་བྱུང་�"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ཨོཕ་ལ་ཡིན་བྱུང་�"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "�ྱོད་  %s: (%s)ཀྱིས་བ�ོན་བ�ང་ནུག"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"�ོང་ཚུའི་གུ་ལུ་ གཡས་ཀྱི་གཡེབ་ག�ང་ཨེབ་ནི་དང་\"་དབང་སྤྲོད་སླར་ཞུ་བ�\"སེལ་འ�ུ་འབད་བའི་�ོག་ལས་ �ྱོད་"
+"ཀྱིས་ཆ་རོགས་ཚུ་ནང་ལས་ དབང་སྤྲོད་སླར་ཞུ་ཚུགས�"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "མ་མ�ོངམ�"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "�ོ་ཡིག་མགྲོན་བརྡ་འབད�"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "དུས་སྦྱོར་བུམ་པ�"
 
@@ -8550,7 +8596,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "དབང་སྤྲོད་དགོས་མ�ོ་བས�"
 
 #, fuzzy
@@ -10847,18 +10893,12 @@ msgstr "ཕྱིར་བགོམས་པ�"
 msgid "Not on server list"
 msgstr "སར་བར་�ོ་ཡིག་གུ་མེན�"
 
-msgid "Appear Online"
-msgstr "གློག་�ོག་འབྱུང་�"
-
 msgid "Appear Permanently Offline"
 msgstr "རྟག་བརྟན་གློག་ལམ་མེདཔ་སྦེ་འབྱུང་�"
 
 msgid "Presence"
 msgstr "ངོ་འཛོམས�"
 
-msgid "Appear Offline"
-msgstr "ཨོཕ་ལ་ཡིན་བྱུང་�"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "རྟག་བརྟན་གློག་ལམ་མེདཔ་སྦེ་མ་འབྱུང་�"
 
@@ -11426,27 +11466,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "�ག་རིང་ལག་ལེན་པ་གིས་ མ�ུད་ལམ་�་བསྡམས་ཡོདཔ་ཨིན�"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "མ�ུད་ལམ་ངལ་མཚམས�!"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "མ�ུད་ལམ་ངོས་ལེན་མི་འབད་བས�"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "འ་ནི་�་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འ�བ་བཞིན་ཡོད�"
 
@@ -11594,6 +11633,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "ལག་ལེན་པ %s གིས་ %s འདི་ �ོ་ ཡང་ན་ མོའི་ཆ་རོགས་�ོ་ཡིག %s%s ནང་�་ས�ོང་འབད་ནི་ཨིན་པས�"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11882,6 +11925,8 @@ msgstr "འཕྲིན་དོན(གདམ་�་ཅན) :"
 msgid "Edit User Mood"
 msgstr "ལག་ལེན་པའི་�བས་ལམ་ཚུ�"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/ཆ་རོགས་ཚུ(_B)"
@@ -12679,9 +12724,6 @@ msgstr "རྒྱབ་ས�ྱོར�"
 msgid "webmaster"
 msgstr "བཟོ་མི་དང་�ེབ་ཨམ�"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "�ིན་༣༢ འདྲེན་ལམ�"
 
@@ -12708,6 +12750,9 @@ msgstr "རྩམ་པ་པོ་ངོ་མ�"
 msgid "lead developer"
 msgstr "སྔོན་བས�ྱོད་བཟོ་མི�"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14146,6 +14191,10 @@ msgid "_TURN server:"
 msgstr "ཨེསི་ཊི་ཡུ་ཨེན་ སར་བར�:(_U)"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "འདྲེན་ལམ:(_P)"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "ལག་ལེན་པའི་མིང་:(_U)"
 
@@ -14168,6 +14217,11 @@ msgstr "མོ་ཛིལ་ལ�"
 msgid "Konqueror"
 msgstr "ཀོང་ཀོ་རར�"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད�(_A)"
@@ -14187,6 +14241,14 @@ msgstr "ཕ་ཡེར་བཱརཌི�"
 msgid "Epiphany"
 msgstr "ཨི་པི་ཕ་ནི�"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ལག་དེབ�"
 
@@ -14762,7 +14824,7 @@ msgstr "(ཅི་མེད�)"
 msgid "Small"
 msgstr "གློག་འཕྲིན�"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15858,6 +15920,10 @@ msgstr "�བས་འཕྲུལ�"
 msgid "Voice/Video Settings"
 msgstr "སྒྲིག་སྟངས་ཚུ་ཞུན་དག་འབད�"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "སྒྲིག་སྟངས་ཚུ་ཞུན་དག་འབད�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15987,7 +16053,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16119,6 +16185,22 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ཨེསི་ཨེསི་ཨེལ་ (འདྲེན་ལམ་ ༥༢༢༣) རྙིངམ་བང་བཙོང་�"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "མ�འ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས�"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ནང་ན་ལུ་ ནུས་མེད་ཀྱི་ཡིག་འབྲུ་ཚུ་ཡོདཔ་ལས་  ལག་ལེན་པ་འདི་ལས་ འཕྲིན་དོན་བཀྲམ་སྟོན་འབད་མ་ཚུགས�]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "བརྡ་དོན་གྱི་�ོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད�"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "གསལ་བཀོད་འབད་འབད�་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས�"
@@ -16647,9 +16729,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "མ�ུད་ལམ་�་མ་བསྡམ་ཡོདཔ་(རྩོམ་སྒྲིག)�"
 
-#~ msgid "Connection reset"
-#~ msgstr "མ�ུད་ལམ་སླར་སྒྲིག"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "སོ་ཀེཊི་ %s ལས་ལྷག་པའི་འཛོལ་བ�:"
 
@@ -16889,7 +16968,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "བྲིས་ནིའི་དོན་ལུ %s �་ཕྱེ་མ་ཚུགས�"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ཡིག་སྣོད་གནས་སོར་འ�ུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བ�ང་ཡི�"
 
 #~ msgid "Could not connect for transfer."
@@ -18660,9 +18739,6 @@ msgstr ""
 #~ msgid "Roomlist Error"
 #~ msgstr "�ང་མིག་�ོ་ཡིག་གི་འཛོལ་བ�"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "�ོབ་ཚུགས་པ་ཅིན་ ཊི་ཨེལ་ཨེསི་འདི་ ལག་ལེན་འ�བ�"
-
 #~ msgid "Hidden"
 #~ msgstr "གསང་བ�"
 
diff --git a/po/el.po b/po/el.po
index 91a969f072..12dd080e77 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2009-07-16 16:48+0300\n"
 "Last-Translator: Bouklis Panos <panos@echidna-band.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -532,7 +532,6 @@ msgstr "Επιβεβαίωση διαγ�αφής πιστοποιητικο�"
 msgid "Certificate Manager"
 msgstr "Ο�γάνωση πιστοποιητικών"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Όνομα υπολογιστή"
 
@@ -804,7 +803,7 @@ msgstr "Σταμάτημα"
 msgid "Waiting for transfer to begin"
 msgstr "Αναμονή ένα�ξης μεταφο�άς"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ακυ�ώθηκε"
 
 msgid "Failed"
@@ -1706,7 +1705,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Η αλυσίδα πιστοποιητικο� που πα�ουσιάστηκε για %s δεν είναι έγκυ�η."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4763,11 +4764,20 @@ msgstr "Π�όσθετο π�ωτοκόλλου XMPP"
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
-msgstr "Απαιτείται SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Αίτηση έγκ�ισης"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Εξαναγκασμός παλιο� (θ��α 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Πλη�οφο�ίες του χ�ήστη %s μη διαθέσιμες"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Επαναφο�ά σ�νδεσης"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Επιτ�έπεται η έγκ�ιση σκέτου κειμένου μέσω μη κ�υπτογ�αφημένων �οών"
@@ -6028,7 +6038,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Οι νέοι κωδικοί δεν ται�ιάζουν."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Το SecurID που πληκτ�ολογήθηκε είναι λανθασμένο"
 
 msgid ""
@@ -6135,10 +6145,6 @@ msgid "Connecting..."
 msgstr "Γίνεται σ�νδεση"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Το SecurID που πληκτ�ολογήθηκε είναι λανθασμένο"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Το SecurID που πληκτ�ολογήθηκε είναι λανθασμένο"
 
@@ -7030,6 +7036,16 @@ msgstr "Διε�θυνση εξυπη�ετητή"
 msgid "Server port"
 msgstr "Θ��α εξυπη�ετητή"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Πα�ακαλώ δώστε μου έγκ�ιση ώστε να μπο�ώ να σας π�οσθέσω στη λίστα φίλων μου."
+
+msgid "No reason given."
+msgstr "Δεν δόθηκε αιτία."
+
+msgid "Authorization Denied Message:"
+msgstr "Μήνυμα ά�νησης έγκ�ισης:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Λήφθηκε αναπάντεχη ανταπόκ�ιση από "
@@ -7064,6 +7080,26 @@ msgstr ""
 msgid "Error requesting %s"
 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.)"
+
+#, 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 έχει ελαττωματικό "
+"μελάτη.)"
+
 msgid "Could not join chat room"
 msgstr "Δεν ήταν δυνατή η είσοδος στο δωμάτιο συζήτησης"
 
@@ -7299,96 +7335,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Το α�χείο %s είναι %s, που είναι μεγαλ�τε�ο από το μέγιστο μέγεθος των %s."
 
-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.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "Εικονίδιο φίλου"
-
-msgid "Voice"
-msgstr "Φωνή"
-
-msgid "AIM Direct IM"
-msgstr "Απευθείας άμεσο μήνυμα AIM"
-
-msgid "Get File"
-msgstr "Λήψη α�χείου"
-
-msgid "Games"
-msgstr "Παιχνίδια"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Π�όσθετα"
-
-msgid "Send Buddy List"
-msgstr "Αποστολή λίστας φίλων"
-
-msgid "ICQ Direct Connect"
-msgstr "Απευθείας σ�νδεση ICQ"
-
-msgid "AP User"
-msgstr "Χ�ήστης AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "�ιχιλιστής"
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr "Παλιό ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Κ�υπτογ�άφηση Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Ασφάλεια ενε�γοποιήθηκε"
-
-msgid "Video Chat"
-msgstr "Βιντεοσυνομιλία"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Ζωντανό βίντεο"
-
-msgid "Camera"
-msgstr "Κάμε�α"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr "Ελε�θε�ος για συζήτηση"
 
@@ -7424,15 +7370,6 @@ msgstr "Δίκτυο"
 msgid "At lunch"
 msgstr "Είμαι για φαγητό"
 
-msgid "IP Address"
-msgstr "Διε�θυνση IP"
-
-msgid "Warning Level"
-msgstr "Επίπεδο π�οειδοποίησης"
-
-msgid "Buddy Comment"
-msgstr "Σχόλιο φίλου"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Δεν ήταν δυνατή η σ�νδεση με τον εξυπη�ετητή πιστοποίησης: %s"
@@ -7535,16 +7472,6 @@ msgstr "Κωδικός στάλθηκε"
 msgid "Unable to initialize connection"
 msgstr "Αδυναμία δημιου�γίας σ�νδεσης"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Πα�ακαλώ δώστε μου έγκ�ιση ώστε να μπο�ώ να σας π�οσθέσω στη λίστα φίλων μου."
-
-msgid "No reason given."
-msgstr "Δεν δόθηκε αιτία."
-
-msgid "Authorization Denied Message:"
-msgstr "Μήνυμα ά�νησης έγκ�ισης:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7662,60 +7589,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Χάσατε %hu μήνυμα από %s για άγνωστο λόγο."
 msgstr[1] "Χάσατε %hu μην�ματα από %s για άγνωστο λόγο."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Πλη�οφο�ίες χ�ήστη μη διαθέσιμες: %s"
-
-msgid "Online Since"
-msgstr "Συνδεδεμένος από"
-
-msgid "Member Since"
-msgstr "Μέλος από"
-
-msgid "Capabilities"
-msgstr "Δυνατότητες"
-
 msgid "Your AIM connection may be lost."
 msgstr "Η σ�νδεσή σας AIM μπο�εί να χαθεί."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Αδ�νατη η εμφάνιση ενός μην�ματος από αυτόν το χ�ήστη επειδή πε�ιείχε "
-"λανθασμένους χα�ακτή�ες.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Αποσυνδεθήκατε από το δωμάτιο συζήτησης %s."
 
-msgid "Mobile Phone"
-msgstr "Κινητό τηλέφωνο"
-
-msgid "Personal Web Page"
-msgstr "Π�οσωπική ιστοσελίδα"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Π�όσθετες πλη�οφο�ίες"
-
-msgid "Zip Code"
-msgstr "Ταχ. Κώδικας"
-
-msgid "Work Information"
-msgstr "Πλη�οφο�ίες ε�γασίας"
-
-msgid "Division"
-msgstr "Τμήμα"
-
-msgid "Position"
-msgstr "Θέση"
-
-msgid "Web Page"
-msgstr "Ιστοσελίδα"
-
 msgid "Pop-Up Message"
 msgstr "Αναδυόμενο μήνυμα"
 
@@ -8004,7 +7884,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Αλλαγή διε�θυνσης σε:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>δεν αναμένετε έγκ�ιση</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8043,6 +7924,14 @@ msgstr "ΡÏ�θμιση Ï€Ï�οώθησης άμεσων μηνυμάτων (διÎ
 msgid "Set Privacy Options..."
 msgstr "Επιλογές εμπιστευτικότητας..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Εμφάνιση _λίστας φίλων"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Λίστα π�οσκλήσεων"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Επιβεβαίωση λογα�ιασμο�"
@@ -8059,9 +7948,6 @@ msgstr "Εμφάνιση φίλων που πε�ιμένουν έγκ�ιση"
 msgid "Search for Buddy by Email Address..."
 msgstr "Αναζήτηση φίλου με email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Αναζήτηση φίλου με πλη�οφο�ίες"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -8171,6 +8057,165 @@ msgstr "Ου�ά πλή�ης"
 msgid "Not while on AOL"
 msgstr "Όχι όταν είστε στο AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Εικονίδιο φίλου"
+
+msgid "Voice"
+msgstr "Φωνή"
+
+msgid "AIM Direct IM"
+msgstr "Απευθείας άμεσο μήνυμα AIM"
+
+msgid "Get File"
+msgstr "Λήψη α�χείου"
+
+msgid "Games"
+msgstr "Παιχνίδια"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Π�όσθετα"
+
+msgid "Send Buddy List"
+msgstr "Αποστολή λίστας φίλων"
+
+msgid "ICQ Direct Connect"
+msgstr "Απευθείας σ�νδεση ICQ"
+
+msgid "AP User"
+msgstr "Χ�ήστης AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "�ιχιλιστής"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr "Παλιό ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Κ�υπτογ�άφηση Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Ασφάλεια ενε�γοποιήθηκε"
+
+msgid "Video Chat"
+msgstr "Βιντεοσυνομιλία"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Ζωντανό βίντεο"
+
+msgid "Camera"
+msgstr "Κάμε�α"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Διε�θυνση IP"
+
+msgid "Warning Level"
+msgstr "Επίπεδο π�οειδοποίησης"
+
+msgid "Buddy Comment"
+msgstr "Σχόλιο φίλου"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Πλη�οφο�ίες χ�ήστη μη διαθέσιμες: %s"
+
+msgid "Mobile Phone"
+msgstr "Κινητό τηλέφωνο"
+
+msgid "Personal Web Page"
+msgstr "Π�οσωπική ιστοσελίδα"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Π�όσθετες πλη�οφο�ίες"
+
+msgid "Zip Code"
+msgstr "Ταχ. Κώδικας"
+
+msgid "Work Information"
+msgstr "Πλη�οφο�ίες ε�γασίας"
+
+msgid "Division"
+msgstr "Τμήμα"
+
+msgid "Position"
+msgstr "Θέση"
+
+msgid "Web Page"
+msgstr "Ιστοσελίδα"
+
+msgid "Online Since"
+msgstr "Συνδεδεμένος από"
+
+msgid "Member Since"
+msgstr "Μέλος από"
+
+msgid "Capabilities"
+msgstr "Δυνατότητες"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Εμφάνιση ως συνδεδεμένος"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Εμφάνιση ως συνδεδεμένος"
+
+msgid "Appear Offline"
+msgstr "Εμφάνιση ως αποσυνδεδεμένος"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Εμφάνιση ως αποσυνδεδεμένος"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Έχετε εκδιωχθεί: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Μπο�είτε να ξαναζητήσετε έγκ�ιση από αυτο�ς του φίλους κάνοντας δεξί κλικ "
+"επάνω τους και επιλέγοντας \"Αίτηση έγκ�ισης (ξανά).\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Ο�ατός"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Λίστα π�οσκλήσεων"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Υδ�οχόος"
 
@@ -8349,8 +8394,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u απαιτεί έγκ�ιση"
 
 msgid "Add buddy question"
@@ -10568,18 +10613,12 @@ msgstr "Έχω βγει έξω"
 msgid "Not on server list"
 msgstr "Όχι στη λίστα του εξυπη�ετητή"
 
-msgid "Appear Online"
-msgstr "Εμφάνιση ως συνδεδεμένος"
-
 msgid "Appear Permanently Offline"
 msgstr "Εμφάνιση ως μόνιμα αποσυνδεδεμένος"
 
 msgid "Presence"
 msgstr "Πα�ουσία"
 
-msgid "Appear Offline"
-msgstr "Εμφάνιση ως αποσυνδεδεμένος"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Εμφάνιση ως όχι μόνιμα αποσυνδεδεμένος"
 
@@ -11118,27 +11157,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Η σ�νδεση διακόπηκε από κάποιο άλλο λογισμικό του υπολογιστή σας."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Ο απομακ�υσμένος υπολογιστής έκλεισε τη σ�νδεση."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Τέλος χ�ονικο� ο�ίου σ�νδεσης."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Ά�νηση σ�νδεσης."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Η διε�θυνση ήδη χ�ησιμοποιείται."
 
@@ -11287,6 +11321,10 @@ msgstr ""
 "επεξε�γαστείτε ή να αφαι�έσετε λογα�ιασμο�ς μέσω του <b>Λογα�ιασμοί-"
 ">Διαχεί�ιση λογα�ιασμών</b> στο πα�άθυ�ο της λίστας φίλων"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s θέλει να γίνει π�οσθήκη του %s στη λίστα φίλων του%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Χ�ώμα πα�ασκηνίου"
@@ -11546,6 +11584,8 @@ msgstr "Γνωστός ως (π�οαι�ετικό)"
 msgid "Edit User Mood"
 msgstr "Επεξε�γασία διάθεσης χ�ήστη"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Φίλοι"
@@ -12308,9 +12348,6 @@ msgstr "υποστή�ιξη"
 msgid "webmaster"
 msgstr "Διαχει�ιστής ιστοσελίδας"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Έκδοση win32"
 
@@ -12336,6 +12373,9 @@ msgstr "α�χικός συγγ�αφέας"
 msgid "lead developer"
 msgstr "κ��ιος υπε�θυνος ανάπτυξης"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13690,6 +13730,10 @@ msgid "_TURN server:"
 msgstr "Εξυπη�ετητής STUN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Θ��α:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Όνομα χ�ήστη:"
 
@@ -13712,6 +13756,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -13730,6 +13779,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Με το χέ�ι"
 
@@ -14285,7 +14342,8 @@ msgstr "κανένα"
 msgid "Small"
 msgstr "Μικ�ά"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Μικ�ότε�ες εκδοχές των π�οεπιλεγμένων smilies"
 
 msgid "Response Probability:"
@@ -15342,6 +15400,10 @@ msgstr "Συσκευή"
 msgid "Voice/Video Settings"
 msgstr "Επεξε�γασία �υθμίσεων"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Επεξε�γασία �υθμίσεων"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15473,7 +15535,7 @@ msgstr ""
 "Αυτό το π�όσθετο είναι χ�ήσιμο για την αποσφαλμάτωση εξυπη�ετητών και "
 "πελατών XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15602,6 +15664,26 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Απαιτείται SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Εξαναγκασμός παλιο� (θ��α 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Το SecurID που πληκτ�ολογήθηκε είναι λανθασμένο"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Αδ�νατη η εμφάνιση ενός μην�ματος από αυτόν το χ�ήστη επειδή πε�ιείχε "
+#~ "λανθασμένους χα�ακτή�ες.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Αναζήτηση φίλου με πλη�οφο�ίες"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Η αλυσίδα πιστοποιητικο� που πα�ουσιάστηκε για %s δεν είναι έγκυ�η."
@@ -16065,9 +16147,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Η σ�νδεση έκλεισε (γίνεται εγγ�αφή)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Επαναφο�ά σ�νδεσης"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Σφάλμα ανάγνωσης από τον υποδοχέα: %s"
 
@@ -16284,7 +16363,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Αδ�νατο το άνοιγμα του %s για εγγ�αφή!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Αποτυχία μεταφο�άς α�χείου. Πιθανώς να ακυ�ώθηκε από την άλλη πλευ�ά."
 
@@ -16365,9 +16444,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "Αποτυχία αποστολής μην�ματος"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Πλη�οφο�ίες του χ�ήστη %s μη διαθέσιμες"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "Υπά�χει ήδη μία ομάδα με αυτό το όνομα."
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 38e0ae892f..4fc06363cd 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2005-01-19 07:55+1100\n"
 "Last-Translator: Peter (Bleeter) Lawler <trans@six-by-nine.com.au>\n"
 "Language-Team: English/AU <trans@six-by-nine.com.au>\n"
@@ -560,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Last name:"
@@ -834,8 +833,8 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
-msgstr "Canceled"
+msgid "Cancelled"
+msgstr "Cancelled"
 
 msgid "Failed"
 msgstr "Failed"
@@ -1796,7 +1795,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2128,14 +2129,14 @@ msgstr "File transfer complete"
 
 #, fuzzy, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "You canceled the transfer of %s"
+msgstr "You cancelled the transfer of %s"
 
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
 #, fuzzy, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "%s cancelled the file transfer"
@@ -4930,12 +4931,20 @@ msgstr "XMPP Protocol Plugin"
 msgid "Domain"
 msgstr "Romanian"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Request Authorisation"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Use TLS if available"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
+msgid "Connection security"
+msgstr "Connection Closed"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -6275,7 +6284,7 @@ msgid "The two PINs you entered do not match."
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 msgid ""
@@ -6383,10 +6392,6 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "The SecurID key entered is invalid."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "The SecurID key entered is invalid."
 
@@ -7301,6 +7306,15 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Please authorise me so I can add you to my buddy list."
+
+msgid "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorisation Denied Message:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Invalid response from server."
@@ -7334,6 +7348,21 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Error creating connection"
 
+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 ""
+
+#, 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 ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7576,92 +7605,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
-msgid "Voice"
-msgstr "Voice"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "Get File"
-
-msgid "Games"
-msgstr "Games"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-msgid "AP User"
-msgstr "AP User"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Security Enabled"
-
-msgid "Video Chat"
-msgstr "Video Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Camera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Screen Name"
-
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
@@ -7697,15 +7640,6 @@ msgstr "Network"
 msgid "At lunch"
 msgstr "Out To Lunch"
 
-msgid "IP Address"
-msgstr "IP Address"
-
-msgid "Warning Level"
-msgstr "Warning Level"
-
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
@@ -7810,15 +7744,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to create new connection."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Please authorise me so I can add you to my buddy list."
-
-msgid "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorisation Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7929,60 +7854,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu message from %s for an unknown reason."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Zip Code"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -8275,7 +8153,8 @@ msgstr "Screen name formatting can change only capitalisation and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorisation</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8319,6 +8198,14 @@ msgstr "Configure IM Forwarding (URL)"
 msgid "Set Privacy Options..."
 msgstr "Show more options"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -8338,9 +8225,6 @@ msgstr "Show Buddies Awaiting Authorisation"
 msgid "Search for Buddy by Email Address..."
 msgstr "Search for Buddy by Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Search for Buddy by Information"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "User is not logged in"
@@ -8448,6 +8332,167 @@ msgstr "Queue full"
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Screen Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Zip Code"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Offline"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8667,7 +8712,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Request Authorisation"
 
 #, fuzzy
@@ -9265,7 +9310,7 @@ msgstr "File Send Failed"
 
 #, fuzzy, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -9346,7 +9391,7 @@ msgstr "Unable to send message to %s:"
 
 #, fuzzy
 msgid "Place Closed"
-msgstr "Canceled"
+msgstr "Cancelled"
 
 msgid "Microphone"
 msgstr ""
@@ -11008,10 +11053,6 @@ msgid "Not on server list"
 msgstr "Not on server list"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Appear Offline"
 
@@ -11019,9 +11060,6 @@ msgstr "Appear Offline"
 msgid "Presence"
 msgstr "Preferences"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Appear Offline"
@@ -11595,27 +11633,26 @@ msgid " (%s)"
 msgstr "%s on %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "The remote user is not present in the network any more"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Connection Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Connection Closed"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "That file already exists"
 
@@ -11767,6 +11804,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "The user %s wants to add %s to his or her buddy list."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -12059,6 +12100,8 @@ msgstr "Message Notification"
 msgid "Edit User Mood"
 msgstr "User Modes"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -12900,9 +12943,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "developer & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12931,6 +12971,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14391,6 +14434,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Username:"
 
@@ -14413,6 +14460,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Accept Defaults"
@@ -14433,6 +14485,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -15020,7 +15080,7 @@ msgstr "Anyone"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16132,6 +16192,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Use Environmental Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Use Environmental Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16267,7 +16331,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16400,6 +16464,24 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "The SecurID key entered is invalid."
 
@@ -16832,10 +16914,6 @@ msgstr ""
 #~ msgstr "Connection Closed"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Connection Closed"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Error while reading from socket."
 
@@ -17062,8 +17140,8 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
+#~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
 #~ msgstr "Could not connect for transfer."
@@ -17839,9 +17917,6 @@ msgstr ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Use TLS if available"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "The user %s wants to add %s to his or her buddy list."
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 34774f4ce9..4f5d33b552 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -560,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Last name:"
@@ -834,7 +833,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1796,7 +1795,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4932,12 +4933,20 @@ msgstr "XMPP Protocol Plugin"
 msgid "Domain"
 msgstr "Romanian"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Request Authorization"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Use TLS if available"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
+msgid "Connection security"
+msgstr "Connection Closed"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -6266,7 +6275,7 @@ msgid "The two PINs you entered do not match."
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 msgid ""
@@ -6374,10 +6383,6 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "The SecurID key entered is invalid."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "The SecurID key entered is invalid."
 
@@ -7292,6 +7297,15 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Please authorize me so I can add you to my buddy list."
+
+msgid "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorization Denied Message:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Invalid response from server."
@@ -7325,6 +7339,21 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Error creating connection"
 
+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 ""
+
+#, 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 ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7567,92 +7596,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
-msgid "Voice"
-msgstr "Voice"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "Get File"
-
-msgid "Games"
-msgstr "Games"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-msgid "AP User"
-msgstr "AP User"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Security Enabled"
-
-msgid "Video Chat"
-msgstr "Video Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Camera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Screen Name"
-
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
@@ -7688,15 +7631,6 @@ msgstr "Network"
 msgid "At lunch"
 msgstr "Out To Lunch"
 
-msgid "IP Address"
-msgstr "IP Address"
-
-msgid "Warning Level"
-msgstr "Warning Level"
-
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
@@ -7801,15 +7735,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to create new connection."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Please authorize me so I can add you to my buddy list."
-
-msgid "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorization Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7922,60 +7847,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Postal Code"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -8264,7 +8142,8 @@ msgstr "Screen name formatting can change only capitalization and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorization</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8308,6 +8187,14 @@ msgstr "Configure IM Forwarding (URL)"
 msgid "Set Privacy Options..."
 msgstr "Show more options"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -8327,9 +8214,6 @@ msgstr "Show Buddies Awaiting Authorization"
 msgid "Search for Buddy by Email Address..."
 msgstr "Search for Buddy by Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Search for Buddy by Information"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "User is not logged in"
@@ -8437,6 +8321,167 @@ msgstr "Queue full"
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Screen Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Postal Code"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Offline"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8656,7 +8701,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Request Authorization"
 
 #, fuzzy
@@ -10997,10 +11042,6 @@ msgid "Not on server list"
 msgstr "Not on server list"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Appear Offline"
 
@@ -11008,9 +11049,6 @@ msgstr "Appear Offline"
 msgid "Presence"
 msgstr "Preferences"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Appear Offline"
@@ -11584,27 +11622,26 @@ msgid " (%s)"
 msgstr "%s on %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "The remote user is not present in the network any more"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Connection Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Connection Closed"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "That file already exists"
 
@@ -11756,6 +11793,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "The user %s wants to add %s to his or her buddy list."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -12048,6 +12089,8 @@ msgstr "Message Notification"
 msgid "Edit User Mood"
 msgstr "User Modes"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -12889,9 +12932,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "developer & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12920,6 +12960,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14380,6 +14423,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Username:"
 
@@ -14402,6 +14449,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Accept Defaults"
@@ -14422,6 +14474,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -15009,7 +15069,7 @@ msgstr "Anyone"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16121,6 +16181,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Use Environmental Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Use Environmental Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16256,7 +16320,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16389,6 +16453,24 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "The SecurID key entered is invalid."
 
@@ -16820,10 +16902,6 @@ msgstr ""
 #~ msgstr "Connection Closed"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Connection Closed"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Error while reading from socket."
 
@@ -17050,7 +17128,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
@@ -17821,9 +17899,6 @@ msgstr ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Use TLS if available"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "The user %s wants to add %s to his or her buddy list."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 78398ab360..411f72fdeb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -522,7 +522,6 @@ msgstr "Confirm certificate delete"
 msgid "Certificate Manager"
 msgstr "Certificate Manager"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -793,7 +792,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1684,7 +1683,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "The certificate chain presented for %s is not valid."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4713,11 +4714,20 @@ msgstr "XMPP Protocol Plug-in"
 msgid "Domain"
 msgstr "Domain"
 
-msgid "Require SSL/TLS"
-msgstr "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Require authorisation"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "User information not available: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Connection Timeout"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -5970,7 +5980,7 @@ msgid "The two PINs you entered do not match."
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid"
 
 msgid ""
@@ -6077,10 +6087,6 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "The SecurID key entered is invalid"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "The SecurID key entered is invalid"
 
@@ -6961,6 +6967,15 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Please authorise me so I can add you to my buddy list."
+
+msgid "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorisation Denied Message:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Received unexpected response from "
@@ -6994,6 +7009,25 @@ msgstr "AOL does not allow your screen name to authenticate here"
 msgid "Error requesting %s"
 msgstr "Error requesting "
 
+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 ""
+"(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.)"
+
+#, 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 ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+
 msgid "Could not join chat room"
 msgstr "Could not join chat room"
 
@@ -7227,95 +7261,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "File %s is %s, which is larger than the maximum size of %s."
 
-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 ""
-"(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.)"
-
-#, 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 ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
-msgid "Voice"
-msgstr "Voice"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "Get File"
-
-msgid "Games"
-msgstr "Games"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-msgid "AP User"
-msgstr "AP User"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Security Enabled"
-
-msgid "Video Chat"
-msgstr "Video Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Camera"
-
-msgid "Screen Sharing"
-msgstr "Screen Sharing"
-
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
@@ -7351,15 +7296,6 @@ msgstr "Network"
 msgid "At lunch"
 msgstr "Out to Lunch"
 
-msgid "IP Address"
-msgstr "IP Address"
-
-msgid "Warning Level"
-msgstr "Warning Level"
-
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Unable to connect to authentication server: %s"
@@ -7455,15 +7391,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to initialise connection"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Please authorise me so I can add you to my buddy list."
-
-msgid "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorisation Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7578,60 +7505,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Postcode"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -7909,7 +7789,8 @@ msgstr "Username formatting can change only capitalisation and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorisation</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7948,6 +7829,14 @@ msgstr "Configure IM Forwarding (web)"
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Show Buddy _List"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -7964,9 +7853,6 @@ msgstr "Show Buddies Awaiting Authorisation"
 msgid "Search for Buddy by Email Address..."
 msgstr "Search for Buddy by Email Address..."
 
-msgid "Search for Buddy by Information"
-msgstr "Search for Buddy by Information"
-
 msgid "Use clientLogin"
 msgstr "Use clientLogin"
 
@@ -8075,6 +7961,165 @@ msgstr "Queue full"
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+msgid "Screen Sharing"
+msgstr "Screen Sharing"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Postcode"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Appear Online"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Online"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -8253,8 +8298,8 @@ msgstr "Your request was accepted."
 msgid "Your request was rejected."
 msgstr "Your request was rejected."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u requires verification"
 
 msgid "Add buddy question"
@@ -10451,18 +10496,12 @@ msgstr "Stepped Out"
 msgid "Not on server list"
 msgstr "Not on server list"
 
-msgid "Appear Online"
-msgstr "Appear Online"
-
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
 msgid "Presence"
 msgstr "Presence"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
@@ -11005,27 +11044,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Connection interrupted by other software on your computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Remote host closed connection."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Connection timed out."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connection refused."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Address already in use."
 
@@ -11172,6 +11206,10 @@ msgstr ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Background Colour"
@@ -11435,6 +11473,8 @@ msgstr "Alias (optional)"
 msgid "Edit User Mood"
 msgstr "Edit User Mood"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -12192,9 +12232,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/QA"
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12220,6 +12257,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13574,6 +13614,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Username:"
 
@@ -13596,6 +13640,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop Default"
 
@@ -13614,6 +13663,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14158,7 +14215,8 @@ msgstr "none"
 msgid "Small"
 msgstr "Small"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Smaller versions of the default smilies"
 
 msgid "Response Probability:"
@@ -15190,6 +15248,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Edit Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Edit Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15318,7 +15380,7 @@ msgstr "Send and receive raw XMPP stanzas."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15449,6 +15511,26 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Require SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "The certificate chain presented for %s is not valid."
diff --git a/po/eo.po b/po/eo.po
index edbe016b65..d3ce46296e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2009-08-16 20:26+0200\n"
 "Last-Translator: Stéphane Fillod <fillods@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -514,7 +514,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Komputilnomo"
 
@@ -766,7 +765,7 @@ msgstr "Haltu"
 msgid "Waiting for transfer to begin"
 msgstr "Atendante la al�utoeko"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Rezignita"
 
 msgid "Failed"
@@ -1636,7 +1635,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4543,11 +4544,20 @@ msgstr "XMPP Protokol-Kromaĵo"
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Petu aÅ­tentigon"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Uzanto informo pri %s nedisponebla"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Devigi malnovan (pordo 5223) SSL-n"
+#, fuzzy
+msgid "Connection security"
+msgstr "Konekto perdita"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
@@ -5756,7 +5766,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Novaj pasvortoj malsamas."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "La enigita SecurID malvalidas."
 
 msgid ""
@@ -5857,10 +5867,6 @@ msgid "Connecting..."
 msgstr "Konektante"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "La enigita SecurID malvalidas."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "La enigita SecurID malvalidas."
 
@@ -6713,6 +6719,15 @@ msgstr "Servilo adreso"
 msgid "Server port"
 msgstr "Servilo pordo"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Bonvolu permesi min do mi povas aldoni vin al mia kunullisto."
+
+msgid "No reason given."
+msgstr "Nenia kialo donita."
+
+msgid "Authorization Denied Message:"
+msgstr "Permeso Rifuzo Mesa�o"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Ricevis neatenditan respondon de"
@@ -6744,6 +6759,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Eraro skribante al %s: %s"
 
+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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr "Ne povis ali�i babilejon"
 
@@ -6972,89 +7000,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Kunul Piktogramo"
-
-msgid "Voice"
-msgstr "Voĉo"
-
-msgid "AIM Direct IM"
-msgstr "AIM Rekta TM"
-
-msgid "Get File"
-msgstr "Ricevu Dosieron"
-
-msgid "Games"
-msgstr "Ludoj"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Enaldonaĵoj"
-
-msgid "Send Buddy List"
-msgstr "Sendu Kunulliston"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Rekta Konekto"
-
-msgid "AP User"
-msgstr "AP Uzanto"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilisto"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Servilo Reludo"
-
-msgid "Old ICQ UTF8"
-msgstr "Malnova ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr "Video Babilado"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Viva Video"
-
-msgid "Camera"
-msgstr "Kamerao"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7090,15 +7035,6 @@ msgstr "Reto"
 msgid "At lunch"
 msgstr "Ekstere Tagman�anten"
 
-msgid "IP Address"
-msgstr "IP adreso"
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr "Kunul Komento"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Ne povis konekti al aÅ­tentokontrolo servilo: %s"
@@ -7185,15 +7121,6 @@ msgstr "Pasvorto sendita"
 msgid "Unable to initialize connection"
 msgstr "Ne povas eki konekton"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Bonvolu permesi min do mi povas aldoni vin al mia kunullisto."
-
-msgid "No reason given."
-msgstr "Nenia kialo donita."
-
-msgid "Authorization Denied Message:"
-msgstr "Permeso Rifuzo Mesa�o"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7287,58 +7214,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Uzantoinformo ne disponebla: %s"
-
-msgid "Online Since"
-msgstr "Enrete Ek De"
-
-msgid "Member Since"
-msgstr "Membro Ek De"
-
-msgid "Capabilities"
-msgstr "Kapablecoj"
-
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vi estas diskonektita de babilejo %s."
 
-msgid "Mobile Phone"
-msgstr "Po�telefono"
-
-msgid "Personal Web Page"
-msgstr "Persona ttt-ejo"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Kroma Informo"
-
-msgid "Zip Code"
-msgstr "Po�tkodo"
-
-msgid "Work Information"
-msgstr "Laborinformo"
-
-msgid "Division"
-msgstr "Dividaĵo"
-
-msgid "Position"
-msgstr "Pozicio"
-
-msgid "Web Page"
-msgstr "TTT-ejo"
-
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesa�o"
 
@@ -7587,7 +7469,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ŝan�u adreson al:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>vi ne atendas aÅ­tentigon</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7626,6 +7509,14 @@ msgstr "Agordi TM Plusendado (ttt)"
 msgid "Set Privacy Options..."
 msgstr "Difinu Privatecajn Opciojn..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Montru Kunul_liston"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Nevidebla"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Konfirmu Konton"
@@ -7642,9 +7533,6 @@ msgstr "Montru Kunulojn Atendante Permeso"
 msgid "Search for Buddy by Email Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
-msgid "Search for Buddy by Information"
-msgstr "Serĉu Kunulon laŭ Informo..."
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7750,6 +7638,165 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Kunul Piktogramo"
+
+msgid "Voice"
+msgstr "Voĉo"
+
+msgid "AIM Direct IM"
+msgstr "AIM Rekta TM"
+
+msgid "Get File"
+msgstr "Ricevu Dosieron"
+
+msgid "Games"
+msgstr "Ludoj"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Enaldonaĵoj"
+
+msgid "Send Buddy List"
+msgstr "Sendu Kunulliston"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Rekta Konekto"
+
+msgid "AP User"
+msgstr "AP Uzanto"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilisto"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Servilo Reludo"
+
+msgid "Old ICQ UTF8"
+msgstr "Malnova ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr "Video Babilado"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Viva Video"
+
+msgid "Camera"
+msgstr "Kamerao"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP adreso"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr "Kunul Komento"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Uzantoinformo ne disponebla: %s"
+
+msgid "Mobile Phone"
+msgstr "Po�telefono"
+
+msgid "Personal Web Page"
+msgstr "Persona ttt-ejo"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Kroma Informo"
+
+msgid "Zip Code"
+msgstr "Po�tkodo"
+
+msgid "Work Information"
+msgstr "Laborinformo"
+
+msgid "Division"
+msgstr "Dividaĵo"
+
+msgid "Position"
+msgstr "Pozicio"
+
+msgid "Web Page"
+msgstr "TTT-ejo"
+
+msgid "Online Since"
+msgstr "Enrete Ek De"
+
+msgid "Member Since"
+msgstr "Membro Ek De"
+
+msgid "Capabilities"
+msgstr "Kapablecoj"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Aperas Enreta"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Aperas Enreta"
+
+msgid "Appear Offline"
+msgstr "Aperas Senkonekta"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Aperas Senkonekta"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Vi estas forigita: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Vi povas re-peti aÅ­tentigon el tiuj kunuloj per dekstre-klaki ilin kaj "
+"elekti \"Re-petu aÅ­tentigon.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Videbla"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Nevidebla"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Ver�isto"
 
@@ -7929,7 +7976,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -10006,18 +10053,12 @@ msgstr "Ekeliris"
 msgid "Not on server list"
 msgstr "Ne en servilo listo"
 
-msgid "Appear Online"
-msgstr "Aperas Enreta"
-
 msgid "Appear Permanently Offline"
 msgstr "Aperas Ĉiama Senkonekta"
 
 msgid "Presence"
 msgstr "Ĉeesto"
 
-msgid "Appear Offline"
-msgstr "Aperas Senkonekta"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne Aperas Ĉiama Senkonekta"
 
@@ -10538,27 +10579,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fora servila fermis la konekton."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr ""
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Konekto malakceptita."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adreso jam uzata."
 
@@ -10694,6 +10730,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s volas aldoni %s-n al sia kunullisto%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "MalantaÅ­a Koloro"
@@ -10945,6 +10985,8 @@ msgstr "Alinomo (nedeviga)"
 msgid "Edit User Mood"
 msgstr "Redaktu Uzantan Agordon"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/K_unuloj"
@@ -11697,9 +11739,6 @@ msgstr "subteno"
 msgid "webmaster"
 msgstr "retestro"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 portebli�o"
 
@@ -11725,6 +11764,9 @@ msgstr "originala aÅ­toro"
 msgid "lead developer"
 msgstr "ĉefa programisto"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afrikansa"
 
@@ -13052,6 +13094,10 @@ msgid "_TURN server:"
 msgstr "ST_UN servilo:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Pordo:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Uzantnomo:"
 
@@ -13074,6 +13120,11 @@ msgstr "Mozilo"
 msgid "Konqueror"
 msgstr "Konkerilo"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Labortablo Aprioro"
 
@@ -13092,6 +13143,14 @@ msgstr "Fajrobirdo"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Mane"
 
@@ -13620,7 +13679,7 @@ msgstr "neniu"
 msgid "Small"
 msgstr "Malgranda"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14628,6 +14687,10 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr "Agordi"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Agordi"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14749,7 +14812,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -14880,6 +14943,16 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Devigi malnovan (pordo 5223) SSL-n"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "La enigita SecurID malvalidas."
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Serĉu Kunulon laŭ Informo..."
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "La enigita uzantnomo malvalidas."
@@ -15219,9 +15292,6 @@ msgstr ""
 #~ msgid "Could Not Connect"
 #~ msgstr "Ne Povas Konekti"
 
-#~ msgid "Connection lost"
-#~ msgstr "Konekto perdita"
-
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Koneto fermita (skribante)"
 
@@ -15301,9 +15371,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC Protokol-Kromaĵo"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Uzanto informo pri %s nedisponebla"
-
 #~ msgid "%s Options"
 #~ msgstr "%s Opcioj"
 
diff --git a/po/es.po b/po/es.po
index 4f54cd319e..1dcbda6035 100644
--- a/po/es.po
+++ b/po/es.po
@@ -53,7 +53,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2010-08-02 23:10+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
@@ -638,7 +638,6 @@ msgstr "Confirme el borrado del certificado"
 msgid "Certificate Manager"
 msgstr "Gestor de certificados"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Servidor"
 
@@ -916,7 +915,7 @@ msgstr "Parar"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -1809,8 +1808,13 @@ msgstr ""
 "El certificado no es válido aún. Compruebe que la fecha y hora de su "
 "ordenador son correctas."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "El certificado ha expirado y no sería considerado válido."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"El certificado no es válido aún. Compruebe que la fecha y hora de su "
+"ordenador son correctas."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4866,11 +4870,20 @@ msgstr "Complemento de protocolo XMPP"
 msgid "Domain"
 msgstr "Dominio"
 
-msgid "Require SSL/TLS"
-msgstr "Requerir cifrado SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Solicitar autorización"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Información de usuario de no disponible: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Expiró la conexión"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
@@ -7035,6 +7048,15 @@ msgstr "Dirección del servidor"
 msgid "Server port"
 msgstr "Puerto del servidor"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
+
+msgid "No reason given."
+msgstr "No se indicó una razón."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensaje de autorización denegada:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Se recibió una respuesta que no se esperaba de %s: %s"
@@ -7071,6 +7093,26 @@ msgstr "AOL no permite que su nombre de usuario se autentique aquí"
 msgid "Error requesting %s"
 msgstr "Error al solicitar %s"
 
+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 ""
+"(Se produjo un error al recibir este mensaje. Es posible que el amigo con el "
+"que esta hablando utilice una codificación distinta de la que se esperaba. "
+"Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
+"ICQ si sabe que codificación está utilizando.)"
+
+#, 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 ""
+"(Se produjo un error al recibir este mensaje. O bien vd. y %s han "
+"seleccionado distintas codificaciones o bien %s tiene una aplicación cliente "
+"defectuosa.)"
+
 msgid "Could not join chat room"
 msgstr "No se pudo conectar a la sala de chat"
 
@@ -7286,96 +7328,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El archivo %s es %s, que es más grande que el tamaño máximo de %s."
 
-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 ""
-"(Se produjo un error al recibir este mensaje. Es posible que el amigo con el "
-"que esta hablando utilice una codificación distinta de la que se esperaba. "
-"Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
-"ICQ si sabe que codificación está utilizando.)"
-
-#, 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 ""
-"(Se produjo un error al recibir este mensaje. O bien vd. y %s han "
-"seleccionado distintas codificaciones o bien %s tiene una aplicación cliente "
-"defectuosa.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icono de amigo"
-
-msgid "Voice"
-msgstr "Voz"
-
-msgid "AIM Direct IM"
-msgstr "MI Directo AIM"
-
-msgid "Get File"
-msgstr "Recibir archivo"
-
-msgid "Games"
-msgstr "Juegos"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Extensiones"
-
-msgid "Send Buddy List"
-msgstr "Enviar lista de amigos"
-
-msgid "ICQ Direct Connect"
-msgstr "Conexión directa ICQ"
-
-msgid "AP User"
-msgstr "Usuario de AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Antiguo ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Cifrado Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Seguridad activada"
-
-msgid "Video Chat"
-msgstr "Vídeo chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vídeo en tiempo real"
-
-msgid "Camera"
-msgstr "Cámara"
-
-msgid "Screen Sharing"
-msgstr "Compartiendo pantalla"
-
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
@@ -7406,15 +7358,6 @@ msgstr "En el trabajo"
 msgid "At lunch"
 msgstr "En la hora de la comida"
 
-msgid "IP Address"
-msgstr "Dirección IP"
-
-msgid "Warning Level"
-msgstr "Niveles de aviso"
-
-msgid "Buddy Comment"
-msgstr "Comentario de amigo"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "No se pudo conectar al servidor de autenticación: %s"
@@ -7516,15 +7459,6 @@ msgstr "Contraseña enviada"
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexión"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
-
-msgid "No reason given."
-msgstr "No se indicó una razón."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensaje de autorización denegada:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7641,60 +7575,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Información de usuario de no disponible: %s"
-
-msgid "Online Since"
-msgstr "Conectado desde"
-
-msgid "Member Since"
-msgstr "Miembro desde"
-
-msgid "Capabilities"
-msgstr "Capacidades"
-
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
-"inválidos.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-msgid "Mobile Phone"
-msgstr "Teléfono móvil"
-
-msgid "Personal Web Page"
-msgstr "Página web personal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Información adicional"
-
-msgid "Zip Code"
-msgstr "Código postal"
-
-msgid "Work Information"
-msgstr "Información de trabajo"
-
-msgid "Division"
-msgstr "Sección"
-
-msgid "Position"
-msgstr "Cargo"
-
-msgid "Web Page"
-msgstr "Página web"
-
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
@@ -7975,7 +7862,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>usted no está esperando autorización</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8015,6 +7903,14 @@ msgstr "Configurar reenvío de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostrar la _lista de amigos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de invitados"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
@@ -8031,9 +7927,6 @@ msgstr "Mostrar amigos pendientes de autorización"
 msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
-msgid "Search for Buddy by Information"
-msgstr "Buscar un amigo a través de su información"
-
 msgid "Use clientLogin"
 msgstr "Utilizar «clientLogin»"
 
@@ -8143,6 +8036,165 @@ msgstr "Cola llena"
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Icono de amigo"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "MI Directo AIM"
+
+msgid "Get File"
+msgstr "Recibir archivo"
+
+msgid "Games"
+msgstr "Juegos"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Extensiones"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de amigos"
+
+msgid "ICQ Direct Connect"
+msgstr "Conexión directa ICQ"
+
+msgid "AP User"
+msgstr "Usuario de AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Antiguo ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Cifrado Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguridad activada"
+
+msgid "Video Chat"
+msgstr "Vídeo chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en tiempo real"
+
+msgid "Camera"
+msgstr "Cámara"
+
+msgid "Screen Sharing"
+msgstr "Compartiendo pantalla"
+
+msgid "IP Address"
+msgstr "Dirección IP"
+
+msgid "Warning Level"
+msgstr "Niveles de aviso"
+
+msgid "Buddy Comment"
+msgstr "Comentario de amigo"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Información de usuario de no disponible: %s"
+
+msgid "Mobile Phone"
+msgstr "Teléfono móvil"
+
+msgid "Personal Web Page"
+msgstr "Página web personal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Información adicional"
+
+msgid "Zip Code"
+msgstr "Código postal"
+
+msgid "Work Information"
+msgstr "Información de trabajo"
+
+msgid "Division"
+msgstr "Sección"
+
+msgid "Position"
+msgstr "Cargo"
+
+msgid "Web Page"
+msgstr "Página web"
+
+msgid "Online Since"
+msgstr "Conectado desde"
+
+msgid "Member Since"
+msgstr "Miembro desde"
+
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Parecer conectado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Parecer conectado"
+
+msgid "Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ha sido expulsado de este MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Puede volver a pedir autorización a estos amigos apretando el botón derecho "
+"del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de invitados"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acuario"
 
@@ -8321,8 +8373,8 @@ msgstr "Su solicitud fué aceptada."
 msgid "Your request was rejected."
 msgstr "Su solicitud fué rechazada."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u solicita verificación"
 
 msgid "Add buddy question"
@@ -10552,18 +10604,12 @@ msgstr "Ha abandonado"
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-msgid "Appear Online"
-msgstr "Parecer conectado"
-
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
 msgid "Presence"
 msgstr "Presencia"
 
-msgid "Appear Offline"
-msgstr "Parecer desconectado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
@@ -11110,27 +11156,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Otro programa en su ordenador ha interrumpido la conexión."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "El servidor remoto ha cerrado la conexión."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Expiró la conexión."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Conexión rechazada."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "La dirección ya se está utilizando."
 
@@ -11279,6 +11320,10 @@ msgstr ""
 "Puede volver a esta ventana para añadir, editar o eliminar cuentas desde la "
 "ventana de lista de amigos seleccionando <b>Cuentas->Gestionar Cuentas</b>"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s quiere añadir a %s a su lista de amigos%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color del fondo"
@@ -11531,6 +11576,8 @@ msgstr "Mensaje (opcional)"
 msgid "Edit User Mood"
 msgstr "Editar estados de ánimo del usuario"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/A_migos"
@@ -12278,9 +12325,6 @@ msgstr "soporte"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Contribuyente senior/QA"
-
 msgid "win32 port"
 msgstr "adaptación a win32"
 
@@ -12306,6 +12350,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desarrollador principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contribuyente senior/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13661,6 +13708,10 @@ msgstr "Servidor de reenvío (TURN)"
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Puerto:"
+
 msgid "Use_rname:"
 msgstr "Nombre de usua_rio:"
 
@@ -13682,6 +13733,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Valores por omisión del escritorio"
 
@@ -13700,6 +13756,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14240,7 +14304,8 @@ msgstr "ninguno"
 msgid "Small"
 msgstr "Pequeña"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versiones más pequeñas de los emoticonos por omisión"
 
 msgid "Response Probability:"
@@ -15289,6 +15354,10 @@ msgstr "Di_spositivo"
 msgid "Voice/Video Settings"
 msgstr "Configuración de voz/vídeo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Configuración de voz/vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15418,7 +15487,7 @@ msgstr "Enviar y recibir entradas XMPP en crudo."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15566,6 +15635,25 @@ msgstr "Visite la página Web de Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "No tiene permisos para desinstalar esta aplicación."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "El certificado ha expirado y no sería considerado válido."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requerir cifrado SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
+#~ "inválidos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Buscar un amigo a través de su información"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "El nombre que introdujo es inválido."
 
diff --git a/po/et.po b/po/et.po
index 407ae59dc3..42a8ea0f0e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2008-09-30 08:10+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -527,7 +527,6 @@ msgstr "Sertifikaadi kustutamise kinnitus"
 msgid "Certificate Manager"
 msgstr "Sertifikaadihaldur"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Hostinimi"
 
@@ -795,7 +794,7 @@ msgstr "Seiska"
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Tühistatud"
 
 msgid "Failed"
@@ -1684,7 +1683,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4726,11 +4727,20 @@ msgstr "XMPP protokolli plugin"
 msgid "Domain"
 msgstr "Domeen"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS on vajalik"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Ãœhinemine %s'ga on vaja kutset."
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vana SSL-i sunnitakse peale (port 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Kasutaja %s andmed pole saadaval"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Ãœhendus katkes"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Avatekstiline autentimise on üle krüptimata andmevoo lubatud"
@@ -5979,7 +5989,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Uued paroolid ei klapi omavahel."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Sisestatud SecurID võti on vigane."
 
 msgid ""
@@ -6086,10 +6096,6 @@ msgid "Connecting..."
 msgstr "Ãœhendumine"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Sisestatud SecurID võti on vigane."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Sisestatud SecurID võti on vigane."
 
@@ -6969,6 +6975,16 @@ msgstr "Serveri aadress"
 msgid "Server port"
 msgstr "Serveri port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Palun anna mulle volitused, et ma saaksin Sind oma sõbranimekirja lisada."
+
+msgid "No reason given."
+msgstr "Põhjendust pole määratud."
+
+msgid "Authorization Denied Message:"
+msgstr "Volituste andmisest keeldumise sõnum:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
@@ -7003,6 +7019,26 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Viga %s lahendamisel"
 
+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 ""
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Ilmselt kasutab sõber, kellega sa "
+"vestled, sellist kooditabelit, mida sinu programm ei oska oodata. Kui sa "
+"tead, mis kooditabelit su sõber kasutab, siis saad sa seda määrata oma AIM/"
+"ICQ konto laiendatud valikute alt.)"
+
+#, 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 ""
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Selle võis põhjustada asjaolu, et "
+"sina oled valinud ühe kooditabeli ja %s teistsugust, või kasutab %s vigast "
+"klienti.)"
+
 msgid "Could not join chat room"
 msgstr "Jututoaga pole võimalik ühineda"
 
@@ -7234,96 +7270,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-"(Selle sõnumi vastuvõtmisel tekkis viga.  Ilmselt kasutab sõber, kellega sa "
-"vestled, sellist kooditabelit, mida sinu programm ei oska oodata. Kui sa "
-"tead, mis kooditabelit su sõber kasutab, siis saad sa seda määrata oma AIM/"
-"ICQ konto laiendatud valikute alt.)"
-
-#, 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 ""
-"(Selle sõnumi vastuvõtmisel tekkis viga.  Selle võis põhjustada asjaolu, et "
-"sina oled valinud ühe kooditabeli ja %s teistsugust, või kasutab %s vigast "
-"klienti.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Sõbraikoon"
-
-msgid "Voice"
-msgstr "Hääl"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr "Faili hankimine"
-
-msgid "Games"
-msgstr "Mängud"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Lisad"
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ otseühendus"
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ serveri relee"
-
-msgid "Old ICQ UTF8"
-msgstr "Vana ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian krüptimine"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr "Turvalisus on lubatud"
-
-msgid "Video Chat"
-msgstr "Videovestlus"
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr "Kaamera"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
@@ -7359,15 +7305,6 @@ msgstr "Võrk"
 msgid "At lunch"
 msgstr "Lõunal"
 
-msgid "IP Address"
-msgstr "IP-aadress"
-
-msgid "Warning Level"
-msgstr "Hoiatuste tase"
-
-msgid "Buddy Comment"
-msgstr "Sõbra kommentaar"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7468,16 +7405,6 @@ msgstr "Parool saadetud"
 msgid "Unable to initialize connection"
 msgstr "Ühendust pole võimalik lähtestada"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Palun anna mulle volitused, et ma saaksin Sind oma sõbranimekirja lisada."
-
-msgid "No reason given."
-msgstr "Põhjendust pole määratud."
-
-msgid "Authorization Denied Message:"
-msgstr "Volituste andmisest keeldumise sõnum:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7571,60 +7498,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Kasutajateave pole saadaval: %s"
-
-msgid "Online Since"
-msgstr "Võrgus alates"
-
-msgid "Member Since"
-msgstr "Liige alates"
-
-msgid "Capabilities"
-msgstr "Võimalused"
-
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kasutaja poolt saadetud sõnumit pole võimalik kuvada, kuna see sisaldab "
-"vigaseid märke.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ãœhendus jututoaga %s on katkestatud."
 
-msgid "Mobile Phone"
-msgstr "Mobiiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Isiklik veebileht"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Täiendavad andmed"
-
-msgid "Zip Code"
-msgstr "Indeks"
-
-msgid "Work Information"
-msgstr "Töökoha andmed"
-
-msgid "Division"
-msgstr "Ãœksus"
-
-msgid "Position"
-msgstr "Ametikoht"
-
-msgid "Web Page"
-msgstr "Veebileht"
-
 msgid "Pop-Up Message"
 msgstr "Hüpiksõnum"
 
@@ -7885,7 +7765,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Aadressi muutmine:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>sa ootad autoriseerimist</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7922,6 +7803,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr "Määra privaatsusvalikud..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Näita _sõbranimekirja"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Nähtamatu"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7938,9 +7827,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr "Sõbra otsimine e-posti aadressi järgi..."
 
-msgid "Search for Buddy by Information"
-msgstr "Sõbra otsimine andmete järgi"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Kasutaja pole sisse logitud"
@@ -8047,6 +7933,161 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Sõbraikoon"
+
+msgid "Voice"
+msgstr "Hääl"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "Faili hankimine"
+
+msgid "Games"
+msgstr "Mängud"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Lisad"
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ otseühendus"
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ serveri relee"
+
+msgid "Old ICQ UTF8"
+msgstr "Vana ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian krüptimine"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Turvalisus on lubatud"
+
+msgid "Video Chat"
+msgstr "Videovestlus"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr "Kaamera"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP-aadress"
+
+msgid "Warning Level"
+msgstr "Hoiatuste tase"
+
+msgid "Buddy Comment"
+msgstr "Sõbra kommentaar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Kasutajateave pole saadaval: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobiiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Isiklik veebileht"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Täiendavad andmed"
+
+msgid "Zip Code"
+msgstr "Indeks"
+
+msgid "Work Information"
+msgstr "Töökoha andmed"
+
+msgid "Division"
+msgstr "Ãœksus"
+
+msgid "Position"
+msgstr "Ametikoht"
+
+msgid "Web Page"
+msgstr "Veebileht"
+
+msgid "Online Since"
+msgstr "Võrgus alates"
+
+msgid "Member Since"
+msgstr "Liige alates"
+
+msgid "Capabilities"
+msgstr "Võimalused"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Nähtamatu"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Nähtamatu"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Veevalaja"
 
@@ -8247,7 +8288,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Ãœhinemine %s'ga on vaja kutset."
 
 #, fuzzy
@@ -10446,18 +10487,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr "Pole serveri loendis"
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10992,27 +11027,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Ãœhendumine katkestati sinu arvutis oleva teise tarkvara poolt."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Kaughost sulges ühenduse."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Ühendumine ületas ajapiirangu."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Ühendus lükati tagasi."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Aadress on juba kasutusel."
 
@@ -11160,6 +11190,10 @@ msgstr ""
 "uuesti avada, kui sa valid sõbranimekirja akna menüüst <b>Kontod->Halda "
 "kontosid</b>."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s soovib kasutaja %s lisada oma sõbranimekirja%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Taustavärvus"
@@ -11430,6 +11464,8 @@ msgstr "Alias (valikuline)"
 msgid "Edit User Mood"
 msgstr "Kasutaja meeleolu määramine"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
@@ -12194,9 +12230,6 @@ msgstr "kasutajatugi"
 msgid "webmaster"
 msgstr "arendaja ja veebimeister"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12222,6 +12255,9 @@ msgstr "algse versiooni autor"
 msgid "lead developer"
 msgstr "juhtiv arendaja"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Aafrika"
 
@@ -13570,6 +13606,10 @@ msgid "_TURN server:"
 msgstr "ST_UN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Kasutajanimi:"
 
@@ -13592,6 +13632,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Töölaua vaikeväärtus"
 
@@ -13610,6 +13655,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Käsitsi"
 
@@ -14160,7 +14213,7 @@ msgstr "puudub"
 msgid "Small"
 msgstr "E-post"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15210,6 +15263,10 @@ msgstr "Seade"
 msgid "Voice/Video Settings"
 msgstr "Sätete redigeerimine"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Sätete redigeerimine"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15339,7 +15396,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15470,6 +15527,26 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS on vajalik"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vana SSL-i sunnitakse peale (port 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Sisestatud SecurID võti on vigane."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Kasutaja poolt saadetud sõnumit pole võimalik kuvada, kuna see sisaldab "
+#~ "vigaseid märke.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Sõbra otsimine andmete järgi"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
@@ -15913,9 +15990,6 @@ msgstr ""
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
 
-#~ msgid "Connection lost"
-#~ msgstr "Ãœhendus katkes"
-
 #~ msgid "Couldn't resolve host"
 #~ msgstr "Hosti pole võimalik lahendada"
 
@@ -16081,7 +16155,7 @@ msgstr ""
 #~ msgid "Password Change Successful"
 #~ msgstr "Paroolimuutmine õnnestus"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
 
 #~ msgid "Could not connect for transfer."
@@ -16099,9 +16173,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC protokolli plugin"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Kasutaja %s andmed pole saadaval"
-
 #~ msgid "%s Options"
 #~ msgstr "%s - valikud"
 
diff --git a/po/eu.po b/po/eu.po
index 04e1f9a65a..9cbc31c9a7 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2009-08-29 23:23+0200\n"
 "Last-Translator: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -526,7 +526,6 @@ msgstr "Zertifikatu-ezabatzea konfirmatu"
 msgid "Certificate Manager"
 msgstr "Zertifikatu-Kudeatzailea"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ostalaria"
 
@@ -801,7 +800,7 @@ msgstr "Gelditu"
 msgid "Waiting for transfer to begin"
 msgstr "Transferentzia hasteko zain"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Bertan behera utzi da"
 
 msgid "Failed"
@@ -1688,7 +1687,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Iraungi egin da zertifikatua, eta ezin da baliozkotzat hartu."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4732,11 +4734,20 @@ msgstr "XMPP Protokolo-Plugina"
 msgid "Domain"
 msgstr "Domeinua"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS Eskatu"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Baimena eskatu"
 
-msgid "Force old (port 5223) SSL"
-msgstr "SSL zaharra (5223 ataka) behartu"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Erabili TLS erabilgarri badago"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Konexioa berabierazten "
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Enkriptatu gabeko jarioen bidezko testu-arrunt balioztatzea onartu"
@@ -5999,7 +6010,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Pasahitz berriak ez datoz bat."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Baliogabea da sartutako SecurID-gakoa"
 
 msgid ""
@@ -6107,10 +6118,6 @@ msgid "Connecting..."
 msgstr "Konektatzen"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Baliogabea da sartutako SecurID-gakoa"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Baliogabea da sartutako SecurID-gakoa"
 
@@ -6991,6 +6998,15 @@ msgstr "Zerbitzariaren helbidea"
 msgid "Server port"
 msgstr "Zerbitzariaren ataka"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Zu nire lagun-zerrendara gehitzeko baimena emaidazu, mesedez."
+
+msgid "No reason given."
+msgstr "Ez da arrazoirik eman."
+
+msgid "Authorization Denied Message:"
+msgstr "Baimena Ezesteko Mezua:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Espero ez zen erantzuna jaso da %s(e)tik"
@@ -7025,6 +7041,24 @@ msgstr "AOL-k ez du zure pantaila-izena hemen balioztatzea onartzen"
 msgid "Error requesting %s"
 msgstr "Errorea %s eskatzean: %s"
 
+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 ""
+"(Errorea mezu hau jasotzean.  Agian, espero zena ez den beste kodeketa bat "
+"darabil zure lagunak.  Zein kodeketa darabilen badakizu, zure AIM/ICQ "
+"kontuaren aukera aurreratuetan zehaztu dezakezu.)"
+
+#, 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 ""
+"((Errorea mezu hau jasotzean.  Kodeketa ezberdinak hautatu dituzue zuk eta %s"
+"(e)k, edo %s(e)k bezero akatsduna dauka.)"
+
 msgid "Could not join chat room"
 msgstr "Ezin gelara batu"
 
@@ -7260,94 +7294,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "%s fitxategiak %s dauzka, hau da, %s tamaina maximoa baina handiagoa da."
 
-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 ""
-"(Errorea mezu hau jasotzean.  Agian, espero zena ez den beste kodeketa bat "
-"darabil zure lagunak.  Zein kodeketa darabilen badakizu, zure AIM/ICQ "
-"kontuaren aukera aurreratuetan zehaztu dezakezu.)"
-
-#, 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 ""
-"((Errorea mezu hau jasotzean.  Kodeketa ezberdinak hautatu dituzue zuk eta %s"
-"(e)k, edo %s(e)k bezero akatsduna dauka.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Lagun-Ikonoa"
-
-msgid "Voice"
-msgstr "Ahotsa"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "Fitxategia Hartu"
-
-msgid "Games"
-msgstr "Jokoak"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Osagarriak"
-
-msgid "Send Buddy List"
-msgstr "Lagun-Zerrenda Bidali"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Zuzeneko Konexioa"
-
-msgid "AP User"
-msgstr "AP Erabiltzailea"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 Zaharra"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Enkripzioa"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Segurtasuna Gaituta"
-
-msgid "Video Chat"
-msgstr "Bideo-Berriketa"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Zuzeneko Bideoa"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Pantaila-Partekatzea"
-
 msgid "Free For Chat"
 msgstr "Berriketarako Libre"
 
@@ -7383,15 +7329,6 @@ msgstr "Sarea"
 msgid "At lunch"
 msgstr "Bazkaltzen"
 
-msgid "IP Address"
-msgstr "IP Helbidea"
-
-msgid "Warning Level"
-msgstr "Abisu-Maila"
-
-msgid "Buddy Comment"
-msgstr "Lagun-Iruzkina"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Ezin balioztatze-zerbitzarira konektatu: %s"
@@ -7491,15 +7428,6 @@ msgstr "Pasahitza bidali da"
 msgid "Unable to initialize connection"
 msgstr "Ezin konexioa hasiarazi"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Zu nire lagun-zerrendara gehitzeko baimena emaidazu, mesedez."
-
-msgid "No reason given."
-msgstr "Ez da arrazoirik eman."
-
-msgid "Authorization Denied Message:"
-msgstr "Baimena Ezesteko Mezua:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7612,59 +7540,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), arrazoi ezezagun baten erruz."
 msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), arrazoi ezezagun baten erruz."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Erabiltzaile-datuak ez daude eskuragarri: %s"
-
-msgid "Online Since"
-msgstr "Noiztik Online"
-
-msgid "Member Since"
-msgstr "Noiztik Kidea"
-
-msgid "Capabilities"
-msgstr "Gaitasunak"
-
 msgid "Your AIM connection may be lost."
 msgstr "Beharbada AIM konexioa galdu duzu."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Ezin erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak dituelako.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s berriketa-gelatik deskonektatu egin zaituzte."
 
-msgid "Mobile Phone"
-msgstr "Telefono Mugikorra"
-
-msgid "Personal Web Page"
-msgstr "Webgune Pertsonala"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informazio Gehigarria"
-
-msgid "Zip Code"
-msgstr "Posta-Kodea"
-
-msgid "Work Information"
-msgstr "Laneko Datuak"
-
-msgid "Division"
-msgstr "Saila"
-
-msgid "Position"
-msgstr "Kargua"
-
-msgid "Web Page"
-msgstr "Webgunea"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Mezua"
 
@@ -7947,7 +7829,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Helbide Hau Ezarri:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ez zaude baimenaren zain</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7986,6 +7869,14 @@ msgstr "IM-Birbidalketa Konfiguratu (URLa)"
 msgid "Set Privacy Options..."
 msgstr "Pribatutasun Aukerak Ezarri..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lagun-_Zerrenda Erakutsi"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Gonbidatu-Zerrenda"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Kontua Berretsi"
@@ -8002,9 +7893,6 @@ msgstr "Baimenaren Zain dauden Lagunak Bistaratu"
 msgid "Search for Buddy by Email Address..."
 msgstr "Helbide Elektronikoaren bidez Bilatu Laguna..."
 
-msgid "Search for Buddy by Information"
-msgstr "Informazioaren bidez Bilatu Laguna"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -8114,6 +8002,165 @@ msgstr "Ilara beteta"
 msgid "Not while on AOL"
 msgstr "Ez AOLn egon bitartean"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Lagun-Ikonoa"
+
+msgid "Voice"
+msgstr "Ahotsa"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Fitxategia Hartu"
+
+msgid "Games"
+msgstr "Jokoak"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Osagarriak"
+
+msgid "Send Buddy List"
+msgstr "Lagun-Zerrenda Bidali"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Zuzeneko Konexioa"
+
+msgid "AP User"
+msgstr "AP Erabiltzailea"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 Zaharra"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Enkripzioa"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Segurtasuna Gaituta"
+
+msgid "Video Chat"
+msgstr "Bideo-Berriketa"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Zuzeneko Bideoa"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Pantaila-Partekatzea"
+
+msgid "IP Address"
+msgstr "IP Helbidea"
+
+msgid "Warning Level"
+msgstr "Abisu-Maila"
+
+msgid "Buddy Comment"
+msgstr "Lagun-Iruzkina"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Erabiltzaile-datuak ez daude eskuragarri: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefono Mugikorra"
+
+msgid "Personal Web Page"
+msgstr "Webgune Pertsonala"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informazio Gehigarria"
+
+msgid "Zip Code"
+msgstr "Posta-Kodea"
+
+msgid "Work Information"
+msgstr "Laneko Datuak"
+
+msgid "Division"
+msgstr "Saila"
+
+msgid "Position"
+msgstr "Kargua"
+
+msgid "Web Page"
+msgstr "Webgunea"
+
+msgid "Online Since"
+msgstr "Noiztik Online"
+
+msgid "Member Since"
+msgstr "Noiztik Kidea"
+
+msgid "Capabilities"
+msgstr "Gaitasunak"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Online Agertu"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Online Agertu"
+
+msgid "Appear Offline"
+msgstr "Offline Agertu"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Offline Agertu"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Kanporatua izan zara: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Lagun hauei baimena berriro eskatzeko, eskuin-klik egizu lagunen gainean eta "
+"\"Baimena Berriro Eskatu\" hautatu ezazu."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Ikusgarri"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Gonbidatu-Zerrenda"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Akuario"
 
@@ -8292,8 +8339,8 @@ msgstr "Zure eskaera onartu da."
 msgid "Your request was rejected."
 msgstr "Zure eskaera ezetsi da."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u(e)k egiaztapena behar du"
 
 msgid "Add buddy question"
@@ -10516,18 +10563,12 @@ msgstr "Kanpoan"
 msgid "Not on server list"
 msgstr "Ez dago zerbitzari-zerrendan"
 
-msgid "Appear Online"
-msgstr "Online Agertu"
-
 msgid "Appear Permanently Offline"
 msgstr "Iraunkorki Agertu Offline"
 
 msgid "Presence"
 msgstr "Presentzia"
 
-msgid "Appear Offline"
-msgstr "Offline Agertu"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ez Iraunkorki Agertu Offline"
 
@@ -11074,27 +11115,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Zure ordenagailuko beste software batek moztu du konexioa."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Konexioa itxi du urruneko ostalariak."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Konexioaren denbora-muga agortua."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Konexioa ezetsia "
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Erabilpean dago jadanik helbidea."
 
@@ -11241,6 +11277,10 @@ msgstr ""
 "Lagun-Zerrenda leihoko <b>Kontuak->Kontuak Kudeatu</b> sakatu ezazu leiho "
 "honetara itzuli eta kontuak gehitu, editatu edo kentzeko"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s(e)k bere lagun-zerrendara gehitu nahi du %s %s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Atzealdeko Kolorea"
@@ -11495,6 +11535,8 @@ msgstr "Ezizena (opzionala)"
 msgid "Edit User Mood"
 msgstr "Erabiltzaile-Umorea Editatu"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Lagunak"
@@ -12245,9 +12287,6 @@ msgstr "euskarria"
 msgid "webmaster"
 msgstr "webmaster-a"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 bertsioa"
 
@@ -12273,6 +12312,9 @@ msgstr "jatorrizko egilea"
 msgid "lead developer"
 msgstr "garatzaile-burua"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13632,6 +13674,10 @@ msgid "_TURN server:"
 msgstr "ST_UN Zerbitzaria:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Ataka:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Erabiltzaile-Izena:"
 
@@ -13654,6 +13700,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Mahaigainaren Lehenetsia"
 
@@ -13672,6 +13723,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Eskuz"
 
@@ -14220,7 +14279,8 @@ msgstr "batere ez"
 msgid "Small"
 msgstr "Txikia"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Smily-en bertsio txikiagoak"
 
 msgid "Response Probability:"
@@ -15261,6 +15321,10 @@ msgstr "G_ailua"
 msgid "Voice/Video Settings"
 msgstr "Ahots/Bideo Ezarpenak"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Ahots/Bideo Ezarpenak"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15392,7 +15456,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15523,6 +15587,26 @@ msgstr "Pidgin Webgunera etorri"
 msgid "You do not have permission to uninstall this application."
 msgstr "Ez daukazu aplikazio hau kentzeko baimenik."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS Eskatu"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "SSL zaharra (5223 ataka) behartu"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Baliogabea da sartutako SecurID-gakoa"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Ezin erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak "
+#~ "dituelako.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Informazioaren bidez Bilatu Laguna"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Zertifikatua ez da baliozkoa oraindik."
 
@@ -16099,9 +16183,6 @@ msgstr "Ez daukazu aplikazio hau kentzeko baimenik."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Konexioa itxi da (idazten)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Konexioa berabierazten "
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Errorea socket-etik irakurtzean:%s."
 
@@ -16340,7 +16421,7 @@ msgstr "Ez daukazu aplikazio hau kentzeko baimenik."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Ezin izan da %s ireki idazteko!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan "
 #~ "behera utziko zuen."
@@ -17030,9 +17111,6 @@ msgstr "Ez daukazu aplikazio hau kentzeko baimenik."
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber protokoloaren plugin-a"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Erabili TLS erabilgarri badago"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "%s erabiltzaileak %s gehitu nahi du bere lagunen zerrendan."
 
diff --git a/po/fa.po b/po/fa.po
index e5b63bee12..6a34733dcf 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2007-04-10 20:37+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz@farsiweb.info>\n"
 "Language-Team: Persian\n"
@@ -541,7 +541,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "نام میزبان"
 
@@ -808,7 +807,7 @@ msgstr "توق�"
 msgid "Waiting for transfer to begin"
 msgstr "در حال انتظار برای آغاز انتقال"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "صر� نظر شد"
 
 msgid "Failed"
@@ -1732,7 +1731,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4801,11 +4802,19 @@ msgid "Domain"
 msgstr "رومانیایی"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "�TLS لازم دارد"
+msgid "Require encryption"
+msgstr "اجازه لازم دارد"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "است�اده از TLS در صورت وجود"
 
-msgid "Force old (port 5223) SSL"
-msgstr "اجبار SSL قدیمی (درگاه ۵۲۲۳)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "اتصال از نو آغاز شد"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "اجازه دادن تأیید هویت متنی ساده در جریان‌های رمزنگاری نشده"
@@ -6087,7 +6096,7 @@ msgid "The two PINs you entered do not match."
 msgstr "گذرواژه‌های جدید مطابقت ندارند."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
 msgid ""
@@ -6195,10 +6204,6 @@ msgid "Connecting..."
 msgstr "در حال اتصال"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "کلید SecurID وارد شده نامعتبر است."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
@@ -7108,6 +7113,15 @@ msgstr "نشانی کارگزار"
 msgid "Server port"
 msgstr "درگاه کارگزار"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "لط�اً به من اجازه دهید شما را به �هرست ر�قایم اضا�ه کنم."
+
+msgid "No reason given."
+msgstr "دلیلی ارائه نشد."
+
+msgid "Authorization Denied Message:"
+msgstr "پیغام رد اجازه:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریا�ت شد."
@@ -7142,6 +7156,25 @@ msgstr ""
 msgid "Error requesting %s"
 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 "
+"خود وارد کنید."
+
+#, 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 کارگیر پر اشکالی دارد.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "متصل نشد"
@@ -7378,96 +7411,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 "
-"خود وارد کنید."
-
-#, 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
-msgid "Buddy Icon"
-msgstr "شمایل ر�یق"
-
-msgid "Voice"
-msgstr "صدای انسان"
-
-msgid "AIM Direct IM"
-msgstr "پیغام اینترنتی مستقیم AIM"
-
-msgid "Get File"
-msgstr "گر�تن پرونده"
-
-msgid "Games"
-msgstr "بازی‌ها"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "ا�زودنی‌ها"
-
-msgid "Send Buddy List"
-msgstr "�رستادن �هرست ر�قا"
-
-msgid "ICQ Direct Connect"
-msgstr "اتصال مستقیم ICQ"
-
-msgid "AP User"
-msgstr "کاربر AP"
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr "پوچ‌گرا"
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr "�UTF-8 �ICQ قدیمی"
-
-msgid "Trillian Encryption"
-msgstr "رمزنگاری Trillian"
-
-msgid "ICQ UTF8"
-msgstr "�UTF-8 �ICQ"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr "امنیت به کار انداخته شد"
-
-msgid "Video Chat"
-msgstr "گپ ویدیویی"
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr "ویدیوی زنده"
-
-msgid "Camera"
-msgstr "دوربین"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "نام کاربری"
-
 msgid "Free For Chat"
 msgstr "آزاد برای گپ"
 
@@ -7503,15 +7446,6 @@ msgstr "شبکه"
 msgid "At lunch"
 msgstr "بیرون برای ناهار"
 
-msgid "IP Address"
-msgstr "نشانی IP"
-
-msgid "Warning Level"
-msgstr "سطح اخطار"
-
-msgid "Buddy Comment"
-msgstr "توضیح دربارهٔ ر�یق"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7618,15 +7552,6 @@ msgstr "گذرواژه �رستاده شد"
 msgid "Unable to initialize connection"
 msgstr "نمی‌توان اتصال ایجاد کرد"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "لط�اً به من اجازه دهید شما را به �هرست ر�قایم اضا�ه کنم."
-
-msgid "No reason given."
-msgstr "دلیلی ارائه نشد."
-
-msgid "Authorization Denied Message:"
-msgstr "پیغام رد اجازه:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7730,59 +7655,13 @@ 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] "شما به دلیل نامعلومی %Ihu پیغام از %s را دریا�ت نکردید."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "اطلاعات کاربر موجود نیست: %s"
-
-msgid "Online Since"
-msgstr "برخط از"
-
-msgid "Member Since"
-msgstr "عضو از"
-
-msgid "Capabilities"
-msgstr "قابلیت‌ها"
-
 msgid "Your AIM connection may be lost."
 msgstr "ممکن است اتصال AIM شما از دست ر�ته باشد."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[نمی‌توان پیغامی از این کاربر را نمایش داد چون حاوی نویسه‌های نامعتبر است.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "اتصال شما با اتاق گپ %s قطع شده است."
 
-msgid "Mobile Phone"
-msgstr "تل�ن همراه"
-
-msgid "Personal Web Page"
-msgstr "ص�حهٔ وب شخصی"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "اطلاعات اضا�ی"
-
-msgid "Zip Code"
-msgstr "ک�د پستی"
-
-msgid "Work Information"
-msgstr "اطلاعات محل کار"
-
-msgid "Division"
-msgstr "شاخه"
-
-msgid "Position"
-msgstr "عنوان شغلی"
-
-msgid "Web Page"
-msgstr "ص�حهٔ وب"
-
 msgid "Pop-Up Message"
 msgstr "پیغام واشو"
 
@@ -8060,7 +7939,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "تغییر نشانی به:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>شما در انتظار اجازهٔ کسی نیستید</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8102,6 +7982,14 @@ msgstr "پیکربندی ارجاع پیغام اینترنتی (نشانی ای
 msgid "Set Privacy Options..."
 msgstr "تنظیم گزینه‌های حریم خصوصی..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "نمایش �هرست ر�قا"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "�هرست دعوت"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "تأیید حساب"
@@ -8118,9 +8006,6 @@ msgstr "نمایش ر�قای در انتظار اجازه"
 msgid "Search for Buddy by Email Address..."
 msgstr "جستجو به دنبال ر�یق از روی پست الکترونیکی..."
 
-msgid "Search for Buddy by Information"
-msgstr "جستجو به دنبال ر�یق از روی اطلاعات"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "کاربر وارد سیستم نشده است"
@@ -8230,6 +8115,166 @@ msgstr "ص� پر است"
 msgid "Not while on AOL"
 msgstr "در AOL امکان ندارد"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "شمایل ر�یق"
+
+msgid "Voice"
+msgstr "صدای انسان"
+
+msgid "AIM Direct IM"
+msgstr "پیغام اینترنتی مستقیم AIM"
+
+msgid "Get File"
+msgstr "گر�تن پرونده"
+
+msgid "Games"
+msgstr "بازی‌ها"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "ا�زودنی‌ها"
+
+msgid "Send Buddy List"
+msgstr "�رستادن �هرست ر�قا"
+
+msgid "ICQ Direct Connect"
+msgstr "اتصال مستقیم ICQ"
+
+msgid "AP User"
+msgstr "کاربر AP"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr "پوچ‌گرا"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr "�UTF-8 �ICQ قدیمی"
+
+msgid "Trillian Encryption"
+msgstr "رمزنگاری Trillian"
+
+msgid "ICQ UTF8"
+msgstr "�UTF-8 �ICQ"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "امنیت به کار انداخته شد"
+
+msgid "Video Chat"
+msgstr "گپ ویدیویی"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr "ویدیوی زنده"
+
+msgid "Camera"
+msgstr "دوربین"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "نام کاربری"
+
+msgid "IP Address"
+msgstr "نشانی IP"
+
+msgid "Warning Level"
+msgstr "سطح اخطار"
+
+msgid "Buddy Comment"
+msgstr "توضیح دربارهٔ ر�یق"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "اطلاعات کاربر موجود نیست: %s"
+
+msgid "Mobile Phone"
+msgstr "تل�ن همراه"
+
+msgid "Personal Web Page"
+msgstr "ص�حهٔ وب شخصی"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "اطلاعات اضا�ی"
+
+msgid "Zip Code"
+msgstr "ک�د پستی"
+
+msgid "Work Information"
+msgstr "اطلاعات محل کار"
+
+msgid "Division"
+msgstr "شاخه"
+
+msgid "Position"
+msgstr "عنوان شغلی"
+
+msgid "Web Page"
+msgstr "ص�حهٔ وب"
+
+msgid "Online Since"
+msgstr "برخط از"
+
+msgid "Member Since"
+msgstr "عضو از"
+
+msgid "Capabilities"
+msgstr "قابلیت‌ها"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "به نظر برخط"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "به نظر برخط"
+
+msgid "Appear Offline"
+msgstr "به نظر برون‌خط"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "به نظر برون‌خط"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "�%s شما را از کانال بیرون انداخت: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"برای درخواست مجدد اجازه از ر�قای زیر روی آن‌ها کلیک راست کرده و «درخواست مجدد "
+"اعطای اجازه» را انتخاب کنید."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "نامرئی"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "�هرست دعوت"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8431,7 +8476,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "اجازه لازم دارد"
 
 #, fuzzy
@@ -10715,18 +10760,12 @@ msgstr "یک دقیقه بیرون ر�ته‌ام"
 msgid "Not on server list"
 msgstr "در �هرست کارگزار نیست"
 
-msgid "Appear Online"
-msgstr "به نظر برخط"
-
 msgid "Appear Permanently Offline"
 msgstr "همیشه به نظر برون‌خط"
 
 msgid "Presence"
 msgstr "حضور"
 
-msgid "Appear Offline"
-msgstr "به نظر برون‌خط"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "همیشه به نظر برون‌خط نباشد"
 
@@ -11270,27 +11309,26 @@ msgid " (%s)"
 msgstr "�%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "�کاربر دوردست اتصال را قطع کرده است."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "انقضای مدت اتصال"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "اتصال رد شد"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "این نام گپ از قبل وجود دارد"
 
@@ -11434,6 +11472,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s می‌خواهد %s را به �هرست ر�قای %s%s اضا�ه کند"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11724,6 +11766,8 @@ msgstr "پیغام (اختیاری) :"
 msgid "Edit User Mood"
 msgstr "حالت‌های کاربر"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_ر�قا"
@@ -12510,9 +12554,6 @@ msgstr "پشتیبانی"
 msgid "webmaster"
 msgstr "برنامه‌ساز و مدیر وب"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "درگاه win32"
 
@@ -12538,6 +12579,9 @@ msgstr "مؤل� اصلی"
 msgid "lead developer"
 msgstr "برنامه‌ساز ارشد"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13969,6 +14013,10 @@ msgid "_TURN server:"
 msgstr "_کارگزار STUN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "درگاه UDP"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "نام _کاربری:"
 
@@ -13991,6 +14039,11 @@ msgstr "موزیلا"
 msgid "Konqueror"
 msgstr "کانکرر"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "_پذیرش پیش‌�رض‌ها"
@@ -14010,6 +14063,14 @@ msgstr "�ایربرد"
 msgid "Epiphany"
 msgstr "اپی�انی"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "دستی"
 
@@ -14584,7 +14645,7 @@ msgstr "(هیچکدام)"
 msgid "Small"
 msgstr "پست الکترونیکی"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15670,6 +15731,10 @@ msgstr "دستگاه"
 msgid "Voice/Video Settings"
 msgstr "ویرایش تنظیمات"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ویرایش تنظیمات"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15798,7 +15863,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کارگیرها یا کارگزارهای XMPP م�ید است."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15933,6 +15998,26 @@ msgid "You do not have permission to uninstall this application."
 msgstr "شما اجازه لازم براى حذ� اين برنامه را نداريد."
 
 #, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "�TLS لازم دارد"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "اجبار SSL قدیمی (درگاه ۵۲۲۳)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "کلید SecurID وارد شده نامعتبر است."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[نمی‌توان پیغامی از این کاربر را نمایش داد چون حاوی نویسه‌های نامعتبر است.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "جستجو به دنبال ر�یق از روی اطلاعات"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "نام کاربری مشخص شده نامعتبر است."
 
@@ -16440,9 +16525,6 @@ msgstr "شما اجازه لازم براى حذ� اين برنامه را ند
 #~ msgid "Connection closed (writing)"
 #~ msgstr "اتصال بسته شد (در حال نوشتن)"
 
-#~ msgid "Connection reset"
-#~ msgstr "اتصال از نو آغاز شد"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "خطا هنگام خواندن از سوکت: %s"
 
@@ -16683,7 +16765,7 @@ msgstr "شما اجازه لازم براى حذ� اين برنامه را ند
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "نمی‌توان %s را برای نوشتن باز کرد!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "انتقال پرونده شکست خورد؛ احتمالاً طر� دیگر انصرا� داده است."
 
 #~ msgid "Could not connect for transfer."
@@ -17398,9 +17480,6 @@ msgstr "شما اجازه لازم براى حذ� اين برنامه را ند
 #~ msgid "TCP port"
 #~ msgstr "درگاه TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "درگاه UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "تنظیم امکانات"
 
@@ -17565,9 +17644,6 @@ msgstr "شما اجازه لازم براى حذ� اين برنامه را ند
 #~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. در ویژگی‌های حساب «است�اده "
 #~ "از TLS در صورت وجود» را انتخاب کنید."
 
-#~ msgid "Use TLS if available"
-#~ msgstr "است�اده از TLS در صورت وجود"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "کاربر %s می‌خواهد %s را به �هرست ر�قایش اضا�ه کند."
 
diff --git a/po/fi.po b/po/fi.po
index 7834086643..e2f55aac22 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2010-02-18 15:01+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
@@ -527,7 +527,6 @@ msgstr "Vahvista varmenteen poisto"
 msgid "Certificate Manager"
 msgstr "Varmennehallinta"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Isäntä"
 
@@ -802,7 +801,7 @@ msgstr "Pysäytä"
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Peruutettu"
 
 msgid "Failed"
@@ -1693,7 +1692,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Varmenne on vanhentunut eikä sitä tulisi pitää kelvollisena."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4726,11 +4728,20 @@ msgstr "XMPP-yhteyskäytäntöliitännäinen"
 msgid "Domain"
 msgstr "Palvelin"
 
-msgid "Require SSL/TLS"
-msgstr "Vaadi SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Pyydä valtuutusta"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Käytä vanhaa (portti 5223) SSL:ää"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Käytä TLS:ää jos mahdollista"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Yhteys suljettu"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
@@ -5984,7 +5995,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen"
 
 msgid ""
@@ -6083,10 +6094,6 @@ msgid "Connecting..."
 msgstr "Yhdistetään..."
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Syötetty SecurID-avain on virheellinen"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Syötetty SecurID-avain on virheellinen"
 
@@ -6975,6 +6982,15 @@ msgstr "Palvelimen osoite"
 msgid "Server port"
 msgstr "Palvelimen portti"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"
+
+msgid "No reason given."
+msgstr "Syytä ei annettu."
+
+msgid "Authorization Denied Message:"
+msgstr "Valtuutuspyyntö evätty:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Odottamaton vastaus osoitteesta %s"
@@ -7009,6 +7025,26 @@ msgstr "AOL ei salli näyttönimen todentamista tätä kautta"
 msgid "Error requesting %s"
 msgstr "Virhe pyydettäessä %s: %s"
 
+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 ""
+"(Viestiä vastaanotettaessa tapahtui virhe. Tuttava jonka kanssa puhut "
+"käyttää luultavasti eri merkistöä kuin mitä odotettiin. Jos tiedät mitä "
+"merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
+"lisäasetuksissa.)"
+
+#, 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 ""
+"(Tämän viestin vastaanotossa oli virhe. Joko sinulla tai käyttäjällä %s on "
+"eri merkistöasetukset käytössä, tai hänellä (%s) on virheellinen "
+"asiakasohjelma.)"
+
 msgid "Could not join chat room"
 msgstr "Keskusteluhuoneeseen ei voi liittyä"
 
@@ -7244,96 +7280,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Tiedosto %s on kooltaan %s, mikä on enemmän kuin suurin sallittu koko %s."
 
-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 ""
-"(Viestiä vastaanotettaessa tapahtui virhe. Tuttava jonka kanssa puhut "
-"käyttää luultavasti eri merkistöä kuin mitä odotettiin. Jos tiedät mitä "
-"merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
-"lisäasetuksissa.)"
-
-#, 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 ""
-"(Tämän viestin vastaanotossa oli virhe. Joko sinulla tai käyttäjällä %s on "
-"eri merkistöasetukset käytössä, tai hänellä (%s) on virheellinen "
-"asiakasohjelma.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Tuttavakuvake"
-
-msgid "Voice"
-msgstr "Ääni"
-
-msgid "AIM Direct IM"
-msgstr "AIM:n suora pikaviesti"
-
-msgid "Get File"
-msgstr "Vastaanota tiedosto"
-
-msgid "Games"
-msgstr "Pelit"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Lisäykset"
-
-msgid "Send Buddy List"
-msgstr "Lähetä tuttavat"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ-suorayhteys"
-
-msgid "AP User"
-msgstr "AP-käyttäjä"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilistinen"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ-palvelimen välitys"
-
-msgid "Old ICQ UTF8"
-msgstr "Vanha ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian-salaus"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Turvatoimet käytössä"
-
-msgid "Video Chat"
-msgstr "Videokeskustelu"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live-video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Näytön jakaminen"
-
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
@@ -7369,15 +7315,6 @@ msgstr "Verkko"
 msgid "At lunch"
 msgstr "Lounaalla"
 
-msgid "IP Address"
-msgstr "IP-osoite"
-
-msgid "Warning Level"
-msgstr "Varoitustaso"
-
-msgid "Buddy Comment"
-msgstr "Tuttavakommentti"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Ei saatu yhteyttä todentamispalvelimeen: %s"
@@ -7476,15 +7413,6 @@ msgstr "Salasana lähetetty"
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"
-
-msgid "No reason given."
-msgstr "Syytä ei annettu."
-
-msgid "Authorization Denied Message:"
-msgstr "Valtuutuspyyntö evätty:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7594,60 +7522,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
-
-msgid "Online Since"
-msgstr "Kirjautunut"
-
-msgid "Member Since"
-msgstr "Rekisteröitynyt"
-
-msgid "Capabilities"
-msgstr "Kyvyt"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Viestiä tältä käyttäjältä ei voi näyttää koska se sisälsi epäkelpoja "
-"merkkejä.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
-msgid "Personal Web Page"
-msgstr "Henkilökohtainen kotisivu"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Lisätiedot"
-
-msgid "Zip Code"
-msgstr "Postinumero"
-
-msgid "Work Information"
-msgstr "Työtiedot"
-
-msgid "Division"
-msgstr "Osasto"
-
-msgid "Position"
-msgstr "Asema"
-
-msgid "Web Page"
-msgstr "Kotisivu"
-
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
@@ -7928,7 +7809,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>Et odota valtuutusta</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7967,6 +7849,14 @@ msgstr "Aseta pikaviestien edelleenlähetys (WWW)"
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Näytä _tuttavat"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Kutsulista"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Vahvista tili"
@@ -7983,9 +7873,6 @@ msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 msgid "Search for Buddy by Email Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-msgid "Search for Buddy by Information"
-msgstr "Etsi tuttavaa tietojen perusteella"
-
 msgid "Use clientLogin"
 msgstr "Käytä clientLoginia"
 
@@ -8096,6 +7983,165 @@ msgstr "Jono täynnä"
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Tuttavakuvake"
+
+msgid "Voice"
+msgstr "Ääni"
+
+msgid "AIM Direct IM"
+msgstr "AIM:n suora pikaviesti"
+
+msgid "Get File"
+msgstr "Vastaanota tiedosto"
+
+msgid "Games"
+msgstr "Pelit"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Lisäykset"
+
+msgid "Send Buddy List"
+msgstr "Lähetä tuttavat"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ-suorayhteys"
+
+msgid "AP User"
+msgstr "AP-käyttäjä"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilistinen"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-palvelimen välitys"
+
+msgid "Old ICQ UTF8"
+msgstr "Vanha ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-salaus"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Turvatoimet käytössä"
+
+msgid "Video Chat"
+msgstr "Videokeskustelu"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live-video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Näytön jakaminen"
+
+msgid "IP Address"
+msgstr "IP-osoite"
+
+msgid "Warning Level"
+msgstr "Varoitustaso"
+
+msgid "Buddy Comment"
+msgstr "Tuttavakommentti"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
+
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
+msgid "Personal Web Page"
+msgstr "Henkilökohtainen kotisivu"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Lisätiedot"
+
+msgid "Zip Code"
+msgstr "Postinumero"
+
+msgid "Work Information"
+msgstr "Työtiedot"
+
+msgid "Division"
+msgstr "Osasto"
+
+msgid "Position"
+msgstr "Asema"
+
+msgid "Web Page"
+msgstr "Kotisivu"
+
+msgid "Online Since"
+msgstr "Kirjautunut"
+
+msgid "Member Since"
+msgstr "Rekisteröitynyt"
+
+msgid "Capabilities"
+msgstr "Kyvyt"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Näytä linjoilla olevalta"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Näytä linjoilla olevalta"
+
+msgid "Appear Offline"
+msgstr "Näytä poissa linjoilta olevalta"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Näytä poissa linjoilta olevalta"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Sinut on potkaistu kanavalta: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
+"nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Näkyvissä"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Kutsulista"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "vesimies"
 
@@ -8274,8 +8320,8 @@ msgstr "Pyyntösi hyväksyttiin."
 msgid "Your request was rejected."
 msgstr "Pyyntösi hylättiin."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u pyytää valtuutusta"
 
 msgid "Add buddy question"
@@ -10481,18 +10527,12 @@ msgstr "Piipahdan ulkona"
 msgid "Not on server list"
 msgstr "Ei palvelimen tuttavissa"
 
-msgid "Appear Online"
-msgstr "Näytä linjoilla olevalta"
-
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissa linjoilta olevalta"
 
 msgid "Presence"
 msgstr "Läsnäolo"
 
-msgid "Appear Offline"
-msgstr "Näytä poissa linjoilta olevalta"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissa linjoilta olevalta"
 
@@ -11039,27 +11079,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Yhteys keskeytyi tietokoneella olevan toisen ohjelman takia."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Etäkone on katkaissut yhteyden."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Ei yhteyttä määräajassa."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Yhteys torjuttu."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Osoite on jo käytössä."
 
@@ -11206,6 +11241,10 @@ msgstr ""
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Tilien hallinta</b> Tuttavat-ikkunassa."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavaluetteloonsa%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Taustaväri"
@@ -11462,6 +11501,8 @@ msgstr "Lempinimi (valinnainen) "
 msgid "Edit User Mood"
 msgstr "Muuta käyttäjän mielialaa"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
@@ -12213,9 +12254,6 @@ msgstr "tuki"
 msgid "webmaster"
 msgstr "verkkosivujen ylläpitäjä"
 
-msgid "Senior Contributor/QA"
-msgstr "Vanhempi osallistuja/laadunvarmistus"
-
 msgid "win32 port"
 msgstr "win32-käännös"
 
@@ -12241,6 +12279,9 @@ msgstr "alkuperäinen tekijä"
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
+msgid "Senior Contributor/QA"
+msgstr "Vanhempi osallistuja/laadunvarmistus"
+
 msgid "Afrikaans"
 msgstr "afrikaans"
 
@@ -13581,6 +13622,10 @@ msgstr "Edelleenvälityspalvelin (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-palvelin:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "UDP-portti"
+
 msgid "Use_rname:"
 msgstr "Käyttäjäni_mi:"
 
@@ -13602,6 +13647,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Työpöydän oletus"
 
@@ -13620,6 +13670,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Oma komento"
 
@@ -14159,7 +14217,8 @@ msgstr "ei mitään"
 msgid "Small"
 msgstr "Pienet"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Pienemmät versiot oletushymiöistä"
 
 msgid "Response Probability:"
@@ -15190,6 +15249,10 @@ msgstr "Lait_e"
 msgid "Voice/Video Settings"
 msgstr "Ääni- ja videoasetukset"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Ääni- ja videoasetukset"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15327,7 +15390,7 @@ msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15457,6 +15520,26 @@ msgstr "Vieraile Pidginin WWW-sivustolla"
 msgid "You do not have permission to uninstall this application."
 msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vaadi SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Käytä vanhaa (portti 5223) SSL:ää"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Syötetty SecurID-avain on virheellinen"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Viestiä tältä käyttäjältä ei voi näyttää koska se sisälsi epäkelpoja "
+#~ "merkkejä.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Etsi tuttavaa tietojen perusteella"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Varmenne ei ole vielä kelvollinen."
 
@@ -16053,9 +16136,6 @@ msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Yhteys suljettu (kirjoitus)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Yhteys suljettu"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Virhe luettaessa socketista: %s"
 
@@ -16262,7 +16342,7 @@ msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
@@ -17444,9 +17524,6 @@ msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 #~ msgid "TCP port"
 #~ msgstr "TCP-portti"
 
-#~ msgid "UDP port"
-#~ msgstr "UDP-portti"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Piirteiden tarkistus"
 
@@ -17459,7 +17536,7 @@ msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 #~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
 #~ msgstr "Pyyntösi lähettää tiedosto (%s) one evätty tuttavan (%d) toimesta"
 
-#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
+#~ msgid "The sending process of file[%s] has been cancelled by buddy[%d]"
 #~ msgstr "Tiedoston (%s) lähetys on peruutettu tuttavan (%d) toimesta"
 
 #~ msgid "Blink tray icon for unread..."
@@ -17492,9 +17569,6 @@ msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 #~ "Palvelin vaatii TLS/SSL kirjautumiseen. Valitse \"Käytä TLS jos "
 #~ "mahdollista\" käyttäjätilit-valikosta."
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Käytä TLS:ää jos mahdollista"
-
 #~ msgid "A"
 #~ msgstr "A"
 
diff --git a/po/fr.po b/po/fr.po
index 5e6806e0ab..d6067b657b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,14 +21,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 18:32+0200\n"
-"PO-Revision-Date: 2010-08-03 18:31+0200\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-10-17 15:54+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. Translators may want to transliterate the name.
@@ -542,7 +542,6 @@ msgstr "Confirmation de suppression de certificat"
 msgid "Certificate Manager"
 msgstr "Gestionnaire de certificats"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
@@ -821,7 +820,7 @@ msgstr "Arrêter"
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annulé"
 
 msgid "Failed"
@@ -865,8 +864,8 @@ msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Les événements système ne seront archivés que si l'option « Archiver tous les "
-"changements d'état dans les archives système » est activée."
+"Les événements système ne seront archivés que si l'option « Archiver tous "
+"les changements d'état dans les archives système » est activée."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
@@ -1711,8 +1710,12 @@ msgstr ""
 "Ce certificat n'est pas encore valide. Veuillez vérifier que la date et "
 "l'heure sur cette machine sont bien réglées."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Le certificat a expiré ete ne doit pas être considéré valide. Veuillez "
+"vérifier que la date et l'heure sur cette machine sont bien réglées."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -2764,7 +2767,8 @@ msgid "Offline Message"
 msgstr "Message déconnecté"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Vous pouvez modifier ou supprimer l'alerte dans la fenêtre « Alertes »."
+msgstr ""
+"Vous pouvez modifier ou supprimer l'alerte dans la fenêtre « Alertes »."
 
 msgid "Yes"
 msgstr "Oui"
@@ -4776,11 +4780,17 @@ msgstr "Plugin pour le protocole XMPP"
 msgid "Domain"
 msgstr "Domaine"
 
-msgid "Require SSL/TLS"
-msgstr "Nécessite SSL/TLS"
+msgid "Require encryption"
+msgstr "Nécessite chiffrement"
+
+msgid "Use encryption if available"
+msgstr "Utiliser le chiffrement si disponible"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forcer l'ancien SSL (port 5223)"
+msgid "Use old-style SSL"
+msgstr "Utiliser le SSL ancien style"
+
+msgid "Connection security"
+msgstr "Sécurité de la connexion"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentification en clair pour les flux cryptés"
@@ -6931,6 +6941,15 @@ msgstr "Hôte du serveur"
 msgid "Server port"
 msgstr "Port du serveur"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
+
+msgid "No reason given."
+msgstr "Pas de raison"
+
+msgid "Authorization Denied Message:"
+msgstr "Message de refus d'autorisation :"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Réception d'une réponse non attendue de %s : %s"
@@ -6967,6 +6986,25 @@ msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici."
 msgid "Error requesting %s"
 msgstr "Erreur à la demande de %s"
 
+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 ""
+"(Une erreur s'est produite à la réception de ce message. Votre interlocuteur "
+"utilise peut-être un encodage inattendu. Si vous connaissez l'encodage qu'il "
+"utilise, vous pouvez le renseigner dans les options avancées de votre compte "
+"AIM/ICQ.)"
+
+#, 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 ""
+"(Une erreur s'est produite à la réception de ce message. %s et vous utilisez "
+"des encodages différents ou le client de %s est défectueux.)"
+
 msgid "Could not join chat room"
 msgstr "Impossible de rejoindre le salon de discussions"
 
@@ -7182,95 +7220,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Le fichier %s fait %s, ce qui est plus gros que la taille maximale de %s."
 
-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 ""
-"(Une erreur s'est produite à la réception de ce message. Votre interlocuteur "
-"utilise peut-être un encodage inattendu. Si vous connaissez l'encodage qu'il "
-"utilise, vous pouvez le renseigner dans les options avancées de votre compte "
-"AIM/ICQ.)"
-
-#, 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 ""
-"(Une erreur s'est produite à la réception de ce message. %s et vous utilisez "
-"des encodages différents ou le client de %s est défectueux.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icône du contact"
-
-msgid "Voice"
-msgstr "Voix"
-
-msgid "AIM Direct IM"
-msgstr "Connexion directe AIM"
-
-msgid "Get File"
-msgstr "Recevoir un fichier"
-
-msgid "Games"
-msgstr "Jeux"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Modules"
-
-msgid "Send Buddy List"
-msgstr "Envoyer sa liste de contacts"
-
-msgid "ICQ Direct Connect"
-msgstr "Connexion directe ICQ"
-
-msgid "AP User"
-msgstr "Utilisateur AP"
-
-msgid "ICQ RTF"
-msgstr "RTF ICQ"
-
-msgid "Nihilist"
-msgstr "Nihiliste"
-
-msgid "ICQ Server Relay"
-msgstr "Relais de serveur ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Ancien ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Chiffrement Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sécurité activée"
-
-msgid "Video Chat"
-msgstr "Visioconférence"
-
-msgid "iChat AV"
-msgstr "Vidéo iChat"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Caméra"
-
-msgid "Screen Sharing"
-msgstr "Partage d'écran"
-
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
@@ -7301,15 +7250,6 @@ msgstr "Au travail"
 msgid "At lunch"
 msgstr "Déjeuner"
 
-msgid "IP Address"
-msgstr "Adresse IP"
-
-msgid "Warning Level"
-msgstr "Niveau d'avertissement"
-
-msgid "Buddy Comment"
-msgstr "Commentaire"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Impossible de se connecter au serveur d'authentification : %s"
@@ -7410,15 +7350,6 @@ msgstr "Mot de passe envoyé"
 msgid "Unable to initialize connection"
 msgstr "Impossible de créer une connexion."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
-
-msgid "No reason given."
-msgstr "Pas de raison"
-
-msgid "Authorization Denied Message:"
-msgstr "Message de refus d'autorisation :"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7540,60 +7471,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Vous avez raté %hu message de %s pour des raisons inconnues."
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Les informations ne sont pas disponibles : %s"
-
-msgid "Online Since"
-msgstr "En ligne depuis"
-
-msgid "Member Since"
-msgstr "Inscrit depuis"
-
-msgid "Capabilities"
-msgstr "Possibilités"
-
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Impossible d'afficher un message de cet utilisateur car il contient des "
-"caractères non valides.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-msgid "Mobile Phone"
-msgstr "Numéro de téléphone portable"
-
-msgid "Personal Web Page"
-msgstr "Page web perso"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informations supplémentaires"
-
-msgid "Zip Code"
-msgstr "Code postal"
-
-msgid "Work Information"
-msgstr "Informations professionnelles"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Poste"
-
-msgid "Web Page"
-msgstr "Page web"
-
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
@@ -7878,8 +7762,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>Vous n'attendez aucune autorisation</i>"
+msgid "you are not waiting for authorization"
+msgstr "Vous n'attendez aucune autorisation"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
@@ -7917,6 +7801,14 @@ msgstr "Configurer le transfert de message (web)"
 msgid "Set Privacy Options..."
 msgstr "Changer les options de confidentialité..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Liste visible"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Liste invisible"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
@@ -7933,9 +7825,6 @@ msgstr "Afficher les demandes d'autorisation"
 msgid "Search for Buddy by Email Address..."
 msgstr "Chercher un contact par adresse électronique..."
 
-msgid "Search for Buddy by Information"
-msgstr "Chercher d'après les informations..."
-
 msgid "Use clientLogin"
 msgstr "Utiliser clientLogin"
 
@@ -8044,6 +7933,160 @@ msgstr "File d'attente pleine"
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Icône du contact"
+
+msgid "Voice"
+msgstr "Voix"
+
+msgid "AIM Direct IM"
+msgstr "Connexion directe AIM"
+
+msgid "Get File"
+msgstr "Recevoir un fichier"
+
+msgid "Games"
+msgstr "Jeux"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Modules"
+
+msgid "Send Buddy List"
+msgstr "Envoyer sa liste de contacts"
+
+msgid "ICQ Direct Connect"
+msgstr "Connexion directe ICQ"
+
+msgid "AP User"
+msgstr "Utilisateur AP"
+
+msgid "ICQ RTF"
+msgstr "RTF ICQ"
+
+msgid "Nihilist"
+msgstr "Nihiliste"
+
+msgid "ICQ Server Relay"
+msgstr "Relais de serveur ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Ancien ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Chiffrement Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sécurité activée"
+
+msgid "Video Chat"
+msgstr "Visioconférence"
+
+msgid "iChat AV"
+msgstr "Vidéo iChat"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Caméra"
+
+msgid "Screen Sharing"
+msgstr "Partage d'écran"
+
+msgid "IP Address"
+msgstr "Adresse IP"
+
+msgid "Warning Level"
+msgstr "Niveau d'avertissement"
+
+msgid "Buddy Comment"
+msgstr "Commentaire"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Les informations ne sont pas disponibles : %s"
+
+msgid "Mobile Phone"
+msgstr "Numéro de téléphone portable"
+
+msgid "Personal Web Page"
+msgstr "Page web perso"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informations supplémentaires"
+
+msgid "Zip Code"
+msgstr "Code postal"
+
+msgid "Work Information"
+msgstr "Informations professionnelles"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Poste"
+
+msgid "Web Page"
+msgstr "Page web"
+
+msgid "Online Since"
+msgstr "En ligne depuis"
+
+msgid "Member Since"
+msgstr "Inscrit depuis"
+
+msgid "Capabilities"
+msgstr "Possibilités"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Apparaître connecté"
+
+msgid "Don't Appear Online"
+msgstr "Ne pas apparaître connecté"
+
+msgid "Appear Offline"
+msgstr "Invisible"
+
+msgid "Don't Appear Offline"
+msgstr "Ne pas apparaître déconnecté"
+
+msgid "you have no buddies on this list"
+msgstr "Vous n'avez aucun contact sur cette liste"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Vous pouvez ajouter un contact à cette liste en cliquant avec le bouton "
+"droit sur lui et en choisissant « %s »"
+
+msgid "Visible List"
+msgstr "Liste visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr "Ces contacts vous verront quand vous passerez « Invisible »"
+
+msgid "Invisible List"
+msgstr "Liste invisible"
+
+msgid "These buddies will always see you as offline"
+msgstr "Ces contacts ne vous verront jamais connectés"
+
 msgid "Aquarius"
 msgstr "Verseau"
 
@@ -8223,8 +8266,8 @@ msgid "Your request was rejected."
 msgstr "Votre requête a été rejetée."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u demande une vérification"
+msgid "%u requires verification: %s"
+msgstr "%u demande une vérification : %s"
 
 msgid "Add buddy question"
 msgstr "Ajouter une question pour les nouveaux contacts"
@@ -10346,8 +10389,8 @@ msgid ""
 msgstr ""
 "Le serveur Yahoo! a demandé une méthode d'authentification non reconnue. "
 "Cette version de l'application n'arrivera probablement pas à se connecter au "
-"service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %"
-"s."
+"service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur "
+"%s."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
@@ -10443,18 +10486,12 @@ msgstr "De sortie"
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-msgid "Appear Online"
-msgstr "Apparaître connecté"
-
 msgid "Appear Permanently Offline"
 msgstr "Apparaître toujours déconnecté"
 
 msgid "Presence"
 msgstr "Présence"
 
-msgid "Appear Offline"
-msgstr "Invisible"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pas apparaître toujours déconnecté"
 
@@ -11006,27 +11043,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Connexion interrompue par une autre application de votre ordinateur."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'interlocuteur a fermé la connexion."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Délai de connexion dépassé."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connexion refusée."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Cette adresse est déjà utilisée."
 
@@ -11176,6 +11208,10 @@ msgstr ""
 "comptes, choisissez <b>Comptes->Gérer les comptes</b> dans la fenêtre de la "
 "liste de contacts."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s veut vous (%s) ajouter à sa liste de contacts%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Couleur de fond"
@@ -11431,6 +11467,8 @@ msgstr "message (facultatif)`"
 msgid "Edit User Mood"
 msgstr "Modifier l'humeur"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contacts"
@@ -12182,9 +12220,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "webmestre"
 
-msgid "Senior Contributor/QA"
-msgstr "contribuant senior/QA"
-
 msgid "win32 port"
 msgstr "portage win32"
 
@@ -12210,6 +12245,9 @@ msgstr "auteur original"
 msgid "lead developer"
 msgstr "codeur principal"
 
+msgid "Senior Contributor/QA"
+msgstr "contribuant senior/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -12462,8 +12500,8 @@ msgid ""
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s est un client de messagerie basé sur libpurple capable de se connecter à "
 "de multiples services de messageries instantanées. %s est écrit en C et "
@@ -13018,16 +13056,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer les archives de la conversation dans %s "
 "datée du %s ?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Êtes-vous sûr de vouloir supprimer les archives système datées du %s ?"
 
 msgid "Delete Log?"
@@ -13558,6 +13596,9 @@ msgstr "Serveur relai (TURN)"
 msgid "_TURN server:"
 msgstr "Serveur _TURN :"
 
+msgid "_UDP Port:"
+msgstr "Port _UDP :"
+
 msgid "Use_rname:"
 msgstr "Utilisateu_r :"
 
@@ -13579,6 +13620,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Paramètres par défaut du bureau"
 
@@ -13597,6 +13643,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manuel"
 
@@ -14131,8 +14185,8 @@ msgstr "aucun"
 msgid "Small"
 msgstr "Petits"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Versions de taille inférieure des frimousses par défaut"
+msgid "Smaller versions of the default smileys"
+msgstr "Versions plus petites des frimousses par défaut"
 
 msgid "Response Probability:"
 msgstr "Probabilité de réponse :"
@@ -14840,8 +14894,8 @@ msgid ""
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Permet d'envoyer des données brutes aux protocoles en mode texte (XMPP, MSN, "
-"IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. Observez le "
-"résultat dans la fenêtre de debug."
+"IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. Observez "
+"le résultat dans la fenêtre de debug."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
@@ -15174,6 +15228,9 @@ msgstr "Appa_reil"
 msgid "Voice/Video Settings"
 msgstr "Paramètres voix et vidéo"
 
+msgid "Voice and Video Settings"
+msgstr "Paramètres voix et vidéo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15301,7 +15358,7 @@ msgstr "Envoyer et recevoir des blocs XMPP."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15366,13 +15423,13 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 "Erreur lors de l'installation du correcteur orthographique ($R3).$\\rSi une "
 "nouvelle tentative échoue, veuillez suivre les instructions sur http://"
-"developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
@@ -15451,6 +15508,9 @@ msgstr "Visitez la page web de Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "Le nom saisi est non valide."
 
@@ -15460,9 +15520,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "The nick name you entered is invalid."
 #~ msgstr "Le pseudo saisi est non valide."
 
-#~ msgid "MXit Login Name"
-#~ msgstr "Nom d'utilisateur MXit"
-
 #~ msgid "Nick Name"
 #~ msgstr "Pseudonyme"
 
@@ -15532,9 +15589,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Unknown error."
 #~ msgstr "Erreur inconnue"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s pour %s (%s)"
-
 #~ msgid "Unable to add user on %s (%s)"
 #~ msgstr "Impossible d'ajouter l'utilisateur à la liste de %s (%s)"
 
@@ -15568,33 +15622,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Debugging Information"
 #~ msgstr "Informations de debug"
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Type de fichier non reconnu.\n"
-#~ "\n"
-#~ "Le type PNG est utilisé par défaut."
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Erreur à l'enregistrement de l'image\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Impossible d'ouvrir le fichier « %s » : %s"
-
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr ""
-#~ "Impossible de charger l'image « %s » : la raison est inconnue, le fichier "
-#~ "est peut-être endommagé."
-
 #~ msgid "Insert an <iq/> stanza."
 #~ msgstr "Insérer un bloc <iq/>."
 
@@ -15702,21 +15729,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Multi-User Chat Extended Presence Information"
 #~ msgstr "Informations de présence des discussions multi-utilisateurs"
 
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Flux de données intrabandes"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Commandes ad-hoc"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Flux de données SOCKS5"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "Données hors de la bande passante"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "Enregistrement intrabande"
-
 #~ msgid "User Location"
 #~ msgstr "Position de l'utilisateur"
 
@@ -15729,9 +15741,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Software Version"
 #~ msgstr "Version du logiciel"
 
-#~ msgid "Stream Initiation"
-#~ msgstr "Initialisation de flux"
-
 #~ msgid "User Activity"
 #~ msgstr "Activité de l'utilisateur"
 
@@ -15786,15 +15795,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "File Repository and Sharing"
 #~ msgstr "Répertoire de fichier et partage"
 
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "Service de découverte STUN pour Jingle"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Négociation de session chiffré simplifiée"
-
-#~ msgid "Hop Check"
-#~ msgstr "Vérifications des bonds"
-
 #~ msgid "Read Error"
 #~ msgstr "Erreur de lecture"
 
@@ -15834,9 +15834,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Connexion terminée (en écriture)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Connexion remise à zéro"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Erreur à la lecture du socket : %s"
 
@@ -15864,13 +15861,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Could not resolve host name"
 #~ msgstr "Impossible de résoudre le nom de l'hôte."
 
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Impossible de se connecter à %s : TLS/SSL est nécessaire mais aucun "
-#~ "support n'est disponible."
-
 #~ msgid "_Proxy"
 #~ msgstr "Serveur _mandataire"
 
@@ -16009,7 +15999,7 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Impossible d'ouvrir %s pour l'écriture"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Échec du transfert de fichier. Annulation probable du correspondant."
 
@@ -16053,9 +16043,6 @@ msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 #~ msgid "Failed to send IM."
 #~ msgstr "Impossible d'envoyer le message."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Les informations sur %s ne sont pas disponibles"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Quelqu'un dit votre nom d'utilisateur dans la discussion"
 
diff --git a/po/ga.po b/po/ga.po
index b094288d75..d47f8586c7 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2008-08-27 16:26-0800\n"
 "Last-Translator: Aaron Kearns <ajkearns6@gmail.com>\n"
 "Language-Team: \n"
@@ -498,7 +498,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Óstainm"
 
@@ -750,7 +749,7 @@ msgid "Waiting for transfer to begin"
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cealaithe"
 
 #, fuzzy
@@ -1629,7 +1628,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4543,12 +4544,19 @@ msgstr "XMPP Prótacal Breiseán"
 msgid "Domain"
 msgstr "Fearann"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Nasc dúnta"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5753,7 +5761,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5851,9 +5859,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Nasctha"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6698,6 +6703,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6729,6 +6743,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "earráid agus ag léamh %s"
 
+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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6949,91 +6976,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-#, fuzzy
-msgid "Voice"
-msgstr "Guth"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-#, fuzzy
-msgid "Games"
-msgstr "Cluichí"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr ""
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7067,15 +7009,6 @@ msgstr "Údar"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr "Seoladh IP"
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7163,15 +7096,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7265,60 +7189,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "Fón Póca"
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-#, fuzzy
-msgid "Position"
-msgstr "�it"
-
-#, fuzzy
-msgid "Web Page"
-msgstr "Leathanach Gréasáin"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7558,7 +7435,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7596,6 +7473,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7612,9 +7495,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7718,6 +7598,162 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+#, fuzzy
+msgid "Voice"
+msgstr "Guth"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Cluichí"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Seoladh IP"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Fón Póca"
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "�it"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Leathanach Gréasáin"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7913,7 +7949,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10055,18 +10091,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10587,27 +10617,25 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr ""
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Dínascadh de bharr moille rófhada"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Nasc diúltaithe"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Seoladh in úsáid cheana féin"
 
@@ -10746,6 +10774,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11007,6 +11039,8 @@ msgstr "Ailias (roghnach)"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Cairde"
@@ -11767,9 +11801,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11798,6 +11829,9 @@ msgstr "An Chéad Údar"
 msgid "lead developer"
 msgstr "Príomhfhorbróir"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afracáinis"
 
@@ -13107,6 +13141,10 @@ msgid "_TURN server:"
 msgstr "Freastalaí"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Ainm Úsáideora:"
 
@@ -13129,6 +13167,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -13147,6 +13190,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 #, fuzzy
 msgid "Manual"
 msgstr "Lámhleabhar"
@@ -13683,7 +13734,7 @@ msgstr "aon cheann"
 msgid "Small"
 msgstr "Ríomhphost"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14696,6 +14747,9 @@ msgstr "Gaireas"
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14817,7 +14871,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15093,10 +15147,6 @@ msgstr ""
 #~ msgstr "Cuir Cara"
 
 #, fuzzy
-#~ msgid "Connection Closed"
-#~ msgstr "Nasc dúnta"
-
-#, fuzzy
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Níorbh fhéidir `%s' a oscailt chun scríoch ann: %s"
 
diff --git a/po/gl.po b/po/gl.po
index 4a6fba35b7..16861bd55c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2009-07-15 15:15+0200\n"
 "Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
 "Language-Team: Galician <g11n@mancomun.org>\n"
@@ -527,7 +527,6 @@ msgstr "Confirme a eliminación do certificado"
 msgid "Certificate Manager"
 msgstr "Xestor de certificados"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nome do host"
 
@@ -807,7 +806,7 @@ msgstr "Deter"
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -1703,7 +1702,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "A cadea de certificación presentada para %s non é válida."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4767,11 +4768,20 @@ msgstr "Complemento de protocolo XMPP"
 msgid "Domain"
 msgstr "Dominio"
 
-msgid "Require SSL/TLS"
-msgstr "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Pedir unha autorización"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forzar o SSL antigo (porto 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Información de usuario non dispoñíbel: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Tempo de espera da conexión excedido"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir a autenticación con texto plano sobre as canles non cifradas"
@@ -6041,7 +6051,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Os novos contrasinais non coinciden."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID que se introduciu non é válida"
 
 msgid ""
@@ -6148,10 +6158,6 @@ msgid "Connecting..."
 msgstr "Conectando"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "A chave SecurID que se introduciu non é válida"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "A chave SecurID que se introduciu non é válida"
 
@@ -7038,6 +7044,15 @@ msgstr "Enderezo do servidor"
 msgid "Server port"
 msgstr "Porto do servidor"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Autoríceme para que poida engadilo á miña lista de contactos."
+
+msgid "No reason given."
+msgstr "Non se indicou unha razón."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensaxe de autorización rexeitada:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Recibiuse unha resposta inesperada de "
@@ -7071,6 +7086,25 @@ msgstr "AOL non lle permite usar o nome de pantalla para autenticarse aquí"
 msgid "Error requesting %s"
 msgstr "Erro ao consultar"
 
+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 ""
+"(Houbo un erro ao recibir a mensaxe. O contacto co que está falando está a "
+"empregar unha codificación diferente da esperada. Se sabe cal está "
+"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)"
+
+#, 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 ""
+"(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
+"mais %s teñen seleccionada unha codificación diferente ou que %s ten un "
+"cliente con erros)"
+
 msgid "Could not join chat room"
 msgstr "Non se puido unir á sala de conversa"
 
@@ -7305,95 +7339,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "O ficheiro %s é %s, que é maior que o tamaño máximo de %s."
 
-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 ""
-"(Houbo un erro ao recibir a mensaxe. O contacto co que está falando está a "
-"empregar unha codificación diferente da esperada. Se sabe cal está "
-"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)"
-
-#, 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 ""
-"(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
-"mais %s teñen seleccionada unha codificación diferente ou que %s ten un "
-"cliente con erros)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona de contacto"
-
-msgid "Voice"
-msgstr "Voz"
-
-msgid "AIM Direct IM"
-msgstr "MI Directa AIM"
-
-msgid "Get File"
-msgstr "Recibir ficheiro"
-
-msgid "Games"
-msgstr "Xogos"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Extensións"
-
-msgid "Send Buddy List"
-msgstr "Enviar lista de contactos"
-
-msgid "ICQ Direct Connect"
-msgstr "Conexión directa ICQ"
-
-msgid "AP User"
-msgstr "Usuario de AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "Reenvío de servidor ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Antigo ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Cifrado Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Seguridade activada"
-
-msgid "Video Chat"
-msgstr "Videoconferencia"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vídeo en directo"
-
-msgid "Camera"
-msgstr "Cámara"
-
-msgid "Screen Sharing"
-msgstr "Pantalla compartida"
-
 msgid "Free For Chat"
 msgstr "Dispoñíbel para conversar"
 
@@ -7429,15 +7374,6 @@ msgstr "Rede"
 msgid "At lunch"
 msgstr "Saín xantar"
 
-msgid "IP Address"
-msgstr "Enderezo IP"
-
-msgid "Warning Level"
-msgstr "Nivel de aviso"
-
-msgid "Buddy Comment"
-msgstr "Comentario de contacto"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Non se puido conectar ao servidor de autenticación: %s"
@@ -7535,15 +7471,6 @@ msgstr "Contrasinal enviado"
 msgid "Unable to initialize connection"
 msgstr "Non é posíbel comezar a conexión"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autoríceme para que poida engadilo á miña lista de contactos."
-
-msgid "No reason given."
-msgstr "Non se indicou unha razón."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensaxe de autorización rexeitada:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7660,60 +7587,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
 msgstr[1] "Perdéronse %hu mensaxes de %s por motivos descoñecidos."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Información de usuario non dispoñíbel: %s"
-
-msgid "Online Since"
-msgstr "Conectado desde"
-
-msgid "Member Since"
-msgstr "Membro desde"
-
-msgid "Capabilities"
-msgstr "Capacidades"
-
 msgid "Your AIM connection may be lost."
 msgstr "Pode que se perdese a conexión AIM."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
-"incorrectos.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vostede foi desconectado da sala de conversa: %s."
 
-msgid "Mobile Phone"
-msgstr "Teléfono móbil"
-
-msgid "Personal Web Page"
-msgstr "Páxina web persoal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Información adicional"
-
-msgid "Zip Code"
-msgstr "Código postal"
-
-msgid "Work Information"
-msgstr "Información do traballo"
-
-msgid "Division"
-msgstr "Sección"
-
-msgid "Position"
-msgstr "Posición"
-
-msgid "Web Page"
-msgstr "Páxina web"
-
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
@@ -8000,7 +7880,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cambiar o enderezo a:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>vostede non está agardando por unha autorización</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8040,6 +7921,14 @@ msgstr "Configurar o reenvío de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Editar opcións de privacidade..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostrar a _lista de contactos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de convidados"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar conta"
@@ -8056,9 +7945,6 @@ msgstr "Mostrar os contactos pendentes de autorización"
 msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un contacto polo enderezo de correo electrónico..."
 
-msgid "Search for Buddy by Information"
-msgstr "Localizar un contacto pola súa información"
-
 msgid "Use clientLogin"
 msgstr "Usar login de cliente"
 
@@ -8166,6 +8052,165 @@ msgstr "Fila chea"
 msgid "Not while on AOL"
 msgstr "Non mentres está en AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona de contacto"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "MI Directa AIM"
+
+msgid "Get File"
+msgstr "Recibir ficheiro"
+
+msgid "Games"
+msgstr "Xogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Extensións"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de contactos"
+
+msgid "ICQ Direct Connect"
+msgstr "Conexión directa ICQ"
+
+msgid "AP User"
+msgstr "Usuario de AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Reenvío de servidor ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Antigo ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Cifrado Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguridade activada"
+
+msgid "Video Chat"
+msgstr "Videoconferencia"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en directo"
+
+msgid "Camera"
+msgstr "Cámara"
+
+msgid "Screen Sharing"
+msgstr "Pantalla compartida"
+
+msgid "IP Address"
+msgstr "Enderezo IP"
+
+msgid "Warning Level"
+msgstr "Nivel de aviso"
+
+msgid "Buddy Comment"
+msgstr "Comentario de contacto"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Información de usuario non dispoñíbel: %s"
+
+msgid "Mobile Phone"
+msgstr "Teléfono móbil"
+
+msgid "Personal Web Page"
+msgstr "Páxina web persoal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Información adicional"
+
+msgid "Zip Code"
+msgstr "Código postal"
+
+msgid "Work Information"
+msgstr "Información do traballo"
+
+msgid "Division"
+msgstr "Sección"
+
+msgid "Position"
+msgstr "Posición"
+
+msgid "Web Page"
+msgstr "Páxina web"
+
+msgid "Online Since"
+msgstr "Conectado desde"
+
+msgid "Member Since"
+msgstr "Membro desde"
+
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Aparecer conectado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Aparecer conectado"
+
+msgid "Appear Offline"
+msgstr "Aparecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Aparecer desconectado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Vostede foi expulsado: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Pode volver pedir a autorización a estes contactos premendo o botón dereito "
+"do rato sobre eles, e escollendo \"Solicitar autorización outra vez.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visíbel"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de convidados"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acuario"
 
@@ -8344,8 +8389,8 @@ msgstr "A súa consulta foi aceptada."
 msgid "Your request was rejected."
 msgstr "A súa cosulta foi rexeitada."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u require verificación"
 
 msgid "Add buddy question"
@@ -10563,18 +10608,12 @@ msgstr "Abandonou"
 msgid "Not on server list"
 msgstr "Non incluído na lista do servidor"
 
-msgid "Appear Online"
-msgstr "Aparecer conectado"
-
 msgid "Appear Permanently Offline"
 msgstr "Aparecer permanentemente desconectado"
 
 msgid "Presence"
 msgstr "Presenza"
 
-msgid "Appear Offline"
-msgstr "Aparecer desconectado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
@@ -11125,27 +11164,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "A conexión foi interrompida por outro software do seu computador."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "O host remoto pechou a conexión."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "A conexión excedeu o tempo de espera."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Conexión rexeitada."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "O enderezo xa está en uso."
 
@@ -11292,6 +11326,10 @@ msgstr ""
 "Pode voltar máis tarde a esta xanela para engadir, editar ou eliminar contas "
 "desde<b>Contas->Xestionar contas</b> desde a xanela da lista de contactos"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s quere engadir a %s á súa lista de contactos%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Cor do fondo"
@@ -11555,6 +11593,8 @@ msgstr "Alias (opcional)"
 msgid "Edit User Mood"
 msgstr "Editar o estado de ánimo de usuario"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contactos"
@@ -12313,9 +12353,6 @@ msgstr "compatibilide"
 msgid "webmaster"
 msgstr "webmáster"
 
-msgid "Senior Contributor/QA"
-msgstr "Contribuínte sénior/QA"
-
 msgid "win32 port"
 msgstr "adaptación a win32"
 
@@ -12341,6 +12378,9 @@ msgstr "autor orixinal"
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contribuínte sénior/QA"
+
 msgid "Afrikaans"
 msgstr "Africano"
 
@@ -13698,6 +13738,10 @@ msgid "_TURN server:"
 msgstr "_Servidor:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Porto:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Nome de usuario:"
 
@@ -13720,6 +13764,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Predeterminado do escritorio"
 
@@ -13738,6 +13787,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14286,7 +14343,8 @@ msgstr "ningúnha"
 msgid "Small"
 msgstr "Pequena"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versións máis pequenas das emoticonas predeterminadas"
 
 msgid "Response Probability:"
@@ -15330,6 +15388,10 @@ msgstr "Dispositivo"
 msgid "Voice/Video Settings"
 msgstr "Editar a configuración"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Editar a configuración"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15460,7 +15522,7 @@ msgstr "Enviar e recibir entradas XMPP en bruto."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15592,6 +15654,26 @@ msgstr "Visite a páxina Web de Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "Non ten permisos para desinstalar esta aplicación."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Require SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forzar o SSL antigo (porto 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "A chave SecurID que se introduciu non é válida"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
+#~ "incorrectos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Localizar un contacto pola súa información"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "A cadea de certificación presentada para %s non é válida."
diff --git a/po/gu.po b/po/gu.po
index 01f59401ee..3f52f7623e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2010-04-07 12:00+0530\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -526,7 +526,6 @@ msgstr "પ�રમાણપત�રને કાઢવા માટે ખા
 msgid "Certificate Manager"
 msgstr "પ�રમાણપત�ર સંચાલન"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "યજમાન નામ"
 
@@ -789,7 +788,7 @@ msgstr "અટકાવો"
 msgid "Waiting for transfer to begin"
 msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ�યા છી�"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "રદ થયેલ"
 
 msgid "Failed"
@@ -1675,7 +1674,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "પ�રમાણપત�રની તારીખ જતી રહી છે અને પ�રમાણિત નક�કી કરવ� જોઇ� નહિં."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4660,11 +4662,20 @@ msgstr "XMPP પ�રોટોકોલ પ�લગઇન"
 msgid "Domain"
 msgstr "ડોમેઇન"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS જરૂરી છે"
+#, fuzzy
+msgid "Require encryption"
+msgstr "સત�તાધિકરણ જરૂરી"
 
-msgid "Force old (port 5223) SSL"
-msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "વપરાશકર�તા જાણકારી ઉપલબ�ધ નથી: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "જોડાણ સમયસમાપ�તિ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�નક�રિપ�ટ નહિં થયેલ સ�ટ�રીમો ઉપર સાદા લખાણ સત�તાધિકરણને પરવાનગી આપો"
@@ -5847,7 +5858,8 @@ msgstr "PIN � અયોગ�ય છે. તે ફક�ત આંકડા [
 msgid "The two PINs you entered do not match."
 msgstr "તમે દાખલ થયેલ બે PINs � બંધબેસત� નથી."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "તમે દાખલ થયેલ નામ � અયોગ�ય છે."
 
 msgid ""
@@ -5936,10 +5948,6 @@ msgstr "MXit સરà«�વર સાથે જોડાવામાં અસમà
 msgid "Connecting..."
 msgstr "જોડાઈ રહ�યા છી�..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "તમે દાખલ થયેલ નામ � અયોગ�ય છે."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "તમે દાખલ કરેલ છે તે PIN પાસે અયોગ�ય લંબાઇ છે [7-10]."
 
@@ -6784,6 +6792,15 @@ msgstr "સર�વર સરનામ�ં"
 msgid "Server port"
 msgstr "સર�વર પોર�ટ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "મહેરબાની કરીને મને સત�તાધિકારીત કરો કે જેથી હ�ં તમને મારી મિત�ર યાદીમાં ઉમેરી શક�ં."
+
+msgid "No reason given."
+msgstr "કોઈ કારણ આપેલ નથી."
+
+msgid "Authorization Denied Message:"
+msgstr "સત�તાધિકરણ નામંજૂરી સંદેશો:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s માંથી અનિચ�છનીય જવાબ મળેલ છે: %s"
@@ -6819,6 +6836,24 @@ msgstr "અહિંયા સત�તાધિકરણ કરવા માટ
 msgid "Error requesting %s"
 msgstr "%s ની માંગણી કરવામાં ભૂલ: %s"
 
+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 ખાતા માટે ઉન�નત ખાતા વિકલ�પોમાં તેને સ�પષ�ટ કરી શકો છો.)"
+
+#, 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 � ક�ષતિભરેલ ક�લાઈન�ટ છે.)"
+
 msgid "Could not join chat room"
 msgstr "સંવાદ ર�મમાં જોડાઇ શક�યા નહિં"
 
@@ -7032,94 +7067,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ફાઇલ %s � %s છે. કે જે %s નાં મહત�તમ માપ કરતા વધારે છે."
 
-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 ખાતા માટે ઉન�નત ખાતા વિકલ�પોમાં તેને સ�પષ�ટ કરી શકો છો.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "મિત�ર ચિહ�ન"
-
-msgid "Voice"
-msgstr "અવાજ"
-
-msgid "AIM Direct IM"
-msgstr "AIM સીધ�ં IM"
-
-msgid "Get File"
-msgstr "ફાઈલ મેળવો"
-
-msgid "Games"
-msgstr "રમતો"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "ઉમેરાઓ"
-
-msgid "Send Buddy List"
-msgstr "મિત�ર યાદી મોકલો"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ સીધ�ં જોડાણ"
-
-msgid "AP User"
-msgstr "AP વપરાશકર�તા"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ સર�વર રીલે"
-
-msgid "Old ICQ UTF8"
-msgstr "જૂન�ં ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ટ�રીલીયન �નક�રિપ�શન"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "સ�રક�ષા સક�રિયકૃત"
-
-msgid "Video Chat"
-msgstr "વીડિયો સંવાદ"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "જીવંત વીડિયો"
-
-msgid "Camera"
-msgstr "કેમેરો"
-
-msgid "Screen Sharing"
-msgstr "સ�ક�રીન વહેંચણી"
-
 msgid "Free For Chat"
 msgstr "સંવાદથી મ�ક�ત"
 
@@ -7150,15 +7097,6 @@ msgstr "કામ પર"
 msgid "At lunch"
 msgstr "બપોરન�ં જમવા માટે બહાર"
 
-msgid "IP Address"
-msgstr "IP સરનામ�ં"
-
-msgid "Warning Level"
-msgstr "ચેતવણી સ�તર"
-
-msgid "Buddy Comment"
-msgstr "મિત�ર ટિપ�પણી"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "પ�રમાણિત થયેલ સર�વર સાથે જોડાવામાં અસમર�થ: %s"
@@ -7254,15 +7192,6 @@ msgstr "પાસવર�ડ મોકલાઈ ગયો"
 msgid "Unable to initialize connection"
 msgstr "જોડાણને પ�રારંભ કરવાન�ં અસમર�થ"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "મહેરબાની કરીને મને સત�તાધિકારીત કરો કે જેથી હ�ં તમને મારી મિત�ર યાદીમાં ઉમેરી શક�ં."
-
-msgid "No reason given."
-msgstr "કોઈ કારણ આપેલ નથી."
-
-msgid "Authorization Denied Message:"
-msgstr "સત�તાધિકરણ નામંજૂરી સંદેશો:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7372,58 +7301,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "તમે %hu સંદેશો %s માંથી ચૂકી ગયેલ છો કોઈ અજ�ઞાત કારણોસર."
 msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કોઈ અજ�ઞાત કારણોસર."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "વપરાશકર�તા જાણકારી ઉપલબ�ધ નથી: %s"
-
-msgid "Online Since"
-msgstr "ત�યારથી ઓનલાઈન"
-
-msgid "Member Since"
-msgstr "ત�યારથી સભ�ય"
-
-msgid "Capabilities"
-msgstr "ક�ષમતાઓ"
-
 msgid "Your AIM connection may be lost."
 msgstr "તમાર�ં AIM જોડાણ ખોવાઈ જશે."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[આ વપરાશકર�તામાંથી સંદેશો દર�શાવવામાં અસમર�થ કારણ કે તે અયોગ�ય અક�ષરો સમાવે છે.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "તમાર�ં જોડાણ સંવાદ કક�ષ %s માંથી તૂટી ગયેલ છે."
 
-msgid "Mobile Phone"
-msgstr "મોબાઈલ ફોન"
-
-msgid "Personal Web Page"
-msgstr "મિત�રગત વેબ પાન�ં"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "વધારાની જાણકારી"
-
-msgid "Zip Code"
-msgstr "�ીપ કોડ"
-
-msgid "Work Information"
-msgstr "કાર�ય જાણકારી"
-
-msgid "Division"
-msgstr "વિભાગ"
-
-msgid "Position"
-msgstr "જગ�યા"
-
-msgid "Web Page"
-msgstr "વેબ પાન�ં"
-
 msgid "Pop-Up Message"
 msgstr "પોપ-અપ સંદેશો"
 
@@ -7687,7 +7571,8 @@ msgstr "વપરાશકરà«�તાનામ બંધારણ માતà«�à
 msgid "Change Address To:"
 msgstr "સરનામાને આમાં બદલો:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>તમે સત�તાધિકરણ માટે રાહ જોઈ રહ�યા છો</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7726,6 +7611,14 @@ msgstr "IM ફોરવરà«�ડીંગ રૂપરેખાંકિત કà
 msgid "Set Privacy Options..."
 msgstr "અંગતતા વિકલ�પોને સ�યોજિત કરો..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "મિત�ર યાદીને બતાવો (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "યાદી આમંત�રિત કરો"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ખાતાની ખાતરી"
@@ -7742,9 +7635,6 @@ msgstr "સતà«�તાધિકરણ માટે રાહ જોઈ રહàª
 msgid "Search for Buddy by Email Address..."
 msgstr "ઇમેલ સરનામાં પ�રમાણે મિત�ર માટે શોધો..."
 
-msgid "Search for Buddy by Information"
-msgstr "જાણકારી દ�વારા મિત�ર માટે શોધ કરો"
-
 msgid "Use clientLogin"
 msgstr "ક�લાયન�ટ પ�રવેશને વાપરો"
 
@@ -7852,6 +7742,165 @@ msgstr "કતાર ભરેલી છે"
 msgid "Not while on AOL"
 msgstr "AOL પર નથી"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "મિત�ર ચિહ�ન"
+
+msgid "Voice"
+msgstr "અવાજ"
+
+msgid "AIM Direct IM"
+msgstr "AIM સીધ�ં IM"
+
+msgid "Get File"
+msgstr "ફાઈલ મેળવો"
+
+msgid "Games"
+msgstr "રમતો"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ઉમેરાઓ"
+
+msgid "Send Buddy List"
+msgstr "મિત�ર યાદી મોકલો"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ સીધ�ં જોડાણ"
+
+msgid "AP User"
+msgstr "AP વપરાશકર�તા"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ સર�વર રીલે"
+
+msgid "Old ICQ UTF8"
+msgstr "જૂન�ં ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ટ�રીલીયન �નક�રિપ�શન"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "સ�રક�ષા સક�રિયકૃત"
+
+msgid "Video Chat"
+msgstr "વીડિયો સંવાદ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "જીવંત વીડિયો"
+
+msgid "Camera"
+msgstr "કેમેરો"
+
+msgid "Screen Sharing"
+msgstr "સ�ક�રીન વહેંચણી"
+
+msgid "IP Address"
+msgstr "IP સરનામ�ં"
+
+msgid "Warning Level"
+msgstr "ચેતવણી સ�તર"
+
+msgid "Buddy Comment"
+msgstr "મિત�ર ટિપ�પણી"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "વપરાશકર�તા જાણકારી ઉપલબ�ધ નથી: %s"
+
+msgid "Mobile Phone"
+msgstr "મોબાઈલ ફોન"
+
+msgid "Personal Web Page"
+msgstr "મિત�રગત વેબ પાન�ં"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "વધારાની જાણકારી"
+
+msgid "Zip Code"
+msgstr "�ીપ કોડ"
+
+msgid "Work Information"
+msgstr "કાર�ય જાણકારી"
+
+msgid "Division"
+msgstr "વિભાગ"
+
+msgid "Position"
+msgstr "જગ�યા"
+
+msgid "Web Page"
+msgstr "વેબ પાન�ં"
+
+msgid "Online Since"
+msgstr "ત�યારથી ઓનલાઈન"
+
+msgid "Member Since"
+msgstr "ત�યારથી સભ�ય"
+
+msgid "Capabilities"
+msgstr "ક�ષમતાઓ"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ઓફલાઈન દેખાઓ "
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ઓફલાઈન દેખાઓ "
+
+msgid "Appear Offline"
+msgstr "ઓફલાઈન દેખાય છે"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ઓફલાઈન દેખાય છે"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "(%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"તમે આ મિત�રઓમાંથી પ�નઃ-અરજી કરી શકો છો તેમના પર જમણ�ં-ક�લિક કરીને અને \"સત�તાધિકરણની "
+"પ�નઃ-અરજી કરો\" પસંદ કરીને"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "દેખીત�ં"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "યાદી આમંત�રિત કરો"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "ક�ંભ રાશિ"
 
@@ -8030,8 +8079,8 @@ msgstr "તમારી માંગણીને સ�વીકારેલ હ
 msgid "Your request was rejected."
 msgstr "તમારી માંગણીને રદ કરેલ હતી."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u ને ચકાસણીની જરૂર છે"
 
 msgid "Add buddy question"
@@ -10212,18 +10261,12 @@ msgstr "ચાલી ગયેલ છે"
 msgid "Not on server list"
 msgstr "સર�વર યાદી પર નથી"
 
-msgid "Appear Online"
-msgstr "ઓફલાઈન દેખાઓ "
-
 msgid "Appear Permanently Offline"
 msgstr "હંમેશ માટે ઓફલાઈન દેખાઓ "
 
 msgid "Presence"
 msgstr "ઉપસ�થિતિ"
 
-msgid "Appear Offline"
-msgstr "ઓફલાઈન દેખાય છે"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "હંમેશ માટે ઓફલાઈન દેખાઓ નહિ"
 
@@ -10761,27 +10804,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "તમારાં કમ�પ�યૂટર પર બીજા સોફ�ટવેર પ�રમાણે રોકેલ જોડાણ."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "દૂરસ�થ યજમાન � જોડાણને બંધ કરેલ છે."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "જોડાણ સમયસમાપ�તિ."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "જોડાણ બંધ થઈ ગય�ં."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "સરનામ�ં પહેલેથી વપરાશમાં છે."
 
@@ -10929,6 +10967,10 @@ msgstr ""
 "તમે મિત�ર યાદી વિન�ડો માં <b>ખાતાઓ->ખાતાઓને સંચાલિત કરો</b> માંથી આ ખાતાઓને ઉમેરવા, "
 "સ�ધારવા, અથવા દૂર કરવા માટે પાછા આવી શકો છો"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s � %s ને તેની અથવા તેણીની મિત�ર યાદી%s%s માં ઉમેરવા માંગે છે"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "પાશ�વૅભાગનો રંગ"
@@ -11180,6 +11222,8 @@ msgstr "સંદેશ (વૈકલ�પિક)"
 msgid "Edit User Mood"
 msgstr "વપરાશકર�તાનાં મિજાજને સ�ધારો"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/મિત�રઓ (_B)"
@@ -11921,9 +11965,6 @@ msgstr "આધાર"
 msgid "webmaster"
 msgstr "તા & વેબસંચાલક"
 
-msgid "Senior Contributor/QA"
-msgstr "અન�ભવી ફાળક/QA"
-
 msgid "win32 port"
 msgstr "win32 પોર�ટ"
 
@@ -11949,6 +11990,9 @@ msgstr "મૂળ લેખક"
 msgid "lead developer"
 msgstr "અગ�રણી વિકાસકર�તા"
 
+msgid "Senior Contributor/QA"
+msgstr "અન�ભવી ફાળક/QA"
+
 msgid "Afrikaans"
 msgstr "આફ�રિકન"
 
@@ -13282,6 +13326,10 @@ msgstr "Relay Server (TURN)"
 msgid "_TURN server:"
 msgstr "TURN સર�વર (_T):"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "પોર�ટ (_P):"
+
 msgid "Use_rname:"
 msgstr "વપરાશકર�તા નામ (_r):"
 
@@ -13303,6 +13351,11 @@ msgstr "મો�ીલા"
 msgid "Konqueror"
 msgstr "કોન�કરર"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ડેસ�કટોપ મૂળભૂત"
 
@@ -13321,6 +13374,14 @@ msgstr "ફાયરબર�ડ"
 msgid "Epiphany"
 msgstr "�પિફની"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "જાતે"
 
@@ -13853,7 +13914,8 @@ msgstr "કંઇ નહિં"
 msgid "Small"
 msgstr "નાન�ં"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "મૂળભૂત હસતા ચહેરાઓની નાનામાં નાની આવૃત�તિઓ"
 
 msgid "Response Probability:"
@@ -14869,6 +14931,10 @@ msgstr "ઉપકરણ (_e)"
 msgid "Voice/Video Settings"
 msgstr "અવાજ/વિડિયો સ�યોજનો"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "અવાજ/વિડિયો સ�યોજનો"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14993,7 +15059,7 @@ msgstr "કાચો XMPP સà«�ટેનà«�àª�ાને મોકલો અનà
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "ડિબગીંગ XMPP સર�વરો અથવા ક�લાયન�ટો માટે આ પ�લગઇન ઉપયોગી છે."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15123,6 +15189,23 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS જરૂરી છે"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "તમે દાખલ થયેલ નામ � અયોગ�ય છે."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[આ વપરાશકર�તામાંથી સંદેશો દર�શાવવામાં અસમર�થ કારણ કે તે અયોગ�ય અક�ષરો સમાવે છે.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "જાણકારી દ�વારા મિત�ર માટે શોધ કરો"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "હજ� પ�રમાણપત�ર યોગ�ય નથી."
 
diff --git a/po/he.po b/po/he.po
index 5d723a77c4..2f7b208699 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
-"PO-Revision-Date: 2010-08-01 09:55+0200\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-20 12:35+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -519,7 +519,6 @@ msgstr "�ישור מחיקת תעודה"
 msgid "Certificate Manager"
 msgstr "מנהל התעודות"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ש� שרת"
 
@@ -781,7 +780,7 @@ msgstr "עצור"
 msgid "Waiting for transfer to begin"
 msgstr "ממתין להעברה להתחיל"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "בוטל"
 
 msgid "Failed"
@@ -1653,8 +1652,12 @@ msgid ""
 "are accurate."
 msgstr "התעודה עוד ל� בתוקף.  יש לווד� כי השעה והת�ריך של מחשבך מדוייקי�."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "תוקף התעודה פג, ולכן �ין להחשיבה כתקפה."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"תוקף התעודה פג ויש להתייחס �ליה כתעודה ש�ינה בתוקף.  יש לווד� כי השעה "
+"והת�ריך של מחשבך מדוייקי�."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1805,7 +1808,7 @@ msgstr "%s [<I>%s</I>] נכנס לחדר."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "%s ידוע כעת בש� �תה"
+msgstr "�ת/ה ידוע/ה כעת בש� %s"
 
 #, c-format
 msgid "%s is now known as %s"
@@ -4609,11 +4612,17 @@ msgstr "תוסף פרוטוקול XMPP"
 msgid "Domain"
 msgstr "דומיין"
 
-msgid "Require SSL/TLS"
-msgstr "דרוש SSL/TLS"
+msgid "Require encryption"
+msgstr "דרוש הצפנה"
+
+msgid "Use encryption if available"
+msgstr "השתמש בהצפנה �� זמין"
 
-msgid "Force old (port 5223) SSL"
-msgstr "�לץ שימוש ב-SSL ישן )יצי�ה 5223("
+msgid "Use old-style SSL"
+msgstr "השתמש בסגנון SSL ישן"
+
+msgid "Connection security"
+msgstr "�בטחת חיבור"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�פשר �ישרור ל� מוצפן בתקשורת ל� מוצפנת"
@@ -6701,6 +6710,15 @@ msgstr "כתובת שרת"
 msgid "Server port"
 msgstr "פורט השרת"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "בבקשה, תנ/י לי �ישור כדי להוסיף �ותך לרשימת �נשי הקשר שלי."
+
+msgid "No reason given."
+msgstr "ל� ניתנה סיבה."
+
+msgid "Authorization Denied Message:"
+msgstr "הודעת סירוב הרש�ה"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "התקבלה תגובה ל�-צפויה מ�ת %s: %s"
@@ -6736,6 +6754,24 @@ msgstr "AOL ×�×™× ×� מ×�פשרי×� ל×�מת ×�ת ש×� המשתמש שלך ×›×�×
 msgid "Error requesting %s"
 msgstr "שגי�ה בבקשת %s"
 
+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.)"
+
+#, 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 "
+"יש תוכנה ע� ב�גי�.)"
+
 msgid "Could not join chat room"
 msgstr "ל� ניתן להתחבר �ל חדר הצ'�ט"
 
@@ -6949,94 +6985,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "הקובץ %s הינו %s, שהו� גדול מהגודל המירבי של %s."
 
-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.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "סמל �יש הקשר"
-
-msgid "Voice"
-msgstr "קול"
-
-msgid "AIM Direct IM"
-msgstr "הודעות ישירות של AIM"
-
-msgid "Get File"
-msgstr "קבל קובץ"
-
-msgid "Games"
-msgstr "משחקי�"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "תוספות"
-
-msgid "Send Buddy List"
-msgstr "שלח רשימת �נשי הקשר"
-
-msgid "ICQ Direct Connect"
-msgstr "חיבור ישיר של ICQ"
-
-msgid "AP User"
-msgstr "AP משתמש"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "כופר במוסכמות"
-
-msgid "ICQ Server Relay"
-msgstr "ניתוב שרת ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 ישן"
-
-msgid "Trillian Encryption"
-msgstr "הצפנת טרילי�ן"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "הטופ שבפופ"
-
-msgid "Security Enabled"
-msgstr "�בטחה מופעלת"
-
-msgid "Video Chat"
-msgstr "שיחת ויד�ו"
-
-msgid "iChat AV"
-msgstr "iChat �ור-קולי"
-
-msgid "Live Video"
-msgstr "שידור חי"
-
-msgid "Camera"
-msgstr "מצלמה"
-
-msgid "Screen Sharing"
-msgstr "שיתוף מסך"
-
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
@@ -7067,15 +7015,6 @@ msgstr "בעבודה"
 msgid "At lunch"
 msgstr "ב�רוחת-צהריי�"
 
-msgid "IP Address"
-msgstr "כתובת IP"
-
-msgid "Warning Level"
-msgstr "רמת �זהרה"
-
-msgid "Buddy Comment"
-msgstr "הערת �יש קשר"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ל� ניתן להתחבר לשרת ה�ימות: %s"
@@ -7169,15 +7108,6 @@ msgstr "הסיסמ� נשלחה"
 msgid "Unable to initialize connection"
 msgstr "ל� ניתן ל�תחל חיבור"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "בבקשה, תנ/י לי �ישור כדי להוסיף �ותך לרשימת �נשי הקשר שלי."
-
-msgid "No reason given."
-msgstr "ל� ניתנה סיבה."
-
-msgid "Authorization Denied Message:"
-msgstr "הודעת סירוב הרש�ה"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7285,58 +7215,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "פספסת %hu הודעה מ�ת %s מסיבה ל� ידועה."
 msgstr[1] "פספסת %hu הודעות מ�ת %s מסיבה ל� ידועה."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "מידע על המשתמש �ינו זמין: %s"
-
-msgid "Online Since"
-msgstr "מחובר מ�ז"
-
-msgid "Member Since"
-msgstr "חבר מ�ז"
-
-msgid "Capabilities"
-msgstr "יכולות"
-
 msgid "Your AIM connection may be lost."
 msgstr "החיבור AIM שלך �ולי יתנתק."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[ל� ניתן להציג הודעה ממשתמש זה כיוון שהי� מכילה תווי� ל� חוקיי�.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "נותקת מחדר הצ'�ט %s."
 
-msgid "Mobile Phone"
-msgstr "פל�פון"
-
-msgid "Personal Web Page"
-msgstr "דף �ינטרנט �ישי"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "מידע נוסף"
-
-msgid "Zip Code"
-msgstr "מיקוד"
-
-msgid "Work Information"
-msgstr "פרטי עבודה"
-
-msgid "Division"
-msgstr "מחלקה"
-
-msgid "Position"
-msgstr "משרה"
-
-msgid "Web Page"
-msgstr "דף �ינטרנט"
-
 msgid "Pop-Up Message"
 msgstr "הודעה קופצת"
 
@@ -7594,8 +7479,8 @@ msgstr "פירמוט של ש×� משתמש רק יכולה לשנות ×�ותיו×
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>�ינך מחכה להרש�ה</i>"
+msgid "you are not waiting for authorization"
+msgstr "�ינך מחכה להרש�ה"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�תה מחכה להרש�ה מ�נשי הקשר להלן"
@@ -7633,6 +7518,14 @@ msgstr "הגדרות עקוב-�חרי להודעות (�תר)"
 msgid "Set Privacy Options..."
 msgstr "קבע �פשרויות פרטיות..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "רשימת נר�ה"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "רשימת בלתי-נר�ה"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "�שר חשבון"
@@ -7649,9 +7542,6 @@ msgstr "הצג �ת �נשי הקשר שמחכי� ל�ישור"
 msgid "Search for Buddy by Email Address..."
 msgstr "חפש �יש-קשר עפ\"י כתובת דו�\"ל..."
 
-msgid "Search for Buddy by Information"
-msgstr "חפש �יש-קשר עפ\"י מידע"
-
 msgid "Use clientLogin"
 msgstr "השתמש ב-clientLogin"
 
@@ -7760,6 +7650,160 @@ msgstr "התור מל�"
 msgid "Not while on AOL"
 msgstr "ל� בזמן שהות ב-AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "סמל �יש הקשר"
+
+msgid "Voice"
+msgstr "קול"
+
+msgid "AIM Direct IM"
+msgstr "הודעות ישירות של AIM"
+
+msgid "Get File"
+msgstr "קבל קובץ"
+
+msgid "Games"
+msgstr "משחקי�"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "תוספות"
+
+msgid "Send Buddy List"
+msgstr "שלח רשימת �נשי הקשר"
+
+msgid "ICQ Direct Connect"
+msgstr "חיבור ישיר של ICQ"
+
+msgid "AP User"
+msgstr "AP משתמש"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "כופר במוסכמות"
+
+msgid "ICQ Server Relay"
+msgstr "ניתוב שרת ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 ישן"
+
+msgid "Trillian Encryption"
+msgstr "הצפנת טרילי�ן"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "הטופ שבפופ"
+
+msgid "Security Enabled"
+msgstr "�בטחה מופעלת"
+
+msgid "Video Chat"
+msgstr "שיחת ויד�ו"
+
+msgid "iChat AV"
+msgstr "iChat �ור-קולי"
+
+msgid "Live Video"
+msgstr "שידור חי"
+
+msgid "Camera"
+msgstr "מצלמה"
+
+msgid "Screen Sharing"
+msgstr "שיתוף מסך"
+
+msgid "IP Address"
+msgstr "כתובת IP"
+
+msgid "Warning Level"
+msgstr "רמת �זהרה"
+
+msgid "Buddy Comment"
+msgstr "הערת �יש קשר"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "מידע על המשתמש �ינו זמין: %s"
+
+msgid "Mobile Phone"
+msgstr "פל�פון"
+
+msgid "Personal Web Page"
+msgstr "דף �ינטרנט �ישי"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "מידע נוסף"
+
+msgid "Zip Code"
+msgstr "מיקוד"
+
+msgid "Work Information"
+msgstr "פרטי עבודה"
+
+msgid "Division"
+msgstr "מחלקה"
+
+msgid "Position"
+msgstr "משרה"
+
+msgid "Web Page"
+msgstr "דף �ינטרנט"
+
+msgid "Online Since"
+msgstr "מחובר מ�ז"
+
+msgid "Member Since"
+msgstr "חבר מ�ז"
+
+msgid "Capabilities"
+msgstr "יכולות"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "נר�ה מחובר"
+
+msgid "Don't Appear Online"
+msgstr "�ל תיר�ה מחובר"
+
+msgid "Appear Offline"
+msgstr "ככל הנר�ה מנותק"
+
+msgid "Don't Appear Offline"
+msgstr "�ל תיר�ה מנותק"
+
+msgid "you have no buddies on this list"
+msgstr "�ין לך חברי� ברשימה זו"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"יש ב�פשרותך להוסיף חבר לרשימה זו ע\"י לחיצה ימנית ע� העכבר עליה� ולבחור \"%s"
+"\""
+
+msgid "Visible List"
+msgstr "רשימת נר�ה"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr "החברי� הללו יכול לר�ות �ת הסטטוס שלך ג� כש�ת/ה \"בלתי-נר�ה\""
+
+msgid "Invisible List"
+msgstr "רשימת בלתי-נר�ה"
+
+msgid "These buddies will always see you as offline"
+msgstr "החברי� הללו יר�ו �ותך כ\"ל�-מחובר\""
+
 msgid "Aquarius"
 msgstr "דלי"
 
@@ -7939,8 +7983,8 @@ msgid "Your request was rejected."
 msgstr "בקשתך נדחתה."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "נדרש �ימות מ�ת %u"
+msgid "%u requires verification: %s"
+msgstr "%u דורש �ימות: %s"
 
 msgid "Add buddy question"
 msgstr "הוסף ש�לת חבר"
@@ -10109,18 +10153,12 @@ msgstr "יצ� לרגע"
 msgid "Not on server list"
 msgstr "ל� ברשימת השרתי�"
 
-msgid "Appear Online"
-msgstr "נר�ה מחובר"
-
 msgid "Appear Permanently Offline"
 msgstr "נר�ה מנותק לעד"
 
 msgid "Presence"
 msgstr "נוכחות"
 
-msgid "Appear Offline"
-msgstr "ככל הנר�ה מנותק"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�ל תיר�ה מנותק לעד"
 
@@ -10653,27 +10691,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "החיבור נותק ע\"י תוכנות �חרות במחשבך."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "השרת המרוחק סגר �ת החיבור."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "�זל הזמן המוקצב לחיבור."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "החיבור סורב."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "כתובת כבר בשימוש."
 
@@ -10811,7 +10844,7 @@ msgid ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span size='larger' weight='bold'>ברוכי� הב�י� �ל%s!</span>\n"
+"<span size='larger' weight='bold'>ברוכ/ה הב�/ה �ל %s!</span>\n"
 "\n"
 "�ין ברשותך ש� חשבונות מוגדרי�. על מנת להתחבר ע� %s יש ללחוץ על הכפתור "
 "<b>הוסף...</b> שלהלן להגדיר �ת חשבונך הר�שון. �� ברצונך ש-%s יתחבר לכמה "
@@ -10820,6 +10853,10 @@ msgstr ""
 "ניתן ג� לחזור לחלון זה על מנת להוסיף, לערוך, �ו להסיר חשבונות על-ידי "
 "<b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברי�"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s רוצה להוסיף �ותך (%s) לרשימת �נשי-הקשר שלו �ו שלה%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "צבע הרקע"
@@ -11070,6 +11107,8 @@ msgstr "הודעה (ל� חובה)"
 msgid "Edit User Mood"
 msgstr "קבע מצב-רוח משתמש"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_�נשי קשר"
@@ -11810,9 +11849,6 @@ msgstr "תמיכה"
 msgid "webmaster"
 msgstr "מנהל �תר"
 
-msgid "Senior Contributor/QA"
-msgstr "תור� בכיר/QA"
-
 msgid "win32 port"
 msgstr "גירסה לחלונות"
 
@@ -11838,6 +11874,9 @@ msgstr "מתכנת מקורי"
 msgid "lead developer"
 msgstr "מפתח ר�שי"
 
+msgid "Senior Contributor/QA"
+msgstr "תור� בכיר/QA"
+
 msgid "Afrikaans"
 msgstr "�פריק�נס"
 
@@ -13155,6 +13194,9 @@ msgstr "שרת העברה (TURN)"
 msgid "_TURN server:"
 msgstr "שרת TURN:"
 
+msgid "_UDP Port:"
+msgstr "יצי�ת UDP:"
+
 msgid "Use_rname:"
 msgstr "ש� משתמש:"
 
@@ -13176,6 +13218,11 @@ msgstr "מוזילה"
 msgid "Konqueror"
 msgstr "קונק�רור"
 
+msgid "Google Chrome"
+msgstr "גוגל כרו�"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ברירות המחדל בשולחן העבודה"
 
@@ -13194,6 +13241,14 @@ msgstr "פיירבירד"
 msgid "Epiphany"
 msgstr "�פיפני"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "כרומניו� (דפדפן-כרומניו�)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "כרומניו� (כרו�)"
+
 msgid "Manual"
 msgstr "מות�� �ישית"
 
@@ -13718,7 +13773,7 @@ msgstr "לל�"
 msgid "Small"
 msgstr "קטן"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "גירס�ות מוקטנות של חייכני ברירת המחדל"
 
 msgid "Response Probability:"
@@ -14728,6 +14783,9 @@ msgstr "מ_כשיר"
 msgid "Voice/Video Settings"
 msgstr "הגדרות קול/ויד�ו"
 
+msgid "Voice and Video Settings"
+msgstr "הגדרות קול וויד�ו"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14854,7 +14912,7 @@ msgstr "שלח וקבל סטנזות XMPP גולמיות."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי ב�גי� בשרתי� ולקוחות של XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -14992,6 +15050,23 @@ msgstr ".Pidginבקרו ב�תר של "
 msgid "You do not have permission to uninstall this application."
 msgstr ".�ין לך זכות למחוק תוכנה ז�ת"
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "תוקף התעודה פג, ולכן �ין להחשיבה כתקפה."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "דרוש SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "�לץ שימוש ב-SSL ישן )יצי�ה 5223("
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[ל� ניתן להציג הודעה ממשתמש זה כיוון שהי� מכילה תווי� ל� חוקיי�.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "חפש �יש-קשר עפ\"י מידע"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "הש� שהזנת �ינו חוקי."
 
diff --git a/po/hi.po b/po/hi.po
index f81a1b578a..2d2ea49e70 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-02-19 15:12+0530\n"
 "Last-Translator: Rajesh Ranjan <rajeshkajha@yahoo.com>\n"
 "Language-Team: Hindi <Indlinux>\n"
@@ -519,7 +519,6 @@ msgstr "प�रमाणपत�र मिटाना स�प�ष�ट
 msgid "Certificate Manager"
 msgstr "प�रमाणपत�र प�रबंधक"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "मेजबाननाम"
 
@@ -780,7 +779,7 @@ msgstr "रूकें"
 msgid "Waiting for transfer to begin"
 msgstr "हस�तांतरण के श�र� होने की प�रतीक�षा करता है."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद�द"
 
 msgid "Failed"
@@ -1663,7 +1662,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "प�रमाणपत�र समाप�त हो गया है और इसे वैध नहीं माना जा सकता है."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4659,11 +4661,20 @@ msgstr "XMPP प�रोटोकाल प�लगिन"
 msgid "Domain"
 msgstr "डोमेन"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS जरूरी"
+#, fuzzy
+msgid "Require encryption"
+msgstr "प�रमाणीकरण जरूरी"
 
-msgid "Force old (port 5223) SSL"
-msgstr "प�राने (port 5223) SSL को बाध�य करें"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "प�रयोक�ता सूचना उपलब�ध नहीं: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "संबंधन का समय समाप�त"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "विगोपित धारा के ऊपर सादा पाठ प�रमाणीकरण की आज�ञा दीजि�"
@@ -5893,7 +5904,8 @@ msgstr "PIN अमान�य है. इसमें केनल [0-9] अं
 msgid "The two PINs you entered do not match."
 msgstr "दो दर�ज पिन नहीं मेल खाती है."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "दर�ज़ नाम अवैध है।"
 
 msgid ""
@@ -5981,10 +5993,6 @@ msgstr "MXit सरà¥�वर से कनेकà¥�ट करने में à¤
 msgid "Connecting..."
 msgstr "ज�ड़ रहा है..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "दर�ज़ नाम अवैध है।"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "दर�ज़ किया गया आपके पिन की लंबाई अवैध है [7-10]."
 
@@ -6824,6 +6832,15 @@ msgstr "सर�वर पता"
 msgid "Server port"
 msgstr "सर�वर पोर�ट"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया म��े प�रमाणित करें तब मैं आपको अपने बड�डी सूची में रख सकता हूं."
+
+msgid "No reason given."
+msgstr "कोई कारण नहीं दिया है."
+
+msgid "Authorization Denied Message:"
+msgstr "प�रमाणीकरण मनाही संदेश:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s से अप�रत�याशित अन�क�रिया पाया: %s"
@@ -6859,6 +6876,24 @@ msgstr "AOL आपके स�क�रीन नाम को यहा� स
 msgid "Error requesting %s"
 msgstr "%s के आग�रह में त�र�टि: %s"
 
+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 खाता के लि� आप निर�दिष�ट कर सकते हैं.)"
+
+#, 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 के पास बगी "
+"क�ला�ंट है.)"
+
 msgid "Could not join chat room"
 msgstr "बातचीत कक�ष मे शामिल नहीं हो सका"
 
@@ -7088,94 +7123,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s फाइल %s है, जो कि %s के अधिकतम आकार से बड़ा है."
 
-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 खाता के लि� आप निर�दिष�ट कर सकते हैं.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "बड�डी प�रतीक"
-
-msgid "Voice"
-msgstr "आवाज़"
-
-msgid "AIM Direct IM"
-msgstr "AIM प�रत�यक�ष आई �म"
-
-msgid "Get File"
-msgstr "फाइल पा�ं"
-
-msgid "Games"
-msgstr "खेल"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "सह-यंत�र"
-
-msgid "Send Buddy List"
-msgstr "बड�डी सूची भेजें"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ सीधा संबंधन"
-
-msgid "AP User"
-msgstr "AP प�रयोक�ता"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "शून�यवादी"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ सर�वर रिले"
-
-msgid "Old ICQ UTF8"
-msgstr "प�राना ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ट�रिलियन गोपन"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "हिपटौप"
-
-msgid "Security Enabled"
-msgstr "स�रक�षा सक�रिय"
-
-msgid "Video Chat"
-msgstr "वीडियो चैट"
-
-msgid "iChat AV"
-msgstr "आइ बात-चीत AV"
-
-msgid "Live Video"
-msgstr "जीवंत विडियो"
-
-msgid "Camera"
-msgstr "कैमरा"
-
-msgid "Screen Sharing"
-msgstr "स�क�रीन सा�ाकरण"
-
 msgid "Free For Chat"
 msgstr "बात-चीत के लि� तैयार"
 
@@ -7211,15 +7158,6 @@ msgstr "नेटवर�क"
 msgid "At lunch"
 msgstr "दिन के खाना पर गया है"
 
-msgid "IP Address"
-msgstr "IP पता"
-
-msgid "Warning Level"
-msgstr "चेतावनी स�तर"
-
-msgid "Buddy Comment"
-msgstr "बड�डी टिप�पणी"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "सत�यापन सर�वर से कनेक�ट करने में असमर�थ: %s"
@@ -7313,15 +7251,6 @@ msgstr "कूटशब�द भेजा "
 msgid "Unable to initialize connection"
 msgstr "कनेक�शन आरंभ करने में असमर�थ"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "कृपया म��े प�रमाणित करें तब मैं आपको अपने बड�डी सूची में रख सकता हूं."
-
-msgid "No reason given."
-msgstr "कोई कारण नहीं दिया है."
-
-msgid "Authorization Denied Message:"
-msgstr "प�रमाणीकरण मनाही संदेश:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7430,58 +7359,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "आपको %hu संदेश %s से नहीं मिला किसी अनजान कारण से."
 msgstr[1] "आपको %hu संदेश %s से नहीं मिला किसी अनजान कारण से."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "प�रयोक�ता सूचना उपलब�ध नहीं: %s"
-
-msgid "Online Since"
-msgstr "से ऑनलाइन"
-
-msgid "Member Since"
-msgstr "से सदस�य"
-
-msgid "Capabilities"
-msgstr "योग�यता"
-
 msgid "Your AIM connection may be lost."
 msgstr "आपका � आई �म संबंधन संभवतः टूट सकता है"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[इस प�रयोक�ता से �क संदेश दिखाने में असमर�थ क�योंकि इसमें अवैध अक�षर है.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "आप %s बात-चीत कक�ष से विसंबंधित हो गये हैं."
 
-msgid "Mobile Phone"
-msgstr "मोबाइल फोन"
-
-msgid "Personal Web Page"
-msgstr "निजी वेब पन�ना"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "अतिरिक�त सूचना"
-
-msgid "Zip Code"
-msgstr "ज़िप कोड"
-
-msgid "Work Information"
-msgstr "कार�य की सूचना"
-
-msgid "Division"
-msgstr "भाग"
-
-msgid "Position"
-msgstr "स�थिति"
-
-msgid "Web Page"
-msgstr "वेब पेज"
-
 msgid "Pop-Up Message"
 msgstr "पॉप-अप संदेश"
 
@@ -7746,7 +7630,8 @@ msgstr "उपयोक�तानाम संरूपण केवल बड
 msgid "Change Address To:"
 msgstr "इसमें पता बदलें:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>आप प�रमाणीकरण की प�रतीक�षा नहीं कर रहे हैं</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7785,6 +7670,14 @@ msgstr "IM फौरवारà¥�डिंग (वेब) विनà¥�यसà¥�à¤
 msgid "Set Privacy Options..."
 msgstr "गोपनीयता विकल�प सेट करें..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "दोस�त सूची दिखा�� (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "निमंत�रण सूची"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "खाता संप�ष�ट करें"
@@ -7801,9 +7694,6 @@ msgstr "प�रमाणीकरण की प�रतीक�षारत
 msgid "Search for Buddy by Email Address..."
 msgstr "दोस�त की खोज ईमेल पता द�वारा करें..."
 
-msgid "Search for Buddy by Information"
-msgstr "बड�डी की खोज सूचना द�वारा करें"
-
 msgid "Use clientLogin"
 msgstr "क�लाइंटलॉगिन का उपयोग करें"
 
@@ -7911,6 +7801,165 @@ msgstr "कतार भरा"
 msgid "Not while on AOL"
 msgstr "AOL दौरान नहीं"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "बड�डी प�रतीक"
+
+msgid "Voice"
+msgstr "आवाज़"
+
+msgid "AIM Direct IM"
+msgstr "AIM प�रत�यक�ष आई �म"
+
+msgid "Get File"
+msgstr "फाइल पा�ं"
+
+msgid "Games"
+msgstr "खेल"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "सह-यंत�र"
+
+msgid "Send Buddy List"
+msgstr "बड�डी सूची भेजें"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ सीधा संबंधन"
+
+msgid "AP User"
+msgstr "AP प�रयोक�ता"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "शून�यवादी"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ सर�वर रिले"
+
+msgid "Old ICQ UTF8"
+msgstr "प�राना ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ट�रिलियन गोपन"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "हिपटौप"
+
+msgid "Security Enabled"
+msgstr "स�रक�षा सक�रिय"
+
+msgid "Video Chat"
+msgstr "वीडियो चैट"
+
+msgid "iChat AV"
+msgstr "आइ बात-चीत AV"
+
+msgid "Live Video"
+msgstr "जीवंत विडियो"
+
+msgid "Camera"
+msgstr "कैमरा"
+
+msgid "Screen Sharing"
+msgstr "स�क�रीन सा�ाकरण"
+
+msgid "IP Address"
+msgstr "IP पता"
+
+msgid "Warning Level"
+msgstr "चेतावनी स�तर"
+
+msgid "Buddy Comment"
+msgstr "बड�डी टिप�पणी"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "प�रयोक�ता सूचना उपलब�ध नहीं: %s"
+
+msgid "Mobile Phone"
+msgstr "मोबाइल फोन"
+
+msgid "Personal Web Page"
+msgstr "निजी वेब पन�ना"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "अतिरिक�त सूचना"
+
+msgid "Zip Code"
+msgstr "ज़िप कोड"
+
+msgid "Work Information"
+msgstr "कार�य की सूचना"
+
+msgid "Division"
+msgstr "भाग"
+
+msgid "Position"
+msgstr "स�थिति"
+
+msgid "Web Page"
+msgstr "वेब पेज"
+
+msgid "Online Since"
+msgstr "से ऑनलाइन"
+
+msgid "Member Since"
+msgstr "से सदस�य"
+
+msgid "Capabilities"
+msgstr "योग�यता"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ऑनलाइन प�रकट हो�ं"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ऑनलाइन प�रकट हो�ं"
+
+msgid "Appear Offline"
+msgstr "ऑफलाइन प�रकट हो�ं"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ऑफलाइन प�रकट हो�ं"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "आपको लात मारी गई: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"आप उनपर दाहिना क�लिक करके और \"प�नः प�रमाणीकरण के लि� आग�रह करें\" च�नकर प�नः "
+"प�रमाणीकरण के लि� अन�रोध कर सकते हैं."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "दृष�टिगोचर"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "निमंत�रण सूची"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "क�ंभ"
 
@@ -8089,8 +8138,8 @@ msgstr "आपकी सलाह स�वीकार की गई."
 msgid "Your request was rejected."
 msgstr "आपकी सलाह अस�वीकार की गई."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u के लि� प�रमाणीकरण जरूरी"
 
 msgid "Add buddy question"
@@ -10264,18 +10313,12 @@ msgstr "बाहर निकल गया"
 msgid "Not on server list"
 msgstr "सर�वर सूची पर नहीं"
 
-msgid "Appear Online"
-msgstr "ऑनलाइन प�रकट हो�ं"
-
 msgid "Appear Permanently Offline"
 msgstr "स�थायी ऑफलाइन प�रकट हो�ं"
 
 msgid "Presence"
 msgstr "उपस�थिति"
 
-msgid "Appear Offline"
-msgstr "ऑफलाइन प�रकट हो�ं"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "स�थायी रूप से ऑफलाइन मत हो�ं"
 
@@ -10814,27 +10857,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "दूसरे सोफ�टवेयर के द�वारा आपकी कंप�यूटर पर संबंधन बाधित ह�आ."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "दूरस�थ मेजबान बंद संबंधन."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "कनेक�शन टाइम आउट"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "कनेक�शन अस�वीकृत"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "फ़ाइल पहले से उपयोग में है."
 
@@ -10981,6 +11019,10 @@ msgstr ""
 "आपको इस विंडो में जोड़ने, संपादित करने, या खाता हटाने के लि� वापस लौटना है <b>खाता-"
 ">खाता प�रबंधित करें</b> दोस�त सूची विंडो में."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s अपनी बड�डी सूची %s%s में %s को जोड़ना चाहता है."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "पृष�ठभूमि रंग"
@@ -11234,6 +11276,8 @@ msgstr "उपनाम (वैकल�पिक)"
 msgid "Edit User Mood"
 msgstr "उपयोक�ता मूड संपादित करें"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/बड�डी (_B)"
@@ -11984,9 +12028,6 @@ msgstr "समर�थन"
 msgid "webmaster"
 msgstr "वेब मास�टर"
 
-msgid "Senior Contributor/QA"
-msgstr "वरिष�ठ योगदानकर�ता/QA"
-
 msgid "win32 port"
 msgstr "win32 पोर�ट"
 
@@ -12012,6 +12053,9 @@ msgstr "मूल लेखक"
 msgid "lead developer"
 msgstr "म�ख�य विकासकर�ता"
 
+msgid "Senior Contributor/QA"
+msgstr "वरिष�ठ योगदानकर�ता/QA"
+
 msgid "Afrikaans"
 msgstr "अफ�रीकांस"
 
@@ -13347,6 +13391,10 @@ msgstr "रिले सर�वर (TURN)"
 msgid "_TURN server:"
 msgstr "सर�वर लौटा�� (_T):"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "पोर�ट (_P):"
+
 msgid "Use_rname:"
 msgstr "उपयोक�तानाम (_r):"
 
@@ -13368,6 +13416,11 @@ msgstr "मोज़िला"
 msgid "Konqueror"
 msgstr "कॉन�करर"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "डेस�कटोप मूलभूत"
 
@@ -13386,6 +13439,14 @@ msgstr "फ़ायरबर�ड"
 msgid "Epiphany"
 msgstr "�पीफैनी"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "हस�तचालित"
 
@@ -13915,7 +13976,8 @@ msgstr "क�छ नहीं"
 msgid "Small"
 msgstr "छोटा"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "तयश�दा स�माइली का छोटा संस�करण"
 
 msgid "Response Probability:"
@@ -14932,6 +14994,10 @@ msgstr "य�क�ति (_e)"
 msgid "Voice/Video Settings"
 msgstr "आवाज/वीडियो सेटिंग"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "आवाज/वीडियो सेटिंग"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15057,7 +15123,7 @@ msgstr "कच�चा XMPP बंद भेजें व पा�ं."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "यह प�लगिन XMPP सर�वर को क�लाइंट पर डिबगिंग के लिये उपयोगी है."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15187,6 +15253,23 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS जरूरी"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "प�राने (port 5223) SSL को बाध�य करें"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "दर�ज़ नाम अवैध है।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[इस प�रयोक�ता से �क संदेश दिखाने में असमर�थ क�योंकि इसमें अवैध अक�षर है.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "बड�डी की खोज सूचना द�वारा करें"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "प�रमाणपत�र अबतक वैध नहीं है."
 
diff --git a/po/hu.po b/po/hu.po
index ae064a1f37..41e01449d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-15 21:49+0200\n"
-"PO-Revision-Date: 2010-08-15 21:48+0200\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 12:33+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -531,7 +531,6 @@ msgstr "Tanúsítványtörlés megerősítése"
 msgid "Certificate Manager"
 msgstr "Tanúsítványkezelő"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Gépnév"
 
@@ -804,7 +803,7 @@ msgstr "Leállítás"
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Megszakítva"
 
 msgid "Failed"
@@ -1694,8 +1693,12 @@ msgstr ""
 "A tanúsítvány még nem érvényes. Ellenőrizze a számítógép dátumának és "
 "idejének pontosságát."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "A tanúsítvány lejárt és nem tekinthető érvényesnek."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"A tanúsítvány lejárt és nem tekinthető érvényesnek. Ellenőrizze a számítógép "
+"dátumának és idejének pontosságát."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4736,11 +4739,17 @@ msgstr "XMPP protokollbővítmény"
 msgid "Domain"
 msgstr "Tartomány"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS megkövetelése"
+msgid "Require encryption"
+msgstr "Titkosítás megkövetelése"
+
+msgid "Use encryption if available"
+msgstr "Titkosítás használata, ha elérhető"
+
+msgid "Use old-style SSL"
+msgstr "Régi stílusú SSL használata"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Régi (5223 port) SSL kényszerítése"
+msgid "Connection security"
+msgstr "Kapcsolat biztonsága"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
@@ -6719,8 +6728,8 @@ msgstr "Nem lehet bejelentkezni: %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
-"s)."
+"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6879,6 +6888,16 @@ msgstr "Kiszolgáló címe"
 msgid "Server port"
 msgstr "Kiszolgáló portja"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr "Nincs ok megadva."
+
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr "Hozzáférés elutasítva üzenet:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Váratlan válasz érkezett a következőtől: %s: %s"
@@ -6914,6 +6933,19 @@ msgstr "Az AOL nem engedélyezi ezen megjelenő név hitelesítését"
 msgid "Error requesting %s"
 msgstr "Hiba %s lekérésekor"
 
+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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr "Nem sikerült kapcsolódni a csevegőszobához"
 
@@ -7120,8 +7152,8 @@ 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 egy %s fájlt próbált küldeni, de közvetlen kapcsolatban legfeljebb csak %"
-"s méretű fájl küldhető. Próbálkozzon inkább a fájlátvitellel.\n"
+"%s egy %s fájlt próbált küldeni, de közvetlen kapcsolatban legfeljebb csak "
+"%s méretű fájl küldhető. Próbálkozzon inkább a fájlátvitellel.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -7265,9 +7297,6 @@ msgstr ""
 "következő indoklással:\n"
 "%s"
 
-msgid "No reason given."
-msgstr "Nincs ok megadva."
-
 msgid "ICQ authorization denied."
 msgstr "ICQ engedélyezés elutasítva."
 
@@ -7711,6 +7740,14 @@ msgstr "Üzenettovábbítás beállítása (web)"
 msgid "Set Privacy Options..."
 msgstr "Magánszféra-beállítások…"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "P_artnerlista megjelenítése"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Meghívási lista"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
@@ -7836,6 +7873,185 @@ msgstr "A sor tele"
 msgid "Not while on AOL"
 msgstr "Nem az AOL-on"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Partnerikon"
+
+msgid "Voice"
+msgstr "Hang"
+
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "Közvetlen IM"
+
+#, fuzzy
+msgid "Get File"
+msgstr "Fájl küldése"
+
+#, fuzzy
+msgid "Games"
+msgstr "Asszámi"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Partnerlista"
+
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "Közvetlen kapcsolatok engedélyezése"
+
+#, fuzzy
+msgid "AP User"
+msgstr "Felhasználó hitelesítése"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+#, fuzzy
+msgid "ICQ Server Relay"
+msgstr "A kiszolgáló válasza:"
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+#, fuzzy
+msgid "Security Enabled"
+msgstr "Biztonsági kód"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "_Videóhívás"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "Csevegés"
+
+#, fuzzy
+msgid "Live Video"
+msgstr " Videó"
+
+#, fuzzy
+msgid "Camera"
+msgstr "Videokamera"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP cím"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "Figyelmeztetés"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Partnermegjegyzés:"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Titkosítás használata, ha elérhető"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "Személyes mobil"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "Opcionális információk:"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "További információk"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Leírás"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Honlap"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "Kapcsolódva ezóta"
+
+msgid "Member Since"
+msgstr "Tagság kezdete"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Belépettként látszik"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Belépettként látszik"
+
+msgid "Appear Offline"
+msgstr "Kilépettként látszik"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Kilépettként látszik"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Kirúgták ebből a MultiMX-ből."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
+"kattintva a nevükön, és az „Engedélyezés újra kérése� választásával"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Látható"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Meghívási lista"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vízöntő"
 
@@ -8015,8 +8231,8 @@ msgid "Your request was rejected."
 msgstr "A kérés visszautasítva."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u ellenőrzést igényel"
+msgid "%u requires verification: %s"
+msgstr "%u ellenőrzést igényel: %s"
 
 msgid "Add buddy question"
 msgstr "Partnerkérdés felvétele"
@@ -9891,9 +10107,6 @@ msgstr "Videokonferencia"
 msgid "Computer"
 msgstr "Számítógép"
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 msgid "PDA"
 msgstr "PDA"
 
@@ -10252,18 +10465,12 @@ msgstr "Kilépett"
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-msgid "Appear Online"
-msgstr "Belépettként látszik"
-
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
 msgid "Presence"
 msgstr "Jelenlét"
 
-msgid "Appear Offline"
-msgstr "Kilépettként látszik"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne látsszon tartósan kilépettként"
 
@@ -10322,9 +10529,6 @@ msgstr "%s felajánlja egy %d fájlból álló csoport elküldését.\n"
 msgid "Write Error"
 msgstr "�rási hiba"
 
-msgid "IP Address"
-msgstr "IP cím"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
@@ -10366,9 +10570,6 @@ msgstr "Érdekes link 2"
 msgid "Cool Link 3"
 msgstr "Érdekes link 3"
 
-msgid "Member Since"
-msgstr "Tagság kezdete"
-
 msgid "Last Update"
 msgstr "Utolsó frissítés"
 
@@ -10597,8 +10798,8 @@ msgstr "%d HTTP proxy kapcsolathiba"
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
-"d. porton"
+"Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) "
+"%d. porton"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10818,27 +11019,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "A kapcsolódást megszakította a számítógép egy másik szoftvere."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "A távoli gép lezárta a kapcsolatot."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "A kapcsolat túllépte az időkorlátot."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Kapcsolat visszautasítva."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "A cím már használatban van."
 
@@ -10851,8 +11047,8 @@ msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Hiba történt a(z) %s olvasásakor. Ez a fájl nem lett betöltve, a régi fájl %"
-"s~ néven lett elmentve."
+"Hiba történt a(z) %s olvasásakor. Ez a fájl nem lett betöltve, a régi fájl "
+"%s~ néven lett elmentve."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
@@ -11249,6 +11445,8 @@ msgstr "Üzenet (elhagyható)"
 msgid "Edit User Mood"
 msgstr "Felhasználói hangulat szerkesztése"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Partnerek"
@@ -11996,9 +12194,6 @@ msgstr "támogató"
 msgid "webmaster"
 msgstr "webmester"
 
-msgid "Senior Contributor/QA"
-msgstr "Veterán közreműködő/QA"
-
 msgid "win32 port"
 msgstr "win32 portolás"
 
@@ -12024,6 +12219,9 @@ msgstr "eredeti szerző"
 msgid "lead developer"
 msgstr "vezető fejlesztő"
 
+msgid "Senior Contributor/QA"
+msgstr "Veterán közreműködő/QA"
+
 msgid "Afrikaans"
 msgstr "afrikaans"
 
@@ -12276,8 +12474,8 @@ msgid ""
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "A %s egy libpurple alapú moduláris üzenetküldő kliens, amely egyszerre több "
 "üzenetküldő szolgáltatáshoz is képes csatlakozni. A %s GTK+ használatával, C "
@@ -12827,16 +13025,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban "
 "kezdődött beszélgetés naplóját?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
 
@@ -13364,6 +13562,9 @@ msgstr "Továbbító kiszolgáló (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN kiszolgáló:"
 
+msgid "_UDP Port:"
+msgstr "_UDP port:"
+
 msgid "Use_rname:"
 msgstr "_Felhasználónév:"
 
@@ -13385,6 +13586,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Asztali környezet alapértelmezése"
 
@@ -13403,6 +13609,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Egyéni"
 
@@ -13853,10 +14067,6 @@ msgstr ""
 "<b>Fájlméret:</b> %s\n"
 "<b>Képméret:</b> %dx%d"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Partnerikon"
-
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
@@ -13942,7 +14152,7 @@ msgstr "nincs"
 msgid "Small"
 msgstr "Kicsi"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Az alapértelmezett hangulatjelek kisebb változatai"
 
 msgid "Response Probability:"
@@ -14789,9 +14999,6 @@ msgstr "Operátor"
 msgid "Half Operator"
 msgstr "Féloperátor"
 
-msgid "Voice"
-msgstr "Hang"
-
 msgid "Authorization dialog"
 msgstr "Hitelesítési ablak"
 
@@ -14981,6 +15188,9 @@ msgstr "_Eszköz"
 msgid "Voice/Video Settings"
 msgstr "Hang/videobeállítások"
 
+msgid "Voice and Video Settings"
+msgstr "Hang- és videobeállítások"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15172,8 +15382,8 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 "Hiba a helyesírás-ellenőrző telepítésekor. ($R3).$\\rHa az újrapróbálkozás "
 "meghiúsul, akkor saját kezűleg is telepítheti a http://developer.pidgin.im/"
diff --git a/po/hy.po b/po/hy.po
index 2960fdeee2..160f7ab500 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: am\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-05-20 17:37+0400\n"
 "Last-Translator: David Avsharyan <avsharyan@gmail.com>\n"
 "Language-Team: \n"
@@ -509,7 +509,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -755,7 +754,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1612,7 +1611,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4469,10 +4470,16 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
 msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
@@ -5627,7 +5634,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5717,9 +5724,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6533,6 +6537,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6564,6 +6577,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6775,89 +6801,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr ""
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr ""
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -6889,15 +6832,6 @@ msgstr ""
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr ""
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -6984,15 +6918,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7086,58 +7011,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr ""
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-msgid "Position"
-msgstr ""
-
-msgid "Web Page"
-msgstr ""
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7376,7 +7256,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7413,6 +7293,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7429,9 +7315,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7534,6 +7417,158 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr ""
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7713,7 +7748,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -9787,18 +9822,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10315,27 +10344,22 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr ""
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr ""
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr ""
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10471,6 +10495,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10718,6 +10746,8 @@ msgstr ""
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -11447,9 +11477,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11475,6 +11502,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12745,6 +12775,10 @@ msgid "_TURN server:"
 msgstr ""
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Ô´Õ¡Õ½Õ¡Õ¯Õ¡Ö€Õ£Õ¥Õ¬"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨Ö‰"
 
@@ -12767,6 +12801,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12785,6 +12824,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -13301,7 +13348,7 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14283,6 +14330,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14404,7 +14454,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
diff --git a/po/id.po b/po/id.po
index 695694c0ab..a5a4a8bb53 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-10-28 02:39+0800\n"
 "Last-Translator: Rai S. Regawa <raireg@yahoo.com>\n"
 "Language-Team: Rai S. Regawa <raireg@yahoo.com>\n"
@@ -550,7 +550,6 @@ msgstr "Konfirmasi penghapusan sertifikat"
 msgid "Certificate Manager"
 msgstr "Manajer Sertifikat"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nama Host"
 
@@ -815,7 +814,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Menunggu transfer untuk mulai"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Dibatalkan"
 
 msgid "Failed"
@@ -1725,7 +1724,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4817,11 +4818,20 @@ msgstr "Plugin Protokol XMPP"
 msgid "Domain"
 msgstr "Domain"
 
-msgid "Require SSL/TLS"
-msgstr "Memerlukan SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Memerlukan Otorisasi"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Paksakan SSL lama (port 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Iformasi untuk pengguna %s tidak tersedia"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Sambungan di-reset"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Ijinkan otorisasi teks biasa melalui aliran tanpa enkripsi "
@@ -6103,7 +6113,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Kata sandi baru tidak sama."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
 msgid ""
@@ -6210,10 +6220,6 @@ msgid "Connecting..."
 msgstr "Menyambungkan"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Kunci SecurID yang dimasukkan tidak valid."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
@@ -7105,6 +7111,17 @@ msgstr "Alamat Server"
 msgid "Server port"
 msgstr "Port Server"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Mohon otorisasi saya sehingga saya dapat menambahkan anda ke daftar teman "
+"saya."
+
+msgid "No reason given."
+msgstr "Tidak diberikan alasan."
+
+msgid "Authorization Denied Message:"
+msgstr "Pesan Penolakan Otorisasi:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Menerima respon HTTP tidak terduga dari server."
@@ -7139,6 +7156,25 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Kesalahan dalam memohon token login"
 
+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 ""
+"(Terdapat kesalahan dalam menerima pesan ini.  Teman yang anda ajak bicara "
+"kemungkinan menggunakan pengkodean berbeda dari harapan. Apabila anda tahu "
+"pengkodean apa yang digunakan, anda dapat menjabarkannya dalam pilihan akun "
+"lanjutan untuk akun AIM/ICQ anda.)"
+
+#, 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 ""
+"(Terdapat kesalahan dalam menerima pesan ini.  Mungkin anda dan %s memiliki "
+"pengkodean berbeda terpilih, atau %s memiliki klien dengan bug.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Tidak dapat menyambung"
@@ -7372,96 +7408,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "File %s adalah %s, yang lebih besar dari ukuran maksimal dari %s."
 
-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 ""
-"(Terdapat kesalahan dalam menerima pesan ini.  Teman yang anda ajak bicara "
-"kemungkinan menggunakan pengkodean berbeda dari harapan. Apabila anda tahu "
-"pengkodean apa yang digunakan, anda dapat menjabarkannya dalam pilihan akun "
-"lanjutan untuk akun AIM/ICQ anda.)"
-
-#, 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 ""
-"(Terdapat kesalahan dalam menerima pesan ini.  Mungkin anda dan %s memiliki "
-"pengkodean berbeda terpilih, atau %s memiliki klien dengan bug.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikon Teman"
-
-msgid "Voice"
-msgstr "Suara"
-
-msgid "AIM Direct IM"
-msgstr "PI Langsung AIM"
-
-msgid "Get File"
-msgstr "Dapatkan File"
-
-msgid "Games"
-msgstr "Permainan"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Tambahan-tambahan"
-
-msgid "Send Buddy List"
-msgstr "Kirim Daftar Teman"
-
-msgid "ICQ Direct Connect"
-msgstr "Sambungan Langsung ICQ"
-
-msgid "AP User"
-msgstr "Pengguna AP"
-
-msgid "ICQ RTF"
-msgstr "RTF ICQ"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Relay Server ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "UTF8 ICQ Lama"
-
-msgid "Trillian Encryption"
-msgstr "Enkripsi Trillian"
-
-msgid "ICQ UTF8"
-msgstr "UTF8 ICQ"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Keamanan Diaktifkan"
-
-msgid "Video Chat"
-msgstr "Percakapan Video"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video Langsung"
-
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nama Layar"
-
 msgid "Free For Chat"
 msgstr "Bebas Untuk Percakapan"
 
@@ -7497,15 +7443,6 @@ msgstr "Jaringan"
 msgid "At lunch"
 msgstr "Sedang Makan Siang"
 
-msgid "IP Address"
-msgstr "Alamat IP"
-
-msgid "Warning Level"
-msgstr "Tingkat Peringatan"
-
-msgid "Buddy Comment"
-msgstr "Komentar Teman"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7611,17 +7548,6 @@ msgstr "Kata sandi terkirim"
 msgid "Unable to initialize connection"
 msgstr "Tidak dapat menginisialisasi sambungan"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Mohon otorisasi saya sehingga saya dapat menambahkan anda ke daftar teman "
-"saya."
-
-msgid "No reason given."
-msgstr "Tidak diberikan alasan."
-
-msgid "Authorization Denied Message:"
-msgstr "Pesan Penolakan Otorisasi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7734,60 +7660,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Anda melewatkan %hu pesan dari %s karena alasan tidak jelas."
 msgstr[1] "Anda melewatkan %hu pesan-pesan dari %s karena alasan tidak jelas."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informasi pengguna tidak tersedia: %s"
-
-msgid "Online Since"
-msgstr "Online Sejak"
-
-msgid "Member Since"
-msgstr "Anggota Sejak"
-
-msgid "Capabilities"
-msgstr "Kemampuan"
-
 msgid "Your AIM connection may be lost."
 msgstr "Sambungan AIM anda mungkin hilang."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Tidak dapat menampilkan pesan dari pengguna ini karena mengandung karakter "
-"tidak valid.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Anda telah diputuskan dari kamar percakapan %s."
 
-msgid "Mobile Phone"
-msgstr "Telepon Seluler"
-
-msgid "Personal Web Page"
-msgstr "Situs Web Pribadi"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informasi Tambahan"
-
-msgid "Zip Code"
-msgstr "Kode Pos"
-
-msgid "Work Information"
-msgstr "Informasi Pekerjaan"
-
-msgid "Division"
-msgstr "Divisi"
-
-msgid "Position"
-msgstr "Posisi"
-
-msgid "Web Page"
-msgstr "Halaman Web"
-
 msgid "Pop-Up Message"
 msgstr "Pesan Popup"
 
@@ -8073,7 +7952,8 @@ msgstr "Pemformatan nama layar dapar hanya merubah kapitalisasi dan sepasi."
 msgid "Change Address To:"
 msgstr "Rubah Alamat Ke:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>anda tidak menunggu otorisasi</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8115,6 +7995,14 @@ msgstr "Konfigurasi Forwarding PI (URL)"
 msgid "Set Privacy Options..."
 msgstr "Tampilkan Pilihan Privasi..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Tampilkan Daftar Teman"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Daftar Undangan"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Konfirmasi Akun"
@@ -8131,9 +8019,6 @@ msgstr "Tampilkan Teman yang Menunggu Otorisasi"
 msgid "Search for Buddy by Email Address..."
 msgstr "Cari Teman berdasarkan Alamat Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Cari Teman berdasarkan Informasi"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Pengguna tidak sedang login"
@@ -8243,6 +8128,166 @@ msgstr "Antrian penuh"
 msgid "Not while on AOL"
 msgstr "Tidak sementara pada AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikon Teman"
+
+msgid "Voice"
+msgstr "Suara"
+
+msgid "AIM Direct IM"
+msgstr "PI Langsung AIM"
+
+msgid "Get File"
+msgstr "Dapatkan File"
+
+msgid "Games"
+msgstr "Permainan"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Tambahan-tambahan"
+
+msgid "Send Buddy List"
+msgstr "Kirim Daftar Teman"
+
+msgid "ICQ Direct Connect"
+msgstr "Sambungan Langsung ICQ"
+
+msgid "AP User"
+msgstr "Pengguna AP"
+
+msgid "ICQ RTF"
+msgstr "RTF ICQ"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Relay Server ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "UTF8 ICQ Lama"
+
+msgid "Trillian Encryption"
+msgstr "Enkripsi Trillian"
+
+msgid "ICQ UTF8"
+msgstr "UTF8 ICQ"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Keamanan Diaktifkan"
+
+msgid "Video Chat"
+msgstr "Percakapan Video"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video Langsung"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nama Layar"
+
+msgid "IP Address"
+msgstr "Alamat IP"
+
+msgid "Warning Level"
+msgstr "Tingkat Peringatan"
+
+msgid "Buddy Comment"
+msgstr "Komentar Teman"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informasi pengguna tidak tersedia: %s"
+
+msgid "Mobile Phone"
+msgstr "Telepon Seluler"
+
+msgid "Personal Web Page"
+msgstr "Situs Web Pribadi"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informasi Tambahan"
+
+msgid "Zip Code"
+msgstr "Kode Pos"
+
+msgid "Work Information"
+msgstr "Informasi Pekerjaan"
+
+msgid "Division"
+msgstr "Divisi"
+
+msgid "Position"
+msgstr "Posisi"
+
+msgid "Web Page"
+msgstr "Halaman Web"
+
+msgid "Online Since"
+msgstr "Online Sejak"
+
+msgid "Member Since"
+msgstr "Anggota Sejak"
+
+msgid "Capabilities"
+msgstr "Kemampuan"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Tampak Online"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Tampak Online"
+
+msgid "Appear Offline"
+msgstr "Tampak Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Tampak Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Anda telah ditendang oleh %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Anda dapat mengajukan ulang otorisasi dari teman-teman ini dengan klik kanan "
+"pada mereka dan memilih \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Tak Terlihat"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Daftar Undangan"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -8443,7 +8488,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Memerlukan Otorisasi"
 
 #, fuzzy
@@ -10738,18 +10783,12 @@ msgstr "Keluar"
 msgid "Not on server list"
 msgstr "Tidak ada pada daftar server"
 
-msgid "Appear Online"
-msgstr "Tampak Online"
-
 msgid "Appear Permanently Offline"
 msgstr "Tampak Offline Secara Permanen"
 
 msgid "Presence"
 msgstr "Kehadiran"
 
-msgid "Appear Offline"
-msgstr "Tampak Offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Jangan Tampak Offline Secara Permanen"
 
@@ -11300,27 +11339,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Pengguna terpisah telah menutup sambungan."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Sambungan Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Sambungan ditolak"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Nama percakapan ini telah digunakan"
 
@@ -11470,6 +11508,10 @@ msgstr ""
 "Anda dapat kembali ke jendela ini untuk menambahkan, merubah, atau mengahpus "
 "akun-akun dari <b>Accounts->Tambahkan/Ubah</b> pada jendela Daftar Teman"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ingin menambahkan %s pada daftar temannya%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Warna Latar Belakang"
@@ -11755,6 +11797,8 @@ msgstr "Kontak Alias"
 msgid "Edit User Mood"
 msgstr "Rubah Mood Pengguna"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Teman-teman"
@@ -12537,9 +12581,6 @@ msgstr "dukungan"
 msgid "webmaster"
 msgstr "pengembang & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Kontributor Senior/QA"
-
 msgid "win32 port"
 msgstr "port ke win32"
 
@@ -12565,6 +12606,9 @@ msgstr "Penulis Asli"
 msgid "lead developer"
 msgstr "pengembang utama"
 
+msgid "Senior Contributor/QA"
+msgstr "Kontributor Senior/QA"
+
 msgid "Afrikaans"
 msgstr "Bahasa Afrika"
 
@@ -13972,6 +14016,10 @@ msgid "_TURN server:"
 msgstr "Server ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Namapengguna:"
 
@@ -13994,6 +14042,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "_Terima Standar"
@@ -14013,6 +14066,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14584,7 +14645,7 @@ msgstr "tidak ada"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15671,6 +15732,10 @@ msgstr "Perangkat"
 msgid "Voice/Video Settings"
 msgstr "Rubah Pengaturan"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Rubah Pengaturan"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15800,7 +15865,7 @@ msgstr "Kirim dan terima bait-bait XMPP mentah."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15931,6 +15996,26 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Memerlukan SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Paksakan SSL lama (port 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Kunci SecurID yang dimasukkan tidak valid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Tidak dapat menampilkan pesan dari pengguna ini karena mengandung "
+#~ "karakter tidak valid.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cari Teman berdasarkan Informasi"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
@@ -16519,9 +16604,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Sambugan tertutup (menulis)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Sambungan di-reset"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Kesalahan membaca dari soket: %s"
 
@@ -16769,7 +16851,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s tidak dapat dibuka untuk penulisan!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan."
 
 #~ msgid "Could not connect for transfer."
@@ -16792,9 +16874,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "Plugin Protokol TOC"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Iformasi untuk pengguna %s tidak tersedia"
-
 #~ msgid "%s Options"
 #~ msgstr "%s Pilihan-pilihan"
 
diff --git a/po/it.po b/po/it.po
index 79c68b7e39..fdc911cc3f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-05-24 12:38+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -530,7 +530,6 @@ msgstr "Conferma cancellazione certificato"
 msgid "Certificate Manager"
 msgstr "Gestione certificati"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nome host"
 
@@ -808,7 +807,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "In attesa dell'inizio del trasferimento"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annullato"
 
 msgid "Failed"
@@ -1706,7 +1705,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 "Il certificato è scaduto e non dovrebbe essere considerato come valido."
 
@@ -4761,11 +4763,20 @@ msgstr "Plugin per il protocollo XMPP"
 msgid "Domain"
 msgstr "Dominio"
 
-msgid "Require SSL/TLS"
-msgstr "Richiedi SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Richiedi autorizzazione"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forza il vecchio SSL (porta 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Informazioni sull'utente non disponibili: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Connessione scaduta"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -5978,7 +5989,8 @@ msgstr "Il PIN non è valido. Dovrebbe essere composto soltanto da cifre [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "I due PIN immessi non corrispondono."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Il nome immesso non è valido."
 
 msgid ""
@@ -6074,10 +6086,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Il nome immesso non è valido."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Il PIN immesso ha una lunghezza non valida [7-10]."
 
@@ -6936,6 +6944,15 @@ msgstr "Indirizzo del server"
 msgid "Server port"
 msgstr "Porta del server"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Autorizzami ad includerti nella mia lista contatti."
+
+msgid "No reason given."
+msgstr "Nessun motivo fornito."
+
+msgid "Authorization Denied Message:"
+msgstr "Messaggio di autorizzazione rifiutata:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "È stata ricevuta una risposta inattesa da parte di %s: %s"
@@ -6971,6 +6988,26 @@ msgstr "AOL non autorizza il tuo nome utente ad autenticarsi qui"
 msgid "Error requesting %s"
 msgstr "Errore nella richiesta di %s"
 
+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 ""
+"(C'è stato un errore nella ricezione del messaggio. L'utente con il quale "
+"stai parlando sta probabilmente usando una codifica diversa da quella "
+"attesa. Se conosci la codifica che sta usando, puoi specificarla nelle "
+"opzioni avanzate del tuo account AIM/ICQ.)"
+
+#, 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'è stato un errore nella ricezione questo messaggio. E' possibile che tu e "
+"%s stiate usando delle codifiche differenti, oppure si tratta di un bug nel "
+"client di %s.)"
+
 msgid "Could not join chat room"
 msgstr "Impossibile entrare nella stanza di discussione"
 
@@ -7186,96 +7223,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Il file %s è di %s. La massima dimensione possibile è di %s."
 
-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 ""
-"(C'è stato un errore nella ricezione del messaggio. L'utente con il quale "
-"stai parlando sta probabilmente usando una codifica diversa da quella "
-"attesa. Se conosci la codifica che sta usando, puoi specificarla nelle "
-"opzioni avanzate del tuo account AIM/ICQ.)"
-
-#, 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'è stato un errore nella ricezione questo messaggio. E' possibile che tu e "
-"%s stiate usando delle codifiche differenti, oppure si tratta di un bug nel "
-"client di %s.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona per il contatto"
-
-msgid "Voice"
-msgstr "Voce"
-
-msgid "AIM Direct IM"
-msgstr "Messaggio immediato diretto AIM"
-
-msgid "Get File"
-msgstr "Ricevi file"
-
-msgid "Games"
-msgstr "Giochi"
-
-msgid "ICQ Xtraz"
-msgstr "Extra ICQ"
-
-msgid "Add-Ins"
-msgstr "Add-in"
-
-msgid "Send Buddy List"
-msgstr "Invia la lista contatti"
-
-msgid "ICQ Direct Connect"
-msgstr "Connessione diretta ICQ"
-
-msgid "AP User"
-msgstr "Utente AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nichilista"
-
-msgid "ICQ Server Relay"
-msgstr "Server relay ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Vecchio ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Crittazione di trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sicurezza abilitata"
-
-msgid "Video Chat"
-msgstr "Video chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video live"
-
-msgid "Camera"
-msgstr "Fotocamera"
-
-msgid "Screen Sharing"
-msgstr "Condivisone dello schermo"
-
 msgid "Free For Chat"
 msgstr "Disponibile alla chat"
 
@@ -7306,15 +7253,6 @@ msgstr "Al lavoro"
 msgid "At lunch"
 msgstr "A pranzo"
 
-msgid "IP Address"
-msgstr "Indirizzo IP"
-
-msgid "Warning Level"
-msgstr "Livello di richiamo"
-
-msgid "Buddy Comment"
-msgstr "Commento per il contatto"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Impossibile connettersi al server di autenticazione: %s"
@@ -7414,15 +7352,6 @@ msgstr "Password inviata"
 msgid "Unable to initialize connection"
 msgstr "Impossibile inizializzare la connessione"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autorizzami ad includerti nella mia lista contatti."
-
-msgid "No reason given."
-msgstr "Nessun motivo fornito."
-
-msgid "Authorization Denied Message:"
-msgstr "Messaggio di autorizzazione rifiutata:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7545,60 +7474,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s per un motivo sconosciuto"
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informazioni sull'utente non disponibili: %s"
-
-msgid "Online Since"
-msgstr "Online da"
-
-msgid "Member Since"
-msgstr "Membro da"
-
-msgid "Capabilities"
-msgstr "Capacità"
-
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Impossibile mostrare un messaggio da questo utente poiché contiene "
-"caratteri non validi.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla stanza di discussione %s."
 
-msgid "Mobile Phone"
-msgstr "Cellulare"
-
-msgid "Personal Web Page"
-msgstr "Pagina web personale"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informazioni aggiuntive"
-
-msgid "Zip Code"
-msgstr "Codice postale"
-
-msgid "Work Information"
-msgstr "Informazioni sul lavoro"
-
-msgid "Division"
-msgstr "Divisione"
-
-msgid "Position"
-msgstr "Posizione"
-
-msgid "Web Page"
-msgstr "Pagina web"
-
 msgid "Pop-Up Message"
 msgstr "Messaggio pop-up"
 
@@ -7884,7 +7766,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cambia l'indirizzo in:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>non stai attendendo nessuna autorizzazione</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7923,6 +7806,14 @@ msgstr "Configura l'inoltro dei messaggi immediati (web)"
 msgid "Set Privacy Options..."
 msgstr "Imposta le opzioni per la privacy..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostra la _lista contatti"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista degli inviti"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Conferma account"
@@ -7939,9 +7830,6 @@ msgstr "Mostra i contatti dai quali attendi autorizzazione"
 msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un contatto per indirizzo email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Cerca un contatto per informazione"
-
 msgid "Use clientLogin"
 msgstr "Usa clientLogin"
 
@@ -8063,6 +7951,165 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona per il contatto"
+
+msgid "Voice"
+msgstr "Voce"
+
+msgid "AIM Direct IM"
+msgstr "Messaggio immediato diretto AIM"
+
+msgid "Get File"
+msgstr "Ricevi file"
+
+msgid "Games"
+msgstr "Giochi"
+
+msgid "ICQ Xtraz"
+msgstr "Extra ICQ"
+
+msgid "Add-Ins"
+msgstr "Add-in"
+
+msgid "Send Buddy List"
+msgstr "Invia la lista contatti"
+
+msgid "ICQ Direct Connect"
+msgstr "Connessione diretta ICQ"
+
+msgid "AP User"
+msgstr "Utente AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nichilista"
+
+msgid "ICQ Server Relay"
+msgstr "Server relay ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Vecchio ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Crittazione di trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sicurezza abilitata"
+
+msgid "Video Chat"
+msgstr "Video chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video live"
+
+msgid "Camera"
+msgstr "Fotocamera"
+
+msgid "Screen Sharing"
+msgstr "Condivisone dello schermo"
+
+msgid "IP Address"
+msgstr "Indirizzo IP"
+
+msgid "Warning Level"
+msgstr "Livello di richiamo"
+
+msgid "Buddy Comment"
+msgstr "Commento per il contatto"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informazioni sull'utente non disponibili: %s"
+
+msgid "Mobile Phone"
+msgstr "Cellulare"
+
+msgid "Personal Web Page"
+msgstr "Pagina web personale"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informazioni aggiuntive"
+
+msgid "Zip Code"
+msgstr "Codice postale"
+
+msgid "Work Information"
+msgstr "Informazioni sul lavoro"
+
+msgid "Division"
+msgstr "Divisione"
+
+msgid "Position"
+msgstr "Posizione"
+
+msgid "Web Page"
+msgstr "Pagina web"
+
+msgid "Online Since"
+msgstr "Online da"
+
+msgid "Member Since"
+msgstr "Membro da"
+
+msgid "Capabilities"
+msgstr "Capacità"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Appai come in linea"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appai come in linea"
+
+msgid "Appear Offline"
+msgstr "Sembra non in linea"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Sembra non in linea"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Sei stato cacciato: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col "
+"tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visibile"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista degli inviti"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acquario"
 
@@ -8241,8 +8288,8 @@ msgstr "La tua richiesta è stata accettata."
 msgid "Your request was rejected."
 msgstr "La tua richiesta è stata rifiutata."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u necessita di verifica"
 
 msgid "Add buddy question"
@@ -10467,18 +10514,12 @@ msgstr "A fare 2 passi"
 msgid "Not on server list"
 msgstr "Non è nella lista del server"
 
-msgid "Appear Online"
-msgstr "Appai come in linea"
-
 msgid "Appear Permanently Offline"
 msgstr "Appai permanentemente come non in linea"
 
 msgid "Presence"
 msgstr "Presenza"
 
-msgid "Appear Offline"
-msgstr "Sembra non in linea"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Non apparire permanentemente come non in linea"
 
@@ -11028,27 +11069,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Connessione interrotta da un altro programma sul tuo computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'host remoto ha chiuso la connessione."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Connessione scaduta."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connessione rifiutata."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Indirizzo già in uso."
 
@@ -11198,6 +11234,10 @@ msgstr ""
 "account, attraverso <b>Account->Gestisci account</b> nella finestra della "
 "Lista contatti."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s vuole aggiungere %s alla sua lista dei contatti%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Colore dello sfondo"
@@ -11453,6 +11493,8 @@ msgstr "Messaggio (opzionale)"
 msgid "Edit User Mood"
 msgstr "Modifica l'umore dell'utente"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contatti"
@@ -12201,9 +12243,6 @@ msgstr "supporto"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Collaboratore senior/QA"
-
 msgid "win32 port"
 msgstr "port su win32"
 
@@ -12229,6 +12268,9 @@ msgstr "autore originale"
 msgid "lead developer"
 msgstr "sviluppatore principale"
 
+msgid "Senior Contributor/QA"
+msgstr "Collaboratore senior/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13577,6 +13619,10 @@ msgstr "Server di relay (TURN)"
 msgid "_TURN server:"
 msgstr "Server _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Porta:"
+
 msgid "Use_rname:"
 msgstr "Nome u_tente:"
 
@@ -13598,6 +13644,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Predefinito di sistema"
 
@@ -13616,6 +13667,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manuale"
 
@@ -14152,7 +14211,8 @@ msgstr "nessuno"
 msgid "Small"
 msgstr "Piccolo"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versione più piccola degli smiley predefiniti"
 
 msgid "Response Probability:"
@@ -15194,6 +15254,10 @@ msgstr "D_ispositivo"
 msgid "Voice/Video Settings"
 msgstr "Impostazioni Voce/Video"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Impostazioni Voce/Video"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15324,7 +15388,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15472,6 +15536,25 @@ msgstr "Visita la pagina web di Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "Non hai il permesso per rimuovere questa applicazione."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Richiedi SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forza il vecchio SSL (porta 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Il nome immesso non è valido."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Impossibile mostrare un messaggio da questo utente poiché contiene "
+#~ "caratteri non validi.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cerca un contatto per informazione"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Il certificato non è ancora valido."
 
diff --git a/po/ja.po b/po/ja.po
index 42598043eb..3aa45ab5f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-06-30 14:57+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -540,7 +540,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ホスト�"
 
@@ -808,7 +807,7 @@ msgstr "�止�る"
 msgid "Waiting for transfer to begin"
 msgstr "転�開始を待�����"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "キャンセル����"
 
 msgid "Failed"
@@ -1731,7 +1730,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4826,11 +4827,20 @@ msgstr "XMPP プロトコル�プラグイン"
 msgid "Domain"
 msgstr "ドメイン�"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "承��必���"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s �ユーザ情報�有効���り��ん"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "�� SSL (�ート番�:5223) を強制的�使用�る"
+#, fuzzy
+msgid "Connection security"
+msgstr "接続�リセット"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "暗�化�れ����ストリームを介��プレーンテキスト�証を許��る"
@@ -6121,7 +6131,7 @@ msgid "The two PINs you entered do not match."
 msgstr "新��パスワード�一致���ん。"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "入力��セキュア ID ���正��。"
 
 msgid ""
@@ -6224,10 +6234,6 @@ msgid "Connecting..."
 msgstr "接続中��"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "入力��セキュア ID ���正��。"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "入力��セキュア ID ���正��。"
 
@@ -7131,6 +7137,15 @@ msgstr "サー��アドレス"
 msgid "Server port"
 msgstr "サー���ート"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "�����を仲間リスト�追加��るよ��承���下��。"
+
+msgid "No reason given."
+msgstr "�由���り��ん。"
+
+msgid "Authorization Denied Message:"
+msgstr "承�拒�メッセージ:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "サー��ら想定外� HTTP 応答を���り���"
@@ -7164,6 +7179,26 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+"(��メッセージを�信�る際�エラー�発生����。会話���る仲間���ら�"
+"別�エンコーディングを使用���る���れ��。相手�使用���るエンコー"
+"ディング���る���れ��アカウント・ダイアログ�拡張オプション�指定��"
+"��下��。)"
+
+#, 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 �ん�����クライアントを使���る"
+"���れ��。)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "接続����ん���"
@@ -7397,97 +7432,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ファイル %s � %s �� (%s �最大サイズを超�����)"
 
-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 ""
-"(��メッセージを�信�る際�エラー�発生����。会話���る仲間���ら�"
-"別�エンコーディングを使用���る���れ��。相手�使用���るエンコー"
-"ディング���る���れ��アカウント・ダイアログ�拡張オプション�指定��"
-"��下��。)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "仲間アイコン"
-
-msgid "Voice"
-msgstr "音声"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "ファイル��得"
-
-msgid "Games"
-msgstr "ゲーム"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "追加"
-
-msgid "Send Buddy List"
-msgstr "仲間リスト��信"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct 接続"
-
-msgid "AP User"
-msgstr "AP ユーザ"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "ニヒリスト"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ サー�中継"
-
-msgid "Old ICQ UTF8"
-msgstr "�� ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian 暗�化"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "ヒップトップ"
-
-msgid "Security Enabled"
-msgstr "セキュリティ�有効"
-
-msgid "Video Chat"
-msgstr "ビデオ・�ャット"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "ライブ・ビデオ"
-
-msgid "Camera"
-msgstr "カメラ"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "スクリーン�"
-
 msgid "Free For Chat"
 msgstr "�ャット����"
 
@@ -7523,15 +7467,6 @@ msgstr "�ットワーク"
 msgid "At lunch"
 msgstr "食事�出������"
 
-msgid "IP Address"
-msgstr "IP-アドレス"
-
-msgid "Warning Level"
-msgstr "警告レベル"
-
-msgid "Buddy Comment"
-msgstr "仲間�コメント"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7633,15 +7568,6 @@ msgstr "パスワード��信中"
 msgid "Unable to initialize connection"
 msgstr "新��接続を開���ん"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "�����を仲間リスト�追加��るよ��承���下��。"
-
-msgid "No reason given."
-msgstr "�由���り��ん。"
-
-msgid "Authorization Denied Message:"
-msgstr "承�拒�メッセージ:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7769,60 +7695,13 @@ msgstr[1] ""
 "原因��明����%2$s �ん�ら� %1$hu 個�メッセージを���れ��ん��"
 "�。"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ユーザ情報�有効���り��ん: %s"
-
-msgid "Online Since"
-msgstr "サイン・イン��日時"
-
-msgid "Member Since"
-msgstr "メン�����日時"
-
-msgid "Capabilities"
-msgstr "機能"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM ��接続�切れ�よ���"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[メッセージ��正�文字���れ��る�����ユーザ�ら�メッセージを表示�"
-"���ん]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�ャット・ルーム %s �ら切断�れ���"
 
-msgid "Mobile Phone"
-msgstr "�帯電話"
-
-msgid "Personal Web Page"
-msgstr "個人的�ウェブページ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "追加情報"
-
-msgid "Zip Code"
-msgstr "郵便番�"
-
-msgid "Work Information"
-msgstr "�業"
-
-msgid "Division"
-msgstr "所属"
-
-msgid "Position"
-msgstr "役�"
-
-msgid "Web Page"
-msgstr "ウェブページ"
-
 msgid "Pop-Up Message"
 msgstr "�ップアップ・メッセージ"
 
@@ -8095,7 +7974,8 @@ msgstr "スクリーン��書��大文字�空白文字��変更��
 msgid "Change Address To:"
 msgstr "変更�るアドレス:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>����承�を待�����ん</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8137,6 +8017,14 @@ msgstr "IM フォワーディング (URL) �設定"
 msgid "Set Privacy Options..."
 msgstr "プライ�シー・オプション�追加..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "仲間リスト�表示"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "招待リスト"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "アカウント�確�"
@@ -8153,9 +8041,6 @@ msgstr "承�を待���る仲間を表示"
 msgid "Search for Buddy by Email Address..."
 msgstr "E-メール�仲間�検索..."
 
-msgid "Search for Buddy by Information"
-msgstr "情報�仲間�検索..."
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "ユーザ�ログイン�����ん"
@@ -8265,6 +8150,166 @@ msgstr "キュー�一���"
 msgid "Not while on AOL"
 msgstr "AOL �居る時�����ん"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "仲間アイコン"
+
+msgid "Voice"
+msgstr "音声"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "ファイル��得"
+
+msgid "Games"
+msgstr "ゲーム"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "追加"
+
+msgid "Send Buddy List"
+msgstr "仲間リスト��信"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct 接続"
+
+msgid "AP User"
+msgstr "AP ユーザ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "ニヒリスト"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ サー�中継"
+
+msgid "Old ICQ UTF8"
+msgstr "�� ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 暗�化"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ヒップトップ"
+
+msgid "Security Enabled"
+msgstr "セキュリティ�有効"
+
+msgid "Video Chat"
+msgstr "ビデオ・�ャット"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ライブ・ビデオ"
+
+msgid "Camera"
+msgstr "カメラ"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "スクリーン�"
+
+msgid "IP Address"
+msgstr "IP-アドレス"
+
+msgid "Warning Level"
+msgstr "警告レベル"
+
+msgid "Buddy Comment"
+msgstr "仲間�コメント"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ユーザ情報�有効���り��ん: %s"
+
+msgid "Mobile Phone"
+msgstr "�帯電話"
+
+msgid "Personal Web Page"
+msgstr "個人的�ウェブページ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "追加情報"
+
+msgid "Zip Code"
+msgstr "郵便番�"
+
+msgid "Work Information"
+msgstr "�業"
+
+msgid "Division"
+msgstr "所属"
+
+msgid "Position"
+msgstr "役�"
+
+msgid "Web Page"
+msgstr "ウェブページ"
+
+msgid "Online Since"
+msgstr "サイン・イン��日時"
+
+msgid "Member Since"
+msgstr "メン�����日時"
+
+msgid "Capabilities"
+msgstr "機能"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "オンライン�よ���"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "オンライン�よ���"
+
+msgid "Appear Offline"
+msgstr "オフライン�よ���"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "オフライン�よ���"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "���� %s �蹴られ���: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"�クリック�� \"承����求\" を�択�る�����れら�仲間�ら�承�をも"
+"�一度�求����。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "隠れ����"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "招待リスト"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水瓶座"
 
@@ -8465,7 +8510,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "承��必���"
 
 #, fuzzy
@@ -10757,18 +10802,12 @@ msgstr "�ょ������"
 msgid "Not on server list"
 msgstr "サー�・リスト��り��ん"
 
-msgid "Appear Online"
-msgstr "オンライン�よ���"
-
 msgid "Appear Permanently Offline"
 msgstr "一時的�オフライン�よ���"
 
 msgid "Presence"
 msgstr "在席"
 
-msgid "Appear Offline"
-msgstr "オフライン�よ���"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
@@ -11334,27 +11373,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "リモート・ユーザ�接続を閉����"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "接続�タイムアウト����"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "接続�拒��れ���"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "���ャット��既�使用�れ����。"
 
@@ -11504,6 +11542,10 @@ msgstr ""
 "仲間リスト�ウィンドウ��る <b>アカウント->追加/編集</b> メニュー�らも��"
 "�画�を開��������。"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s �ん� %s �んを仲間リスト%s%s �追加��������"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11785,6 +11827,8 @@ msgstr "コンタクト�別�"
 msgid "Edit User Mood"
 msgstr "ユーザ・モード"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/仲間(_B)"
@@ -12574,9 +12618,6 @@ msgstr "サ�ート"
 msgid "webmaster"
 msgstr "開発者/ウェブマスタ"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Win32 ��ーティング"
 
@@ -12602,6 +12643,9 @@ msgstr "オリジナル�作者"
 msgid "lead developer"
 msgstr "メイン�開発者"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "アフリカーンズ語"
 
@@ -14032,6 +14076,10 @@ msgid "_TURN server:"
 msgstr "STUN サー�(_U):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "�ート番�(_P):"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "ユーザ�(_U):"
 
@@ -14054,6 +14102,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "デフォルト値を�用�る(_A)"
@@ -14073,6 +14126,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "手動設定"
 
@@ -14644,7 +14705,7 @@ msgstr "��"
 msgid "Small"
 msgstr "E-メール"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15714,6 +15775,10 @@ msgstr "デ�イス"
 msgid "Voice/Video Settings"
 msgstr "設定�編集"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "設定�編集"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15844,7 +15909,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "�れ� XMPP サービスやクライアントをデ�ッグ�る際�便利�プラグイン��。"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15974,6 +16039,23 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 "������アプリケーションをアンインストール�る権�を������ん。"
 
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "�� SSL (�ート番�:5223) を強制的�使用�る"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "入力��セキュア ID ���正��。"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[メッセージ��正�文字���れ��る�����ユーザ�ら�メッセージを表"
+#~ "示����ん]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "情報�仲間�検索..."
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "�択��アカウント�オフライン��"
@@ -16520,9 +16602,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "書�込�用�接続を閉����"
 
-#~ msgid "Connection reset"
-#~ msgstr "接続�リセット"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "ソケット�ら読�込む際�エラー: %s"
 
@@ -16759,7 +16838,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "書�込�モード� %s を開���ん�"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "ファイル転��失敗����。��ら������キャンセル�����ょ�。"
 
@@ -16783,9 +16862,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC プロトコル・プラグイン"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s �ユーザ情報�有効���り��ん"
-
 #~ msgid "%s Options"
 #~ msgstr "%s �オプション"
 
diff --git a/po/ka.po b/po/ka.po
index 0ea495a7c6..33bb3386d3 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0 CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2006-02-05 23:19+0100\n"
 "Last-Translator: Ubuntu Georgian Translators <>\n"
 "Language-Team: Georgian <ka@li.org>\n"
@@ -546,7 +546,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ჰ�სტის ს�ხელი"
 
@@ -807,7 +806,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "ველ�დები გ�დ�ტ�ნის დ�წყებ�ს"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "გ�უქმებული�"
 
 #, fuzzy
@@ -1741,7 +1740,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4735,12 +4736,20 @@ msgid "Domain"
 msgstr "რუმინული"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "მ�ითხ�ვე TLS"
+msgid "Require encryption"
+msgstr "დ�დ�სტურების მ�თხ�ვნ�"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "გ�მ�იყენე TLS თუ·შეს�ძლებელი�"
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "კ�ვშირის შეცდ�მ�"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5996,7 +6005,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr "�ხ�ლი პ�რ�ლები �რ ემთხვევ�"
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -6097,9 +6106,6 @@ msgstr "�რ ვ�რ დ�კ�ვშირებული სერვე
 msgid "Connecting..."
 msgstr "დ�კ�ვშირებ�"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6977,6 +6983,15 @@ msgstr "სერვერის მის�მ�რთი"
 msgid "Server port"
 msgstr "სერვერი-პ�რტი"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "გთხ�ვთ მ�მცეთ �ვტ�რიზ�ცი� თქვენი ჩემ მეგ�ბრების სი�ში დ�ს�მ�ტებლ�დ."
+
+msgid "No reason given."
+msgstr "მიზეზი მითითებული �რ��"
+
+msgid "Authorization Denied Message:"
+msgstr "�ვტ�რიზ�ციის უ�რყ�ფის შეტყ�ბინებ�"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "სერვერის �რ�სწ�რი პ�სუხი"
@@ -7008,6 +7023,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ვერ ვუკ�ვშირდები"
@@ -7243,90 +7271,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "მეგ�ბრის მინი-სურ�თი"
-
-msgid "Voice"
-msgstr "ხმ�"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr "ფილის მიღებ�"
-
-msgid "Games"
-msgstr "თ�მ�ში"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ პირდ�პირი კ�ვშირი"
-
-msgid "AP User"
-msgstr "AP მ�მხმ�რებლები"
-
-msgid "ICQ RTF"
-msgstr "ICQ·RTF"
-
-msgid "Nihilist"
-msgstr "ნიჰილისტი"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ-ზე სერვერზე დ�ყრდნ�ბ�"
-
-msgid "Old ICQ UTF8"
-msgstr "ძველი ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian შიფრი"
-
-msgid "ICQ UTF8"
-msgstr "ICQ·UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "დ�ცვ� ჩ�რთული�"
-
-msgid "Video Chat"
-msgstr "ვიდე� ჩ�ტი"
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr "ც�ცხ�ლი ვიდე�"
-
-msgid "Camera"
-msgstr "კ�მერ�"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "მ�მხმ�რებელი"
-
 #, fuzzy
 msgid "Free For Chat"
 msgstr "თ�ვისუფ�ლი Chat-ი"
@@ -7363,15 +7307,6 @@ msgstr "ქსელი"
 msgid "At lunch"
 msgstr "ს�ჭმელ�დ გ�სული"
 
-msgid "IP Address"
-msgstr "IP მის�მ�რთი"
-
-msgid "Warning Level"
-msgstr "შენშვნის დ�ნე"
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "�რ ვ�რ დ�კ�ვშირებული სერვერთ�ნ."
@@ -7463,15 +7398,6 @@ msgstr "პ�რ�ლი გ�გზ�ვნილი�"
 msgid "Unable to initialize connection"
 msgstr "�ხ�ლი კ�ვშირის დ�მყ�რებ� შეუძლებელი�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "გთხ�ვთ მ�მცეთ �ვტ�რიზ�ცი� თქვენი ჩემ მეგ�ბრების სი�ში დ�ს�მ�ტებლ�დ."
-
-msgid "No reason given."
-msgstr "მიზეზი მითითებული �რ��"
-
-msgid "Authorization Denied Message:"
-msgstr "�ვტ�რიზ�ციის უ�რყ�ფის შეტყ�ბინებ�"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7559,58 +7485,13 @@ 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] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "შეუძლი�"
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "მ�ბილური ტელეფ�ნი"
-
-msgid "Personal Web Page"
-msgstr "პირ�დი ვებ-გვერდი"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "დ�მ�ტებითი ინფ�რმ�ცი�"
-
-msgid "Zip Code"
-msgstr "ს�ფ�სტ� ინდექსი"
-
-msgid "Work Information"
-msgstr "ინფ�რმ�ცი� ს�მს�ხურის შეს�ხებ"
-
-msgid "Division"
-msgstr "დ�ნ�ყ�ფი"
-
-msgid "Position"
-msgstr "თ�ნ�მდებ�ბ�"
-
-msgid "Web Page"
-msgstr "ვებ გვერდი"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7856,7 +7737,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>თქვენ �ხლ� ელ�დებით �ვტ�რიზ�ცი�ს</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7896,6 +7778,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "�ჩვენე მეგ�ბრების სი�"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "უხილ�ვი�"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "�ნგ�რიშის დ�დ�სტურებ�"
@@ -7912,9 +7802,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "მ�მხმ�რებელი �რ �რის ხ�ზზე"
@@ -8019,6 +7906,162 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "მეგ�ბრის მინი-სურ�თი"
+
+msgid "Voice"
+msgstr "ხმ�"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "ფილის მიღებ�"
+
+msgid "Games"
+msgstr "თ�მ�ში"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ პირდ�პირი კ�ვშირი"
+
+msgid "AP User"
+msgstr "AP მ�მხმ�რებლები"
+
+msgid "ICQ RTF"
+msgstr "ICQ·RTF"
+
+msgid "Nihilist"
+msgstr "ნიჰილისტი"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-ზე სერვერზე დ�ყრდნ�ბ�"
+
+msgid "Old ICQ UTF8"
+msgstr "ძველი ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian შიფრი"
+
+msgid "ICQ UTF8"
+msgstr "ICQ·UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "დ�ცვ� ჩ�რთული�"
+
+msgid "Video Chat"
+msgstr "ვიდე� ჩ�ტი"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr "ც�ცხ�ლი ვიდე�"
+
+msgid "Camera"
+msgstr "კ�მერ�"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "მ�მხმ�რებელი"
+
+msgid "IP Address"
+msgstr "IP მის�მ�რთი"
+
+msgid "Warning Level"
+msgstr "შენშვნის დ�ნე"
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "მ�ბილური ტელეფ�ნი"
+
+msgid "Personal Web Page"
+msgstr "პირ�დი ვებ-გვერდი"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "დ�მ�ტებითი ინფ�რმ�ცი�"
+
+msgid "Zip Code"
+msgstr "ს�ფ�სტ� ინდექსი"
+
+msgid "Work Information"
+msgstr "ინფ�რმ�ცი� ს�მს�ხურის შეს�ხებ"
+
+msgid "Division"
+msgstr "დ�ნ�ყ�ფი"
+
+msgid "Position"
+msgstr "თ�ნ�მდებ�ბ�"
+
+msgid "Web Page"
+msgstr "ვებ გვერდი"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr "შეუძლი�"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s გ�ხდ� უმ�ქმედ� (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "უხილ�ვი�"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "უხილ�ვი�"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8235,7 +8278,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "დ�დ�სტურების მ�თხ�ვნ�"
 
 #, fuzzy
@@ -10423,18 +10466,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10966,27 +11003,25 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "სერვერი გ�ითიშ�"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "კ�ვშირი ვერ გ�ნხ�რცილდ�"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "კ�ვშირი ვერ გ�ნხ�რციელდ�."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -11131,6 +11166,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "მ�მხმ�რებელს %s, სურს დ��მ�ტ�ს %s თ�ვის სი�ში."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11408,6 +11447,8 @@ msgstr "კ�ნტ�ქტის სინ�ნიმი"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_მეგ�ბრები"
@@ -12210,9 +12251,6 @@ msgstr "სუპ�რტი"
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -12239,6 +12277,9 @@ msgstr "თ�ვდ�პირველი �ვტ�რი"
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13628,6 +13669,10 @@ msgid "_TURN server:"
 msgstr "ST_UN სერვერი:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "UDP პ�რტი"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "მ�მხმ�რებელი"
 
@@ -13650,6 +13695,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "წ�შლ�"
@@ -13669,6 +13719,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ხელით"
 
@@ -14232,7 +14290,7 @@ msgstr "�რ�ფერი"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15293,6 +15351,10 @@ msgstr "მ�წყ�ბილ�ბ�"
 msgid "Voice/Video Settings"
 msgstr "გ�რემ�ს ცვლ�დების გ�მ�ყენებ�"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "გ�რემ�ს ცვლ�დების გ�მ�ყენებ�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15419,7 +15481,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15548,6 +15610,10 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "მ�ითხ�ვე TLS"
+
+#, fuzzy
 #~ msgid "Nick Name"
 #~ msgstr "მეტს�ხელი"
 
@@ -15845,10 +15911,6 @@ msgstr ""
 #~ msgstr "კ�ვშირის სერვერი"
 
 #, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "კ�ვშირის შეცდ�მ�"
-
-#, fuzzy
 #~ msgid "Could not write"
 #~ msgstr "ვერ ვ�გზ�ვნი"
 
@@ -16199,9 +16261,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "TCP პ�რტი"
 
-#~ msgid "UDP port"
-#~ msgstr "UDP პ�რტი"
-
 #, fuzzy
 #~ msgid "Feature Calibration"
 #~ msgstr "დ�დ�სტურების მ�თხ�ვნ�"
@@ -16346,9 +16405,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber პრ�ტ�კ�ლის პლ�გინი"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "გ�მ�იყენე TLS თუ·შეს�ძლებელი�"
-
 #~ msgid "_Authorize"
 #~ msgstr "_�ვტ�რიზ�ცი�"
 
diff --git a/po/km.po b/po/km.po
index 63cae0044e..ad4593f9cd 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-02-25 15:29+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -519,7 +519,6 @@ msgstr "អះអាង​ការ​លុប​វិញ្ញាបនប�
 msgid "Certificate Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​វិញ្ញាបនប�្រ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ឈ្មោះ​ម៉ាស៊ីន"
 
@@ -777,7 +776,7 @@ msgstr "បញ្ឈប់"
 msgid "Waiting for transfer to begin"
 msgstr "រង់ចាំ​ការ​ផ្ទ�រ​ចាប់ផ្ដើម"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "បានបោះបង់"
 
 msgid "Failed"
@@ -1659,7 +1658,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "វិញ្ញាបនប�្រ​បានផុ�​កំណ�់ ហើយ​​មិនគួរ​​�្រូវ​បាន​ចាក់ទុក�ា​�្រឹម�្រូវ​នោះ​ទ� ។"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4643,11 +4645,20 @@ msgstr "កម្មវិធី​ជំនួយ​ពិធីការ XMPP"
 msgid "Domain"
 msgstr "ដែន"
 
-msgid "Require SSL/TLS"
-msgstr "�្រូវការ SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "�ម្រូវ​ឲ្យ​មានការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ"
 
-msgid "Force old (port 5223) SSL"
-msgstr "បង្�ុះ​ (ច្រក 5223) SSL ចាស់"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "មិនមាន​ព��៌មាន​អ្នក​ប្រើ​ ៖ %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "អស់​ព�ល​​�ភ្ជាប់"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "អនុញ្ញា�​ឲ្យ​អ�្�បទ​ធម្ម�ា​លើ​ស្ទ្រីម​ដែល​មិន​បានអ៊ិនគ្រីប"
@@ -5870,7 +5881,8 @@ msgstr "PIN មិនáž�្រឹមáž�្រូវ​ទáŸ� ។ វា​គáž
 msgid "The two PINs you entered do not match."
 msgstr "PIN ពីរ ដែល​អ្នក​បាន​បញ្ចូល​​​មិន​�្រូវ​គ្នា ។"
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិន�្រឹម�្រូវ​ទ� ។"
 
 msgid ""
@@ -5958,10 +5970,6 @@ msgstr "មិន​អាច​�ភ្ជាប់​ទៅ​កាន់​
 msgid "Connecting..."
 msgstr "កំពុង​�ភ្ជាប់..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិន�្រឹម�្រូវ​ទ� ។"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN ដែល​អ្នក​បាន​បញ្ចូល​​មាន​ប្រវែង​មិន​�្រឹម�្រូវ [៧-១០] ។"
 
@@ -6796,6 +6804,15 @@ msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
 msgid "Server port"
 msgstr "ច្រក​ម៉ាស៊ីនបម្រើ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "សូម​អនុញ្ញា�​�្ញុំ ដូច្ន�ះ​�្ញុំ​អាច​បន្�ែម​អ្នក​នៅកាន់​បញ្ជី​មិ�្�ភក្ដិ​របស់​​�្ញុំ ។"
+
+msgid "No reason given."
+msgstr "គ្មាន​ហ��ុផល​បានផ្ដល់ ។"
+
+msgid "Authorization Denied Message:"
+msgstr "សារ​បដិស�ធ​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "បាន​ទទួល​ការ​ឆ្លើយ​�ប​ដែលមិន​រំពឹង​ទុក​ពី %s: %s"
@@ -6830,6 +6847,24 @@ msgstr "AOL មិនអនុញ្ញាáž�​ឲ្យ​​​ផ្ទៀáž
 msgid "Error requesting %s"
 msgstr "កំហុស​ក្នុងកា​រស្នើសុំ %s: %s"
 
+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 របស់​អ្នក ។)"
+
+#, 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 មាន​ម៉ាស៊ីន​ភ្ញៀវ​"
+"មិ�្�ភក្ដិ ។)"
+
 msgid "Could not join chat room"
 msgstr "មិនអាច​ចូល​រួម​ក្នុង​បន្ទប់​ជជែក​បានទ�"
 
@@ -7059,94 +7094,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ឯកសារ %s គឺជា %s ដែល​ធំជាង​ទំហំ​អ�ិបរមា​របស់ %s ។"
 
-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 របស់​អ្នក ។)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "រូប�ំណាង​មិ�្�ភក្ដិ"
-
-msgid "Voice"
-msgstr "សំឡ�ង"
-
-msgid "AIM Direct IM"
-msgstr "AIM នាំ IM"
-
-msgid "Get File"
-msgstr "យក​ឯកសារ"
-
-msgid "Games"
-msgstr "ល្បែង"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "បន្�ែម"
-
-msgid "Send Buddy List"
-msgstr "ផ្ញើ​បញ្ជី​មិ�្�ភក្ដិ"
-
-msgid "ICQ Direct Connect"
-msgstr "�ភ្ជាប់​ ICQ ដោយ​ផ្ទាល់"
-
-msgid "AP User"
-msgstr "អ្នក​ប្រើ AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ពន្យារ​ម៉ាស៊ីន​បម្រើ ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 ចាស់"
-
-msgid "Trillian Encryption"
-msgstr "ការ​អ៊ិនគ្រីប Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "បាន​បើក​សុវ�្�ិភាព"
-
-msgid "Video Chat"
-msgstr "ជជែក​�ាម​វីដ�អូ"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "វីដ�អូ​បន្�ផ្ទាល់"
-
-msgid "Camera"
-msgstr "ម៉ាស៊ីន​��​"
-
-msgid "Screen Sharing"
-msgstr "ការ​ចែករំលែក​អ�ក្រង់"
-
 msgid "Free For Chat"
 msgstr "ទំន�រ​សម្រាប់​ជជែក"
 
@@ -7182,15 +7129,6 @@ msgstr "បណ្ដាញ"
 msgid "At lunch"
 msgstr "​ទៅ​អាហារ​�្ងៃ​�្រង់​នៅ​ក្រៅ"
 
-msgid "IP Address"
-msgstr "អាសយដ្ឋាន IP"
-
-msgid "Warning Level"
-msgstr "កម្រិ�​ព្រមាន"
-
-msgid "Buddy Comment"
-msgstr "ម�ិយោបល់​មិ�្�ភក្ដិ"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "មិនអាច​�ភ្ជាប់​ទៅ​កាន់ម៉ាស៊ីនបម្រើ​​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​បាន​ទ� ៖ %s"
@@ -7284,15 +7222,6 @@ msgstr "បានផ្ញើ​ពាក្យ​​​សម្ងា�់"
 msgid "Unable to initialize connection"
 msgstr "មិនអាច​ចាប់ផ្ដើម​កា​រ�ភ្ជាប់​បានទ�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "សូម​អនុញ្ញា�​�្ញុំ ដូច្ន�ះ​�្ញុំ​អាច​បន្�ែម​អ្នក​នៅកាន់​បញ្ជី​មិ�្�ភក្ដិ​របស់​​�្ញុំ ។"
-
-msgid "No reason given."
-msgstr "គ្មាន​ហ��ុផល​បានផ្ដល់ ។"
-
-msgid "Authorization Denied Message:"
-msgstr "សារ​បដិស�ធ​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7395,58 +7324,13 @@ 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 ដោយសារ​ហ��ុផល​ដែល​មិនស្គាល់ ។"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "មិនមាន​ព��៌មាន​អ្នក​ប្រើ​ ៖ %s"
-
-msgid "Online Since"
-msgstr "លើ​បណ្ដាញ​�ាំងពី"
-
-msgid "Member Since"
-msgstr "សមាជិក​�ាំង​ពី"
-
-msgid "Capabilities"
-msgstr "សម�្�ភាព"
-
 msgid "Your AIM connection may be lost."
 msgstr "កា​រ�ភ្ជាប់ AIM របស់​អ្នក​អាច​បា�់បង់ ។"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[មិនអាច​បង្ហាញ​សារ​ពី​អ្នក​ប្រើ​ន�ះ​បានទ� ពីព្រោះ​វា​មាន​�ួអក្សរ​មិន​�្រឹម�្រូវ ។]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "អ្នក​�្រូវ​បានផ្ដាច់​ច�ញ​ពី​បន្ទប់​ជជែក %s ។"
 
-msgid "Mobile Phone"
-msgstr "ទូរស�ព្ទ​​ចល��"
-
-msgid "Personal Web Page"
-msgstr "ទំព�រ​បណ្ដាញ​ផ្ទាល់�្លួន"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "ព��៌មាន​បន្�ែម"
-
-msgid "Zip Code"
-msgstr "ល��​�ំបន់"
-
-msgid "Work Information"
-msgstr "ព��៌មាន​ការងារ"
-
-msgid "Division"
-msgstr "វិធី​ចែក"
-
-msgid "Position"
-msgstr "ទី�ាំង​"
-
-msgid "Web Page"
-msgstr "ទំព�រ​បណ្�ាញ"
-
 msgid "Pop-Up Message"
 msgstr "សារ​ល�ច​ឡើង"
 
@@ -7707,7 +7591,8 @@ msgstr "កា​រធ្វើ​ទ្រង់ទ្រាយឈ្មោះ
 msgid "Change Address To:"
 msgstr "ផ្លាស់ប្ដូរ​អាសយដ្ឋាន​ ជូន​ចំពោះ ៖"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>អ្នកមិនកំពុង​រង់ចាំ​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​ទ�</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7746,6 +7631,14 @@ msgstr "កំណ�់​រចនាសម្ព�ន្ធ​ការ​ប
 msgid "Set Privacy Options..."
 msgstr "កំណ�់​ជម្រើស​ឯកជន..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "បង្ហាញ​បញ្ជីមិ�្�ភក្ដិ"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "អញ្ជើញ​បញ្ជី"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "អះអាង​គណនី"
@@ -7762,9 +7655,6 @@ msgstr "បង្ហាញ​ការ​ផ្ទៀងផ្ទា�់​រ
 msgid "Search for Buddy by Email Address..."
 msgstr "ស្វែងរក​មិ�្�ភក្ដិ​�ាម​អាសយដ្ឋាន​អ៊ីមែល..."
 
-msgid "Search for Buddy by Information"
-msgstr "ស្វែងរក​មិ�្�ភក្ដិ​�ាម​ព��៌មាន"
-
 msgid "Use clientLogin"
 msgstr "ប្រើការ​​ចូល​ម៉ាស៊ីន​ភ្ញៀវ"
 
@@ -7871,6 +7761,165 @@ msgstr "ជួរ​​ព�ញ"
 msgid "Not while on AOL"
 msgstr "មិន​សម្រាក​នៅ​លើ AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "រូប�ំណាង​មិ�្�ភក្ដិ"
+
+msgid "Voice"
+msgstr "សំឡ�ង"
+
+msgid "AIM Direct IM"
+msgstr "AIM នាំ IM"
+
+msgid "Get File"
+msgstr "យក​ឯកសារ"
+
+msgid "Games"
+msgstr "ល្បែង"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "បន្�ែម"
+
+msgid "Send Buddy List"
+msgstr "ផ្ញើ​បញ្ជី​មិ�្�ភក្ដិ"
+
+msgid "ICQ Direct Connect"
+msgstr "�ភ្ជាប់​ ICQ ដោយ​ផ្ទាល់"
+
+msgid "AP User"
+msgstr "អ្នក​ប្រើ AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ពន្យារ​ម៉ាស៊ីន​បម្រើ ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 ចាស់"
+
+msgid "Trillian Encryption"
+msgstr "ការ​អ៊ិនគ្រីប Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "បាន​បើក​សុវ�្�ិភាព"
+
+msgid "Video Chat"
+msgstr "ជជែក​�ាម​វីដ�អូ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "វីដ�អូ​បន្�ផ្ទាល់"
+
+msgid "Camera"
+msgstr "ម៉ាស៊ីន​��​"
+
+msgid "Screen Sharing"
+msgstr "ការ​ចែករំលែក​អ�ក្រង់"
+
+msgid "IP Address"
+msgstr "អាសយដ្ឋាន IP"
+
+msgid "Warning Level"
+msgstr "កម្រិ�​ព្រមាន"
+
+msgid "Buddy Comment"
+msgstr "ម�ិយោបល់​មិ�្�ភក្ដិ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "មិនមាន​ព��៌មាន​អ្នក​ប្រើ​ ៖ %s"
+
+msgid "Mobile Phone"
+msgstr "ទូរស�ព្ទ​​ចល��"
+
+msgid "Personal Web Page"
+msgstr "ទំព�រ​បណ្ដាញ​ផ្ទាល់�្លួន"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "ព��៌មាន​បន្�ែម"
+
+msgid "Zip Code"
+msgstr "ល��​�ំបន់"
+
+msgid "Work Information"
+msgstr "ព��៌មាន​ការងារ"
+
+msgid "Division"
+msgstr "វិធី​ចែក"
+
+msgid "Position"
+msgstr "ទី�ាំង​"
+
+msgid "Web Page"
+msgstr "ទំព�រ​បណ្�ាញ"
+
+msgid "Online Since"
+msgstr "លើ​បណ្ដាញ​�ាំងពី"
+
+msgid "Member Since"
+msgstr "សមាជិក​�ាំង​ពី"
+
+msgid "Capabilities"
+msgstr "សម�្�ភាព"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "បង្ហាញ​លើ​បណ្ដាញ"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "បង្ហាញ​លើ​បណ្ដាញ"
+
+msgid "Appear Offline"
+msgstr "បង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "បង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "អ្នក​�្រូ​វបាន​ធាក់ច�ញ​ដោយ ៖ (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"អ្នក​អាច​ស្នើ​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​ឡើង​វិញ​ពី​មិ�្�ភក្ដិ​ទាំង​ន�ះ ដោយ​ចុច​កណ្ដុរ​ស្ដាំ​លើ​ពួកវា ហើយជ្រើស "
+"\"ស្នើ​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​ឡើង​វិញ ។\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "​មើលឃើញ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "អញ្ជើញ​បញ្ជី"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -8049,8 +8098,8 @@ msgstr "សំណើ​របស់​អ្នក​�្រូវបាន​
 msgid "Your request was rejected."
 msgstr "សំណើ​របស់​អ្នក​�្រូវ​បាន​ច្រានចោល ។"
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u �្រូវការ​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ"
 
 msgid "Add buddy question"
@@ -10224,18 +10273,12 @@ msgstr "ច�ញ"
 msgid "Not on server list"
 msgstr "មិន​នៅ​ក្នុង​បញ្ជី​ម៉ាស៊ីនបម្រើ​ទ�"
 
-msgid "Appear Online"
-msgstr "បង្ហាញ​លើ​បណ្ដាញ"
-
 msgid "Appear Permanently Offline"
 msgstr "បង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ​ជា​អចិន្�្រៃយ�"
 
 msgid "Presence"
 msgstr "វ�្�មាន"
 
-msgid "Appear Offline"
-msgstr "បង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "កុំបង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ​អចិន្�្រៃយ�"
 
@@ -10764,27 +10807,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "ការ​�ភ្ជាប់​បានផ្អាក​ដោយ​កម្មវិធី​ផ្ស�ង​នៅ​ក្នុង​កុំព្យូទ�រ​របស់ ។"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "ការ​�ភ្ជាប់​បានបិទ​ពី​ម៉ាស៊ីន​ពី​ចម្ងាយ ។"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "អស់ព�ល​�ភ្ជាប់ ។"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "បានបដិស�ធ​កា​រ�ភ្ជាប់ ។"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "អាសយដ្ឋាន​កំពុង​ប្រើ​ហើយ ។"
 
@@ -10931,6 +10969,10 @@ msgstr ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ចង់​បន្�ែម %s ទៅ​កាន់​បញ្ជី​មិ�្�ភក្ដិ​របស់​គា�់ %s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "ពណ៌​ផ្ទៃ​�ាង​ក្រោយ​"
@@ -11181,6 +11223,8 @@ msgstr "ឈ្មោះ​ក្លែងក្លាយ (ជម្រើស)"
 msgid "Edit User Mood"
 msgstr "កែសម្រួល​អារម្មណ�​អ្នកប្រើ"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/មិ�្�ភក្ដិ"
@@ -11927,9 +11971,6 @@ msgstr "គាំទ្រ"
 msgid "webmaster"
 msgstr "ប្រធាន​បណ្ដាញ"
 
-msgid "Senior Contributor/QA"
-msgstr "អ្នក​ចែកចាយ​ជាន់�្ពស់/QA"
-
 msgid "win32 port"
 msgstr "ច្រក win32"
 
@@ -11955,6 +11996,9 @@ msgstr "អ្នកនិពន្ធ​ដើម"
 msgid "lead developer"
 msgstr "ប្រធាន​អ្នកអភិវឌ្�"
 
+msgid "Senior Contributor/QA"
+msgstr "អ្នក​ចែកចាយ​ជាន់�្ពស់/QA"
+
 msgid "Afrikaans"
 msgstr "អាហ្វ្រីកាអាន"
 
@@ -13274,6 +13318,10 @@ msgstr "បញ្ជូន​ម៉ាស៊ីន​បម្រើ​� (TURN
 msgid "_TURN server:"
 msgstr "ម៉ាស៊ីន​បម្រើ TURN ៖"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "ច្រក ៖"
+
 msgid "Use_rname:"
 msgstr "ឈ្មោះ​​អ្នក​ប្រើ ៖"
 
@@ -13295,6 +13343,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ផ្ទៃ�ុ​លំនាំដើម"
 
@@ -13313,6 +13366,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "សៀវភៅ​ដៃ"
 
@@ -13837,7 +13898,8 @@ msgstr "គ្មាន"
 msgid "Small"
 msgstr "�ូច"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "កំណែ​�ូច​របស់​សញ្ញាអារម្មណ�​លំនាំដើម"
 
 msgid "Response Probability:"
@@ -14845,6 +14907,10 @@ msgstr "ឧបករណ�​"
 msgid "Voice/Video Settings"
 msgstr "ការ​កំណ�់​សំឡ�ង​/​វីដ�អូ"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ការ​កំណ�់​សំឡ�ង​/​វីដ�អូ"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14970,7 +15036,7 @@ msgstr "ផ្ញើ​ និង​ទទួល​ XMPP stanzas ដើម ។"
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "កម្មវិធី​ជំនួយ​ន�ះ​មានប្រយោជន�​សម្រាប់បំបា�់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15100,6 +15166,23 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "�្រូវការ SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "បង្�ុះ​ (ច្រក 5223) SSL ចាស់"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិន�្រឹម�្រូវ​ទ� ។"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[មិនអាច​បង្ហាញ​សារ​ពី​អ្នក​ប្រើ​ន�ះ​បានទ� ពីព្រោះ​វា​មាន​�ួអក្សរ​មិន​�្រឹម�្រូវ ។]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ស្វែងរក​មិ�្�ភក្ដិ​�ាម​ព��៌មាន"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "​វិញ្ញាបនប�្រ​មិន​�្រឹម​�្រូវ​នៅ​ឡើយទ� ។"
 
diff --git a/po/kn.po b/po/kn.po
index 1e6031b57a..005756ef4d 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
-"PO-Revision-Date: 2010-02-26 12:08+0530\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-09-15 12:18+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
-"Language-Team: American English <>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,9 +62,8 @@ msgstr ""
 msgid "Error"
 msgstr "ದೋಷ"
 
-#, fuzzy
 msgid "Account was not modified"
-msgstr "ಖಾತೆ ಸೇರಿಸಲಾಗಲಿಲ�ಲ "
+msgstr "ಖಾತೆ ಬದಲಾಯಿಸಲಾಗಲಿಲ�ಲ"
 
 msgid "Account was not added"
 msgstr "ಖಾತೆ ಸೇರಿಸಲಾಗಲಿಲ�ಲ "
@@ -527,7 +526,6 @@ msgstr "ಪà³�ರಮಾಣಪತà³�ರವನà³�ನà³� ಅಳಿಸà³�ವಿಕà³
 msgid "Certificate Manager"
 msgstr "ಪ�ರಮಾಣಪತ�ರ ವ�ಯವಸ�ಥಾಪಕ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ಆತಿಥೇಯಗಣಕ"
 
@@ -802,7 +800,7 @@ msgstr "ನಿಲ�ಲಿಸ�"
 msgid "Waiting for transfer to begin"
 msgstr "ವರ�ಗಾವಣೆಯ ಪ�ರಾರಂಭಕ�ಕಾಗಿ ನಿರೀಕ�ಷಿಸಲಾಗ�ತ�ತಿದೆ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ರದ�ದಾಗಿದೆ"
 
 msgid "Failed"
@@ -1697,9 +1695,16 @@ msgid ""
 "The certificate is not valid yet.  Check that your computer's date and time "
 "are accurate."
 msgstr ""
+"ಪ�ರಮಾಣಪತ�ರವ� ಸರಿಯಾಗಿದೆ ಎಂದ� ಇನ�ನೂ ಸಹ ಗ�ರ�ತಿಸಲಾಗಿಲ�ಲ. ನಿಮ�ಮ ಗಣಕದ ದಿನಾಂಕ ಹಾಗ� ಸಮಯವ� "
+"ನಿಖರವಾಗಿದೆಯೆ ಎಂಬ�ದನ�ನ� ಪರಿಶೀಲಿಸಿ."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "ಪ�ರಮಾಣಪತ�ರದ ವಾಯಿದೆ ತೀರಿದೆ ಹಾಗ� ಅದನ�ನ� ಮಾನ�ಯವಾದ�ದ� ಎಂದ� ಪರಿಗಣಿಸ�ವಂತಿಲ�ಲ."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"ಪ�ರಮಾಣಪತ�ರವ� ಸರಿಯಾಗಿದೆ ಎಂದ� ಇನ�ನೂ ಸಹ ಗ�ರ�ತಿಸಲಾಗಿಲ�ಲ. ನಿಮ�ಮ ಗಣಕದ ದಿನಾಂಕ ಹಾಗ� ಸಮಯವ� "
+"ನಿಖರವಾಗಿದೆಯೆ ಎಂಬ�ದನ�ನ� ಪರಿಶೀಲಿಸಿ."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -3866,18 +3871,17 @@ msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 "ದೃಢೀಕರಣವ� ಪೂರ�ಣಗೊಂಡಿದೆ ಎಂದ� ಪರಿಚಾರಕ ಭಾವಿಸ�ತ�ತದೆ ಆದರೆ ಕ�ಲೈಂಟ� ಹಾಗೆ ಅಂದ�ಕೊಳ�ಳ�ವ�ದಿಲ�ಲ"
 
-#, fuzzy
 msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
-"ಪರಿಚಾರಕಕ�ಕಾಗಿ ಒಂದ� ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರ�ವ ಸ�ಟ�ರೀಮ�‌ನ ಮೂಲಕ ಸರಳಪಠ�ಯ ದೃಢೀಕರಣದ ಅಗತ�ಯವಿದೆ"
+"ಪರಿಚಾರಕಕ�ಕಾಗಿ ಒಂದ� ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರ�ವ ಸ�ಟ�ರೀಮ�‌ನ ಮೂಲಕ ಸರಳಪಠ�ಯ ದೃಢೀಕರಣದ ಅಗತ�ಯವಿರಬಹ�ದ�"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s may require plaintext authentication over an unencrypted connection.  "
 "Allow this and continue authentication?"
 msgstr ""
-"%s ಗೆ ಒಂದ� ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರ�ವ ಸಂಪರ�ಕದ ಮೂಲಕ ಸರಳಪಠ�ಯ ದೃಢೀಕರಣದ ಅಗತ�ಯವಿದೆ.  ಇದನ�ನ� "
-"ಅನ�ಮತಿಸಿ ನಂತರ ದೃಢೀಕರಣದೊಂದಿಗೆ ಮ�ಂದ�ವರೆಯ�ವ�ದೆ ?"
+"%s ಗೆ ಒಂದ� ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರ�ವ ಸಂಪರ�ಕದ ಮೂಲಕ ಸರಳಪಠ�ಯ ದೃಢೀಕರಣದ ಅಗತ�ಯವಿರಬಹ�ದ�.  "
+"ಇದನ�ನ� ಅನ�ಮತಿಸಿ ನಂತರ ದೃಢೀಕರಣದೊಂದಿಗೆ ಮ�ಂದ�ವರೆಯ�ವ�ದೆ ?"
 
 msgid "SASL authentication failed"
 msgstr "SASL ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
@@ -3887,39 +3891,36 @@ msgstr "SASL ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
 msgid "SASL error: %s"
 msgstr "SASL ದೋಷ: %s"
 
-#, fuzzy
 msgid "Invalid Encoding"
-msgstr "ತಪ�ಪ�  ಇನ�‌ಪ�ಟ� ಸ�ಥಿತಿ"
+msgstr "ಸರಿಯಲ�ಲದ ಎನ�ಕೋಡಿಂಗ�"
 
-#, fuzzy
 msgid "Unsupported Extension"
-msgstr "ಬೆಂಬಲವಿರದ ಆವೃತ�ತಿ"
+msgstr "ಬೆಂಬಲವಿರದ ವಿಸ�ತರಣೆ"
 
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
 msgstr ""
+"ಪರಿಚಾರಕದಿಂದ(ಸರ�ವರ��) ಅಮಾನ�ಯವಾದ ಪ�ರತ�ಯ�ತ�ತರ ಬಂದಿದೆ. ಇದ� ಒಂದ� MITM ದಾಳಿಯಾಗಿರಬಹ�ದ� "
+"ಎಂದ� ಊಹಿಸಲಾಗ�ತ�ತದೆ."
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, fuzzy
 msgid "Server does not support channel binding"
-msgstr "ನಿಷೇಧಿಸ�ವ�ದನ�ನ� ಪರಿಚಾರಕವ� ಬೆಂಬಲಿಸ�ವ�ದಿಲ�ಲ"
+msgstr "ಪರಿಚಾರಕವ� ಚಾನಲ�‌ ಬೈಂಡಿಂಗ� ಅನ�ನ� ಬೆಂಬಲಿಸ�ವ�ದಿಲ�ಲ"
 
-#, fuzzy
 msgid "Unsupported channel binding method"
-msgstr "ಬೆಂಬಲವಿರದ ಎನ�ಕೋಡಿಂಗ� "
+msgstr "ಬೆಂಬಲವಿರದ ಚಾನಲ� ಬೈಂಡಿಂಗ� ವಿಧಾನ"
 
 msgid "User not found"
 msgstr "ಬಳಕೆದಾರ ಸಿಗಲಿಲ�ಲ"
 
 # , c-format
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "ತಪ�ಪ� ಬಳಕೆದಾರಹೆಸರ�"
+msgstr "ತಪ�ಪ� ಬಳಕೆದಾರಹೆಸರಿನ ಎನ�ಕೋಡಿಂಗ�"
 
 msgid "Resource Constraint"
 msgstr "ಸಂಪನ�ಮೂಲ ಮಿತಿ"
@@ -4240,9 +4241,8 @@ msgstr "ಪಿಂಗ�‌ನ ಕಾಲಾವಧಿ ಮೀರಿದೆ"
 msgid "Invalid XMPP ID"
 msgstr "ಅಮಾನ�ಯವಾದ XMPP �ಡಿ"
 
-#, fuzzy
 msgid "Invalid XMPP ID. Username portion must be set."
-msgstr "ಅಮಾನ�ಯವಾದ XMPP ID. ಡೊಮೈನನ�ನ� ಸೂಚಿಸಬೇಕ�."
+msgstr "ಅಮಾನ�ಯವಾದ XMPP ID. ಬಳಕೆದಾರಹೆಸರಿನ ಭಾಗವನ�ನ� ಸೂಚಿಸಬೇಕ�."
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ಅಮಾನ�ಯವಾದ XMPP ID. ಡೊಮೈನನ�ನ� ಸೂಚಿಸಬೇಕ�."
@@ -4734,9 +4734,8 @@ msgstr "ping &lt;jid&gt;:\tಒಬà³�ಬ ಬಳಕೆದಾರ/ಘಟಕ/ಪರà²
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ಬಳಕೆದಾರರ ಗಮನ ಸೆಳೆಯಲ� ಅವರತ�ತ �ೇಂಕರಿಸಿ"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "ಸರಿಯಾದ ಬಳಕೆದಾರರನ�ನ� ಆಯ�ದ�ಕೊಳ�ಳಿ"
+msgstr "ಭಾವಲಹರಿ: ಪ�ರಸಕ�ತ ಬಳಕೆದಾರರ ಭಾವಲಹರಿಯನ�ನ� ಆಯ�ದ�ಕೊಳ�ಳಿ"
 
 msgid "Extended Away"
 msgstr "ಆಚೆಹೋಗಿದ�ದನ�ನ� ವಿಸ�ತರಿಸಲಾಗಿದೆ"
@@ -4758,11 +4757,17 @@ msgstr "XMPP ಪ�ರೋಟೋಕಾಲ� ಪ�ಲಗ�ಗಿನ�ನ�"
 msgid "Domain"
 msgstr "ಡೊಮೈನ�"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS ನ ಅಗತ�ಯವಿದೆ"
+msgid "Require encryption"
+msgstr "ಗೂಢಲಿಪೀಕರಣದ ಅಗತ�ಯವಿದೆ"
+
+msgid "Use encryption if available"
+msgstr "ಲಭ�ಯವಿದ�ದಲ�ಲಿ ಗೂಢಲಿಪೀಕರಣವನ�ನ� ಬಳಸಿ"
 
-msgid "Force old (port 5223) SSL"
-msgstr "ಹಳೆಯ (ಸಂಪರ�ಕಸ�ಥಾನ 5223) SSL ಅನ�ನ� ಒತ�ತಾಯಿಸ�"
+msgid "Use old-style SSL"
+msgstr "ಹಳೆಯ-ಶೈಲಿಯ SSL ಅನ�ನ� ಬಳಸಿ"
+
+msgid "Connection security"
+msgstr "ಸಂಪರ�ಕದ ಸ�ರಕ�ಷತೆ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರ�ವ ಸ�ಟ�ರೀಮ�‌ನ ಮೂಲಕ ಸರಳಪಠ�ಯ ದೃಢೀಕರಣವನ�ನ� ಅನ�ಮತಿಸ�"
@@ -4818,13 +4823,13 @@ msgid "A custom smiley in the message is too large to send."
 msgstr "ಸಂದೇಶದಲ�ಲಿನ ಇಚ�ಛೆಯ ಸ�ಮೈಲಿಯ ಗಾತ�ರವ� ಕಳ�ಹಿಸಲ� ಬಹಳ ದೊಡ�ಡದಾಗಿದೆ."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP ಸ�ಟ�ರೀಮ� ಹೆಡರ� ಕಾಣೆಯಾಗಿದೆ"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP ಆವೃತ�ತಿಯ� ತಾಳೆಯಾಗ�ತ�ತಿಲ�ಲ"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP ಸ�ಟ�ರೀಮ�‌ನಿಂದ ID ಕಾಣೆಯಾಗಿದೆ"
 
 msgid "XML Parse error"
 msgstr "XML ಪಾರ�ಸ� ದೋಷ"
@@ -5761,9 +5766,8 @@ msgstr "HTTP ವಿಧಾನದ ಪರಿಚಾರಕ"
 msgid "Show custom smileys"
 msgstr "ಇಚ�ಛೆಯ ಸ�ಮೈಲಿಗಳನ�ನ� ತೋರಿಸ�"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "ಸಂಪರ�ಕ ರಚಿಸಲ� ವಿಫಲ"
+msgstr "ನೇರ ಸಂಪರ�ಕವನ�ನ� ಅನ�ಮತಿಸ�"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge(ಮೆತ�ತಗೆ ತಿವಿ): ಬಳಕೆದಾರರ ಗಮನ ಸೆಳೆಯಲ� ಅವರನ�ನ� ಮೆತ�ತಗೆ ತಿವಿ"
@@ -5973,8 +5977,8 @@ msgstr "PIN ತಪà³�ಪಾಗಿದೆ. ಅದà³� ಕೇವಲ ಅಂಕಿಗà
 msgid "The two PINs you entered do not match."
 msgstr "ನೀವ� ನಮೂದಿಸಿದ ಎರಡ� PIN ತಾಳೆಯಾಗ�ತ�ತಿಲ�ಲ."
 
-msgid "The name you entered is invalid."
-msgstr "ನೀವ� ನಮೂದಿಸಿದ ಹೆಸರ� ತಪ�ಪಾಗಿದೆ."
+msgid "The Display Name you entered is invalid."
+msgstr "ನೀವ� ನಮೂದಿಸಿದ ಕಾಣಿಸಲಾಗಿದೆ ಹೆಸರ� ತಪ�ಪಾಗಿದೆ."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5996,7 +6000,7 @@ msgstr ""
 "ಪ�ರಯತ�ನಿಸಿ."
 
 msgid "Your UID"
-msgstr ""
+msgstr "ನಿಮ�ಮ UID"
 
 #. pin
 #. pin (required)
@@ -6068,16 +6072,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "ಸಂಪರ�ಕಿಸಲಾಗ�ತ�ತಿದೆ..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "ನೀವ� ನಮೂದಿಸಿದ ಹೆಸರ� ತಪ�ಪಾಗಿದೆ."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ನೀವ� ನಮೂದಿಸಿದ PIN ಸರಿಯಲ�ಲದ ಉದ�ದವನ�ನ� ಹೊಂದಿದೆ [7-10]."
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6110,14 +6110,11 @@ msgstr "ನಿಮ�ಮ ಅಧಿವೇಶನದ ಕಾಲಾವಧಿ ತೀರ
 msgid "Invalid country selected. Please try again."
 msgstr "ಆಯ�ಕೆ ಮಾಡಲಾದ ದೇಶವ� ತಪ�ಪಾಗಿದೆ. ದಯವಿಟ�ಟ� ಇನ�ನೊಮ�ಮೆ ಆರಿಸಿ."
 
-#, fuzzy
 msgid "The MXit ID you entered is not registered. Please register first."
-msgstr "ಬಳಕೆದಾರ ಹೆಸರನ�ನ� ನೋಂದಾಯಿಸಲಾಗಿಲ�ಲ. ದಯವಿಟ�ಟ� ಮೊದಲ� ನೋಂದಾಯಿಸಿ."
+msgstr "ನಮೂದಿಸಲಾದ MXit IDಯನ�ನ� ನೋಂದಾಯಿಸಲಾಗಿಲ�ಲ. ದಯವಿಟ�ಟ� ಮೊದಲ� ನೋಂದಾಯಿಸಿ."
 
-#, fuzzy
 msgid "The MXit ID you entered is already registered. Please choose another."
-msgstr ""
-"ಬಳಕೆದಾರ ಹೆಸರನ�ನ� ಈಗಾಗಲೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದ� ಬಳಕೆದಾರ ಹೆಸರನ�ನ� ಆರಿಸಿ."
+msgstr "ನಮೂದಿಸಲಾದ MXit ID ಯನ�ನ� ಈಗಾಗಲೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ. ದಯವಿಟ�ಟ� ಬೇರೊಂದನ�ನ� ಆರಿಸಿ."
 
 msgid "Internal error. Please try again later."
 msgstr "ಆಂತರಿಕ ದೋಷ. ದಯವಿಟ�ಟ� ಇನ�ನೊಮ�ಮೆ ಪ�ರಯತ�ನಿಸಿ."
@@ -6154,17 +6151,15 @@ msgstr "ಮೆನà³�ವನà³�ನà³� ಲೋಡà³� ಮಾಡಲಾಗà³�ತà³�ತà
 msgid "Status Message"
 msgstr "ಸ�ಥಿತಿಯ ಸಂದೇಶ"
 
-#, fuzzy
 msgid "Rejection Message"
-msgstr "ಸ�ವೀಕರಿಸಲಾದ ಸಂದೇಶಗಳ�"
+msgstr "ತಿರಸ�ಕರಿಸಲಾದ ಸಂದೇಶಗಳ�"
 
 #. hidden number
 msgid "Hidden Number"
 msgstr "ಅಡಗಿಸಲಾದ ಸಂಖ�ಯೆ"
 
-#, fuzzy
 msgid "Your MXit ID..."
-msgstr "Yahoo ID..."
+msgstr "ನಿಮ�ಮ MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6178,22 +6173,18 @@ msgid "Enable splash-screen popup"
 msgstr "ಎರಚ�-ತೆರೆ ಪ�ಟಿಕೆಯನ�ನ� ಶಕ�ತಗೊಳಿಸ�"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "ನಿಮ�ಮನ�ನ� ಹೊರಗಟ�ಟಲಾಗಿದೆ: (%s)"
+msgstr "ನಿಮ�ಮನ�ನ� ಈ MultiMX ಹೊರಗಟ�ಟಲಾಗಿದೆ."
 
-#, fuzzy
 msgid "was kicked"
-msgstr "ಸರಿಯಲ�ಲದ ಟಿಕೆಟ�"
+msgstr "ಹೊರಗಟ�ಟಲಾಗಿದೆ"
 
-#, fuzzy
 msgid "_Room Name:"
-msgstr "ಕೋಣೆ(_R):"
+msgstr "ಕೋಣೆಯ ಹೆಸರ�(_R):"
 
 #. Display system message in chat window
-#, fuzzy
 msgid "You have invited"
-msgstr "ನಿಮಗೆ ಇ-ಮೇಯ�ಲ� ಬಂದಿದೆ!"
+msgstr "ನಿಮಗೆ ಆಮಂತ�ರಣ ಬಂದಿದೆ"
 
 #, fuzzy
 msgid "Last Online"
@@ -6930,6 +6921,15 @@ msgstr "ಪರಿಚಾರಕ(ಸರ�ವರ��) ವಿಳಾಸ"
 msgid "Server port"
 msgstr "ಪರಿಚಾರಕ(ಸರ�ವರ��) ಸಂಪರ�ಕಸ�ಥಾನ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ದಯವಿಟ�ಟ� ನಿಮ�ಮನ�ನ� ನನ�ನ ಗೆಳೆಯರ ಪಟ�ಟಿಗೆ ಸೇರಿಸಲ� ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ."
+
+msgid "No reason given."
+msgstr "ಕಾರಣ ಕೊಟ�ಟಿಲ�ಲ."
+
+msgid "Authorization Denied Message:"
+msgstr "ಅಧಿಕಾರವನ�ನ� ನಿರಾಕರಿಸಲಾದ ಸಂದೇಶ:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s ದಿಂದ ಅನಿರೀಕ�ಷಿತವಾದ ಪ�ರತ�ಯ�ತ�ತರವನ�ನ� ಪಡೆಯಲಾಗಿದೆ: %s"
@@ -6962,9 +6962,29 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "ನಿಮ�ಮ ತೆರೆಯ ಹೆಸರನ�ನ� ಇಲ�ಲಿ ದೃಢೀಕರಿಸ�ವ�ದನ�ನ� AOL ಅನ�ಮತಿಸ�ವ�ದಿಲ�ಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s"
-msgstr "%s ಕ�ಕೆ ಮನವಿ ಸಲ�ಲಿಸ�ವಲ�ಲಿ ದೋಷ: %s"
+msgstr "%s ಕ�ಕೆ ಮನವಿ ಸಲ�ಲಿಸ�ವಲ�ಲಿ ದೋಷ"
+
+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 ಖಾತೆಯಲ�ಲಿನ ಸ�ಧಾರಿತ "
+"ಖಾತೆ ಆಯ�ಕೆಗಳಲ�ಲಿ ಸೂಚಿಸಬಹ�ದ�.)"
+
+#, 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 ಒಂದ� ದೋಷಪೂರಿತವಾದ ಕ�ಲೈಂಟನ�ನ� "
+"ಬಳಸ�ತ�ತಿದ�ದಾರೆ.)"
 
 msgid "Could not join chat room"
 msgstr "ಮಾತ�ಕತೆ ಕೋಣೆಯನ�ನ� ಸೇರಲಾಗಲಿಲ�ಲ"
@@ -7180,96 +7200,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s ಕಡತವ� %s ನಷ�ಟಿದೆ, ಇದ� ಗರಿಷ�ಟ ಗಾತ�ರವಾದಂತಹ %s ಅನ�ನ� ಮೀರಿದೆ."
 
-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 ಖಾತೆಯಲ�ಲಿನ ಸ�ಧಾರಿತ "
-"ಖಾತೆ ಆಯ�ಕೆಗಳಲ�ಲಿ ಸೂಚಿಸಬಹ�ದ�.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "ಗೆಳೆಯನ ಚಿಹ�ನೆ"
-
-msgid "Voice"
-msgstr "ಧ�ವನಿ"
-
-msgid "AIM Direct IM"
-msgstr "AIM ನೇರ IM"
-
-msgid "Get File"
-msgstr "ಕಡತ ಪಡೆಯಿರಿ"
-
-msgid "Games"
-msgstr "ಆಟಗಳ�"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "ಆಡ�‌-ಇನ�‌ಗಳ�"
-
-msgid "Send Buddy List"
-msgstr "ಗೆಳೆಯರ ಪಟ�ಟಿ ಕಳಿಸಿ"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ ನೇರ ಸಂಪರ�ಕ"
-
-msgid "AP User"
-msgstr "AP ಬಳಕೆದಾರ"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ ಪರಿಚಾರಕ ರಿಲೆ"
-
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ಟ�ರಿಲಿಯನ� ಗೂಢಲಿಪೀಕರಣ"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "ಹಿಪ�‌ಟಾಪ�"
-
-msgid "Security Enabled"
-msgstr "ಸ�ರಕ�ಷತೆಯನ�ನ� ಶಕ�ತಗೊಳಿಸಲಾದ"
-
-msgid "Video Chat"
-msgstr "ವೀಡಿಯೊ ಮಾತ�ಕತೆ"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "ಲೈವ� ವೀಡಿಯೊ"
-
-msgid "Camera"
-msgstr "ಕ�ಯಾಮೆರಾ"
-
-msgid "Screen Sharing"
-msgstr "ತೆರೆಯನ�ನ� ಹಂಚಿಕೊಳ�ಳ�ವಿಕೆ"
-
 msgid "Free For Chat"
 msgstr "ಮಾತ�ಕತೆಗೆ ಮ�ಕ�ತ"
 
@@ -7300,15 +7230,6 @@ msgstr "ಕೆಲಸದಲ�ಲಿ"
 msgid "At lunch"
 msgstr "ಊಟ ಮಾಡಲಾಗ�ತ�ತಿದೆ"
 
-msgid "IP Address"
-msgstr "�ಪಿ ವಿಳಾಸ"
-
-msgid "Warning Level"
-msgstr "ಎಚ�ಚರಿಕೆ ಮಟ�ಟ"
-
-msgid "Buddy Comment"
-msgstr "ಗೆಳೆಯನ ಅಭಿಪ�ರಾಯ"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ದೃಢೀಕರಣ ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ�ಕ ಸಾಧಿಸಲ� ಆಗಲಿಲ�ಲ: %s"
@@ -7406,15 +7327,6 @@ msgstr "ಗà³�ಪà³�ತಪದವನà³�ನà³� ಕಳà³�ಹಿಸಲಾಗಿದà³
 msgid "Unable to initialize connection"
 msgstr "ಸಂಪರ�ಕವನ�ನ� ಆರಂಭಿಸಲ� ಸಾಧ�ಯವಾಗಲಿಲ�ಲ"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "ದಯವಿಟ�ಟ� ನಿಮ�ಮನ�ನ� ನನ�ನ ಗೆಳೆಯರ ಪಟ�ಟಿಗೆ ಸೇರಿಸಲ� ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ."
-
-msgid "No reason given."
-msgstr "ಕಾರಣ ಕೊಟ�ಟಿಲ�ಲ."
-
-msgid "Authorization Denied Message:"
-msgstr "ಅಧಿಕಾರವನ�ನ� ನಿರಾಕರಿಸಲಾದ ಸಂದೇಶ:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7541,60 +7453,13 @@ msgstr[0] ""
 msgstr[1] ""
 "ಒಂದ� ಅಜ�ಞಾತ ಕಾರಣದಿಂದಾಗಿ ನೀವ� %hu ಸಂದೇಶಗಳನ�ನ�  (%s ಇವರಿಂದ) ಕಳೆದ�ಕೊಂಡಿರಿ."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಲಭ�ಯವಿಲ�ಲ: %s"
-
-msgid "Online Since"
-msgstr "ಈ ಸಮಯದಿಂದ ಆನ�‌ಲೈನಿನಲ�ಲಿದ�ದಾರೆ"
-
-msgid "Member Since"
-msgstr "ಈ ಸಮಯದಿಂದ ಸದಸ�ಯರಾಗಿದ�ದಾರೆ"
-
-msgid "Capabilities"
-msgstr "ಸಾಮರ�ಥ�ಯಗಳ�"
-
 msgid "Your AIM connection may be lost."
 msgstr "ನಿಮ�ಮ AIM ಸಂಪರ�ಕವ� ಇಲ�ಲವಾಗಬಹ�ದ�."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[ಈ ಬಳಕೆದಾರರಿಂದ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ �ಕೆಂದರೆ ಇದ� ಸರಿಯಲ�ಲದ ಅಕ�ಷರಗಳನ�ನ� "
-"ಹೊಂದಿದೆ.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ಮಾತ�ಕತೆ ಕೋಣೆ %s ಇಂದ ನಿಮ�ಮ ಸಂಪರ�ಕವ� ಕಡಿದ� ಹೋಗಿದೆ."
 
-msgid "Mobile Phone"
-msgstr "ಸಂಚಾರಿ ದೂರವಾಣಿ"
-
-msgid "Personal Web Page"
-msgstr "ವೈಯಕ�ತಿಕ ಜಾಲಪ�ಟ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "ಹೆಚ�ಚಿನ ಮಾಹಿತಿ"
-
-msgid "Zip Code"
-msgstr "�ಿಪ�(ಪಿನ�)ಕೋಡ�"
-
-msgid "Work Information"
-msgstr "ಕೆಲಸದ ಮಾಹಿತಿ"
-
-msgid "Division"
-msgstr "ವಿಭಾಗ"
-
-msgid "Position"
-msgstr "ಹ�ದ�ದೆ"
-
-msgid "Web Page"
-msgstr "ಜಾಲಪ�ಟ"
-
 msgid "Pop-Up Message"
 msgstr "ಪ�ಟಿಕೆ(ಪಾಪಪ�) ಸಂದೇಶ"
 
@@ -7878,8 +7743,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "ವಿಳಾಸವನ�ನ� ಹೀಗೆ ಬದಲಿಸಿ"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>ಧೃಡೀಕರಣಕ�ಕೆ ನೀವ� ಕಾಯ�ತ�ತಿಲ�ಲ</i>"
+msgid "you are not waiting for authorization"
+msgstr "ಧೃಡೀಕರಣಕ�ಕೆ ನೀವ� ಕಾಯ�ತ�ತಿಲ�ಲ"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "ನೀವ� ಈ ಕೆಳಕಂಡ ಗೆಳೆಯರಿಂದ ಧೃಡೀಕರಣ ಕಾಯ�ತ�ತಿದ�ದೀರಿ"
@@ -7917,6 +7782,14 @@ msgstr "IM ಫಾರà³�ವಾರà³�ಡಿಂಗà³� ಅನà³�ನà³� ಸಂರಚà
 msgid "Set Privacy Options..."
 msgstr "ಗೌಪ�ಯತಾ ಆಯ�ಕೆಗಳನ�ನ� ಸೂಚಿಸಿ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ಗೆಳೆಯರ ಪಟ�ಟಿಯನ�ನ� ತೋರಿಸ�(_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ಆಮಂತ�ರಿತರ ಪಟ�ಟಿ"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ಖಾತೆಯನ�ನ� ಖಚಿತಪಡಿಸಿ"
@@ -7933,9 +7806,6 @@ msgstr "ದೃಢೀಕರಣಕà³�ಕಾಗಿ ಕಾಯà³�ತà³�ತಿರà³�à²
 msgid "Search for Buddy by Email Address..."
 msgstr "ಇ-ಮೈಲ�‌ ವಿಳಾಸವನ�ನ� ಬಳಸಿಕೊಂಡ� ಗೆಳೆಯನಿಗಾಗಿ ಹ�ಡ�ಕಿ..."
 
-msgid "Search for Buddy by Information"
-msgstr "ಮಾಹಿತಿಯನ�ನ� ಬಳಸಿಕೊಂಡ� ಒಬ�ಬ ಗೆಳೆಯನಿಗಾಗಿ ಹ�ಡ�ಕಿ"
-
 msgid "Use clientLogin"
 msgstr "clientLogin ಅನ�ನ� ಬಳಸಿ"
 
@@ -8044,6 +7914,165 @@ msgstr "ಸರತಿಯಸಾಲ� ಭರತಿಯಾಗಿದೆ"
 msgid "Not while on AOL"
 msgstr "AOL ನಲ�ಲಿದ�ದಾಗ ಅಲ�ಲ"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ಗೆಳೆಯನ ಚಿಹ�ನೆ"
+
+msgid "Voice"
+msgstr "ಧ�ವನಿ"
+
+msgid "AIM Direct IM"
+msgstr "AIM ನೇರ IM"
+
+msgid "Get File"
+msgstr "ಕಡತ ಪಡೆಯಿರಿ"
+
+msgid "Games"
+msgstr "ಆಟಗಳ�"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ಆಡ�‌-ಇನ�‌ಗಳ�"
+
+msgid "Send Buddy List"
+msgstr "ಗೆಳೆಯರ ಪಟ�ಟಿ ಕಳಿಸಿ"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ನೇರ ಸಂಪರ�ಕ"
+
+msgid "AP User"
+msgstr "AP ಬಳಕೆದಾರ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ ಪರಿಚಾರಕ ರಿಲೆ"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ಟ�ರಿಲಿಯನ� ಗೂಢಲಿಪೀಕರಣ"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ಹಿಪ�‌ಟಾಪ�"
+
+msgid "Security Enabled"
+msgstr "ಸ�ರಕ�ಷತೆಯನ�ನ� ಶಕ�ತಗೊಳಿಸಲಾದ"
+
+msgid "Video Chat"
+msgstr "ವೀಡಿಯೊ ಮಾತ�ಕತೆ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ಲೈವ� ವೀಡಿಯೊ"
+
+msgid "Camera"
+msgstr "ಕ�ಯಾಮೆರಾ"
+
+msgid "Screen Sharing"
+msgstr "ತೆರೆಯನ�ನ� ಹಂಚಿಕೊಳ�ಳ�ವಿಕೆ"
+
+msgid "IP Address"
+msgstr "�ಪಿ ವಿಳಾಸ"
+
+msgid "Warning Level"
+msgstr "ಎಚ�ಚರಿಕೆ ಮಟ�ಟ"
+
+msgid "Buddy Comment"
+msgstr "ಗೆಳೆಯನ ಅಭಿಪ�ರಾಯ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಲಭ�ಯವಿಲ�ಲ: %s"
+
+msgid "Mobile Phone"
+msgstr "ಸಂಚಾರಿ ದೂರವಾಣಿ"
+
+msgid "Personal Web Page"
+msgstr "ವೈಯಕ�ತಿಕ ಜಾಲಪ�ಟ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "ಹೆಚ�ಚಿನ ಮಾಹಿತಿ"
+
+msgid "Zip Code"
+msgstr "�ಿಪ�(ಪಿನ�)ಕೋಡ�"
+
+msgid "Work Information"
+msgstr "ಕೆಲಸದ ಮಾಹಿತಿ"
+
+msgid "Division"
+msgstr "ವಿಭಾಗ"
+
+msgid "Position"
+msgstr "ಹ�ದ�ದೆ"
+
+msgid "Web Page"
+msgstr "ಜಾಲಪ�ಟ"
+
+msgid "Online Since"
+msgstr "ಈ ಸಮಯದಿಂದ ಆನ�‌ಲೈನಿನಲ�ಲಿದ�ದಾರೆ"
+
+msgid "Member Since"
+msgstr "ಈ ಸಮಯದಿಂದ ಸದಸ�ಯರಾಗಿದ�ದಾರೆ"
+
+msgid "Capabilities"
+msgstr "ಸಾಮರ�ಥ�ಯಗಳ�"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ಆಲ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸ�ಕೊಳ�ಳ�"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ಆಲ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸ�ಕೊಳ�ಳ�"
+
+msgid "Appear Offline"
+msgstr "ಆಫ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸಿಕೊಳ�ಳ�"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ಆಫ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸಿಕೊಳ�ಳ�"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ನಿಮ�ಮನ�ನ� ಈ MultiMX ಹೊರಗಟ�ಟಲಾಗಿದೆ."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ನೀವ� ಈ ಗೆಳೆಯರಿಂದ ಮರಳಿ ದೃಢೀಕರಿಸ�ವಂತೆ ಮನವಿ ಸಲ�ಲಿಸಲ� ಅವರ ಮೇಲೆ ಕ�ಲಿಕ� ಮಾಡಿ ನಂತರ "
+"\"ದೃಢೀಕರಿಸಲ� ಮರಳಿ-ಮನವಿ ಮಾಡಿ\" ಅನ�ನ� ಆಯ�ಕೆ ಮಾಡಬಹ�ದ�. "
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ಗೋಚರ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ಆಮಂತ�ರಿತರ ಪಟ�ಟಿ"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "ಕ�ಂಭ(ಅಕ�ವೇರಿಸ�)"
 
@@ -8223,8 +8252,8 @@ msgid "Your request was rejected."
 msgstr "ನಿಮ�ಮ ಮನವಿಯನ�ನ� ತಿರಸ�ಕರಿಸಲಾಗಿದೆ."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u ಗಾಗಿ ಪರಿಶೀಲಿಸ�ವ ಅಗತ�ಯವಿರ�ತ�ತದೆ"
+msgid "%u requires verification: %s"
+msgstr "%u ಗಾಗಿ ಪರಿಶೀಲಿಸ�ವ ಅಗತ�ಯವಿರ�ತ�ತದೆ: %s"
 
 msgid "Add buddy question"
 msgstr "ಗೆಳೆಯರ ಪ�ರಶ�ನೆಯನ�ನ� ಸೇರಿಸಿ"
@@ -8328,9 +8357,8 @@ msgid "Admin"
 msgstr "ವ�ಯವಸ�ಥಾಪಕ"
 
 #. XXX: Should this be "Topic"?
-#, fuzzy
 msgid "Room Title"
-msgstr "ಕೋಣೆಗಳ ಪಟ�ಟಿ"
+msgstr "ಕೋಣೆಯ ಶೀರ�ಷಿಕೆ"
 
 msgid "Notice"
 msgstr "ಸೂಚನೆ"
@@ -10257,9 +10285,8 @@ msgstr "ಮಾತ�ಕತೆ ಕೋಣೆಯ ಭಾಷೆ"
 msgid "Ignore conference and chatroom invitations"
 msgstr "ಸಮ�ಮೇಳನ ಹಾಗ� ಮಾತ�ಕತೆಕೋಣೆಗಳ ಆಮಂತ�ರಣಗಳನ�ನ� ಆಲಕ�ಷಿಸ�"
 
-#, fuzzy
 msgid "Use account proxy for HTTP and HTTPS connections"
-msgstr "SSL ಸಂಪರ�ಕಗಳಿಗೆ ಖಾತೆ ಪ�ರಾಕ�ಸಿಯನ�ನ� ಬಳಸಿ"
+msgstr "HTTP ಹಾಗ� HTTPS ಸಂಪರ�ಕಗಳಿಗೆ ಖಾತೆ ಪ�ರಾಕ�ಸಿಯನ�ನ� ಬಳಸಿ"
 
 msgid "Chat room list URL"
 msgstr "ಮಾತ�ಕತೆಕೋಣೆಗಳ ಪಟ�ಟಿಯ  URL"
@@ -10420,9 +10447,7 @@ msgstr "%s ದೊಂದಿಗೆ ಸಂಪರ�ಕ ಸಾಧಿಸಲ� ಸಾ
 
 #, fuzzy
 msgid "Unable to connect: The server returned an empty response."
-msgstr ""
-"MXit ಪರಿಚಾರಕ(ಸರ�ವರ�) ಅನ�ನ� ಸಂಪರ�ಕಿಸಲ� ಸಾಧ�ಯವಾಗಿಲ�ಲ. ದಯವಿಟ�ಟ� ನಿಮ�ಮ ಪರಿಚಾರಕದ "
-"ಸಿದ�ಧತೆಗಳನ�ನ� ಪರಿಶೀಲಿಸಿ."
+msgstr " ಪರಿಚಾರಕವನ�ನ� ಸಂಪರ�ಕಿಸಲ� ಆಗಲಿಲ�ಲ: %s."
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
@@ -10447,18 +10472,12 @@ msgstr "ನಿರ�ಗಮಿಸಲಾಗಿದೆ"
 msgid "Not on server list"
 msgstr "ಪರಿಚಾರಕದ(ಸರ�ವರ��) ಪಟ�ಟಿಯಲ�ಲಿ ಇಲ�ಲ"
 
-msgid "Appear Online"
-msgstr "ಆಲ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸ�ಕೊಳ�ಳ�"
-
 msgid "Appear Permanently Offline"
 msgstr "ಶಾಶ�ವತವಾಗಿ ಆಫ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸಿಕೊಳ�ಳ�"
 
 msgid "Presence"
 msgstr "ಇರ�ವಿಕೆ"
 
-msgid "Appear Offline"
-msgstr "ಆಫ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸಿಕೊಳ�ಳ�"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "ಶಾಶ�ವತವಾಗಿ ಆಫ�‌ಲೈನಿನಲ�ಲಿ ಕಾಣಿಸಿಕೊಳ�ಳಬೇಡ"
 
@@ -11005,27 +11024,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "ನಿಮ�ಮ ಗಣಕದಲ�ಲಿನ ಬೇರೊಂದ� ತಂತ�ರಾಂಶವ� ಸಂಪರ�ಕಕ�ಕೆ ತಡೆಯೊಡ�ಡಿದೆ."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "ದೂರದ ಪರಿಚಾರಕ(ಸರ�ವರ��) ಸಂಪರ�ಕವನ�ನ� ಕಡಿದ� ಹಾಕಿದೆ."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "ಸಂಪರ�ಕದ ಸಮಯ ಮೀರಿದೆ."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "ಸಂಪರ�ಕವನ�ನ� ನಿರಾಕರಿಸಲಾಗಿದೆ."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "ವಿಳಾಸವ� ಆಗಲೇ ಬಳಕೆಯಲ�ಲಿದೆ."
 
@@ -11171,8 +11185,14 @@ msgstr ""
 "ಅನ�ನ� ಅನೇಕ IM ಖಾತೆಗಳಿಗೆ ಸಂಪರ�ಕ ಹೊಂದಿಸಲ� ಬಯಸಿದಲ�ಲಿ, ಅವೆಲ�ಲವನ�ನೂ ಸಹ ಸಂರಚಿಸಲ� ಪ�ನಃ "
 "<b>ಸೇರಿಸ�...</b> ಅನ�ನ� ಒತ�ತಿ.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+"ಗೆಳೆಯರ ಪಟ�ಟಿ ವಿಂಡೊದಲ�ಲಿನ  <b>ಖಾತೆಗಳ�->ಖಾತೆಗಳನ�ನ� ನಿರ�ವಹಿಸ�</b> ಎಂಬ�ದಕ�ಕೆ "
+"ಖಾತೆಗಳನ�ನ� ಸೇರಿಸಲ�, ಸಂಪಾದಿಸಲ� ಅಥವ ತೆಗೆದ�ಹಾಕಲ� ನೀವ� ಈ ವಿಂಡೊಗೆ ಮರಳಿ ಬರಬಹ�ದ�."
+
+# , c-format
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s ಎಂಬ�ವರ� ನಿಮ�ಮನ�ನ� (%s) ಅವರ ಗೆಳೆಯರ ಪಟ�ಟಿ %s%s ಗೆ ಸೇರಿಸಲ� ಬಯಸಿದ�ದಾರೆ"
 
 #. Buddy List
 msgid "Background Color"
@@ -11423,13 +11443,14 @@ msgstr "ಗೊತ�ತಿಲ�ಲದ ನೋಡ�‌ನ ಬಗೆ"
 msgid "Please select your mood from the list"
 msgstr "ಪಟ�ಟಿಯಿಂದ ನಿಮ�ಮ ಲಹರಿಯನ�ನ�(ಮೂಡ�) ಆಯ�ಕೆ ಮಾಡಿಕೊಳ�ಳಿ"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "ಅಲಿಯಾಸ� (�ಚ�ಛಿಕ)"
+msgstr "ಸಂದೇಶ (�ಚ�ಛಿಕ)"
 
 msgid "Edit User Mood"
 msgstr "ಬಳಕೆದಾರರ ಲಹರಿಯನ�ನ� ಸಂಪಾದಿಸಿ"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/ಗೆಳೆಯರ�(_B)"
@@ -11508,9 +11529,8 @@ msgstr "/ಸಾಧನಗಳ�/ಆದ�ಯತೆಗಳ�(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ಸಾಧನಗಳ�/ಖಾಸಗಿಮಾಹಿತಿ(_i)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/ಸಾಧನಗಳ�/ವ�ಯವಸ�ಥೆಯ ದಾಖಲಾತಿ(_L)"
+msgstr "/ಸಾಧನಗಳ�/ಲಹರಿಯನ�ನ� ಹೊಂದಿಸ�(_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/ಸಾಧನಗಳ�/ಕಡತ ವರ�ಗಾವಣೆಗಳ�(_F)"
@@ -12177,9 +12197,6 @@ msgstr "ಬೆಂಬಲ"
 msgid "webmaster"
 msgstr "ವೆಬ�‌ಮಾಸ�ಟರ�"
 
-msgid "Senior Contributor/QA"
-msgstr "ಹಿರಿಯ ಸಹಾಯಕರ�/QA"
-
 msgid "win32 port"
 msgstr "win32 ಸಂಪರ�ಕಸ�ಥಾನ"
 
@@ -12205,15 +12222,17 @@ msgstr "ಮೂಲ ಲೇಖಕ"
 msgid "lead developer"
 msgstr "ಪ�ರಧಾನ ವಿಕಸನಾಗಾರರ�"
 
+msgid "Senior Contributor/QA"
+msgstr "ಹಿರಿಯ ಸಹಾಯಕರ�/QA"
+
 msgid "Afrikaans"
 msgstr "ಆಫ�ರಿಕಾನಸ�"
 
 msgid "Arabic"
 msgstr "ಅರೇಬಿಕ�"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "ನಾಚಿಕೆ"
+msgstr "ಅಸ�ಸಾಮಿ"
 
 msgid "Belarusian Latin"
 msgstr "ಬೆಲಾರ�ಸಿಯನ� ಲ�ಯಾಟಿನ�"
@@ -12224,9 +12243,8 @@ msgstr "ಬಲ�ಗೇರಿಯನ�"
 msgid "Bengali"
 msgstr "ಬೆಂಗಾಲಿ"
 
-#, fuzzy
 msgid "Bengali-India"
-msgstr "ಬೆಂಗಾಲಿ"
+msgstr "ಬೆಂಗಾಲಿ-ಭಾರತ"
 
 msgid "Bosnian"
 msgstr "ಬೊಸ�ನಿಯನ�"
@@ -12342,9 +12360,8 @@ msgstr "ಲಾವೋ"
 msgid "Macedonian"
 msgstr "ಮ�ಯಾಕೆಡೊನಿಯನ�"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "ಮಲಯ"
+msgstr "ಮಲಯಾಲಂ"
 
 msgid "Mongolian"
 msgstr "ಮಂಗೋಲಿಯನ�"
@@ -13127,13 +13144,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ಬೇರೊಂದ� libpurple ಕ�ಲೈಂಟ� ಚಾಲನೆಯಲ�ಲಿರ�ವ�ದರಿಂದ ನಿರ�ಗಮಿಸಲಾಗ�ತ�ತಿದೆ.\n"
 
-#, fuzzy
 msgid "_Media"
-msgstr "/ಮಾಧ�ಯಮ(_M)"
+msgstr "ಮಾಧ�ಯಮ(_M)"
 
-#, fuzzy
 msgid "_Hangup"
-msgstr "ಹ�ಯಾಂಗ�ಅಪ�"
+msgstr "ಹ�ಯಾಂಗ�‌ಅಪ�(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13553,6 +13568,9 @@ msgstr "ರಿಲೆ ಪರಿಚಾರಕ (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN ಪರಿಚಾರಕ(ಸರ�ವರ��):"
 
+msgid "_UDP Port:"
+msgstr "_UDP ಸಂಪರ�ಕಸ�ಥಾನ:"
+
 msgid "Use_rname:"
 msgstr "ಬಳಕೆದಾರರ ಹೆಸರ�(_r):"
 
@@ -13574,6 +13592,11 @@ msgstr "ಮೊ�ಿಲ�ಲಾ"
 msgid "Konqueror"
 msgstr "'ಕಾಂ'ಕರರ�"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ಗಣಕ ಪೂರ�ವನಿಯೋಜಿತ"
 
@@ -13592,6 +13615,14 @@ msgstr "ಫೈರ���ಬರ�ಡ�"
 msgid "Epiphany"
 msgstr "ಎಪಿಫ�ಯಾನಿ"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ಕೈಪಿಡಿ"
 
@@ -14124,7 +14155,7 @@ msgstr "�ನೂ ಇಲ�ಲ"
 msgid "Small"
 msgstr "ಸಣ�ಣ"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "ಪೂರ�ವನಿಯೋಜಿತ ಸ�ಮೈಲಿಗಳ ಸಣ�ಣ ಆವೃತ�ತಿಗಳ�"
 
 msgid "Response Probability:"
@@ -15070,23 +15101,20 @@ msgid "Timestamp Format Options"
 msgstr "ಸಮಯಮ�ದ�ರೆ ಸ�ವರೂಪದ ಆಯ�ಕೆಗಳ�"
 
 # , c-format
-#, fuzzy, c-format
+#, c-format
 msgid "_Force timestamp format:"
-msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ�ವರೂಪವನ�ನ� ಬಲವಂತವಾಗಿ ಸೂಚಿಸಿ(_F)"
+msgstr "ಸಮಯಮ�ದ�ರೆ ಸ�ವರೂಪವನ�ನ� ಒತ�ತಾಯಿಸ�(_F):"
 
-#, fuzzy
 msgid "Use system default"
-msgstr "ಗಣಕ ಪೂರ�ವನಿಯೋಜಿತ"
+msgstr "ಗಣಕ ಪೂರ�ವನಿಯೋಜಿತವನ�ನ� ಬಳಸ�"
 
 # , c-format
-#, fuzzy
 msgid "12 hour time format"
-msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ�ವರೂಪವನ�ನ� ಬಲವಂತವಾಗಿ ಸೂಚಿಸಿ(_F)"
+msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ�ವರೂಪ"
 
 # , c-format
-#, fuzzy
 msgid "24 hour time format"
-msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ�ವರೂಪವನ�ನ� ಬಲವಂತವಾಗಿ ಸೂಚಿಸಿ(_F)"
+msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ�ವರೂಪ"
 
 msgid "Show dates in..."
 msgstr "ದಿನಾಂಕಗಳನ�ನ� ಹೀಗೆ ತೋರಿಸ�..."
@@ -15162,6 +15190,9 @@ msgstr "ಸಾಧನ(_e)"
 msgid "Voice/Video Settings"
 msgstr "ಧ�ವನಿ/ವೀಡಿಯೊ ಸಿದ�ಧತೆಗಳ�"
 
+msgid "Voice and Video Settings"
+msgstr "ಧ�ವನಿ ಹಾಗ� ವೀಡಿಯೊ ಸಿದ�ಧತೆಗಳ�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15287,13 +15318,12 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "ಕಚ�ಛಾ XMPP ವಾಕ�ಯವೃಂದಗಳನ�ನ� ಕಳ�ಹಿಸಿ ಹಾಗ� ಸ�ವೀಕರಿಸಿ."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "XMPP ಪರಿಚಾರಕಗಳಿಗಾಗಿ ಅಥವ ಕ�ಲೈಂಟ�ಗಳಿಗಾಗಿ ದೋಷ ನಿವಾರಣೆ ಮಾಡ�ವಲ�ಲಿ ಈ ಪ�ಲಗ�‌ಇನ� "
 "ಸಹಾಯಕವಾಗ�ತ�ತದೆ."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15310,24 +15340,23 @@ msgstr ""
 
 #. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr ""
+msgstr "ಪ�ರಮ�ಖ ಪಿಜಿನ� ಕಡತಗಳ� ಹಾಗ� dllಗಳ�"
 
 #. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
+msgstr "ಪಿಜಿನ�‌ಗಾಗಿ ಒಂದ� ಆರಂಭದ ಮೆನ� ನಮೂದನ�ನ� ರಚಿಸ�"
 
 #. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
+msgstr "ಗಣಕತೆರೆಯಲ�ಲಿ ಪಿಜಿನ�‌ನ ಒಂದ� ಶಾರ�ಟ-ಕಟ�‌ ಅನ�ನ� ರಚಿಸ�"
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Desktop"
-msgstr "ಗಣಕ ಪೂರ�ವನಿಯೋಜಿತ"
+msgstr "ಗಣಕತೆರೆ"
 
 #. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
@@ -15351,23 +15380,20 @@ msgid ""
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ ರನ��ಟೈಂ ಆವೃತ�ತಿ"
+msgstr "GTK+ ರನ�‌ಟೈಮ� (ಇಲ�ಲದೆ ಹೋದಲ�ಲಿ ಅಗತ�ಯವಿರ�ತ�ತದೆ)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "ಸ�ಥಳ"
+msgstr "ಲೋಕಲೈಸೇಶನ�"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr ""
+msgstr "ಮ�ಂದಿನ >"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "ಪಿಜಿನ� ಇಂಟರ�ನೆಟ� ಮೆಸೆಂಜರ�"
+msgstr "ಪಿಜಿನ� ಇನ�‌ಸ�ಟಂಟ� ಮೆಸೇಜಿಂಗ� ಕ�ಲೈಂಟ� (ಅಗತ�ಯವಿದೆ)"
 
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
@@ -15376,31 +15402,28 @@ msgid ""
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
-msgstr "ಶಾರ�ಟ�-ಕಟ�"
+msgstr "ಶಾರ�ಟ�-ಕಟ�‌ಗಳ�"
 
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
+msgstr "ಪಿಜಿನ� ಅನ�ನ� ಆರಂಭಿಸಲ� ಶಾರ�ಟ�-ಕಟ�‌ಗಳ�"
 
 #. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
+msgstr "ಕಾಗ�ಣಿತ ಪರೀಕ�ಷೆ ಬೆಂಬಲ"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "ಪ�ರಾರಂಭ"
+msgstr "ಪ�ರಾರಂಭಿಸ ಮೆನ�"
 
 #. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
-msgstr ""
+msgstr "ಕಾಗ�ಣಿತಕ�ಕೆ ಬೆಂಬಲವಿಲ�ಲ.  (ಅನ�ಸ�ಥಾಪನೆಗೆ ಅಂತರಜಾಲ ಸಂಪರ�ಕದ ಅಗತ�ಯವಿರ�ತ�ತದೆ)"
 
-#, fuzzy
 msgid "The installer is already running."
-msgstr "\"%s\" ಎಂದ ಅಡ�ಡಹೆಸರ� ಆಗಲೇ ಬಳಕೆಯಲ�ಲಿದೆ."
+msgstr "ಅನ�ಸ�ಥಾಪಕವ� ಈಗಾಗಲೆ ಚಾಲನೆಯಲ�ಲಿದೆ."
 
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
@@ -15408,9 +15431,8 @@ msgid ""
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "URI Handlers"
-msgstr "myim URL ಹ�ಯಾಂಡ�ಲರ�"
+msgstr "URI ಹ�ಯಾಂಡ�ಲರ�"
 
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
@@ -15419,10 +15441,32 @@ msgstr ""
 
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr ""
+msgstr "ಪಿಜಿನ� ಜಾಲಪ�ಟಕ�ಕೆ ಭೇಟಿಕೊಡಿ"
 
 msgid "You do not have permission to uninstall this application."
-msgstr ""
+msgstr "ಅನ�ಸ�ಥಾಪಿಸಲಾದ ಈ ಅನ�ವಯವನ�ನ� ತೆಗೆದ�ಹಾಕಲ� ನಿಮಗೆ ಅನ�ಮತಿ ಇಲ�ಲ."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "ಪ�ರಮಾಣಪತ�ರದ ವಾಯಿದೆ ತೀರಿದೆ ಹಾಗ� ಅದನ�ನ� ಮಾನ�ಯವಾದ�ದ� ಎಂದ� ಪರಿಗಣಿಸ�ವಂತಿಲ�ಲ."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS ನ ಅಗತ�ಯವಿದೆ"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ಹಳೆಯ (ಸಂಪರ�ಕಸ�ಥಾನ 5223) SSL ಅನ�ನ� ಒತ�ತಾಯಿಸ�"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ನೀವ� ನಮೂದಿಸಿದ ಹೆಸರ� ತಪ�ಪಾಗಿದೆ."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ಈ ಬಳಕೆದಾರರಿಂದ ಸಂದೇಶಗಳನ�ನ� ತೋರಿಸಲ� ಸಾಧ�ಯವಿಲ�ಲ �ಕೆಂದರೆ ಇದ� ಸರಿಯಲ�ಲದ ಅಕ�ಷರಗಳನ�ನ� "
+#~ "ಹೊಂದಿದೆ.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ಮಾಹಿತಿಯನ�ನ� ಬಳಸಿಕೊಂಡ� ಒಬ�ಬ ಗೆಳೆಯನಿಗಾಗಿ ಹ�ಡ�ಕಿ"
 
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "ಪ�ರಮಾಣಪತ�ರವ� ಸರಿಯಾಗಿದೆ ಎಂದ� ಇನ�ನೂ ಸಹ ಗ�ರ�ತಿಸಲಾಗಿಲ�ಲ."
@@ -15814,10 +15858,6 @@ msgstr ""
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "ಸರ�ವರ� ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ�ಲ"
 
-#, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "ಸಂಪರ�ಕ ಕಳೆದಿದೆ"
-
 #~ msgid "Unable to connect to host"
 #~ msgstr "ಆತಿಥೇಯಗಣಕ ಸಂಪರ�ಕಿಸಲಾಗಲಿಲ�ಲ"
 
@@ -15930,7 +15970,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "ಬರೆಯ�ವದಕ�ಕಾಗಿ  %s ತೆರೆಯಲ� ಆಗಲಿಲ�ಲ"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ಕಡತ ವರ�ಗಾವಣೆ ವಿಫಲ ; ಬಹ�ಶ: ಆಚೆಯವರ� ರದ�ದ� ಮಾಡಿದರ�"
 
 #~ msgid "Could not connect for transfer."
@@ -15954,9 +15994,6 @@ msgstr ""
 #~ msgid "%s requests you to send them a file"
 #~ msgstr "%s ಕಡತವೊಂದನ�ನ� ಕಳಿಸಲ� ನಿಮ�ಮನ�ನ� ಕೋರಿದ�ದಾರೆ"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s ಬಳಕೆದಾರರ ಮಹಿತಿ ಲಭ�ಯವಿಲ�ಲ"
-
 #~ msgid "%s Options"
 #~ msgstr "%s ಆಯ�ಕೆಗಳ�"
 
diff --git a/po/ko.po b/po/ko.po
index 40220869c9..2acd1240a3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-10-01 16:15+0900\n"
 "Last-Translator: sushizang <sushizang@empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -544,7 +544,6 @@ msgstr "�� 삭제 확�"
 msgid "Certificate Manager"
 msgstr "�� 관리�"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "호스트명"
 
@@ -816,7 +815,7 @@ msgstr "ìž…ë ¥"
 msgid "Waiting for transfer to begin"
 msgstr "전송 시작� 기다리고 있습니다."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "취소�었습니다."
 
 msgid "Failed"
@@ -1754,7 +1753,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4847,11 +4848,20 @@ msgstr "MSN 프로토콜 플러그�"
 msgid "Domain"
 msgstr "루마니아어"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "승�� 필요합니다."
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s � 사용� 정보는 사용할 수 없습니다."
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "구 SSL (�트 번호: 5223) � 강제�으로 사용"
+#, fuzzy
+msgid "Connection security"
+msgstr "접� 초기화"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "암호화 �어 있지 않� 스트림� 통한 문�열 �� 허가"
@@ -6137,7 +6147,7 @@ msgid "The two PINs you entered do not match."
 msgstr "새 비밀번호가 �치하지 않습니다."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "입력한 보안 ID 키는 잘못�었습니다."
 
 msgid ""
@@ -6240,10 +6250,6 @@ msgid "Connecting..."
 msgstr "접� 중입니다."
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "입력한 보안 ID 키는 잘못�었습니다."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "입력한 보안 ID 키는 잘못�었습니다."
 
@@ -7142,6 +7148,15 @@ msgstr "서버 주소"
 msgid "Server port"
 msgstr "서버 �트"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "제가 당신� 친구 목�� 추가할 수 있�� 승�해 주십시오."
+
+msgid "No reason given."
+msgstr "�유를 알 수 없습니다."
+
+msgid "Authorization Denied Message:"
+msgstr "승� 거부 메시지:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "서버로부터 예�치 못한 HTTP �답� 받았습니다."
@@ -7175,6 +7190,24 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "%s �(를) 해�하는 중 오류"
 
+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 ""
+"(� 메시지를 받� 때 오류가 발�했습니다. 대화 중� 친구는 아마� 다른 �코딩"
+"� 사용하고 있는 것 같습니다. �대가 사용하고 있는 �코딩� 알고 있으면, 계"
+"정 창� 고급 설정�서 �를 지정해 주십시오.)"
+
+#, 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 님� 비정� ���언트를 사용하고 있는 것 같습니다.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "접�할 수 없었습니다."
@@ -7409,95 +7442,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "파� %s �(는) %s 입니다. (%s � 최대 �기를 초과했습니다.)"
 
-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 ""
-"(� 메시지를 받� 때 오류가 발�했습니다. 대화 중� 친구는 아마� 다른 �코딩"
-"� 사용하고 있는 것 같습니다. �대가 사용하고 있는 �코딩� 알고 있으면, 계"
-"정 창� 고급 설정�서 �를 지정해 주십시오.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "친구 아�콘"
-
-msgid "Voice"
-msgstr "�성"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "파� 가져오기"
-
-msgid "Games"
-msgstr "게임"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "추가"
-
-msgid "Send Buddy List"
-msgstr "친구 목� 보내기"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct 접�"
-
-msgid "AP User"
-msgstr "AP 사용�"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ 서버 중계"
-
-msgid "Old ICQ UTF8"
-msgstr "구형 ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian 암호화"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "보안 사용"
-
-msgid "Video Chat"
-msgstr "�� 대화"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "��브 ��"
-
-msgid "Camera"
-msgstr "카메�"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "아�디"
-
 msgid "Free For Chat"
 msgstr "대화할 수 있습니다."
 
@@ -7533,15 +7477,6 @@ msgstr "네트워�"
 msgid "At lunch"
 msgstr "�심 �사 중입니다."
 
-msgid "IP Address"
-msgstr "IP 주소"
-
-msgid "Warning Level"
-msgstr "경고 수준"
-
-msgid "Buddy Comment"
-msgstr "친구� 코멘트"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7642,15 +7577,6 @@ msgstr "비밀번호 전송 중"
 msgid "Unable to initialize connection"
 msgstr "새로운 접�� 열 수 없습니다."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "제가 당신� 친구 목�� 추가할 수 있�� 승�해 주십시오."
-
-msgid "No reason given."
-msgstr "�유를 알 수 없습니다."
-
-msgid "Authorization Denied Message:"
-msgstr "승� 거부 메시지:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7761,60 +7687,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 "��� 알 수 없지만, %2$s 님으로부터� %1$hu개� 메시지를 못했습니다."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "사용� 정보를 �용할 수 없습니다: %s"
-
-msgid "Online Since"
-msgstr "접�한 �시"
-
-msgid "Member Since"
-msgstr "멤버가 � �시"
-
-msgid "Capabilities"
-msgstr "기능"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM 으로� 접�� �어진 것 같습니다."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[메시지� 잘못� 문�가 �함�어 있기 때문�, � 사용�로부터� 메시지를 표시"
-"할 수 없습니다.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "대화실 %s (으)로부터 접�� �어졌습니다."
 
-msgid "Mobile Phone"
-msgstr "휴대 전화"
-
-msgid "Personal Web Page"
-msgstr "개� 웹페�지"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "추가 정보"
-
-msgid "Zip Code"
-msgstr "우편 번호"
-
-msgid "Work Information"
-msgstr "�업"
-
-msgid "Division"
-msgstr "소�"
-
-msgid "Position"
-msgstr "�위"
-
-msgid "Web Page"
-msgstr "웹페�지"
-
 msgid "Pop-Up Message"
 msgstr "�업 메시지"
 
@@ -8083,7 +7962,8 @@ msgstr "ì•„ì�´ë””ì�˜ ì„œì‹�ì�€ 대문ìž�와 공백 문ìž�만 변경할 수 있ìŠ
 msgid "Change Address To:"
 msgstr "변경할 주소:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>승�� 기다리고 있지 않습니다.</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8125,6 +8005,14 @@ msgstr "IM �워딩 (URL) 설정"
 msgid "Set Privacy Options..."
 msgstr "개� 설정 추가..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "친구 목� 열기..."
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "초대 목�"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "계정 확�"
@@ -8141,9 +8029,6 @@ msgstr "승�� 기다리는 친구 표시"
 msgid "Search for Buddy by Email Address..."
 msgstr "�메�로 친구 검색..."
 
-msgid "Search for Buddy by Information"
-msgstr "정보로 친구 검색..."
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "사용�는 접� 중� 아닙니다."
@@ -8253,6 +8138,166 @@ msgstr "�가 다 찼습니다."
 msgid "Not while on AOL"
 msgstr "AOL 사용 중�는 불가능합니다."
 
+#. Label
+msgid "Buddy Icon"
+msgstr "친구 아�콘"
+
+msgid "Voice"
+msgstr "�성"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "파� 가져오기"
+
+msgid "Games"
+msgstr "게임"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "추가"
+
+msgid "Send Buddy List"
+msgstr "친구 목� 보내기"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct 접�"
+
+msgid "AP User"
+msgstr "AP 사용�"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 서버 중계"
+
+msgid "Old ICQ UTF8"
+msgstr "구형 ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 암호화"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "보안 사용"
+
+msgid "Video Chat"
+msgstr "�� 대화"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "��브 ��"
+
+msgid "Camera"
+msgstr "카메�"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "아�디"
+
+msgid "IP Address"
+msgstr "IP 주소"
+
+msgid "Warning Level"
+msgstr "경고 수준"
+
+msgid "Buddy Comment"
+msgstr "친구� 코멘트"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "사용� 정보를 �용할 수 없습니다: %s"
+
+msgid "Mobile Phone"
+msgstr "휴대 전화"
+
+msgid "Personal Web Page"
+msgstr "개� 웹페�지"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "추가 정보"
+
+msgid "Zip Code"
+msgstr "우편 번호"
+
+msgid "Work Information"
+msgstr "�업"
+
+msgid "Division"
+msgstr "소�"
+
+msgid "Position"
+msgstr "�위"
+
+msgid "Web Page"
+msgstr "웹페�지"
+
+msgid "Online Since"
+msgstr "접�한 �시"
+
+msgid "Member Since"
+msgstr "멤버가 � �시"
+
+msgid "Capabilities"
+msgstr "기능"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "온��으로 표시"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "온��으로 표시"
+
+msgid "Appear Offline"
+msgstr "오프��으로 표시"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "오프��으로 표시"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s �게 차였습니다: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"오른쪽 �릭하여 \"승� 재요청\" � 선�하면, �들� 친구로부터 ��� 재요청"
+"할 수 있습니다."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "숨김 �태"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "초대 목�"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "물병�리"
 
@@ -8453,7 +8498,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "승�� 필요합니다."
 
 #, fuzzy
@@ -10749,18 +10794,12 @@ msgstr "잠시 외출"
 msgid "Not on server list"
 msgstr "서버 목�� 없습니다."
 
-msgid "Appear Online"
-msgstr "온��으로 표시"
-
 msgid "Appear Permanently Offline"
 msgstr "�시�으로 오프��으로 표시"
 
 msgid "Presence"
 msgstr "�리� 있�"
 
-msgid "Appear Offline"
-msgstr "오프��으로 표시"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�시�으로 오프��으로 표시 안 함"
 
@@ -11317,27 +11356,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "리모트 사용�가 접�� �었습니다."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "접� 시간� 초과�었습니다."
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "접�� 거부�었습니다."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "� 대화명� �미 사용 중입니다."
 
@@ -11487,6 +11525,10 @@ msgstr ""
 "친구 목� 창� 있는 <b>계정 -> 추가/편집</b> 메뉴�서� � 창� 열 수 있습니"
 "다."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s 님� %s 님� 친구 목� %s%s� 추가하고 싶어 합니다."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "배경색"
@@ -11766,6 +11808,8 @@ msgstr "연�처 별칭"
 msgid "Edit User Mood"
 msgstr "사용� 모드"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/친구(_B)"
@@ -12551,9 +12595,6 @@ msgstr "지�"
 msgid "webmaster"
 msgstr "개발�/웹마스터"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Win32 �팅"
 
@@ -12579,6 +12620,9 @@ msgstr "초기 제작�"
 msgid "lead developer"
 msgstr "수� 개발�"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13981,6 +14025,10 @@ msgid "_TURN server:"
 msgstr "STUN 서버(_U):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "�트 번호(_P):"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "사용�명(_U):"
 
@@ -14003,6 +14051,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "기본값 �용(_A)"
@@ -14022,6 +14075,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "수� 설정"
 
@@ -14594,7 +14655,7 @@ msgstr "(없�)"
 msgid "Small"
 msgstr "�메�"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15666,6 +15727,10 @@ msgstr "장치"
 msgid "Voice/Video Settings"
 msgstr "설정 편집"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "설정 편집"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15793,7 +15858,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "�것� XMPP 서버 �는 ���언트를 디버그 할 때� 편리한 플러그�입니다."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15923,6 +15988,23 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr "� 프로그램� 제거할 수 있는 권한� 없습니다."
 
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "구 SSL (�트 번호: 5223) � 강제�으로 사용"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "입력한 보안 ID 키는 잘못�었습니다."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[메시지� 잘못� 문�가 �함�어 있기 때문�, � 사용�로부터� 메시지를 "
+#~ "표시할 수 없습니다.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "정보로 친구 검색..."
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "지정한 아�디가 잘못�었습니다."
@@ -16449,9 +16531,6 @@ msgstr "� 프로그램� 제거할 수 있는 권한� 없습니다."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "쓰기 연결� 닫았습니다."
 
-#~ msgid "Connection reset"
-#~ msgstr "접� 초기화"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "소켓으로부터 �는 중 오류: %s"
 
@@ -16691,7 +16770,7 @@ msgstr "� 프로그램� 제거할 수 있는 권한� 없습니다."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "쓰기 모드�서 %s �(를) 열 수 없습니다!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "파� 전송� 실패했습니다. 아마� �대측�서 취소한 것 같습니다."
 
 #~ msgid "Could not connect for transfer."
@@ -16714,9 +16793,6 @@ msgstr "� 프로그램� 제거할 수 있는 권한� 없습니다."
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 프로토콜 플러그�"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s � 사용� 정보는 사용할 수 없습니다."
-
 #~ msgid "%s Options"
 #~ msgstr "%s 설정"
 
diff --git a/po/ku.po b/po/ku.po
index f3f9e8cab9..faffc33679 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-02-26 09:48+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
@@ -560,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Navê Makîneyê"
 
@@ -828,7 +827,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr "Li benda destpêkirina transferê ye"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Hate Betalkirin"
 
 msgid "Failed"
@@ -1789,7 +1788,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4864,11 +4865,20 @@ msgid "Domain"
 msgstr "Romanî"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "TLS Pêwist e"
+msgid "Require encryption"
+msgstr "Ji bo têketina %s 'ê vexwendin divê."
 
-msgid "Force old (port 5223) SSL"
-msgstr ""
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Heke hebe, TLS bikar bîne"
+
+#, fuzzy
+msgid "Use old-style SSL"
+msgstr "SSL'a kevn bikar bîne"
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Girêdan Hate Qutkirin"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Destûrê bide nivîsên ku ji pergalên neşîfrekirî tên."
@@ -6180,7 +6190,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Şîfreyên nû hev nagirin."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 msgid ""
@@ -6288,10 +6298,6 @@ msgid "Connecting..."
 msgstr "Girêdide"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
@@ -7202,6 +7208,17 @@ msgstr "Navnîşana pêşkêşkar"
 msgid "Server port"
 msgstr "Porta pêşkêşkar"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Ji kerema xwe re destûrê bide min, bi vî awayî ez dikarim te têxim lîsteya "
+"xwe ya hevalan."
+
+msgid "No reason given."
+msgstr "Navê xuya dibe tune."
+
+msgid "Authorization Denied Message:"
+msgstr "Mezinahiya Peyamê ya Xelet:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
@@ -7236,6 +7253,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Çewtiya pêkanîna girêdanan"
 
+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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Nekarî girêbide"
@@ -7476,90 +7506,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Wêne"
-
-msgid "Voice"
-msgstr "Deng"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "Pelî bistîne"
-
-msgid "Games"
-msgstr "Lîstik"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Pêvek"
-
-msgid "Send Buddy List"
-msgstr "Lîste bişîne"
-
-msgid "ICQ Direct Connect"
-msgstr "Girêdana Rasterast a ICQ"
-
-msgid "AP User"
-msgstr "Bikarhênera/ê AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Hîçparêz"
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 ya kevn"
-
-msgid "Trillian Encryption"
-msgstr "Şîfrekirina Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr "Ewlekarî çalake"
-
-msgid "Video Chat"
-msgstr "Sohbeta Bi Dîmen"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vîdeoya Zindî"
-
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Navê Ekranê"
-
 msgid "Free For Chat"
 msgstr "Li Benda Sohbetê ye"
 
@@ -7595,15 +7541,6 @@ msgstr "Tor"
 msgid "At lunch"
 msgstr "Li Xwarinê"
 
-msgid "IP Address"
-msgstr "Navnîşana IP'ê"
-
-msgid "Warning Level"
-msgstr "Asta Hişyarkirinê"
-
-msgid "Buddy Comment"
-msgstr "Raveya Hevalan"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Li pêşkêşkerê nehate girêdan."
@@ -7705,17 +7642,6 @@ msgstr "Şîfre hat andinş"
 msgid "Unable to initialize connection"
 msgstr "Girêdana nû nehat çêkirin."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Ji kerema xwe re destûrê bide min, bi vî awayî ez dikarim te têxim lîsteya "
-"xwe ya hevalan."
-
-msgid "No reason given."
-msgstr "Navê xuya dibe tune."
-
-msgid "Authorization Denied Message:"
-msgstr "Mezinahiya Peyamê ya Xelet:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7821,59 +7747,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Peyama %hu a ji %s ji ber sedemeke nayê zanîn, nehat ber destê te."
 msgstr[1] "Peyama %hu a ji %s ji ber sedemeke nayê zanîn, nehat ber destê te."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Online Since"
-msgstr "Maweya ku girêdayî mayî"
-
-msgid "Member Since"
-msgstr "Maweyê Girêdanê:"
-
-msgid "Capabilities"
-msgstr "Taybetmendî"
-
 msgid "Your AIM connection may be lost."
 msgstr "Dibe ku girêdana te ya AIM winda bûbe."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Girêdana te ya ji odeya sohbetê %s hate birrîn."
 
-msgid "Mobile Phone"
-msgstr "Telefona Destan"
-
-msgid "Personal Web Page"
-msgstr "Malpera Kesane"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Agahiyên Cureyên Nivîsê"
-
-msgid "Zip Code"
-msgstr "Zip Code"
-
-msgid "Work Information"
-msgstr "Agahiya karê"
-
-msgid "Division"
-msgstr "BeÅŸ"
-
-msgid "Position"
-msgstr "Pozisyon"
-
-msgid "Web Page"
-msgstr "Rûpela torê"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -8128,7 +8008,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Navnîşanê biguherîne bo:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>Tu ne li hêviya rêdanêyî</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8171,6 +8052,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lîsteya Kesan Nîşan Bide"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "vexwendina lîsteyê"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Hesab biçespîne"
@@ -8190,9 +8079,6 @@ msgstr "hevalên li hêviya destûrê nîşan bide"
 msgid "Search for Buddy by Email Address..."
 msgstr "Ji Xwe re bi E-peyaman li Hevalan Bigere"
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Bekarhêner neteketiye"
@@ -8297,6 +8183,165 @@ msgstr "Lîste tije ye"
 msgid "Not while on AOL"
 msgstr "Ne li ser AOL'ê"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Wêne"
+
+msgid "Voice"
+msgstr "Deng"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Pelî bistîne"
+
+msgid "Games"
+msgstr "Lîstik"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Pêvek"
+
+msgid "Send Buddy List"
+msgstr "Lîste bişîne"
+
+msgid "ICQ Direct Connect"
+msgstr "Girêdana Rasterast a ICQ"
+
+msgid "AP User"
+msgstr "Bikarhênera/ê AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Hîçparêz"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 ya kevn"
+
+msgid "Trillian Encryption"
+msgstr "Şîfrekirina Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Ewlekarî çalake"
+
+msgid "Video Chat"
+msgstr "Sohbeta Bi Dîmen"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vîdeoya Zindî"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Navê Ekranê"
+
+msgid "IP Address"
+msgstr "Navnîşana IP'ê"
+
+msgid "Warning Level"
+msgstr "Asta Hişyarkirinê"
+
+msgid "Buddy Comment"
+msgstr "Raveya Hevalan"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Telefona Destan"
+
+msgid "Personal Web Page"
+msgstr "Malpera Kesane"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Agahiyên Cureyên Nivîsê"
+
+msgid "Zip Code"
+msgstr "Zip Code"
+
+msgid "Work Information"
+msgstr "Agahiya karê"
+
+msgid "Division"
+msgstr "BeÅŸ"
+
+msgid "Position"
+msgstr "Pozisyon"
+
+msgid "Web Page"
+msgstr "Rûpela torê"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "Maweya ku girêdayî mayî"
+
+msgid "Member Since"
+msgstr "Maweyê Girêdanê:"
+
+msgid "Capabilities"
+msgstr "Taybetmendî"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Negirêdayî Nîşan Bide"
+
+msgid "Appear Offline"
+msgstr "Negirêdayî Nîşan Bide"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Negirêdayî Nîşan Bide"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Nexuya"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "vexwendina lîsteyê"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8516,7 +8561,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Ji bo têketina %s 'ê vexwendin divê."
 
 #, fuzzy
@@ -10739,18 +10784,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr "Ne di lîsteya pêşkêşker de ye"
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr "Her Dem Wekî Negirêdayî Bixuye"
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr "Negirêdayî Nîşan Bide"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Her Dem Wekî Negirêdayî Nexuye"
 
@@ -11289,27 +11328,26 @@ msgid " (%s)"
 msgstr "%s - %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "%s Deriyê sohbetê girt"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Dem Têra Girêdanê Nekir"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Girêdan pêk nehat."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Vî navê sohbetê vêga dixebite"
 
@@ -11454,6 +11492,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Bikarhêner %s dixwaze ku %s têxe lîsteya xwe ya hevalan."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11744,6 +11786,8 @@ msgstr "Navê Xuya Dibe"
 msgid "Edit User Mood"
 msgstr "Modên Bikarhêner"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kes"
@@ -12551,9 +12595,6 @@ msgstr "piştgirî"
 msgid "webmaster"
 msgstr "pêşxistinkar & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Porta win32"
 
@@ -12580,6 +12621,9 @@ msgstr "tîprêziya xweser"
 msgid "lead developer"
 msgstr "pêşxistinkar"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13998,6 +14042,10 @@ msgid "_TURN server:"
 msgstr "_Pêşkêşkar:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Navê bikarhêner:"
 
@@ -14020,6 +14068,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Yê Heyî Bipejirîne"
@@ -14039,6 +14092,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Bi destan"
 
@@ -14613,7 +14674,7 @@ msgstr "Herkes"
 msgid "Small"
 msgstr "E-peyam"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15707,6 +15768,10 @@ msgstr "Amûr"
 msgid "Voice/Video Settings"
 msgstr "Mîhengên Giştî Bikar Bîne"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Mîhengên Giştî Bikar Bîne"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15835,7 +15900,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15965,6 +16030,14 @@ msgid "You do not have permission to uninstall this application."
 msgstr "Destûra te ji bo rakirina vê bernameyê tune."
 
 #, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "TLS Pêwist e"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
@@ -16359,10 +16432,6 @@ msgstr "Destûra te ji bo rakirina vê bernameyê tune."
 #~ msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
 
 #, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "Girêdan Hate Qutkirin"
-
-#, fuzzy
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Girêdan venabe."
 
@@ -17096,9 +17165,6 @@ msgstr "Destûra te ji bo rakirina vê bernameyê tune."
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Pêveke Protokola Jabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Heke hebe, TLS bikar bîne"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Te niha lerizandinek ÅŸand!"
 
@@ -18042,9 +18108,6 @@ msgstr "Destûra te ji bo rakirina vê bernameyê tune."
 #~ msgid "Error retreiving roomlist"
 #~ msgstr "Xeletiya standina lîsteya odeyê"
 
-#~ msgid "Force old SSL"
-#~ msgstr "SSL'a kevn bikar bîne"
-
 #~ msgid "Hidden"
 #~ msgstr "Veşartî"
 
diff --git a/po/lo.po b/po/lo.po
index 919e9ff705..34d2d3e19f 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-04-29 09:28+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
@@ -498,7 +498,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -744,7 +743,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1601,7 +1600,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4458,10 +4459,16 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
 msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
@@ -5616,7 +5623,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5705,9 +5712,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6522,6 +6526,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6553,6 +6566,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6764,89 +6790,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr ""
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr ""
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -6878,15 +6821,6 @@ msgstr ""
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr ""
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -6973,15 +6907,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7075,58 +7000,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr ""
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-msgid "Position"
-msgstr ""
-
-msgid "Web Page"
-msgstr ""
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7366,7 +7246,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7403,6 +7283,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7419,9 +7305,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7524,6 +7407,158 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr ""
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7703,7 +7738,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -9778,18 +9813,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10306,27 +10335,22 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr ""
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr ""
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr ""
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10462,6 +10486,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10710,6 +10738,8 @@ msgstr ""
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -11440,9 +11470,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11468,6 +11495,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12738,6 +12768,9 @@ msgstr ""
 msgid "_TURN server:"
 msgstr ""
 
+msgid "_UDP Port:"
+msgstr ""
+
 #, fuzzy
 msgid "Use_rname:"
 msgstr "ຊື່ຜູ້ໃຊ້:"
@@ -12761,6 +12794,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12779,6 +12817,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -13294,7 +13340,7 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14276,6 +14322,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14397,7 +14446,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
diff --git a/po/lt.po b/po/lt.po
index 14f69d193a..618a1cf956 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-08-30 15:07+0200\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
 "Language-Team:\n"
@@ -539,7 +539,6 @@ msgstr "Patvirtinkite liudijimo pašalinimą"
 msgid "Certificate Manager"
 msgstr "Liudijimų tvarkytuvė"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Mazgo vardas"
 
@@ -826,7 +825,7 @@ msgstr "Sustabdyti"
 msgid "Waiting for transfer to begin"
 msgstr "Laukiama perdavimo pradžios"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Atšaukta"
 
 msgid "Failed"
@@ -1733,7 +1732,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 "Liudijimo galiojimas pasibaigęs.  Šis liudijimas neturėtų būti laikomas "
 "galiojan�iu."
@@ -4858,11 +4860,20 @@ msgstr "XMPP protokolo papildinys"
 msgid "Domain"
 msgstr "Sritis"
 
-msgid "Require SSL/TLS"
-msgstr "Reikalauti SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "BÅ«tina prieigos teisÄ—"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Priverstinai naudoti senÄ… 5223 prievado SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Vartotojo informacija neprieinama: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Jungties laukimo laikas baigÄ—si"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Leisti tapatybės nustatymą grynu tekstu nekoduojamame duomenų sraute"
@@ -6134,7 +6145,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Nauji slaptažodžiai nesutampa."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
 msgid ""
@@ -6241,10 +6252,6 @@ msgid "Connecting..."
 msgstr "Jungiamasi"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Įvestas SecurID raktas yra neteisingas."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
@@ -7133,6 +7140,17 @@ msgstr "Serverio adresas"
 msgid "Server port"
 msgstr "Serverio prievadas"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Prašau suteikti man prieigos teisę, kad aš galė�iau įtraukti Jus į savo "
+"bi�iulių sąrašą."
+
+msgid "No reason given."
+msgstr "Nenurodyta priežastis."
+
+msgid "Authorization Denied Message:"
+msgstr "Prieigos teisės nesuteikimo žinutė:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Gautas nelauktas atsakymas iš %s"
@@ -7167,6 +7185,25 @@ msgstr "AOL neleidžia jūsų vardui prisijungti"
 msgid "Error requesting %s"
 msgstr "Užklausos %s metu gauta klaida: %s"
 
+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 ""
+"(Priimant šią žinutę įvyko klaida.  Grei�iausiai bi�iulis su kuriuo "
+"bendraujate naudoja kitokią koduotę nei buvo numatyta.  Jei žinote, kokią "
+"koduotÄ™ jis naudoja, galite jÄ… nurodyti papildomose AIM/ICQ paskyros "
+"nuostatose."
+
+#, 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 ""
+"(Šio pranešimo gavimo metu įvyko klaida.  Arba Jūs ir %s esate pasirinkę "
+"skirtingas koduotes, arba %s naudoja kliento programÄ… su riktais.)"
+
 msgid "Could not join chat room"
 msgstr "Nepavyko prisijungti prie pokalbių kambario"
 
@@ -7423,96 +7460,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Failas „%s“ yra %s dydžio – didesnis nei maksimalus leidžiamas dydis %s."
 
-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 ""
-"(Priimant šią žinutę įvyko klaida.  Grei�iausiai bi�iulis su kuriuo "
-"bendraujate naudoja kitokią koduotę nei buvo numatyta.  Jei žinote, kokią "
-"koduotÄ™ jis naudoja, galite jÄ… nurodyti papildomose AIM/ICQ paskyros "
-"nuostatose."
-
-#, 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 ""
-"(Šio pranešimo gavimo metu įvyko klaida.  Arba Jūs ir %s esate pasirinkę "
-"skirtingas koduotes, arba %s naudoja kliento programÄ… su riktais.)"
-
-#  Label
-#. Label
-msgid "Buddy Icon"
-msgstr "Vartotojo paveiksliukas"
-
-msgid "Voice"
-msgstr "Balsas"
-
-msgid "AIM Direct IM"
-msgstr "AIM tiesioginės greitosios žinutės"
-
-msgid "Get File"
-msgstr "Gauti failai"
-
-msgid "Games"
-msgstr "Žaidimai"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Papildiniai"
-
-msgid "Send Buddy List"
-msgstr "Nusiųsti bi�iulių sąrašą"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ tiesioginÄ— jungtis"
-
-msgid "AP User"
-msgstr "AP vartotojas"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilistas"
-
-msgid "ICQ Server Relay"
-msgstr "Perdavimas per ICQ serverį"
-
-msgid "Old ICQ UTF8"
-msgstr "Senas ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian užkodavimas"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Su saugumu"
-
-msgid "Video Chat"
-msgstr "Vaizdinis pokalbis"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Tiesioginis vaizdas"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Ekrano dalinimasis"
-
 msgid "Free For Chat"
 msgstr "Prieinamas pokalbiui"
 
@@ -7548,15 +7495,6 @@ msgstr "Tinklas"
 msgid "At lunch"
 msgstr "išėjęs papietauti"
 
-msgid "IP Address"
-msgstr "IP adresas"
-
-msgid "Warning Level"
-msgstr "PerspÄ—jimo lygis"
-
-msgid "Buddy Comment"
-msgstr "Bi�iulio komentaras"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Nepavyko prisijungti prie tapatybÄ—s nustatymo serverio: %s"
@@ -7658,17 +7596,6 @@ msgstr "Išsiųstas slaptažodis"
 msgid "Unable to initialize connection"
 msgstr "Nepavyko sukurti jungties"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Prašau suteikti man prieigos teisę, kad aš galė�iau įtraukti Jus į savo "
-"bi�iulių sąrašą."
-
-msgid "No reason given."
-msgstr "Nenurodyta priežastis."
-
-msgid "Authorization Denied Message:"
-msgstr "Prieigos teisės nesuteikimo žinutė:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7801,61 +7728,13 @@ msgstr[1] ""
 msgstr[2] ""
 "Jūs praleidote %hu pranešimų nuo vartotojo %s dėl nežinomos priežasties."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Vartotojo informacija neprieinama: %s"
-
-msgid "Online Since"
-msgstr "Prisijungęs nuo"
-
-msgid "Member Since"
-msgstr "Narys nuo"
-
-msgid "Capabilities"
-msgstr "SugebÄ—jimai"
-
 msgid "Your AIM connection may be lost."
 msgstr "Jūsų AIM jungtis gali būti prarasta."
 
-#  The conversion failed!
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Negalima pavaizduoti žinutės nuo šio vartotojo, kadangi joje yra neteisingų "
-"simbolių.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Jūs buvote atjungtas nuo pokalbių kambario %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilus telefonas"
-
-msgid "Personal Web Page"
-msgstr "AsmeninÄ— svetainÄ—"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Papildoma informacija"
-
-msgid "Zip Code"
-msgstr "Pašto kodas"
-
-msgid "Work Information"
-msgstr "DarbovietÄ—s informacija"
-
-msgid "Division"
-msgstr "Skyrius"
-
-msgid "Position"
-msgstr "Pareigos"
-
-msgid "Web Page"
-msgstr "SvetainÄ—"
-
 msgid "Pop-Up Message"
 msgstr "Iššokanti žinutė"
 
@@ -8148,7 +8027,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Pakeisti adresą į:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>jūs nelaukiate prieigos suteikimo</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8188,6 +8068,14 @@ msgstr "Konfigūruoti žinu�ių persiuntimą (žiniatinklis)..."
 msgid "Set Privacy Options..."
 msgstr "Nustatyti privatumo parinktis..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "_Rodyti bi�iulių sąrašą"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Pakvietimų sąrašas"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Patvirtinti abonentÄ…"
@@ -8204,9 +8092,6 @@ msgstr "Parodyti bi�iulius, laukian�ius prieigos suteikimo"
 msgid "Search for Buddy by Email Address..."
 msgstr "Ieškoti bi�iulio pagal el. pašto adresą..."
 
-msgid "Search for Buddy by Information"
-msgstr "Ieškoti bi�iulio pagal informaciją"
-
 msgid "Use clientLogin"
 msgstr "Naudoti „clientLogin“"
 
@@ -8314,6 +8199,167 @@ msgstr "EilÄ— pilna"
 msgid "Not while on AOL"
 msgstr "Negalima prisijungus per AOL"
 
+#  Label
+#. Label
+msgid "Buddy Icon"
+msgstr "Vartotojo paveiksliukas"
+
+msgid "Voice"
+msgstr "Balsas"
+
+msgid "AIM Direct IM"
+msgstr "AIM tiesioginės greitosios žinutės"
+
+msgid "Get File"
+msgstr "Gauti failai"
+
+msgid "Games"
+msgstr "Žaidimai"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Papildiniai"
+
+msgid "Send Buddy List"
+msgstr "Nusiųsti bi�iulių sąrašą"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ tiesioginÄ— jungtis"
+
+msgid "AP User"
+msgstr "AP vartotojas"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilistas"
+
+msgid "ICQ Server Relay"
+msgstr "Perdavimas per ICQ serverį"
+
+msgid "Old ICQ UTF8"
+msgstr "Senas ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian užkodavimas"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Su saugumu"
+
+msgid "Video Chat"
+msgstr "Vaizdinis pokalbis"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Tiesioginis vaizdas"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Ekrano dalinimasis"
+
+msgid "IP Address"
+msgstr "IP adresas"
+
+msgid "Warning Level"
+msgstr "PerspÄ—jimo lygis"
+
+msgid "Buddy Comment"
+msgstr "Bi�iulio komentaras"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Vartotojo informacija neprieinama: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilus telefonas"
+
+msgid "Personal Web Page"
+msgstr "AsmeninÄ— svetainÄ—"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Papildoma informacija"
+
+msgid "Zip Code"
+msgstr "Pašto kodas"
+
+msgid "Work Information"
+msgstr "DarbovietÄ—s informacija"
+
+msgid "Division"
+msgstr "Skyrius"
+
+msgid "Position"
+msgstr "Pareigos"
+
+msgid "Web Page"
+msgstr "SvetainÄ—"
+
+msgid "Online Since"
+msgstr "Prisijungęs nuo"
+
+msgid "Member Since"
+msgstr "Narys nuo"
+
+msgid "Capabilities"
+msgstr "SugebÄ—jimai"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Atrodyti prisijungusiu"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Atrodyti prisijungusiu"
+
+msgid "Appear Offline"
+msgstr "Atrodyti atsijungusiu"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Atrodyti atsijungusiu"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Tave išspyrė (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Jūs galite iš naujo paprašyti prieigos suteikimo iš šių bi�iulių "
+"spragtelėdamas dešiniuoju klavišu ant jų ir pasirinkdamas „Iš naujo "
+"paprašyti prieigos teisės“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Matomas"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Pakvietimų sąrašas"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vandenis"
 
@@ -8496,8 +8542,8 @@ msgstr "Jūsų užklausta priimta."
 msgid "Your request was rejected."
 msgstr "Jūsų užklausta atmesta."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u reikalauja patikrinimo"
 
 msgid "Add buddy question"
@@ -10763,18 +10809,12 @@ msgstr "Trumpam išėjęs"
 msgid "Not on server list"
 msgstr "Nėra serverio sąraše"
 
-msgid "Appear Online"
-msgstr "Atrodyti prisijungusiu"
-
 msgid "Appear Permanently Offline"
 msgstr "Atrodyti atsijungusiu"
 
 msgid "Presence"
 msgstr "BÅ«sena"
 
-msgid "Appear Offline"
-msgstr "Atrodyti atsijungusiu"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Neatrodyti atsijungusiu"
 
@@ -11333,27 +11373,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Jungtis nutraukta kitos programos jūsų kompiuteryje."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Nutolęs mazgas uždarė jungtį."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Jungties laukimo laikas baigÄ—si."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Jungtis atmesta."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresas jau užimtas"
 
@@ -11505,6 +11540,10 @@ msgstr ""
 "Vėliau galite sugrįžti į šį langą sukurti, keisti, ar pašalinti paskyrų per "
 "<b>Paskyros->Tvarkyti paskyras</b> meniu bi�iulių sąrašo lange."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Vartotojas %s%s%s%s nori pridėti %s į savo bi�iulių sąrašą%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Fono spalva"
@@ -11766,6 +11805,8 @@ msgid "Edit User Mood"
 msgstr "Nustatyti vartotojo nuotaikÄ…"
 
 #  Buddies menu
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Bi�iuliai"
@@ -12552,9 +12593,6 @@ msgstr "palaikymas"
 msgid "webmaster"
 msgstr "svetainÄ—s administratorius"
 
-msgid "Senior Contributor/QA"
-msgstr "Vyresnysis bendradarbis/kokybÄ—s kontrolÄ—"
-
 msgid "win32 port"
 msgstr "perkėlimas į win32"
 
@@ -12580,6 +12618,9 @@ msgstr "pradinis autorius"
 msgid "lead developer"
 msgstr "pagrindinis kūrėjas"
 
+msgid "Senior Contributor/QA"
+msgstr "Vyresnysis bendradarbis/kokybÄ—s kontrolÄ—"
+
 msgid "Afrikaans"
 msgstr "Būrų kalba"
 
@@ -13976,6 +14017,10 @@ msgid "_TURN server:"
 msgstr "_Serveris:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Prievadas:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Naudotojo vardas:"
 
@@ -13998,6 +14043,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Darbalaukio numatytasis"
 
@@ -14016,6 +14066,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Rankinis"
 
@@ -14565,7 +14623,8 @@ msgstr "Jokių šypsenėlių"
 msgid "Small"
 msgstr "Mažas"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mažesni numatytųjų šypsenėlių variantai"
 
 msgid "Response Probability:"
@@ -15728,6 +15787,11 @@ msgstr "Į_renginys"
 msgid "Voice/Video Settings"
 msgstr "Balso ir vaizdo nustatymai"
 
+#  Use Environmental Settings
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Balso ir vaizdo nustatymai"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15869,7 +15933,7 @@ msgstr "Siųsti ir gauti neapdorotas XMPP strofas."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16004,6 +16068,27 @@ msgstr "Aplankyti Pidgin tinklalapį"
 msgid "You do not have permission to uninstall this application."
 msgstr "Jūs neturite teisių išdiegti šios programos."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Reikalauti SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Priverstinai naudoti senÄ… 5223 prievado SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Įvestas SecurID raktas yra neteisingas."
+
+#  The conversion failed!
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Negalima pavaizduoti žinutės nuo šio vartotojo, kadangi joje yra "
+#~ "neteisingų simbolių.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Ieškoti bi�iulio pagal informaciją"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Liudijimas dar neįsigaliojęs."
 
diff --git a/po/mai.po b/po/mai.po
new file mode 100644
index 0000000000..8e61e38a1a
--- /dev/null
+++ b/po/mai.po
@@ -0,0 +1,14920 @@
+# translation of pidgin_mai.po to Maithili
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sangeeta Kumari <sangeeta_0975@yahoo.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin_mai\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-09-02 18:48+0530\n"
+"Last-Translator: sangeeta_0975@yahoo.com>\n"
+"Language-Team: Maithili <http://code.google.com/p/bhashaghar>\n"
+"Language: mai\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
+"\n"
+"\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Finch"
+msgstr "फिंच"
+
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. `%s -h' के� बेसी सूचनाक लेल प�रयत�न करू.\n"
+
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stderr\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, 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 पर रिपोट करू"
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "त�र�टि"
+
+msgid "Account was not modified"
+msgstr ""
+
+msgid "Account was not added"
+msgstr "खाता जोड़ल नहि छल"
+
+msgid "Username of an account must be non-empty."
+msgstr ""
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid "New mail notifications"
+msgstr "नव डाक सूचना"
+
+msgid "Remember password"
+msgstr "ग�ड़किल�ली याद राखू"
+
+msgid "There are no protocol plugins installed."
+msgstr ""
+
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(अहा� स�भवतः 'make install' करबाक लेल बिसरि गेलह��.)"
+
+msgid "Modify Account"
+msgstr "खाता संशोधित करू"
+
+msgid "New Account"
+msgstr "नव खाता"
+
+msgid "Protocol:"
+msgstr "प�रोटोकॉल:"
+
+msgid "Username:"
+msgstr "प�रयोक�ताक नाम:"
+
+msgid "Password:"
+msgstr "ग�ड़किल�ली: "
+
+msgid "Alias:"
+msgstr "उपनाम:"
+
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr ""
+
+#. Cancel button
+#. Cancel
+msgid "Cancel"
+msgstr "रद करू"
+
+#. Save button
+#. Save
+msgid "Save"
+msgstr "सहेजू"
+
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "की अहा� निश�चित अछि जे %s के� मेटाव� चाहैत छी?"
+
+msgid "Delete Account"
+msgstr "खाता मेटाउ"
+
+#. Delete button
+msgid "Delete"
+msgstr "मेटाउ"
+
+msgid "Accounts"
+msgstr "खाता"
+
+msgid "You can enable/disable accounts from the following list."
+msgstr "निम�नलिखित सूचीस� अहा� खाताके� सक�रिय/निष�क�रिय क� सकै छी"
+
+#. Add button
+msgid "Add"
+msgstr "जोड़ू"
+
+#. Modify button
+msgid "Modify"
+msgstr "स�धारू"
+
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s बनैने अछि %s ह�नक' %s%s मीत"
+
+msgid "Add buddy to your list?"
+msgstr "मीतके� अपन सूचीमे जोड़ू?"
+
+#, 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मे जोड़बाक लेल चाहैत अछि."
+
+msgid "Authorize buddy?"
+msgstr "मीत प�राधिकृत करू?"
+
+msgid "Authorize"
+msgstr "प�राधिकृत करू"
+
+msgid "Deny"
+msgstr "मना करू"
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"औनलाइन: %d\n"
+"क�ल: %d"
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "खाता: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"अंतिम बेर देखल गेल:%s पहिने"
+
+msgid "Default"
+msgstr "पूर�वनिर�धारित"
+
+msgid "You must provide a username for the buddy."
+msgstr ""
+
+msgid "You must provide a group."
+msgstr "अहा� �कटा समूह जरूर दिअ'."
+
+msgid "You must select an account."
+msgstr "अहा� जरूर �कटा खाता च�नू."
+
+msgid "The selected account is not online."
+msgstr "च�नलका खाता औनलाइन नहि अछि."
+
+msgid "Error adding buddy"
+msgstr "मीतके� जोड़बाकमे त�र�टि"
+
+msgid "Username"
+msgstr "प�रयोक�तानाम"
+
+msgid "Alias (optional)"
+msgstr "उपनाम (वैकल�पिक)"
+
+msgid "Add in group"
+msgstr "समूहमे जोड़ू"
+
+msgid "Account"
+msgstr "खाता"
+
+msgid "Add Buddy"
+msgstr "मीत जोड़ू"
+
+msgid "Please enter buddy information."
+msgstr "कृप�या मीतक सूचना डालू."
+
+msgid "Chats"
+msgstr "बतियाउ"
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr "नाम"
+
+msgid "Alias"
+msgstr "उपनाम"
+
+msgid "Group"
+msgstr "समूह"
+
+msgid "Auto-join"
+msgstr "स�वतः सामिल होउ"
+
+msgid "Add Chat"
+msgstr "बतियाउ"
+
+msgid "You can edit more information from the context menu later."
+msgstr "अहा� संदर�भ मेनूस� बेसी सूचनाके� बादमे संपादित क� सकै छी."
+
+msgid "Error adding group"
+msgstr "समूह जोड़बाकमे त�र�टि"
+
+msgid "You must give a name for the group to add."
+msgstr "अहा�के� जोड़बाक लेल �कटा नाम जरूर देबाक चाही."
+
+msgid "Add Group"
+msgstr "समूह जोड़ू"
+
+msgid "Enter the name of the group"
+msgstr "समूहक नाम भरू."
+
+msgid "Edit Chat"
+msgstr "गप�प-सप�प संपादित करू"
+
+msgid "Please Update the necessary fields."
+msgstr "आवश�यक क�षेत�रके� कृप�या अद�यतन करू."
+
+msgid "Edit"
+msgstr "संपादन"
+
+msgid "Edit Settings"
+msgstr "सेटिंग संपादित करू"
+
+msgid "Information"
+msgstr "सूचना"
+
+msgid "Retrieving..."
+msgstr "पाउ रहल अछि..."
+
+msgid "Get Info"
+msgstr "सूचना पाउ"
+
+msgid "Add Buddy Pounce"
+msgstr "मीतक थाप जोड़ू"
+
+msgid "Send File"
+msgstr "फाइल पठाउ"
+
+msgid "Blocked"
+msgstr "रोकल गेल"
+
+msgid "Show when offline"
+msgstr "देखाउ जखन आफलाइन"
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "%s क' लेल कृप�या नव नाम डालू."
+
+msgid "Rename"
+msgstr "नाम बदलू"
+
+msgid "Set Alias"
+msgstr "उपनाम सेट करू"
+
+msgid "Enter empty string to reset the name."
+msgstr "कृप�या नामक फिन� सेट करबाक लेल खाली स�ट�रिंग डालू."
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "ई संपर�कके� हट�बाकस� संपर�कस� सभमीतके� बाहर क' देताह"
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "ई समूहके� हट�बाकस� संपर�कस� सभमीतके� बाहर क' देताह"
+
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "की अहा� निश�चित अछि जे %s के� मिटावै चाहै छी?"
+
+#. XXX: anything to do with the returned ui-handle?
+msgid "Confirm Remove"
+msgstr "हटा�ब स�निश�चित करू"
+
+msgid "Remove"
+msgstr "हटाबू"
+
+#. Buddy List
+msgid "Buddy List"
+msgstr "मीत सूची"
+
+msgid "Place tagged"
+msgstr "टैग राखू"
+
+msgid "Toggle Tag"
+msgstr "टैग टागल करू"
+
+msgid "View Log"
+msgstr "लौग देखू"
+
+#. General
+msgid "Nickname"
+msgstr "उपनाम"
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+msgid "Idle"
+msgstr "निष�क�रिय"
+
+msgid "On Mobile"
+msgstr "मोबाइल पर"
+
+msgid "New..."
+msgstr "नव..."
+
+msgid "Saved..."
+msgstr "सहेजल..."
+
+msgid "Plugins"
+msgstr "प�लगिन"
+
+msgid "Block/Unblock"
+msgstr "रोकू/नहि रोकू"
+
+msgid "Block"
+msgstr "रोकू"
+
+msgid "Unblock"
+msgstr "अनब�लाक"
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+msgid "OK"
+msgstr "बेस"
+
+msgid "New Instant Message"
+msgstr "नव इंस�टेंट संदेश"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
+msgid "Channel"
+msgstr "चैनल"
+
+msgid "Join a Chat"
+msgstr "गप�प-सप�पस� ज�ड़ू"
+
+msgid "Please enter the name of the chat you want to join."
+msgstr "कृप�या चैटक नाम दिअ' जकरामे अहा� सामिल ह�बाक लेल चाहैत छी."
+
+msgid "Join"
+msgstr "सामिल होउ"
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
+#. Create the "Options" frame.
+msgid "Options"
+msgstr "विकल�प"
+
+msgid "Send IM..."
+msgstr "IM पठाउ..."
+
+msgid "Block/Unblock..."
+msgstr "रोकू/नहि रोकू..."
+
+msgid "Join Chat..."
+msgstr "चैटमे सामिल होउ..."
+
+msgid "View Log..."
+msgstr "लौग देखू..."
+
+msgid "View All Logs"
+msgstr ""
+
+msgid "Show"
+msgstr "देखाउ"
+
+msgid "Empty groups"
+msgstr "रिक�त समूहसभ"
+
+msgid "Offline buddies"
+msgstr "आफलाइन मीतसभ"
+
+msgid "Sort"
+msgstr "छा�टू"
+
+msgid "By Status"
+msgstr "स�थिति द�वारा"
+
+msgid "Alphabetically"
+msgstr "वर�णक�रममे"
+
+msgid "By Log Size"
+msgstr "लौग आकार द�वारा"
+
+msgid "Buddy"
+msgstr "मीत"
+
+msgid "Chat"
+msgstr "गप�प-सप�प"
+
+msgid "Grouping"
+msgstr "समूहन"
+
+msgid "Certificate Import"
+msgstr "प�रमाणपत�र आयात"
+
+msgid "Specify a hostname"
+msgstr "होस�टनाम निर�दिष�ट करू"
+
+msgid "Type the host name this certificate is for."
+msgstr "होस�टनाम टाइप करू जकरा लेल ई प�रमाणपत�र अछि."
+
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"फाइल %s आयात नहि क�ल जा� सकल.\n"
+"स�निश�चित करू जे फाइल पठनीय अछि आओर PEM प�रारूपमे अछि.\n"
+
+msgid "Certificate Import Error"
+msgstr "प�रमाणपत�र आयात त�र�टि"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 प�रमाणपत�र आयात विफल"
+
+msgid "Select a PEM certificate"
+msgstr "PEM प�रमाणपत�र च�नू"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"फाइल %s मे निर�यात विफल.\n"
+"जा�चू जे अहा�क लक�ष�य पथमे लिखबाक अन�मति अछि\n"
+
+msgid "Certificate Export Error"
+msgstr "प�रमाणपत�र निर�यात त�र�टि"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 प�रमाणपत�र निर�यात विफल"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 प�रमाणपत�र निर�यात"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s क' लेल प�रमाणपत�र"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"सामान�य नाम: %s\n"
+"\n"
+"SHA1 फि�गरप�रिंट:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL होस�ट प�रमाणपत�र"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "सच�चे %s क' लेल प�रमाणपत�र मेटाबै चाहैत छी?"
+
+msgid "Confirm certificate delete"
+msgstr "प�रमाणपत�र मेटोअनाइ स�प�ष�ट करू"
+
+msgid "Certificate Manager"
+msgstr "प�रमाणपत�र प�रबंधक"
+
+msgid "Hostname"
+msgstr "होस�टनाम"
+
+msgid "Info"
+msgstr "सूचना"
+
+#. Close button
+msgid "Close"
+msgstr "बन�न करू"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s विसंबंधित."
+
+#, 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 ""
+"%s\n"
+"\n"
+"फि�च खातास� फिन� ज�ड़ैक प�रयास नहि करताह जखन तकि अहा� त�र�टि सही करैत छी आओर फिन� खाता "
+"सक�रिय नहि करैत छी."
+
+msgid "Re-enable Account"
+msgstr "खाता प�नर�सक�रिय करू"
+
+msgid "No such command."
+msgstr "�हन कोनो कमांड नहि अछि."
+
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "वाक�यविन�यास त�र�टि: �हि कमांडमे अहा� गलत संख�याक तर�क टंकित क�लह��."
+
+msgid "Your command failed for an unknown reason."
+msgstr "अहा�क कमांड अनचिन�ह कारणसं विफल भ' गेल."
+
+msgid "That command only works in chats, not IMs."
+msgstr "ई कमांड केवल गप�प-सप�पमे चलैत अछि, आइ�ममे नहि."
+
+msgid "That command only works in IMs, not chats."
+msgstr "ई कमांड केवल आइ�ममे काज करैछ, गप�प-सप�पमे नहि."
+
+msgid "That command doesn't work on this protocol."
+msgstr "ई कमांड �हि प�रोटोकोलमे नहि काज करैछ."
+
+msgid "Message was not sent, because you are not signed on."
+msgstr "संदेश पठा�ल नहि जा� सकल कारण अहा� साइनआन नहि छी."
+
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s टंकित क� रहल अछि..."
+
+msgid "You have left this chat."
+msgstr "अहा� ई गप�प-सप�प�के� छोड़ि देलह��"
+
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"खाताक कनेक�शन टूटि गेल अछि आओर अहा� आबि गप�प सप�पमे नहि अछि. अहा� गप�प सप�पमे फिन� सामिल "
+"अपने भ' जा�म जखन खाता फिन� ज�डैछ."
+
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "लागिन श�रू भ' गेल. ई वार�तालापक आगा�क संदेशक लाग रहत."
+
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "लागिंग रूक गेल छल. ई वार�तालापक भविष�यक संदेश नहि लाग भ' सकताह."
+
+msgid "Send To"
+msgstr "�हिमे पठाउ"
+
+msgid "Conversation"
+msgstr "वार�तालाप"
+
+msgid "Clear Scrollback"
+msgstr "स�क�रालबैक साफ करू"
+
+msgid "Show Timestamps"
+msgstr "टाइमस�टेंप�स देखाउ"
+
+msgid "Add Buddy Pounce..."
+msgstr "मीत थाप जोड़ू..."
+
+msgid "Invite..."
+msgstr ""
+
+msgid "Enable Logging"
+msgstr "लौगिंग सक�रिय करू"
+
+msgid "Enable Sounds"
+msgstr "ध�वनि सक�रिय करू"
+
+msgid "You are not connected."
+msgstr ""
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Supported debug options are: plugins version"
+msgstr ""
+
+msgid "No such command (in this context)."
+msgstr "�हन कोनो कमांड नहि अछि (�हि प�रसंगमे)."
+
+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"
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr "कहू &lt;संदेश&gt;: सामान�य ढंगस� संदेश पठाउ जना अहा� कमांडक प�रयोग नहि क� रहल छलह��"
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "हमर &lt;काज&gt;: �कटा मीत अथवा गप�प-सप�पके� �कटा IRC शैली काज पठाउ."
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "डिबग &lt;विकल�प&gt;: विविध डिबग सूचना वर�तमान वार�तालापमे पठाउ."
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "साफ करू: वार�तालाप स�क�रॉलबैक साफ करैछ"
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "मदति &lt;कमांड&gt;: �कटा विशेष कमांड पर मदति."
+
+msgid "users:  Show the list of users in the chat."
+msgstr "प�रयोक�तासभ:  गप�पसप�पमे प�रयोक�तासभक सूची देखाउ."
+
+msgid "plugins: Show the plugins window."
+msgstr "प�लगिन: प�लगिन बिंडो देखाउ."
+
+msgid "buddylist: Show the buddylist."
+msgstr "मीतसूची: मीतसूची देखाउ."
+
+msgid "accounts: Show the accounts window."
+msgstr "खाता: खाता बिंडो देखाउ."
+
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: डिबग बिंडो देखाउ."
+
+msgid "prefs: Show the preference window."
+msgstr "वरीयता: वरीयता बिंडो देखाउ."
+
+msgid "statuses: Show the savedstatuses window."
+msgstr "वस�त�स�थिति: savedstatuses बिंडो देखाउ."
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
+msgid "Unable to open file."
+msgstr "फाइल खोल�मे असमर�थ"
+
+msgid "Debug Window"
+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.
+#.
+msgid "Clear"
+msgstr "खाली"
+
+msgid "Filter:"
+msgstr "फिल�टर:"
+
+msgid "Pause"
+msgstr "ठहरू"
+
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Create the window.
+msgid "File Transfers"
+msgstr "फाइल हस�तांतरण"
+
+msgid "Progress"
+msgstr "प�रगति"
+
+msgid "Filename"
+msgstr "फाइलनाम"
+
+msgid "Size"
+msgstr "आकार"
+
+msgid "Speed"
+msgstr "गति"
+
+msgid "Remaining"
+msgstr "शेष"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#. presence
+msgid "Status"
+msgstr "स�थिति"
+
+msgid "Close this window when all transfers finish"
+msgstr "ई बिंडो बन�न करू जखन सभटा हस�तांतरण समाप�त भ' जाइछ"
+
+msgid "Clear finished transfers"
+msgstr "खतम भेल हस�तांतरण साफ करू"
+
+msgid "Stop"
+msgstr "रोकू"
+
+msgid "Waiting for transfer to begin"
+msgstr "हस�तांतरणक श�र� हो�बाक प�रतीक�षा करैछ"
+
+msgid "Cancelled"
+msgstr "रद क�ल गेल"
+
+msgid "Failed"
+msgstr "असफल"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "भेजल-डाक"
+
+msgid "Received"
+msgstr "हस�तगत"
+
+msgid "Finished"
+msgstr "समाप�त"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "फाइल %s क' रूपे� सहेजल गेल छल."
+
+msgid "Sending"
+msgstr "पठा� रहल अछि"
+
+msgid "Receiving"
+msgstr "प�राप�त क� रहल अछि"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "%s मे वार�तालाप %s पर"
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "%s क' संग %s पर वार�तालाप"
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"सिस�टम घटना लौग क�ल ज�ताह ज� \"सिस�टम लौगमे स�थितिसभ लौग करू\" वरीयता सक�रिय अछि."
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr "इंस�टेंट मेसेंजर लौग क�ल ज�ताह ज� \"द�र�त संदेशसभ\" वरीयता सक�रिय अछि."
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "गप�प-सप�पक लौग क�ल जा�ताह ज� \" बतियानाई लौग करू\" सक�रिय अछि."
+
+msgid "No logs were found"
+msgstr "कोनो लौग नहि भेटल"
+
+msgid "Total log size:"
+msgstr "क�ल लौग आकार:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "स�क�रौल/खोजू: "
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "%s मे वार�तालाप"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s क संग वार�तालाप"
+
+msgid "All Conversations"
+msgstr ""
+
+msgid "System Log"
+msgstr "तंत�र लौग"
+
+msgid "Calling..."
+msgstr ""
+
+msgid "Hangup"
+msgstr "हैंगअप"
+
+#. Number of actions
+msgid "Accept"
+msgstr "स�वीकारू"
+
+msgid "Reject"
+msgstr "अस�वीकृत करू"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
+msgid "Emails"
+msgstr "इमेल"
+
+msgid "You have mail!"
+msgstr "अहा�क लेल मेल अछि!"
+
+msgid "Sender"
+msgstr "प�रेषक"
+
+msgid "Subject"
+msgstr "विषय"
+
+#, 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 नव संदेश राखैत अछि."
+
+msgid "New Mail"
+msgstr "नव मेल"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s लेल सूचना"
+
+msgid "Buddy Information"
+msgstr "मीत सूचना"
+
+msgid "Continue"
+msgstr "जारी राखू"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "आमंत�रित करू"
+
+msgid "(none)"
+msgstr "(कोनो नहि)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+msgid "URI"
+msgstr "URI"
+
+msgid "ERROR"
+msgstr "त�र�टि"
+
+msgid "loading plugin failed"
+msgstr "प�लगिन लोड क�नाइ विफल"
+
+msgid "unloading plugin failed"
+msgstr "प�लगिन अनलोड क�नाइ विफल"
+
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"नाम: %s\n"
+"संस�करण: %s\n"
+"विवरण: %s\n"
+"लेखक: %s\n"
+"वेबसाइट: %s\n"
+"फाइलनाम: %s\n"
+
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "बिन�यस�त करबाक पूर�व प�लगिन लोड करबाक जरूरत अछि."
+
+msgid "No configuration options for this plugin."
+msgstr "ई प�लगिन लेल कोनहो बिन�यास बिकल�प नहि"
+
+msgid "Error loading plugin"
+msgstr "प�लगिन लोड करबामे त�र�टि"
+
+msgid "The selected file is not a valid plugin."
+msgstr "च�नलका फाइल �कटा वैध प�लगिन नहि अछि."
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr "डिबग विंडो खोलू आओर फिन� सही त�र�टि स�देशके� देखबाक कओसिस करू."
+
+msgid "Select plugin to install"
+msgstr "स�स�थापित करबाक लेल प�लगिन च�नू"
+
+msgid "You can (un)load plugins from the following list."
+msgstr "अहा� नीच�चा� देल सूचीस� प�लगिन (अन)लोड क� सकैछ."
+
+msgid "Install Plugin..."
+msgstr "प�लगिन स�स�थापित करू..."
+
+msgid "Configure Plugin"
+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
+msgid "Preferences"
+msgstr "पसिन�न"
+
+msgid "Please enter a buddy to pounce."
+msgstr "कृप�या थाप मारैक' लेल मीतक नाम भरू."
+
+msgid "New Buddy Pounce"
+msgstr "नव मीतक थाप"
+
+msgid "Edit Buddy Pounce"
+msgstr "मीतक थाप संपादित करू"
+
+msgid "Pounce Who"
+msgstr "किनकापर थाप दिअ"
+
+#. Account:
+msgid "Account:"
+msgstr "खाता:"
+
+msgid "Buddy name:"
+msgstr "मीतक नाम:"
+
+#. Create the "Pounce When Buddy..." frame.
+msgid "Pounce When Buddy..."
+msgstr "थाप दिअ जखन मीत..."
+
+msgid "Signs on"
+msgstr "साइन आन"
+
+msgid "Signs off"
+msgstr "साइन आफ"
+
+msgid "Goes away"
+msgstr "दूरि जाइछ"
+
+msgid "Returns from away"
+msgstr "दूरिस� वापिस घ�म�"
+
+msgid "Becomes idle"
+msgstr "निष�क�रिय भ' जाइछ"
+
+msgid "Is no longer idle"
+msgstr "आबि निष�क�रिय नहि अछि"
+
+msgid "Starts typing"
+msgstr "टाइपि�ग श�रू करैत अछि"
+
+msgid "Pauses while typing"
+msgstr "टाइपि�गक मध�य ठहरैत अछि"
+
+msgid "Stops typing"
+msgstr "टाइप क�नाइ बन�न करैत अछि"
+
+msgid "Sends a message"
+msgstr "�कटा सन�देश पठाबैत अछि"
+
+#. Create the "Action" frame.
+msgid "Action"
+msgstr "क�रिया"
+
+msgid "Open an IM window"
+msgstr "�कटा IM विंडो खोलू"
+
+msgid "Pop up a notification"
+msgstr "अधिसूचना पापअप करू"
+
+msgid "Send a message"
+msgstr "�कटा सन�देश पठाउ"
+
+msgid "Execute a command"
+msgstr "�कटा कमा�ड चलाउ"
+
+msgid "Play a sound"
+msgstr "ध�वनि बजाउ"
+
+msgid "Pounce only when my status is not Available"
+msgstr "थाप दिअ' जखन हमर स�थिति उपलब�ध नहि अछि"
+
+msgid "Recurring"
+msgstr "आवृत�ति"
+
+msgid "Cannot create pounce"
+msgstr "थाप नहि बना� सकैत अछि"
+
+msgid "You do not have any accounts."
+msgstr "अहा�क कोनो खाता नहि अछि."
+
+msgid "You must create an account first before you can create a pounce."
+msgstr "अहा�क जरूर �कटा खाता पहिने बनओनाइ चाही �करास� पहिने जे अहा� �कटा थाप बनबैत छी."
+
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "की अहा� निश�चित अछि जे अहा� %s पर %s लेल थापके� मिटाबै लेल चाहैछ?"
+
+msgid "Buddy Pounces"
+msgstr "मीतक थाप"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s अहा�क लेल टाइप क�नाइ चालू क� दैलकैछ (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s अहा�क लेल टाइप करबाक कालमे ठहरि गेलाह (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s साइनआन क�लक अछि (%s) "
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s बेकारीस� वापस आबि गेल अछि (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s अन�पस�थिति स� वापस आबि गेल अछि (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s अहा� लेल टाइप क�नाइ बन�न क� देल अछि (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s साइन औफ क� च�कल अछि (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s बेकार बैठल अछि (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s अन�पस�थित अछि. (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s अहा�क �क संदेश पठा�लक अछि. (%s)"
+
+msgid "Unknown pounce event. Please report this!"
+msgstr "अनचिन�ह थाप घटना. कृप�या �कर रपट करू!"
+
+msgid "Based on keyboard use"
+msgstr "क��जीपटलक प�रयोग पर आधारित"
+
+msgid "From last sent message"
+msgstr "अंतिम भेजलल संदेश स�"
+
+msgid "Never"
+msgstr "कहियो नहि"
+
+msgid "Show Idle Time"
+msgstr "बेकार समय देखाउ"
+
+msgid "Show Offline Buddies"
+msgstr "आफलाइन मीत देखाउ"
+
+msgid "Notify buddies when you are typing"
+msgstr "टंकित करबाक दौरान मीतके� अधिसूचित करू"
+
+msgid "Log format"
+msgstr "लाग रचना"
+
+msgid "Log IMs"
+msgstr "लाग IM"
+
+msgid "Log chats"
+msgstr "बतियानाई लाग करू"
+
+msgid "Log status change events"
+msgstr "लाग स�थिति परिवर�तन घटना"
+
+msgid "Report Idle time"
+msgstr "निष�क�रिय समय रिपोट करू"
+
+msgid "Change status when idle"
+msgstr "जखन बेकार अछि त� स�थिति बदलू"
+
+msgid "Minutes before changing status"
+msgstr "स�थितिक बदलबाक पहिने मिनट"
+
+msgid "Change status to"
+msgstr "�त� स�थिति बदलू"
+
+msgid "Conversations"
+msgstr "गप�प-सप�प"
+
+msgid "Logging"
+msgstr "लाग क� रहल अछि"
+
+msgid "You must fill all the required fields."
+msgstr ""
+
+msgid "The required fields are underlined."
+msgstr ""
+
+msgid "Not implemented yet."
+msgstr "अखन तक लागू नहि."
+
+msgid "Save File..."
+msgstr "फाइलके� सहेजू..."
+
+msgid "Open File..."
+msgstr "फाइल खोलू..."
+
+msgid "Choose Location..."
+msgstr "स�थान च�नू..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "ई श�रेणीक बेसी कक�ष पता करबाक लेल 'Enter' दबाबू."
+
+msgid "Get"
+msgstr "पाउ"
+
+#. Create the window.
+msgid "Room List"
+msgstr "कक�ष सूची"
+
+msgid "Buddy logs in"
+msgstr "मीत लाग इन करैछ"
+
+msgid "Buddy logs out"
+msgstr "मीत लौग आउट करैछ"
+
+msgid "Message received"
+msgstr "प�राप�त सन�देश"
+
+msgid "Message received begins conversation"
+msgstr "संदेश भेटल संवाद श�र� भ' गेल"
+
+msgid "Message sent"
+msgstr "सन�देश भेजल गेल"
+
+msgid "Person enters chat"
+msgstr "व�यक�ति गप�प-सप�पमे सामिल होइछ"
+
+msgid "Person leaves chat"
+msgstr "व�यक�ति गप�प-सप�प छोड़ैछ"
+
+msgid "You talk in chat"
+msgstr "अहा� गप�प-सप�पमे बाजैछी"
+
+msgid "Others talk in chat"
+msgstr "दोसरसभ गप�प-सप�पमे बाजैछ"
+
+msgid "Someone says your username in chat"
+msgstr ""
+
+msgid "Attention received"
+msgstr ""
+
+msgid "GStreamer Failure"
+msgstr "GStreamer विफलता"
+
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer आरंभ होने पर विफल भ' गेलाह"
+
+msgid "(default)"
+msgstr "(default)"
+
+msgid "Select Sound File ..."
+msgstr "ध�वनि फाइल च�नू..."
+
+msgid "Sound Preferences"
+msgstr "ध�वनि पसिन�न "
+
+msgid "Profiles"
+msgstr "प�रोफाइलसभ"
+
+msgid "Automatic"
+msgstr "स�वचालित"
+
+msgid "Console Beep"
+msgstr "कंसोल बीप"
+
+msgid "Command"
+msgstr "कमांड"
+
+msgid "No Sound"
+msgstr "कोनो ध�वनि नहि"
+
+msgid "Sound Method"
+msgstr "ध�वनि विधि"
+
+msgid "Method: "
+msgstr "विधि: "
+
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"ध�वनि कमा�ड:\n"
+"(फाइलनाम लेल %s)"
+
+#. Sound options
+msgid "Sound Options"
+msgstr "ध�वनि विकल�प"
+
+msgid "Sounds when conversation has focus"
+msgstr "ध�वनि करू जखन वार�तालाप केंद�रित रहैत अछि"
+
+msgid "Always"
+msgstr "हरदम"
+
+msgid "Only when available"
+msgstr "जखन उपलब�ध सिर�फ तखन"
+
+msgid "Only when not available"
+msgstr "उपलब�ध नहि होय पर सिर�फ."
+
+msgid "Volume(0-100):"
+msgstr "आयतन (0-100):"
+
+#. Sound events
+msgid "Sound Events"
+msgstr "ध�वनि घटना"
+
+msgid "Event"
+msgstr "घटना"
+
+msgid "File"
+msgstr "फाइल"
+
+msgid "Test"
+msgstr "जा�च"
+
+msgid "Reset"
+msgstr "रिसेट करू"
+
+msgid "Choose..."
+msgstr "चयन करू..."
+
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "की अहा� निश�चित अछि जे \"%s\" के� मेटाव� चाहैत छी?"
+
+msgid "Delete Status"
+msgstr "वस�त�स�थिति मेटाउ"
+
+msgid "Saved Statuses"
+msgstr "सहेजल स�थिति"
+
+#. title
+msgid "Title"
+msgstr "शीर�षक"
+
+msgid "Type"
+msgstr "प�रकार"
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. saveable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+msgid "Message"
+msgstr "संदेश"
+
+#. Use
+msgid "Use"
+msgstr "उपयोग करू"
+
+msgid "Invalid title"
+msgstr "अवैध शीर�षक"
+
+msgid "Please enter a non-empty title for the status."
+msgstr "कृप�या स�थिति क' लेल गैर रिक�त फाइल डालू"
+
+msgid "Duplicate title"
+msgstr "नकल शीर�षक"
+
+msgid "Please enter a different title for the status."
+msgstr "कृप�या स�थितिके� लेल �कटा अलग शीर�षक दिअ'."
+
+msgid "Substatus"
+msgstr "उपस�थिति"
+
+msgid "Status:"
+msgstr "स�थिति:"
+
+msgid "Message:"
+msgstr "संदेश:"
+
+msgid "Edit Status"
+msgstr "स�थिति संपादित करू"
+
+msgid "Use different status for following accounts"
+msgstr "नीच�चा� देल खाता क' लेल भिन�न स�थितिक प�रयोग करू"
+
+#. Save & Use
+msgid "Save & Use"
+msgstr "सहेजू आ प�रयोग करू"
+
+msgid "Certificates"
+msgstr "प�रमाणपत�र"
+
+msgid "Sounds"
+msgstr "ध�वनिसभ"
+
+msgid "Statuses"
+msgstr "वस�त�स�थिति"
+
+msgid "Error loading the plugin."
+msgstr "प�लगिनके� लोड करबामे त�र�टि."
+
+msgid "Couldn't find X display"
+msgstr "X डिसप�ले नहि पाबि सकल"
+
+msgid "Couldn't find window"
+msgstr "विंडो नहि पाबि सकल"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "ई प�लगिन लोड नहि क�ल जा� सकैत अछि कि�क ई X11 समर�थनक स�ग नहि निर�मित छल."
+
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+msgid "Clipboard plugin"
+msgstr "क�लिपबोर�ड प�लगिन"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"जखन gnt क�लिपबोर�डके� सामग�री बदलैत अछि, सामग�रीके� X पर उपलब�ध क�ल जाइछ, ज� संभव अछि."
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s त�रत साइनआन केलाह"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s त�रत साइन ऑफ क�लक"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s अहा�के� �कटा संदेश पठोअलक"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s अहा�क उपनाम %s मे बाजलाह"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s �कटा संदेश %s मे पठोअलक"
+
+msgid "Buddy signs on/off"
+msgstr "मीत साइनआन/ऑफ अछि"
+
+msgid "You receive an IM"
+msgstr "अहा� �कटा IM प�राप�त करैत छी"
+
+msgid "Someone speaks in a chat"
+msgstr "किओ गप�प-सप�पमे बाजल अछि"
+
+msgid "Someone says your name in a chat"
+msgstr "किओ गप�प-सप�पमे अहा�क नाम कहैत अछि"
+
+msgid "Notify with a toaster when"
+msgstr "टोस�टरक संग सूचित करू जखन"
+
+msgid "Beep too!"
+msgstr "बीप ओ!"
+
+msgid "Set URGENT for the terminal window."
+msgstr "टर�मिनल बिंडो क' लेल अत�यावश�यक सेट करू."
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "टोस�टर प�लगिन"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s क' संग %s पर वार�तालाप:</b><br>"
+
+msgid "History Plugin Requires Logging"
+msgstr "इतिहास प�लगिन क' लेल लागिंग जरूरी"
+
+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 ""
+"अओजार -> वरीयता -> लागिंग स� लागिंग सक�रिय क�ल जा� सकैछ.\n"
+"\n"
+"इंस�टेट मेसेंजर आओर/अथवा गप�प-सप�प लेल लाग सक�रिय हो�बास� समान बातचीतरूपे� इतिहास सक�रिय क� "
+"द�ताह."
+
+msgid "GntHistory"
+msgstr "GntHistory"
+
+msgid "Shows recently logged conversations in new conversations."
+msgstr "हालेमे लाग क�ल वार�तालापक नव वार�तालापमे दैखबैत अछि."
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"जखन �कटा नव वार�तालाप ख�लैत अछि, तखन ई प�लगिन मोज�दा वार�तालापमे अंतिम वार�तालापके� "
+"जोड़ि देताह."
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr ""
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr ""
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr ""
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+
+msgid "Online"
+msgstr "आनलाइन"
+
+#. primitive,						no,							id,			name
+msgid "Offline"
+msgstr "आफलाइन"
+
+msgid "Online Buddies"
+msgstr "औनलाइन मीतसभ"
+
+msgid "Offline Buddies"
+msgstr "आफलाइन मीत"
+
+msgid "Online/Offline"
+msgstr "औनलाइन/आफलाइन"
+
+msgid "Meebo"
+msgstr "मीबू"
+
+msgid "No Grouping"
+msgstr "कोनो समूहन नहि"
+
+msgid "Nested Subgroup"
+msgstr ""
+
+msgid "Nested Grouping (experimental)"
+msgstr ""
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "वैकल�पिक मीतलिस�ट समूहन विकल�पसभ दैछ."
+
+msgid "Lastlog"
+msgstr "अंतिमलाग"
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "अंतिमलाग: पश�चलागमे उपस�ट�रिंग लेल खोज."
+
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+msgid "Lastlog plugin."
+msgstr "अंतिमलौग प�लगिन."
+
+msgid "accounts"
+msgstr "खाता"
+
+msgid "Password is required to sign on."
+msgstr "ग�ड़किल�ली साइनआन करबाक लेल जरूरी अछि"
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s क' लेल ग�ड़किल�ली डालू (%s)"
+
+msgid "Enter Password"
+msgstr "ग�ड़किल�ली दाखिल करू"
+
+msgid "Save password"
+msgstr "ग�ड़किल�ली सहेजू"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s लेल प�रोटॅकोल प�लगिन नहि अछि."
+
+msgid "Connection Error"
+msgstr "संबंधनमे त�र�टि"
+
+msgid "New passwords do not match."
+msgstr "नव ग�ड़किल�ली मेल नहि खाइछ."
+
+msgid "Fill out all fields completely."
+msgstr "सभ फील�डक पूरा भरू."
+
+msgid "Original password"
+msgstr "मूल ग�ड़किल�ली"
+
+msgid "New password"
+msgstr "नव ग�ड़किल�ली"
+
+msgid "New password (again)"
+msgstr "नव ग�ड़किल�ली (फिन�)"
+
+#, c-format
+msgid "Change password for %s"
+msgstr " %s क' लेल ग�ड़किल�ली बदलू"
+
+msgid "Please enter your current password and your new password."
+msgstr "कृप�या अहा� वर�तमान ग�ड़किल�ली भरू अथवा अपन नव ग�ड़किल�ली भरू."
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s लेल प�रयोक�ता सूचना बदलू"
+
+msgid "Set User Info"
+msgstr "प�रयोक�ताक सूचना भरू"
+
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
+msgid "Unknown"
+msgstr "अज�ञात"
+
+msgid "Buddies"
+msgstr "मीत"
+
+msgid "buddy list"
+msgstr "मीत सूची"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr ""
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"अहा�क स�ग रूट प�रमाणपत�रक कोनो डाटाबेस नहि अछि, इ�ह लेल ई प�रमाणपत�र वैधीकृत नहि क�ल "
+"जा� सकैत अछि."
+
+msgid "The certificate chain presented is invalid."
+msgstr ""
+
+msgid "The certificate has been revoked."
+msgstr ""
+
+msgid "An unknown certificate error occurred."
+msgstr ""
+
+msgid "(DOES NOT MATCH)"
+msgstr "(मेल नहि खाइछ)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s केवल �कबेर प�रयोगक लेल निम�नलिखित प�रमाणपत�र प�रस�त�त क�लक:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"सामान�य नाम: %s %s\n"
+"फि�गरप�रिंट (SHA1): %s"
+
+#. TODO: Find what the handle ought to be
+msgid "Single-use Certificate Verification"
+msgstr "�कबेर प�रयोगक लेल प�रमाणपत�र सत�यापन"
+
+#. Scheme name
+#. Pool name
+msgid "Certificate Authorities"
+msgstr "प�रमाणपत�र प�राधिकार"
+
+#. Scheme name
+#. Pool name
+msgid "SSL Peers Cache"
+msgstr "SSL पीयर�स कैश"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s क' लेल प�रमाणपत�र स�वीकारू?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL प�रमाणपत�र सत�यापन"
+
+msgid "_View Certificate..."
+msgstr "प�रमाणपत�र देखू (_V)..."
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr ""
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL प�रमाणपत�र त�र�टि"
+
+msgid "Unable to validate certificate"
+msgstr ""
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"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
+msgid "Certificate Information"
+msgstr "प�रमाणपत�र सूचना"
+
+#. show error to user
+msgid "Registration Error"
+msgstr "पंजीयन त�र�टि"
+
+msgid "Unregistration Error"
+msgstr "गैरपंजीयन त�र�टि"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s साइन औन क�लकाह"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s साइन ऑफ क�लकाह"
+
+#. Undocumented
+#. Unknown error
+msgid "Unknown error"
+msgstr "अज�ञात त�र�टि"
+
+msgid "Unable to send message: The message is too large."
+msgstr "संदेश पठावैमे विफल: संदेश बड़ पैघ अछि."
+
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "%s मे संदेश पठाब�मे विफल."
+
+msgid "The message is too large."
+msgstr "ई संदेश बड़ पैघ अछि."
+
+msgid "Unable to send message."
+msgstr "संदेश पठाब�मे असमर�थ."
+
+msgid "Send Message"
+msgstr "सन�देश पठाउ"
+
+msgid "_Send Message"
+msgstr "सन�देश पठाउ (_S)"
+
+#, c-format
+msgid "%s entered the room."
+msgstr "%s कक�षमे आ�ल."
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] कक�षमे आ�ल."
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "आब अहा� %s रूपे� जानल जाइछ"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s आब %s रूपे� जानल जाइछ"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s  कक�षके� छोड़लाह."
+
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s कक�षके� छोड़लाह (%s)."
+
+msgid "Invite to chat"
+msgstr ""
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"कृप�या प�रयोक�ताक नाम डालू जिनका अहा� आमंत�रित करै चाहै छी. ज� अहा� चाही त' आमंत�रण संदेशो "
+"पठा� सकैछ."
+
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "संबंधन ल� मे विफल: %s"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "नाम ल� मे विफल: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "सर�वर नाम पावैमे विफल: %s"
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "पर�पल D-BUS सर�वर नीच�चा� देल कारणक लेल नहि चलि रहल अछि"
+
+msgid "No name"
+msgstr "कोनो नाम नहि"
+
+msgid "Unable to create new resolver process\n"
+msgstr "�कटा नव समाधानकर�ता प�रक�रिया बनाबैमे असमर�थ\n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "समाधानकर�ता प�रक�रियामे आग�रह पठावैमे असमर�थ\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s हल करैमे त�र�टि:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s हल करैमे त�र�टि: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"हलकरैक प�रक�रियास� त�र�टि:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr ""
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr ""
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "थ�रेड निर�माण विफल: %s"
+
+msgid "Unknown reason"
+msgstr "अनचिन�ह कारण"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s:पढ़ैमे त�र�टि\n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s:लिखैमे त�र�टि\n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s प�रवेशमे त�र�टि \n"
+"%s.\n"
+
+msgid "Directory is not writable."
+msgstr "निर�देशिका उपलब�ध नहि अछि"
+
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 बाइटक फाइल नहि पठा�ल जा� सकैछ."
+
+msgid "Cannot send a directory."
+msgstr "फाइल नहि पठा�ल जा� सकैछ."
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s  नियमित फाइल नहि अछि. �करा उप�पर लिखबास� साफ मना करैछ.\n"
+
+msgid "File is not readable."
+msgstr "फ़ाइल पढ़ब योग�य नहि अछि."
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s अहा�क %s (%s) मे पठाब� चाहैछ"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s अहा�क �कटा फाइल पठाब� चाहैछ"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s स� फाइल स�थानांतर प�रार�थना स�वीकार करू?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"�कटा फाइल �त�स� डाउनलोड करबाक लेल उपलब�ध अछि:\n"
+"दूरस�थ मेजबान: %s\n"
+"दूरस�थ पोर�ट: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s %s फाइलके� पठाबैक प�रस�ताव दैछ"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s अवैध फाइलनाम अछि.\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s के� %s मे पठावैक प�रस�ताव द� रहल अछि"
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "%s स� %s फाइल स�थानांतर प�रार�थना स�वीकार करू?"
+
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "%s फाइलक हस�तांतरण पूर�ण भेल"
+
+msgid "File transfer complete"
+msgstr "फाइल हस�तांतरण पूर�ण भेल"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr ""
+
+msgid "File transfer cancelled"
+msgstr "फाइल हस�तांतरण रद"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr ""
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s मे फाइल हस�तांतरण विफल भ' गेल"
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s स� फाइल स�थानांतर विफल"
+
+msgid "Run the command in a terminal"
+msgstr "टर�मिनलमे कमांड चलाउ"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "\"aim\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "\"gg\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "\"icq\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "\"irc\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "\"msnim\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "\"sip\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "\"xmpp\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "\"yrmsgr\" URL क' नियंत�रण लेल प�रय�क�त कमांड, ज� सक�रिय क�ल छल"
+
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" URL क' लेल नियंत�रक"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" URL क' लेल नियंत�रक"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"aim\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"gg\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"icq\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"irc\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"msnim\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"sip\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"xmpp\" URL क' नियंत�रित क�नाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"सही अछि ज� \"command\" क�ंजीमे निर�दिष�ट कमांडक \"ymsgr\" URL क' नियंत�रित करब चाही."
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"सही अछि ज� ई प�रकारक URL क' नियंत�रित करबाक लेल प�रय�क�त कमांडके� �कटा टर�मिनलमे चला�नाइ "
+"चाही."
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "की निर�दिष�ट कमांडक \"aim\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"gg\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"icq\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"irc\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"msnim\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"sip\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"xmpp\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "कि निर�दिष�ट कमांडक \"ymsgr\" URL क' नियंत�रित क�नाइ चाही"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">लागरमे पठन प�रकार�य नहि अछि</font></b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+msgid "Plain text"
+msgstr "सादा पाठ"
+
+msgid "Old flat format"
+msgstr "प�रान सपाट प�रारूप"
+
+msgid "Logging of this conversation failed."
+msgstr "ई वार�तालापक लौगिंग विफल भ' गेल."
+
+msgid "XML"
+msgstr "XML"
+
+#, 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"
+
+#, 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"
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>लौग खोजबामे विफल!</b></font>"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>फाइल पढ़ि नहि सकल: %s</b></font>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <स�वतः जबाब दिअ'>: %s\n"
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr ""
+
+msgid "Error with your microphone"
+msgstr ""
+
+msgid "Error with your webcam"
+msgstr ""
+
+msgid "Conference error"
+msgstr ""
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr ""
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "अहा� %s के� प�रयोग करैछ, म�दा ई प�लगिन %s क' लेल जरूरी अछि."
+
+msgid "This plugin has not defined an ID."
+msgstr "ई प�लगिन �कटा ID के� परिभाषित नहि क�लक."
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "प�लगिन मेजिक बेमेल %d (जरूरी %d)"
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI संस�करण बेमेल %d.%d.x (%d.%d.x जरूरी)"
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr "आवश�यक प�लग-इन %s नहि भेटल. कृप�या �हि प�लग-इनके� स�थापित करू आओर फिन� प�रयत�न करू."
+
+msgid "Unable to load the plugin"
+msgstr "प�लगिनके� लोड करबामे असमर�थ."
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "आवश�यक प�लग-इन %s के� लोड नहि क� सकल."
+
+msgid "Unable to load your plugin."
+msgstr "अपन प�लगिनके� लोड करबामे असमर�थ."
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s क' लेल %s जरूरी अछि, म�दा अनलोड करबामे विफल."
+
+msgid "Autoaccept"
+msgstr "स�वतः स�वीकारू"
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "च�नलका प�रयोक�तास� फाइल स�थानांतर प�रार�थना स�वतः स�वीकारू."
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "\"%s\" के� \"%s\" स� फाइल स�थानांतरक स�वतः स�वीकार पूर�ण भेल."
+
+msgid "Autoaccept complete"
+msgstr "समाप�ति स�वतः स�वीकारू"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s स� जखन फाइल स�थानांतर प�रार�थना आबैत अछि"
+
+msgid "Set Autoaccept Setting"
+msgstr "स�व स�वीकार जमावट सेट करू"
+
+msgid "_Save"
+msgstr "सहेजू (_S)"
+
+msgid "_Cancel"
+msgstr "रद करू (_C)"
+
+msgid "Ask"
+msgstr "पूछू"
+
+msgid "Auto Accept"
+msgstr "स�वतः स�वीकारू"
+
+msgid "Auto Reject"
+msgstr "स�वतः अस�वीकृत करू"
+
+msgid "Autoaccept File Transfers..."
+msgstr "फाइल हस�तांतरणके� स�वतः स�वीकार करू..."
+
+#. XXX: Is there a better way than this? There really should be.
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+"पथ जकरामे फाइल सहेजनाइ अछि\n"
+"(कृप�या पूर�ण पथ दिअ')"
+
+msgid "Automatically reject from users not in buddy list"
+msgstr "मीत सूचीमे नहि मोज�द प�रयोक�तासभक स�वतः अस�वीकार करू"
+
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+"पापअपक स�ग सूचित करू जखन स�वतः स�वीकृत फाइल हस�तांतरण पूरा भ' जाइछ\n"
+"(केवल तखने जखन प�रेषक क' स�ग कोनो वार�तालाप नहि होइछ)"
+
+msgid "Create a new directory for each user"
+msgstr ""
+
+msgid "Notes"
+msgstr "टिप�पणी"
+
+msgid "Enter your notes below..."
+msgstr "अपन टिप�पणी नीच�चा� दिअ'..."
+
+msgid "Edit Notes..."
+msgstr "टिप�पणी संपादित करू..."
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Notes"
+msgstr "मीत टिप�पणी"
+
+#. *< name
+#. *< version
+msgid "Store notes on particular buddies."
+msgstr "खासि मीत पर टिप�पणी जमा करू."
+
+#. *< summary
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr "अहा�क मीतसूची पर मीतसभक लेल टिप�पणीके� जमा करबाक बिकल�प जोड़ैत अछि."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Cipher Test"
+msgstr "सिफर जा�च"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "साइफर जांचैत अछि जे libpurple क' स�ग आबैत अछि."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr "DBus उदाहरण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr "DBus प�लगिन उदाहरण"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "File Control"
+msgstr "फाइल नियंत�रण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Allows control by entering commands in a file."
+msgstr "फाइलमे कमा�ड दाखिल क�क' निय�त�रणक अन�मति देत अछि."
+
+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.
+msgid "I'dle Mak'er"
+msgstr "निष�क�रिय बनैनिहार"
+
+msgid "Set Account Idle Time"
+msgstr "खाता निष�क�रिय समय नियत करू"
+
+msgid "_Set"
+msgstr "नियत करू (_S)"
+
+msgid "None of your accounts are idle."
+msgstr "अहा�क कोनो खाता निष�क�रिय नहि अछि"
+
+msgid "Unset Account Idle Time"
+msgstr "खाता निष�क�रिय समय अनियत करू"
+
+msgid "_Unset"
+msgstr "अनियत करू (_U)"
+
+msgid "Set Idle Time for All Accounts"
+msgstr "सभ खाताक' लेल निष�क�रिय समय सेट करू"
+
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "सभ निष�क�रिय खाताक लेल निष�क�रिय समय अनियत करू"
+
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "अहा�क हाथस� बिन�यासक अन�मति दैछ जे अहा� कतेक देर स� निष�क�रिय छी"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Client"
+msgstr "IPC जांच क�लाइन�ट"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a client."
+msgstr "प�लगिन IPC समर�थन, �कटा क�लाइंटक तरहे� परीक�षण करू."
+
+#. *  description
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"प�लगिन IPC समर�थन, �कटा क�लाइंटक तरहे� परीक�षण करू. ई सर�वर प�लगिनक पता करैछ आओर पंजीकृत "
+"क�क' कमांड बजबैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "IPC जांच सर�वर"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "प�लगिन IPC समर�थनके� जांच�, सर�वर माफिक"
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "प�लगिन IPC समर�थन सर�वरकरूपे� परीक�षण करू. ई IPC कमांडसभक पंजीकृत करैछ."
+
+msgid "Hide Joins/Parts"
+msgstr ""
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr ""
+
+msgid "If user has not spoken in this many minutes"
+msgstr ""
+
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr "न�काबैमे सामिल/अलग होउ"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Hides extraneous join/part messages."
+msgstr "बाहरक सामिल/अलग संदेश न�काबै अछि."
+
+#. *  description
+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.
+msgid "(UTC)"
+msgstr "(UTC)"
+
+msgid "User is offline."
+msgstr "प�रयोक�ता आफलाइन अछि"
+
+msgid "Auto-response sent:"
+msgstr "स�वचालित उत�तर भेजलक:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s साइन ऑफ क�ल अछि."
+
+msgid "One or more messages may have been undeliverable."
+msgstr "�कटा अथवा आओर संदेश नहि पठावैबला भ' सकैछ."
+
+msgid "You were disconnected from the server."
+msgstr "अहा� सर�वर स� विसंबंधित भ' गेल छलह��."
+
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr "अहा� अखन विसंबंधित छी. संदेश तखन तक प�राप�त नहि हैते जखनतक अहा� लागिन नहि हा�ब."
+
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "संदेश पठा�ल नहि जा� सकल कारण अधिकतम नमाइ स� बेसी भ' गेल छल."
+
+msgid "Message could not be sent."
+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.
+msgid "Adium"
+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.
+msgid "Fire"
+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.
+msgid "Messenger Plus!"
+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.
+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.
+msgid "MSN Messenger"
+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.
+msgid "Trillian"
+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.
+msgid "aMSN"
+msgstr "aMSN"
+
+#. Add general preferences.
+msgid "General Log Reading Configuration"
+msgstr "सामान�य लाग पठन बिन�यास"
+
+msgid "Fast size calculations"
+msgstr "तेज आकार गणना"
+
+msgid "Use name heuristics"
+msgstr "नाम स�वतःशोधके� प�रयोग करू"
+
+#. Add Log Directory preferences.
+msgid "Log Directory"
+msgstr "निर�देशिका लाग राखू"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Log Reader"
+msgstr "लाग देखनिहार"
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "लाग प�रदर�शकमे अन�य IM क�लाइंटक लाग देखाउ."
+
+#. * description
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+msgid "Mono Plugin Loader"
+msgstr "�कल प�लगिन लोडर"
+
+msgid "Loads .NET plugins with Mono."
+msgstr "लोड .NET प�लगिन मोनोके� स�ग."
+
+msgid "Add new line in IMs"
+msgstr "IM मे नव पंक�ति जोड़ू"
+
+msgid "Add new line in Chats"
+msgstr "गप�पसप�पमे नव पंक�ति जोड़ू"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr "नव प�क�ति"
+
+#. *< name
+#. *< version
+msgid "Prepends a newline to displayed message."
+msgstr "देखाओल स�देशमे नव प�क�ति पहिने जोड़ैत अछि."
+
+#. *< summary
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+
+msgid "Offline Message Emulation"
+msgstr "आफलाइन संदेश नकल"
+
+msgid "Save messages sent to an offline user as pounce."
+msgstr "आफलाइन प�रयोक�ताके� थापक रूपमे प�रेषित संदेश सहेजू."
+
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#, 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\" फिन� लौग करैत अछि?"
+
+msgid "Offline Message"
+msgstr "आफलाइन संदेश"
+
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr "अहा� थाप संपादित/विलोपित क� सकैत छी `मीत थाप' संवादस�"
+
+msgid "Yes"
+msgstr "ह�"
+
+msgid "No"
+msgstr "नहि"
+
+msgid "Save offline messages in pounce"
+msgstr "आफलाइन संदेश थापमे सहेजू"
+
+msgid "Do not ask. Always save in pounce."
+msgstr "नहि पूछू. हरदम थापमे सहेजू."
+
+msgid "One Time Password"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr "पर�ल प�लगिन लोडर"
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr "पर�ल प�लगिन लोड करबाक लेल समर�थन दैछ."
+
+msgid "Psychic Mode"
+msgstr "मनः स�थिति"
+
+msgid "Psychic mode for incoming conversation"
+msgstr "अ�निहार वार�तालापक लेल मनःस�थिति"
+
+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! क' लेल काज करैत अछि"
+
+msgid "You feel a disturbance in the force..."
+msgstr "अहा� दबावमे �कटा व�यवधानक अन�भव करैछी..."
+
+msgid "Only enable for users on the buddy list"
+msgstr "केवल मीत सूची पर प�रयोक�ताक लेल सक�रिय करू"
+
+msgid "Disable when away"
+msgstr "दूर भेला पर निष�क�रिय करू"
+
+msgid "Display notification message in conversations"
+msgstr "वार�तालापमे अधिसूचना संदेश देखाउ"
+
+msgid "Raise psychic conversations"
+msgstr "मानसिक वार�तालाप उठाबू"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Signals Test"
+msgstr "संकेतक परीक�षण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all signals are working properly."
+msgstr "ई देखबाक लेल परीक�षण करू जे सभ संकेत नीकस� काज क� रहल अछि."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Simple Plugin"
+msgstr "सादा प�लगिन"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests to see that most things are working."
+msgstr "देखबाक लेल जांचू जे बेसी चीज काज क� रहलैछ."
+
+#. Scheme name
+msgid "X.509 Certificates"
+msgstr "X.509 प�रमाणपत�र"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS क द�वारा SSL समर�थन दैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Mozilla NSS क द�वारा SSL समर�थन दैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL समर�थन लाइब�रेरीक गिर�द रैपर दैछ."
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "आब %s दूरि नहि अछि."
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s दूरि चलि गेल."
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s निष�क�रिय भ' गेल."
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "आब %s निष�क�रिय नहि अछि."
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s साइनआन क�ल अछि."
+
+msgid "Notify When"
+msgstr "सूचना दिअ' जखन"
+
+msgid "Buddy Goes _Away"
+msgstr "मीत दूरि चल गेल (_A)"
+
+msgid "Buddy Goes _Idle"
+msgstr "मीत निष�क�रिय भ' गेल (_I)"
+
+msgid "Buddy _Signs On/Off"
+msgstr "मीत साइनआन / ऑफ (_S)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr "मीत स�थिति सूचना"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr "वार�तालाप विंडोमे सूचना दैछ जखन मीत दूर वा निष�क�रियरूपे� आबैछ अथवा जाइछ."
+
+msgid "Tcl Plugin Loader"
+msgstr "Tcl प�लगिन लोडर"
+
+msgid "Provides support for loading Tcl plugins"
+msgstr "Tcl प�लगिन लोड करैमे सहायक अछि."
+
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"ActiveTCL प�रतिष�ठापन जा�चेमे असमर�थ. ज� अहा� TCL प�लगिनक प�रयोग करबाक लेल चाहै छी, "
+"ActiveTCL के� http://www.activestate.com स� प�रतिष�ठापित करू\n"
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+
+msgid "Unable to listen for incoming IM connections"
+msgstr ""
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "स�थानीय mDNS सर�वरक संग संबंधन स�थापित करैमे असमर�थ.  कि ई चलि रहल अछि?"
+
+msgid "First name"
+msgstr "पहिल नाम"
+
+msgid "Last name"
+msgstr "अंतिम नाम"
+
+#. email
+msgid "Email"
+msgstr "इमेल"
+
+msgid "AIM Account"
+msgstr "AIM खाता"
+
+msgid "XMPP Account"
+msgstr "XMPP खाता"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour प�रोटोकोल प�लगिन"
+
+msgid "Purple Person"
+msgstr "पर�पल व�यक�ति"
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s वार�तालापके� बन�न क� देलकाह."
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "संदेश पठाबैमे असमर�थ, वार�तालाप आरंभ नहि क�ल जा� सकल."
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "स�थानीय mDNSResponder क' संग त�र�टि संचार."
+
+msgid "Invalid proxy settings"
+msgstr "अवैध प�रौक�सी निर�धारण"
+
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "अहा�क देल प�रोक�सीक प�रकारक लेल मेजबान नाम वा पोर�ट नम�बर अवैध अछि."
+
+msgid "Token Error"
+msgstr "टोकन त�र�टि"
+
+msgid "Unable to fetch the token.\n"
+msgstr "कक�ष सूची नहि ला� सकल\n"
+
+msgid "Save Buddylist..."
+msgstr "मीत सूची सहेजू..."
+
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr "अहा�क मीतसूची रिक�त अछि, फाइलमे किछ� नहि लिखल गेल छल."
+
+msgid "Buddylist saved successfully!"
+msgstr "मीतसूची सफलतापूर�वक सहेजल गेल!"
+
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "%s क' लेल %s मे मीतसूची नहि लिख सकल"
+
+msgid "Couldn't load buddylist"
+msgstr "मीतसूची लोड नहि क� सकल"
+
+msgid "Load Buddylist..."
+msgstr "मीतसूची लोड करू..."
+
+msgid "Buddylist loaded successfully!"
+msgstr "मीतसूची सफलतापूर�वक लोड करल गेल"
+
+msgid "Save buddylist..."
+msgstr "मीत सूची सहेजू..."
+
+msgid "Load buddylist from file..."
+msgstr "फाइल स� मीतसूचीके� लोड करू..."
+
+msgid "You must fill in all registration fields"
+msgstr ""
+
+msgid "Passwords do not match"
+msgstr "ग�ड़किल�ली मेल नहि खाइत अछि."
+
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+
+msgid "New Gadu-Gadu Account Registered"
+msgstr "नव गाडू गाडू खाता पंजीकृत"
+
+msgid "Registration completed successfully!"
+msgstr "पंजीयन सफलतापूर�वक पूर�ण भेल!"
+
+msgid "Password"
+msgstr "ग�ड़किल�ली"
+
+msgid "Password (again)"
+msgstr "ग�ड़किल�ली (फिन� स�)"
+
+msgid "Enter captcha text"
+msgstr ""
+
+msgid "Captcha"
+msgstr ""
+
+msgid "Register New Gadu-Gadu Account"
+msgstr "नव गाडू गाडू खाता पंजीकृत करू"
+
+msgid "Please, fill in the following fields"
+msgstr "कृप�या निचलका क�षेत�रमे भरू"
+
+msgid "City"
+msgstr "नगर"
+
+msgid "Year of birth"
+msgstr "जन�मक साल"
+
+#. gender
+msgid "Gender"
+msgstr "लिंग"
+
+msgid "Male or female"
+msgstr "प�रूष अथवा स�त�री"
+
+#. 0
+msgid "Male"
+msgstr "प�र�ष"
+
+msgid "Female"
+msgstr "स�त�री"
+
+msgid "Only online"
+msgstr "औनलाइन"
+
+msgid "Find buddies"
+msgstr "मीत खोजू"
+
+msgid "Please, enter your search criteria below"
+msgstr "कृप�या अपन खोज मापदंड डालू"
+
+msgid "Fill in the fields."
+msgstr "क�षेत�रमे भरू"
+
+msgid "Your current password is different from the one that you specified."
+msgstr "अहा�क अखनक ग�ड़किल�ली अहा�क निर�दिष�ट क�लस� भिन�न अछि"
+
+msgid "Unable to change password. Error occurred.\n"
+msgstr "ग�ड़किल�ली बदल�मे विफल. त�र�टि आ�ल.\n"
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Gadu-Gadu खाता लेल ग�ड़किल�ली बदलू"
+
+msgid "Password was changed successfully!"
+msgstr "ग�ड़किल�ली सफलतापूर�वक बदलल गेल!"
+
+msgid "Current password"
+msgstr "मोज�दा ग�ड़किल�ली"
+
+msgid "Password (retype)"
+msgstr "ग�ड़किल�ली (फिन� टंकित करू)"
+
+msgid "Enter current token"
+msgstr "मोज�दा टोकन डालू"
+
+msgid "Current token"
+msgstr "मोज�दा टोकेन"
+
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr "कृप�या अपन वर�तमान ग�ड़किल�ली भरू आओर अपन नव ग�ड़किल�ली UIN लेल भरू."
+
+msgid "Change Gadu-Gadu Password"
+msgstr "गाडू-गाडू ग�ड़किल�ली बदलू"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "मीतक लेल �कटा गप�प-सप�प च�नू: %s"
+
+msgid "Add to chat..."
+msgstr "गप�प-सप�पमे जोड़ू..."
+
+#. 0
+#. Global
+msgid "Available"
+msgstr "उपलब�ध"
+
+#. 2
+msgid "Chatty"
+msgstr "गप�प-सप�प"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "परेशान नहि करू"
+
+#. 1
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+msgid "Away"
+msgstr "दूरि"
+
+msgid "UIN"
+msgstr "UIN"
+
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+msgid "First Name"
+msgstr "पहिल नाम"
+
+msgid "Birth Year"
+msgstr "जन�मक साल"
+
+msgid "Unable to display the search results."
+msgstr "खोज परिणामके� प�रदर�शनमे असमर�थ"
+
+msgid "Gadu-Gadu Public Directory"
+msgstr "गाडू गाडू सार�वजनिक निर�देशिका"
+
+msgid "Search results"
+msgstr "खोज नतीजा"
+
+msgid "No matching users found"
+msgstr "कोनो मिलान भेल प�रयोक�ता नहि भेटल"
+
+msgid "There are no users matching your search criteria."
+msgstr "अहा�क खोज मापदंडस� मिलल ज�लल प�रयोक�ता नहि अछि"
+
+msgid "Unable to read from socket"
+msgstr "सोकेटस� पढ़ैमे असमर�थ"
+
+msgid "Buddy list downloaded"
+msgstr "मीत सूची डाउनलोड क�ल गेल"
+
+msgid "Your buddy list was downloaded from the server."
+msgstr "अहा�क मीतसूची सर�वरस� डाउनलोड क�ल गेल"
+
+msgid "Buddy list uploaded"
+msgstr "मीत सूची अपलोड क�ल गेल"
+
+msgid "Your buddy list was stored on the server."
+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).
+msgid "Connected"
+msgstr "संबंधित"
+
+msgid "Connection failed"
+msgstr "संबंधन विफल भेल"
+
+msgid "Add to chat"
+msgstr "गप�प-सप�पमे जोड़ू"
+
+msgid "Chat _name:"
+msgstr "गप�प-सप�प नाम (_n)"
+
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "संबंधित क� रहल अछि"
+
+msgid "Chat error"
+msgstr "गप�प-सप�प त�र�टि"
+
+msgid "This chat name is already in use"
+msgstr "ई गप�प-सप�प नाम पहिनेस� प�रयोगमे अछि"
+
+msgid "Not connected to the server"
+msgstr ""
+
+msgid "Find buddies..."
+msgstr "मीत खोजू..."
+
+msgid "Change password..."
+msgstr "ग�ड़किल�ली बदलू..."
+
+msgid "Upload buddylist to Server"
+msgstr "सर�वर पर मीतसूचीक अपलोड करू"
+
+msgid "Download buddylist from Server"
+msgstr "सर�वर पर राखल मीत सूचीके� मेटाउ"
+
+msgid "Delete buddylist from Server"
+msgstr "सर�वर पर राखल मीत सूची के� मेटाउ"
+
+msgid "Save buddylist to file..."
+msgstr "फाइलमे मीत सूचीके� सहेजू..."
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "गाडू-गाडू प�रोटोकोल प�लगिन"
+
+#. summary
+msgid "Polish popular IM"
+msgstr "पोलिश लोकप�रिय IM"
+
+msgid "Gadu-Gadu User"
+msgstr "गाडू-गाडू प�रयोक�ता"
+
+msgid "GG server"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "अनचिन�ह कमांड: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "वर�तमान विषय: %s"
+
+msgid "No topic is set"
+msgstr "कोनो विषय नियत नहि अछि"
+
+msgid "File Transfer Failed"
+msgstr "फाइल हस�तांतरण विफल"
+
+msgid "Unable to open a listening port."
+msgstr ""
+
+msgid "Error displaying MOTD"
+msgstr "MOTD देखाब�मे त�र�टि"
+
+msgid "No MOTD available"
+msgstr "MOTD मोज�द नहि अछि"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "�हि संबंधनक संग कोनो MOTD ज�डल नहि अछि."
+
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s लेल MOTD"
+
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+
+msgid "View MOTD"
+msgstr "MOTD देखू"
+
+msgid "_Channel:"
+msgstr "चैनल (_C):"
+
+msgid "_Password:"
+msgstr "ग�ड़किल�ली (_P):"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+
+msgid "SSL support unavailable"
+msgstr "SSL समर�थन उपलब�ध नहि अछि"
+
+msgid "Unable to connect"
+msgstr "संबंधित करैमे असमर�थ"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr ""
+
+#, c-format
+msgid "Server closed the connection"
+msgstr ""
+
+msgid "Users"
+msgstr "प�रयोक�ता"
+
+msgid "Topic"
+msgstr "विषय"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "IRC Protocol Plugin"
+msgstr "IRC प�रोटोकोल प�लगिन"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "ओ IRC प�रोटोकोल जे थोड़ अधलाह अछि"
+
+#. host to connect to
+msgid "Server"
+msgstr "सर�वर"
+
+#. port to connect to
+msgid "Port"
+msgstr "पोर�ट"
+
+msgid "Encodings"
+msgstr "�नकोडिंगसभ"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
+msgid "Real name"
+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);
+#.
+msgid "Use SSL"
+msgstr "SSL प�रयोग करू"
+
+msgid "Bad mode"
+msgstr "अधलाह रूप"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+msgid "End of ban list"
+msgstr ""
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "%s स� अहांपर प�रतिबंध लागल अछि."
+
+msgid "Banned"
+msgstr "निषेध"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s निषेध नहि क� सकैछ: निषिद�ध सूची भरल अछि"
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr " <i>(पहिचानल)</i>"
+
+msgid "Nick"
+msgstr "उपनाम"
+
+msgid "Currently on"
+msgstr "अखन चालू अछि"
+
+msgid "Idle for"
+msgstr "�कर लेल बेकार"
+
+msgid "Online since"
+msgstr "स� औनलाइन"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>विशेषण परिभाषित क� रहल अछि:</b>"
+
+msgid "Glorious"
+msgstr "स�नहरा"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s विषयके� �हिमे बद�ल देलकाह: %s"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s टॉपिक साफ क� देलक."
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s क' लेल विषय अछि: %s"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "अनचिन�ह संदेश '%s'"
+
+msgid "Unknown message"
+msgstr "अनचिन�ह संदेश"
+
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC सर�वर �कटा संदेश प�लक जे ई बू�ि नहि सकल."
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "प�रयोक�ता अछि %s: %s"
+
+msgid "Time Response"
+msgstr "समय अन�क�रिया"
+
+msgid "The IRC server's local time is:"
+msgstr "IRC सर�वरक स�थानीय समय अछि:"
+
+msgid "No such channel"
+msgstr "�हन कोनो कक�ष नहि अछि"
+
+#. does this happen?
+msgid "no such channel"
+msgstr "�हन कोनो कक�ष नहि अछि"
+
+msgid "User is not logged in"
+msgstr "प�रयोक�ता लागइन नहि अछि"
+
+msgid "No such nick or channel"
+msgstr "�हन कोनो कक�ष अथवा उपनाम नहि अछि"
+
+msgid "Could not send"
+msgstr "पठाय नहि सकल"
+
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr "%s मे सामिल हो�बाक लेल आमंत�रण चाही."
+
+msgid "Invitation only"
+msgstr "केवल आमंत�रणस�"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "अहा�क %s  लाइत मारलक: (%s)"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s (%s) स� लाइत मारलक"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "रूपे� (%s %s) द�वारा %s"
+
+msgid "Invalid nickname"
+msgstr "अवैध उप-नाम"
+
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "अहा�क च�नल उपनाम सर�वर द�वारा अस�वीकार भ' गेल. संभवतः ओकरामे अवैध संप�रतीक अछि."
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"अहा�क च�नल खाता नाम सर�वर द�वारा अस�वीकार भ' गेल. संभवतः ओकरामे अवैध संप�रतीक अछि."
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+msgid "Nickname in use"
+msgstr "उपयोगमे उपनाम"
+
+msgid "Cannot change nick"
+msgstr "उपनाम नहि बद�ल सकैछ"
+
+msgid "Could not change nick"
+msgstr "उपनाम नहि बद�ल सकलाह"
+
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr "अहा� %s%s चैनल छोड़ च�कल छी"
+
+msgid "Error: invalid PONG from server"
+msgstr "त�र�टि: सर�वरस� अवैध पोंग"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "पिंग उत�तर -- पिछडना�: %lu सकेंड"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s मे सामिल नहि भ' सकैत अछि: पंजीयन आवश�यक."
+
+msgid "Cannot join channel"
+msgstr "चैनलमे सामिल नहि भ' सकैछ"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "निक अथवा चैनल अस�थाइ रूपे� उपलब�ध नहि अछि."
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "%s स� कोडा मारैछ"
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;जे क�रिया क�नाइ अछि&gt;: क�रिया करू."
+
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr "दूर [संदेश]: अन�पस�थिति संदेश निश�चित करू अथवा अन�पस�थिति लेल कोनो संदेश नहि राखू."
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: chanserv मे �कटा कमांड पठाउ"
+
+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] ...:  कोनह�स� चैनल संचालक पद हटा� लिओ. �करा लेल स�वयं "
+"अहा�क चैनल संचालक रहबाक चाही"
+
+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 ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"आमंत�रित करू &lt;उपनाम&gt; [कक�ष]: ककरो निर�दिष�ट चैनलमे आमंत�रित करू अथवा फिन� वर�तमान "
+"चैनलमे."
+
+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][,...]]: �कटा अथवा बेसी चैनलमे घ�सू आओर "
+"ज� जर�री अछि त' सभके� चैनल क�ंजियो दिअ'."
+
+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 ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"किक &lt;उपनाम&gt; [संदेश]:  ककरो चैनल स� निका�ल दिअ'. �हि हेत� अहा�के� अपनहि चैनलक "
+"संचालक हो�बाक चाही."
+
+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 "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;जे क�रिया करैछ&gt;: क�रिया करू."
+
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: memoserv मे कमांड पठाउ"
+
+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 ""
+"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 "names [channel]:  List the users currently in a channel."
+msgstr "नाम [चैनल]: चैनलमे अखन विद�यमान प�रयोक�ताक सूची देखाउ."
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "निक &lt;नव उपनाम&gt;:  अपन उपनाम बदलू."
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: nickserv मे �कटा कमांड भेजू"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;target&lt;:  �कटा सूचना प�रयोक�ता अथवा चैनलके� भेजू."
+
+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 ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;संदेश&gt;: ज� अहा�के� पता नहि अछि जे ई कि अछि त' संभवतः अहा� �कर प�रयोग "
+"नहि क� सकैछ."
+
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: operserv मे �कटा नव कमांड नहि पठाउ"
+
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr "part [कक�ष] [संदेश]:वर�तमान चैनल अथवा �क विशिष�ट चैनल छोड़ू �कटा वैकल�पिक संदेशक संग"
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [उपनाम]: पूछैछ जे प�रयोक�ताक (ज� प�रयोक�ता नहि निर�दिष�ट क�लकाह ज� सर�वर) कतैक लैग "
+"अछि."
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"प�रश�न &lt;उपनाम&gt; &lt;संदेश&gt;:  �कटा प�रयोक�ता के� निजी संदेश पठाउ. (बजा� पूरा चैनल "
+"के� पठावै)."
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "छोडू [संदेश]:सर�वर स� �कटा वैकल�पिक संदेशक संग विसंबंधित करू"
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "उद�धरण [...]: सर�वर के� �कटा कच�चा कमांड पठाउ"
+
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"हटाबू &lt;उपनाम&gt; [संदेश]:  ककरो चैनलमे स� निकाल दिअ'. �करा लेल स�वय� अहा�के� चैनल "
+"संचालक हो�बाक चाही"
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr "समय: �खन IRC सर�वरक स�थानीय समय देखाबै अछि."
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [नव विषय]: चैनल विषय के� देखू अथवा बदलू."
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  प�रयोक�ता मोडके� नियत अथवा अनियत करू"
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nick]: CTCP VERSION आग�रहके� प�रयोक�ताके� पठाउ"
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"आवाज &lt;उपनाम1&gt; [उपनाम2] ...:  कोनह� के� चैनलमे बोलबाक क�षमता दिअ' �करा लेल स�वय� "
+"अहा�के� चैनल संचालक हो�बाक चाही"
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;संदेश&gt;:  ज� अहा�के� नहि पता ई कि अछि त' संभवतः अहा� �कर प�रयोग नहि क� "
+"सकैत छी."
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [सर�वर] &lt;उपनाम&gt;:  �कटा प�रयोक�ताक संबंधमे सूचना आनू"
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: �कटा प�रयोक�ता पर सूचना पाउ जे लौग आफ क�न� अछि."
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s स� उत�तर अ�बाक समय: %lu सकेंड"
+
+msgid "PONG"
+msgstr "पोंग"
+
+msgid "CTCP PING reply"
+msgstr " CTCP पिंगक उत�तर"
+
+msgid "Disconnected."
+msgstr "संबंधन नहि अछि"
+
+msgid "Unknown Error"
+msgstr "अनजान त�र�टि"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "तदर�थ कमा�ड विफल"
+
+msgid "execute"
+msgstr "कार�यान�वित करू"
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "गोपित स�ट�रीम पर सादा पाठ प�रमाणीकरण सर�वर लेल जरूरी अछि "
+
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr ""
+
+msgid "Server does not use any supported authentication method"
+msgstr "सर�वर कोनह� समर�थित प�रमाणीकरण विधिक प�रयोग नहि क� सकैछ"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"�कटा विगोपित संबंधन पर सादा पाठ प�रमाणीकरणके� %s सर�वरक आवश�यक अछि. अहा� �करा अन�मति "
+"दिअ' आओर प�रमाणीकरण जारी राखू?"
+
+msgid "Plaintext Authentication"
+msgstr "सादा पाठ प�रमाणीकरण"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "अहा�क लेल गोपन जरूरी अछि म�दा ई सर�वर पर ई मोज�द नहि अछि."
+
+msgid "Invalid challenge from server"
+msgstr "सर�वर द�वारा अवैध च�नौती"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+msgid "SASL authentication failed"
+msgstr ""
+
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "Invalid Encoding"
+msgstr ""
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr "प�रयोक�ता नहि भेटल"
+
+msgid "Invalid Username Encoding"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr "संसाधन निर�धारक"
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr ""
+
+msgid "Unexpected response from server"
+msgstr "सर�वरस� अप�रत�याशित प�रतिक�रिया"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+
+msgid "Unable to establish SSL connection"
+msgstr ""
+
+msgid "Full Name"
+msgstr "पूरा नाम"
+
+msgid "Family Name"
+msgstr "घरक नाम"
+
+msgid "Given Name"
+msgstr "देल नाम"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Street Address"
+msgstr "गलीक पता"
+
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
+msgid "Extended Address"
+msgstr "विस�तृत पता"
+
+msgid "Locality"
+msgstr "नगर"
+
+msgid "Region"
+msgstr "क�षेत�र"
+
+msgid "Postal Code"
+msgstr "पोस�टल कोड"
+
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+msgid "Country"
+msgstr "देश"
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+msgid "Telephone"
+msgstr "टेलिफोन"
+
+msgid "Organization Name"
+msgstr "संस�था नाम"
+
+msgid "Organization Unit"
+msgstr "संस�था �काइ"
+
+msgid "Job Title"
+msgstr "कार�य उपाधि"
+
+msgid "Role"
+msgstr "भूमिका"
+
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "जन�मदिन"
+
+msgid "Description"
+msgstr "विवरण"
+
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard संपादित करू"
+
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr "सभचीज वैकल�पिक अछि. जाहि सूचना के� भर�मे अहा�के� समस�या नहि ह�� केवल ओकरा भरू."
+
+msgid "Client"
+msgstr "क�ला��ट"
+
+msgid "Operating System"
+msgstr "औपरेटिंग सिस�टम"
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Priority"
+msgstr "प�राथमिकता"
+
+msgid "Resource"
+msgstr "संसाधन"
+
+msgid "Uptime"
+msgstr "चालू रहबा क' समय"
+
+msgid "Logged Off"
+msgstr ""
+
+#, c-format
+msgid "%s ago"
+msgstr "%s पहिले"
+
+msgid "Middle Name"
+msgstr "मध�य नाम"
+
+msgid "Address"
+msgstr "पता"
+
+msgid "P.O. Box"
+msgstr "पी ओ बाक�स"
+
+msgid "Photo"
+msgstr "चित�र"
+
+msgid "Logo"
+msgstr "लोगो"
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+
+msgid "Cancel Presence Notification"
+msgstr "उपस�थिति चेतावनी रद करू"
+
+msgid "Un-hide From"
+msgstr "स� सामना आनू"
+
+msgid "Temporarily Hide From"
+msgstr "अस�थाइ र�पे� �करास� न�काबू"
+
+msgid "(Re-)Request authorization"
+msgstr "(फिन�) प�रमाणीकरण लेल आग�रह करू"
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "सदस�यता वापस लिअ'"
+
+msgid "Initiate _Chat"
+msgstr "गप�प-सप�प श�रू करू(_C)"
+
+msgid "Log In"
+msgstr "लाग इन"
+
+msgid "Log Out"
+msgstr "लाग आउट"
+
+msgid "JID"
+msgstr "JID"
+
+#. last name
+msgid "Last Name"
+msgstr "अंतिम नाम"
+
+msgid "The following are the results of your search"
+msgstr "निम�न अहा�क खोजक नतीजा अछि"
+
+#. current comment from Jabber User Directory users.jabber.org
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"देल क�षेत�रमे खोज मापदंड डालकै �कटा संपर�क ढू�ढू. नोट: प�रत�येक क�षेत�र वाइल�ड कार�ड खोज (%) क "
+"समर�थन करैछ"
+
+msgid "Directory Query Failed"
+msgstr "निर�देशिका प�रश�न विफल"
+
+msgid "Could not query the directory server."
+msgstr "निर�देशिका सर�वरक प�रश�न नहि क� सकल."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "सर�वर निर�देश: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "कोनो मेल खा�त XMPP प�रयोक�तासभक खोजबाक लेल �कटा अथवा आओर क�षेत�रसभमे भरू."
+
+msgid "Email Address"
+msgstr "इमेल पता"
+
+msgid "Search for XMPP users"
+msgstr "XMPP प�रयोक�तासभक लेल खोजू"
+
+#. "Search"
+msgid "Search"
+msgstr "खोजू"
+
+msgid "Invalid Directory"
+msgstr "अवैध निर�देशिका"
+
+msgid "Enter a User Directory"
+msgstr "�कटा प�रयोक�ताक निर�देशिका डालू"
+
+msgid "Select a user directory to search"
+msgstr "खोजबाक लेल प�रयोक�ताक निर�देशिका च�नू"
+
+msgid "Search Directory"
+msgstr "निर�देशिका खोजू"
+
+msgid "_Room:"
+msgstr "कक�ष (_R):"
+
+msgid "_Server:"
+msgstr "सर�वर (_S):"
+
+msgid "_Handle:"
+msgstr "दस�ता (_H):"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s �कटा वैध कक�ष नाम नहि अछि"
+
+msgid "Invalid Room Name"
+msgstr "अवैध कक�ष नाम"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s �कटा वैध सर�वर नाम नहि अछि"
+
+msgid "Invalid Server Name"
+msgstr "अवैध सर�वर नाम"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s �कटा वैध कक�ष नाम नहि अछि"
+
+msgid "Invalid Room Handle"
+msgstr "अवैध कक�ष नाम"
+
+msgid "Configuration error"
+msgstr "बिन�यासमे त�र�टि"
+
+msgid "Unable to configure"
+msgstr "विन�यास करैमे असमर�थ"
+
+msgid "Room Configuration Error"
+msgstr "कक�ष विन�यास त�र�टि"
+
+msgid "This room is not capable of being configured"
+msgstr "ई कक�ष बिन�यासयोग�य नहि अछि"
+
+msgid "Registration error"
+msgstr "पंजीयन त�र�टि"
+
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr "गैर MUC गप�प-सप�प कक�षसभमे उपनामक परिवर�तन समर�थित नहि अछि"
+
+msgid "Error retrieving room list"
+msgstr "कमरा सूचीस� त�र�टि पाउ"
+
+msgid "Invalid Server"
+msgstr "अवैध सर�वर"
+
+msgid "Enter a Conference Server"
+msgstr "सम�मेलन सर�वरमे घ�सू"
+
+msgid "Select a conference server to query"
+msgstr "सम�मेलन सर�वर के� सवाल करबाक लेल च�नू"
+
+msgid "Find Rooms"
+msgstr "कक�ष खोजू"
+
+msgid "Affiliations:"
+msgstr ""
+
+msgid "No users found"
+msgstr ""
+
+msgid "Roles:"
+msgstr ""
+
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Ping timed out"
+msgstr ""
+
+msgid "Invalid XMPP ID"
+msgstr "अवैध XMPP ID"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "अवैध XMPP ID. डोमेन जरूर सेट ह�बाक चाही."
+
+msgid "Malformed BOSH URL"
+msgstr ""
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "%s@%s क पंजीयन सफल"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s मे पंजीयन सफल"
+
+msgid "Registration Successful"
+msgstr "पंजीयन सफल रहल"
+
+msgid "Registration Failed"
+msgstr "पंजीयन विफल रहल"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s स� पंजीयन सफलतापूर�वक हटा�ल गेल"
+
+msgid "Unregistration Successful"
+msgstr "पंजीयन वापिस लेनाइ सफल"
+
+msgid "Unregistration Failed"
+msgstr "पंजीयन वापिस लेनाइ विफल"
+
+msgid "State"
+msgstr "स�थिति"
+
+msgid "Postal code"
+msgstr "पोस�टल कोड"
+
+msgid "Phone"
+msgstr "फोन"
+
+msgid "Date"
+msgstr "दिनांक"
+
+msgid "Already Registered"
+msgstr "पहिनेस� पंजीकृत अछि"
+
+msgid "Unregister"
+msgstr "प�जीकरण वापिस लिअ'"
+
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "कृप�या अपन खाता पंजीकृत करबाक लेल नीच�चा� देल सूचना भरू."
+
+msgid "Please fill out the information below to register your new account."
+msgstr "कृप�या अपन नव खाता पंजीकृत करबाक लेल नीच�चा� देल सूचना भरू."
+
+msgid "Register New XMPP Account"
+msgstr "नव XMPP खाता पंजीकृत करू"
+
+msgid "Register"
+msgstr "पंजीकृत करू"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s पर खाता प�जीयन बदलू"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "नव खाता %s पर पंजीकृत करू"
+
+msgid "Change Registration"
+msgstr "पञ�जीयन बदलू"
+
+msgid "Error unregistering account"
+msgstr "खाता प�जीयन वापिस लेबामे त�र�टि"
+
+msgid "Account successfully unregistered"
+msgstr "खाताक सफलतापूर�वक प�जीयन वापिस लेल गेल"
+
+msgid "Initializing Stream"
+msgstr "धाराक आरंभ क� रहल अछि"
+
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS के� आर�भ करैत अछि"
+
+msgid "Authenticating"
+msgstr "प�रमाणित क� रहल अछि"
+
+msgid "Re-initializing Stream"
+msgstr "धाराक फिन� आरंभ"
+
+msgid "Server doesn't support blocking"
+msgstr ""
+
+msgid "Not Authorized"
+msgstr "प�राधिकृत नहि"
+
+msgid "Mood"
+msgstr "स�वभाव"
+
+msgid "Now Listening"
+msgstr "आबि स�नि रहल अछि"
+
+msgid "Both"
+msgstr "द�नू"
+
+msgid "From (To pending)"
+msgstr "स� (स�थगितमे)"
+
+msgid "From"
+msgstr "स�"
+
+msgid "To"
+msgstr "के�"
+
+msgid "None (To pending)"
+msgstr "कोनो नहि (स�थगितमे)"
+
+msgid "None"
+msgstr "किछ� नहि"
+
+#. subscription type
+msgid "Subscription"
+msgstr "सदस�यता"
+
+msgid "Mood Text"
+msgstr "मूड पाठ"
+
+msgid "Allow Buzz"
+msgstr "बज�ज स�वीकारू"
+
+msgid "Mood Name"
+msgstr ""
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Tune Artist"
+msgstr "कलाकार ट�यून करू"
+
+msgid "Tune Title"
+msgstr "ध�नक शीर�षक"
+
+msgid "Tune Album"
+msgstr "�ल�बम ट�यून करू"
+
+msgid "Tune Genre"
+msgstr "घराना ट�यून करू"
+
+msgid "Tune Comment"
+msgstr "ध�नक टिप�पणी"
+
+msgid "Tune Track"
+msgstr "ट�रैक ट�यून करू"
+
+msgid "Tune Time"
+msgstr "समय ट�यून करू"
+
+msgid "Tune Year"
+msgstr "साल ट�यून करू"
+
+msgid "Tune URL"
+msgstr "ट�यून URL"
+
+msgid "Password Changed"
+msgstr "ग�ड़किल�ली बद�ल गेल"
+
+msgid "Your password has been changed."
+msgstr "अहा�क ग�ड़किल�ली बद�ल देल गेल अछि."
+
+msgid "Error changing password"
+msgstr "ग�ड़किल�ली बदल�मे त�र�टि"
+
+msgid "Change XMPP Password"
+msgstr "XMPP ग�ड़किल�ली बदलू"
+
+msgid "Please enter your new password"
+msgstr "कृप�या अपन नव ग�ड़किल�ली डालू"
+
+msgid "Set User Info..."
+msgstr "प�रयोक�ताक सूचना नियत करू..."
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+msgid "Change Password..."
+msgstr "ग�ड़किल�ली बदलू..."
+
+#. }
+msgid "Search for Users..."
+msgstr "प�रयोक�ताक लेल खोजू..."
+
+msgid "Bad Request"
+msgstr "अधलाह आग�रह"
+
+msgid "Conflict"
+msgstr "विरोध"
+
+msgid "Feature Not Implemented"
+msgstr "ग�ण लागू नहि भेल"
+
+msgid "Forbidden"
+msgstr "वर�जित"
+
+msgid "Gone"
+msgstr "गेल छलाह"
+
+msgid "Internal Server Error"
+msgstr "आंतरिक सर�वर त�र�टि"
+
+msgid "Item Not Found"
+msgstr "चीज नहि मिलल"
+
+msgid "Malformed XMPP ID"
+msgstr "विरूपित XMPP ID"
+
+msgid "Not Acceptable"
+msgstr "स�वीकार�य नहि"
+
+msgid "Not Allowed"
+msgstr "आज�ञा नहि"
+
+msgid "Payment Required"
+msgstr "भ�गतान आवश�यक"
+
+msgid "Recipient Unavailable"
+msgstr "प�राप�तकर�ता उपलब�ध नहि अछि"
+
+msgid "Registration Required"
+msgstr "पंजीयन आवश�यक"
+
+msgid "Remote Server Not Found"
+msgstr "दूरस�थ सर�वर नहि भेटल"
+
+msgid "Remote Server Timeout"
+msgstr "दूरस�थ सर�वरक समयसमाप�त"
+
+msgid "Server Overloaded"
+msgstr "सर�वर बड़ लादल अछि"
+
+msgid "Service Unavailable"
+msgstr "सेवा उपलब�ध नहि अछि"
+
+msgid "Subscription Required"
+msgstr "सदस�यता आवश�यक"
+
+msgid "Unexpected Request"
+msgstr "अनपेक�षित आग�रह"
+
+msgid "Authorization Aborted"
+msgstr "प�रमाणीकरण रहि गेल"
+
+msgid "Incorrect encoding in authorization"
+msgstr "प�रमाणीकरणमे गलत �नकोडिंग"
+
+msgid "Invalid authzid"
+msgstr "अवैध औथ�जआइडी"
+
+msgid "Invalid Authorization Mechanism"
+msgstr "अवैध प�रमाणीकरण यांत�रिकी"
+
+msgid "Authorization mechanism too weak"
+msgstr "प�रमाणीकरण यांत�रिकी बड़ कमज़ोर अछि"
+
+msgid "Temporary Authentication Failure"
+msgstr "अस�थायी प�रमाणीकरण विफल"
+
+msgid "Authentication Failure"
+msgstr "प�रमाणीकरण विफल"
+
+msgid "Bad Format"
+msgstr "अधलाह रचना"
+
+msgid "Bad Namespace Prefix"
+msgstr "अधलाह नेमस�पेस उपसर�ग"
+
+msgid "Resource Conflict"
+msgstr "संसाधन विरोध"
+
+msgid "Connection Timeout"
+msgstr "संबंधनक समय समाप�त"
+
+msgid "Host Gone"
+msgstr "मेजबान चलि गेल"
+
+msgid "Host Unknown"
+msgstr "अनचिन�ह मेजबान"
+
+msgid "Improper Addressing"
+msgstr "अन�पय�क�त संबोधन"
+
+msgid "Invalid ID"
+msgstr "अवैध ID"
+
+msgid "Invalid Namespace"
+msgstr "अवैध नैमस�पेस"
+
+msgid "Invalid XML"
+msgstr "अवैध XML"
+
+msgid "Non-matching Hosts"
+msgstr "कोनो जोड़ीदार मेजबान नहि अछि"
+
+msgid "Policy Violation"
+msgstr "नीति उल�लंघन"
+
+msgid "Remote Connection Failed"
+msgstr "दूरस�थ संबंधन विफल"
+
+msgid "Restricted XML"
+msgstr "प�रतिबंधित XML"
+
+msgid "See Other Host"
+msgstr "अन�य मेजबान देखू"
+
+msgid "System Shutdown"
+msgstr "तंत�र बन�न"
+
+msgid "Undefined Condition"
+msgstr "अनचिन�ह स�थिति"
+
+msgid "Unsupported Encoding"
+msgstr "असमर�थित �नकोडिंग"
+
+msgid "Unsupported Stanza Type"
+msgstr "असमर�थित छंद प�रकार"
+
+msgid "Unsupported Version"
+msgstr "असमर�थित संस�करण"
+
+msgid "XML Not Well Formed"
+msgstr "XML नीक रूपे� नहि अछि"
+
+msgid "Stream Error"
+msgstr "धारा त�र�टि"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "%s प�रयोक�ता के� निषेध करैमे असमर�थ"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "अनचिन�ह ज�ड़ाव: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "%s प�रयोक�ताक \"%s\" रूपे� जोड़ैमे असमर�थ"
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "अनचिन�ह भूमिका: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "भूमिकाके� \"%s\" प�रयोक�ताक लेल सेट करैमे असमर�थ: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%s प�रयोक�ता के� लाइत मार�मे असमर�थ"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "%s प�रयोक�ताके� पि�ग करैमे असमर�थ"
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "बज�ज"
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s अहा�क बज�ज क�न� छै!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "बज�जिंग %s..."
+
+#, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr "�कटा स�साधन च�नू"
+
+msgid "Initiate Media"
+msgstr ""
+
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
+msgid "config:  Configure a chat room."
+msgstr "कंफिग: गप�प-सप�प कक�षक बिन�यस�त करू."
+
+msgid "configure:  Configure a chat room."
+msgstr "बिन�यास: गप�प-सप�प कक�षक बिन�यस�त करू."
+
+msgid "part [message]:  Leave the room."
+msgstr ""
+
+msgid "register:  Register with a chat room."
+msgstr "पंजीकृत: गप�प-सप�प कक�षक संग पंजीकृत करू"
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr "विषय [नव विषय]: चैनल विषय के� देखू अथवा बदलू."
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "invite &lt;user&gt; [message]:  प�रयोक�ताके� कक�षमे आमंत�रित करू."
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr ""
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;user&gt; &lt;message&gt;:  अन�य प�रयोक�ता के� निजी संदेश पठाउ."
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tप�रयोक�ता/घटक/सर�वर पिंग करैछ."
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "बज़�ज़: ध�यान घींचबाक लेल �कटा प�रयोक�ताक बज�ज करू"
+
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr "बड़ समय लेल अन�पस�थित"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP प�रोटोकाल प�लगिन"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "डोमेन"
+
+msgid "Require encryption"
+msgstr "गोपन जरूरी"
+
+msgid "Use encryption if available"
+msgstr ""
+
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
+msgstr ""
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "विगोपित धाराक उप�पर सादा पाठ प�रमाणीकरणक आज�ञा दिअ'"
+
+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
+msgid "Connect server"
+msgstr "सर�वर संबंधित करू"
+
+msgid "File transfer proxies"
+msgstr "फाइल हस�तांतरण पोर�ट"
+
+msgid "BOSH URL"
+msgstr ""
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr ""
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s वार�तालापके� छोड़न� अछि."
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s स� संदेश"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s �त� विषय नियत क�लकाह: %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "विषय अछि: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s के� संदेश पठा�ब विफल: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP संदेश त�र�टि"
+
+#, c-format
+msgid "(Code %s)"
+msgstr ""
+
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "XML विश�लेषणक त�र�टि"
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s गप�प-सप�पमे सामिल हो�बामे त�र�टि"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s गप�प-सप�पमे त�र�टि"
+
+msgid "Create New Room"
+msgstr "ीनव कक�ष बनाबू"
+
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"अहा� नव कक�ष बना रहल अछि. की अहा� �करा बिन�यस�त करैले चाहैछी, अथवा पूर�वनिर�धारित सेटिंग "
+"स�वीकार करब?"
+
+msgid "_Configure Room"
+msgstr "कक�षके� बिन�यस�त करू (_C)"
+
+msgid "_Accept Defaults"
+msgstr "पूर�वनिर�धारित स�वीकारू (_A)"
+
+msgid "No reason"
+msgstr "कोनो कारण नहि"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr ""
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr ""
+
+msgid "Unknown Error in presence"
+msgstr "उपस�थितिमे अनचिन�ह त�र�टि"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr "%s के� फाइल हस�तांतरणमे असमर�थ, कारण प�रयोक�ता फाइल हस�तांतरण समर�थन नहि करैछ."
+
+msgid "File Send Failed"
+msgstr "फाइल पठा�ब विफल"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s मे फाइल पठाबैमे विफल अवैध JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s मे फाइल भेजबामे असमर�थ, प�रयोक�ता औनलाइन नहि अछि."
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s मे फाइल भेजबामे असमर�थ, प�रयोक�ता मोज�दगीमे सदस�यता नहि लेन� अछि."
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "कृप�या %s क' संसाधन च�नू जकरामे अहा� फाइल पठाबै लेल चाहब"
+
+msgid "Afraid"
+msgstr ""
+
+msgid "Amazed"
+msgstr ""
+
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr "क�रोधित"
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr "चिंतित"
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr "शर�मिंदा"
+
+msgid "Bored"
+msgstr "उबल"
+
+msgid "Brave"
+msgstr ""
+
+msgid "Calm"
+msgstr "शांत"
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Confused"
+msgstr ""
+
+msgid "Contemplative"
+msgstr ""
+
+msgid "Contented"
+msgstr ""
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+msgid "Creative"
+msgstr ""
+
+msgid "Curious"
+msgstr ""
+
+msgid "Dejected"
+msgstr ""
+
+msgid "Depressed"
+msgstr ""
+
+msgid "Disappointed"
+msgstr ""
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+msgid "Distracted"
+msgstr ""
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr "उत�साहित"
+
+msgid "Flirtatious"
+msgstr ""
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+msgid "Grumpy"
+msgstr ""
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr "स�खी"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "गर�म"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+msgid "Hungry"
+msgstr ""
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr "प�यारमे"
+
+msgid "Indignant"
+msgstr ""
+
+msgid "Interested"
+msgstr ""
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr "अजय"
+
+msgid "Jealous"
+msgstr "इर�ष�याल�"
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr ""
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr "माध�य"
+
+msgid "Moody"
+msgstr ""
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Proud"
+msgstr ""
+
+msgid "Relaxed"
+msgstr ""
+
+msgid "Relieved"
+msgstr ""
+
+msgid "Remorseful"
+msgstr ""
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr "द�खी"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr "गंभीर"
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "औंघा�ल"
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr "मजबूत"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+msgid "Undefined"
+msgstr "अपरिभाषित"
+
+msgid "Weak"
+msgstr "कमजोर"
+
+msgid "Worried"
+msgstr ""
+
+msgid "Set User Nickname"
+msgstr "प�रयोक�ता उपनाम नियत करू"
+
+msgid "Please specify a new nickname for you."
+msgstr "कृप�या अपना लेल नव उपनाम निर�दिष�ट करू."
+
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr "ई सूचना अहा�क स�पर�क सूची पर सभटा स�पर�कमे दृश�य अछि इ�ह लेल किछ� उचित च�नू."
+
+msgid "Set"
+msgstr "सेट"
+
+msgid "Set Nickname..."
+msgstr "उपनाम नियत करू..."
+
+msgid "Actions"
+msgstr "क�रियासभ"
+
+msgid "Select an action"
+msgstr "�कटा काज च�नू"
+
+#. 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
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\"मे जोड�मे असमर�थ."
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
+msgstr ""
+
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "%s (%s) मे मीत सूची त�ल�यकालन म�द�दा"
+
+#, 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\" समूहमे अछि पर सर�वर सूचीमे नहि अछि. की अहा� ई मीत के� जोड़ैल "
+"चाहैछ?"
+
+#, 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 स�थानीय सूचीमे अछि पर सर�वर सूचीमे नहि. की अहा� ई मीतके� जोड़ैल चाहैछ?"
+
+msgid "Unable to parse message"
+msgstr "संदेश विश�लेषणमे असमर�थ"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "वाक�यरचनाक त�र�टि (संभवतः क�ला��ट बग)"
+
+msgid "Invalid email address"
+msgstr ""
+
+msgid "User does not exist"
+msgstr "प�रयोक�ता नहि मोज�द अछि"
+
+msgid "Fully qualified domain name missing"
+msgstr "फूली क�वालिफाइड डोमेन नाम ग�म अछि"
+
+msgid "Already logged in"
+msgstr "पहिनेस� लौग इन"
+
+msgid "Invalid username"
+msgstr ""
+
+msgid "Invalid friendly name"
+msgstr "अवैध मित�रवत नाम!"
+
+msgid "List full"
+msgstr "सूची पूर�ण"
+
+msgid "Already there"
+msgstr "पहिनेस� अछि"
+
+msgid "Not on list"
+msgstr "सूचीमे नहि"
+
+msgid "User is offline"
+msgstr "प�रयोक�ता आफलाइन अछि"
+
+msgid "Already in the mode"
+msgstr "पहिनेस� मोडमे अछि"
+
+msgid "Already in opposite list"
+msgstr "पहिनेस� विपरीत सूचीमे मोज�द"
+
+msgid "Too many groups"
+msgstr "कतेको समूह"
+
+msgid "Invalid group"
+msgstr "अवैध समूह"
+
+msgid "User not in group"
+msgstr "प�रयोक�ता समूहमे नहि"
+
+msgid "Group name too long"
+msgstr "समूह नाम बड़ नमहर अछि"
+
+msgid "Cannot remove group zero"
+msgstr "समूह शून�यके� मिटा नहि सकैछ"
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "�हन समूहमे संपर�क डालैक प�रयास जे उपस�थित नहि अछि"
+
+msgid "Switchboard failed"
+msgstr "स�विचबोर�ड विफल"
+
+msgid "Notify transfer failed"
+msgstr "हस�तातंरण विफल अधिसूचित करू"
+
+msgid "Required fields missing"
+msgstr "आवश�यक क�षेत�र ग�म"
+
+msgid "Too many hits to a FND"
+msgstr "�कटा FND पर बड़ हिट�स अछि"
+
+msgid "Not logged in"
+msgstr "लौगइन नहि अछि"
+
+msgid "Service temporarily unavailable"
+msgstr "सेवा अस�थायीरूपे� मोज�द नहि अछि."
+
+msgid "Database server error"
+msgstr "डाटाबेस सर�वर त�र�टि"
+
+msgid "Command disabled"
+msgstr "कमांड असमर�थ"
+
+msgid "File operation error"
+msgstr "फाइल कार�यवाहीमे गलती"
+
+msgid "Memory allocation error"
+msgstr "स�मृति आबंटन त�र�टि"
+
+msgid "Wrong CHL value sent to server"
+msgstr "सर�वरके� गलत CHL मान पठा�ल गेल"
+
+msgid "Server busy"
+msgstr "सर�वर व�यस�त अछि"
+
+msgid "Server unavailable"
+msgstr "सर�वर उपलब�ध नहि अछि"
+
+msgid "Peer notification server down"
+msgstr "पीयर अधिसूचना सर�वर बन�न"
+
+msgid "Database connect error"
+msgstr "डाटाबेस संबंधनमे त�र�टि"
+
+msgid "Server is going down (abandon ship)"
+msgstr "सर�वर बन�न भ' रहल अछि (जहाज छोडू)"
+
+msgid "Error creating connection"
+msgstr "संबंधन बनबैमे त�र�टि"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "सी वी आर पैरामीटर अथवा त' अनचिन�ह अछि अथवा वर�जित अछि"
+
+msgid "Unable to write"
+msgstr "लिखैमे असमर�थ"
+
+msgid "Session overload"
+msgstr "सत�र बड़ लादल अछि"
+
+msgid "User is too active"
+msgstr "प�रयोक�ता बड़ तेज़ अछि"
+
+msgid "Too many sessions"
+msgstr "ढेरी सत�र"
+
+msgid "Passport not verified"
+msgstr "पासपोर�ट जांचल नहि"
+
+msgid "Bad friend file"
+msgstr "अधलाह मित�र फाइल"
+
+msgid "Not expected"
+msgstr "अपेक�षित नहि"
+
+msgid "Friendly name is changing too rapidly"
+msgstr ""
+
+msgid "Server too busy"
+msgstr "सर�वर बड़ व�यस�त अछि"
+
+msgid "Authentication failed"
+msgstr "सत�यापन असफल"
+
+msgid "Not allowed when offline"
+msgstr "जखन आफलाइन अछि तखन आज�ञा नहि"
+
+msgid "Not accepting new users"
+msgstr "नव प�रयोक�तासभक स�वीकार नहि करैछ"
+
+msgid "Kids Passport without parental consent"
+msgstr "माता-पिताक सहमतिक� बिन� बच�चासभक पासपोर�ट"
+
+msgid "Passport account not yet verified"
+msgstr "पासपोर�ट खाता �खन तक जा�चल नहि गेल"
+
+msgid "Passport account suspended"
+msgstr ""
+
+msgid "Bad ticket"
+msgstr "अधलाह टिकट"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "अनचिन�ह त�र�टि कोड %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN त�र�टि: %s\n"
+
+msgid "Other Contacts"
+msgstr ""
+
+msgid "Non-IM Contacts"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
+msgid "Nudge"
+msgstr "टहोका"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s अहा�क टहोका देन� अछि!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "%s के� टहोका द� रहल अछि..."
+
+msgid "Email Address..."
+msgstr ""
+
+msgid "Your new MSN friendly name is too long."
+msgstr "अहा�क MSN मित�रवत नाम बड़ लम�बा अछि."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
+msgid "Set your friendly name."
+msgstr "अपन मैत�रीक नाम नियत करू."
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "इ�ह ओ नाम अछि जे दोसर MSN मीत अहा�के� ई रूपे� देखताह."
+
+msgid "Set your home phone number."
+msgstr "घरक फोन नंबर नियत करू."
+
+msgid "Set your work phone number."
+msgstr "दफ�तरक फोन नंबर नियत करू."
+
+msgid "Set your mobile phone number."
+msgstr "मोबाइल फोन नंबर नियत करू."
+
+msgid "Allow MSN Mobile pages?"
+msgstr "MSN मोबाइल पन�नाके� आज�ञा दिअ'?"
+
+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 मोबाइल पन�ना "
+"भेजक� अन�मति देबाक अथवा मना करैले चाहै छी?"
+
+msgid "Allow"
+msgstr "स�वीकारू"
+
+msgid "Disallow"
+msgstr "मना करू"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+msgid "This account does not have email enabled."
+msgstr ""
+
+msgid "Send a mobile message."
+msgstr "मोबाइल संदेश पठाउ."
+
+msgid "Page"
+msgstr "पृष�ठ"
+
+msgid "Playing a game"
+msgstr ""
+
+msgid "Working"
+msgstr "कार�यशील"
+
+msgid "Has you"
+msgstr "अहा�क राखैछ"
+
+msgid "Home Phone Number"
+msgstr "घरक फोन नंबर"
+
+msgid "Work Phone Number"
+msgstr "काजस�थानक फोन नंबर"
+
+msgid "Mobile Phone Number"
+msgstr "मोबाइल फोन नंबर"
+
+msgid "Be Right Back"
+msgstr "कनेक देरमे वापस"
+
+msgid "Busy"
+msgstr "व�यस�त"
+
+msgid "On the Phone"
+msgstr "फोन पर अछि"
+
+msgid "Out to Lunch"
+msgstr "दिनक खाना पर गेल अछि"
+
+msgid "Game Title"
+msgstr ""
+
+msgid "Office Title"
+msgstr ""
+
+msgid "Set Friendly Name..."
+msgstr "मित�रवत नाम नियत करू..."
+
+msgid "Set Home Phone Number..."
+msgstr "घरका फोन नंबर नियत करू..."
+
+msgid "Set Work Phone Number..."
+msgstr "दफ�तरक फोन नंबर नियत करू..."
+
+msgid "Set Mobile Phone Number..."
+msgstr "मोबाइल फोन नंबर नियत करू..."
+
+msgid "Enable/Disable Mobile Devices..."
+msgstr "मोबाइल य�क�तिके� सक�रिय/ निष�क�रिय करू"
+
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "मोबाइल पन�ना के� स�वीकृति/अस�वीकृति दिअ'..."
+
+msgid "View Blocked Text..."
+msgstr ""
+
+msgid "Open Hotmail Inbox"
+msgstr "Hotmail इनबॉक�स खोलू"
+
+msgid "Send to Mobile"
+msgstr "मोबाइल के� पठाउ"
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"MSN लेल SSL क समर�थनक आवश�यकता अछि. कृप�या �कटा समर�थित SSLलाइब�रेरी स�थापित करू."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+msgstr ""
+
+msgid "Unable to Add"
+msgstr ""
+
+msgid "Authorization Request Message:"
+msgstr "प�रमाणीकरण लेल आग�रह संदेश"
+
+msgid "Please authorize me!"
+msgstr "कृप�या हमरा प�रमाणित करू!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "बेस (_O)"
+
+msgid "Error retrieving profile"
+msgstr "प�रोफाइल प�राप�त करैमे त�र�टि"
+
+msgid "General"
+msgstr "सामान�य"
+
+msgid "Age"
+msgstr "आय�"
+
+msgid "Occupation"
+msgstr "व�यवसाय"
+
+msgid "Location"
+msgstr "स�थान"
+
+msgid "Hobbies and Interests"
+msgstr "र�चि आओर लगाव"
+
+msgid "A Little About Me"
+msgstr "कनिक हमर संबंधमे"
+
+msgid "Social"
+msgstr "सामाजिक"
+
+msgid "Marital Status"
+msgstr "वैवाहिक स�थिति"
+
+msgid "Interests"
+msgstr "ब�याज"
+
+msgid "Pets"
+msgstr "पर�ल"
+
+msgid "Hometown"
+msgstr "घरक शहर"
+
+msgid "Places Lived"
+msgstr "स�थान जीवंत"
+
+msgid "Fashion"
+msgstr "फैशन"
+
+msgid "Humor"
+msgstr "मजाक"
+
+msgid "Music"
+msgstr "संगीत"
+
+msgid "Favorite Quote"
+msgstr "मनपसंद कहावत"
+
+msgid "Contact Info"
+msgstr "स�पर�क सूचना"
+
+msgid "Personal"
+msgstr "व�यक�तिगत"
+
+msgid "Significant Other"
+msgstr "महत�वपूर�ण अन�य"
+
+msgid "Home Phone"
+msgstr "फोन आवास"
+
+msgid "Home Phone 2"
+msgstr "घरक फोन 2"
+
+msgid "Home Address"
+msgstr "घरक पता"
+
+msgid "Personal Mobile"
+msgstr "निजी मोबाइल"
+
+msgid "Home Fax"
+msgstr "घरक फैक�स"
+
+msgid "Personal Email"
+msgstr ""
+
+msgid "Personal IM"
+msgstr "निजी IM"
+
+msgid "Anniversary"
+msgstr "वर�षगांठ"
+
+#. Business
+msgid "Work"
+msgstr "कामकाज"
+
+msgid "Company"
+msgstr "कंपनी"
+
+msgid "Department"
+msgstr "विभाग"
+
+msgid "Profession"
+msgstr "व�यवसाय"
+
+msgid "Work Phone"
+msgstr "फोन कार�यालय"
+
+msgid "Work Phone 2"
+msgstr "कार�यालय फोन 2"
+
+msgid "Work Address"
+msgstr "कार�यालय पता"
+
+msgid "Work Mobile"
+msgstr "कार�यालय मोबाइल"
+
+msgid "Work Pager"
+msgstr "कार�यालय पेजर"
+
+msgid "Work Fax"
+msgstr "कार�यालय फ़ैक�स"
+
+msgid "Work Email"
+msgstr ""
+
+msgid "Work IM"
+msgstr "कार�यालय IM"
+
+msgid "Start Date"
+msgstr "आरंभ तिथि"
+
+msgid "Favorite Things"
+msgstr "मनपसंद वस�त�"
+
+msgid "Last Updated"
+msgstr "अंतिम अद�यतन"
+
+msgid "Homepage"
+msgstr "म�ख�य पृष�ठ"
+
+msgid "The user has not created a public profile."
+msgstr "प�रयोक�ता अपन सार�वजनिक प�रोफाइल नहि बन�ने छै."
+
+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 प�रयोक�ताक प�रोफाइल खोज नहि सकल. �कर मतलब अछि जे �हि नामक प�रयोक�ता नहि अछि "
+"अथवा प�रयोक�ता त' अछि म�दा ओ अपन सार�वजनिक प�रोफाइल नहि बन�ने अछि."
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"प�रयोक�ताक प�रोफाइलमे कोनो सूचना खोजि नहि सकल. बेसी संभव �हि नामक प�रयोक�ता नहि अछि."
+
+msgid "View web profile"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *< summary
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "विंडोज लाइव मेसेंजर प�रोटोकोल प�लगिन"
+
+msgid "Use HTTP Method"
+msgstr "HTTP विधिक उपयोग करू"
+
+msgid "HTTP Method Server"
+msgstr "HTTP विधि सर�वर"
+
+msgid "Show custom smileys"
+msgstr "पसंदीदा स�माइली देखाउ"
+
+msgid "Allow direct connections"
+msgstr ""
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "टहोका: ध�यान आकृष�ठ करबाक लेल �कटा प�रयोक�ताके� टहोका दिअ'"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID सत�यापन: जोड़बामे असमर�थ"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+msgid "The following users are missing from your addressbook"
+msgstr ""
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr ""
+
+msgid "Unable to add user"
+msgstr "प�रयोक�ता जोड़ैमे असमर�थ"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "अनचिन�ह त�र�टि (%d)"
+
+msgid "Unable to remove user"
+msgstr ""
+
+msgid "Mobile message was not sent because it was too long."
+msgstr ""
+
+#, 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"
+"देखभालक काम खत�म हो�बाक पर अहा� सफलतापूर�वक साइन इन क� सकबै."
+
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
+msgid "Writing error"
+msgstr "लिखैमे त�र�टि"
+
+msgid "Reading error"
+msgstr "पढ़ैमे त�र�टि"
+
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+"%s सर�वर स� संबंधन त�र�टि:\n"
+"%s"
+
+msgid "Our protocol is not supported by the server"
+msgstr ""
+
+msgid "Error parsing HTTP"
+msgstr ""
+
+msgid "You have signed on from another location"
+msgstr ""
+
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+"MSN सर�वर अस�थाइ र�प स� उपलब�ध नहि अछि. कृप�या किछ� देर प�रतीक�षाक बाद फिन� प�रयास करू."
+
+msgid "The MSN servers are going down temporarily"
+msgstr ""
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "प�रमाणीकरणमे असमर�थ: %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"अहा�क MSN मीत सूची अस�थाइ र�प स� उपलब�ध नहि अछि. कृप�या प�रतीक�षा करू आओर फिन� प�रयास करू."
+
+msgid "Handshaking"
+msgstr "हेन�डशेकिंग"
+
+msgid "Transferring"
+msgstr "हस�तांतरण भ' रहल अछि"
+
+msgid "Starting authentication"
+msgstr "प�रमाणीकरण श�र� क� रहल अछि"
+
+msgid "Getting cookie"
+msgstr "क�की आन रहल अछि"
+
+msgid "Sending cookie"
+msgstr "क�की पठा� रहल अछि"
+
+msgid "Retrieving buddy list"
+msgstr "मीत सूची आन रहल अछि"
+
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+
+msgid "Away From Computer"
+msgstr "कम�प�यूटर स� दूर"
+
+msgid "On The Phone"
+msgstr "फोन पर अछि"
+
+msgid "Out To Lunch"
+msgstr " दिनक खाना पर गेल अछि"
+
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "संदेश संभवतः पठा�ल नहि जाय सकल कारण समय समाप�त भ' गेल:"
+
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "संदेश पठा�ल नहि जाय सकल, जखन अदृश�य अछि त' अन�मति नहि अछि"
+
+msgid "Message could not be sent because the user is offline:"
+msgstr "संदेश पठा�ल नहि जाय सकल कारण प�रयोक�ता आफलाइन अछि"
+
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "संदेश पठा�ल नहि जाय सकल कारण संबंधनमे त�र�टि भ' गेल"
+
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "संदेश पठा�ल नहि जाय सकल कारण हम बह�त तेजी स� पठा� रहल छी."
+
+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 ""
+"संदेश नहि भेजल जा� सकल कि�क हमलोकनि सर�वरक स�ग �कटा सत�र स�थापित करबामे असमर�थ छल. ई "
+"संभवतः सर�वर समस�या अछि, किछ� मिनटमे फिन� कओसिस करू:"
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "संदेश पठा�ल नहि जाय सकल कारण स�विचबोर�डमे त�र�टि भ' गेल:"
+
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "संदेश पठा�ल नहि जाय सकल कारण अनचिन�ह त�र�टि भेल:"
+
+msgid "Delete Buddy from Address Book?"
+msgstr ""
+
+msgid "Do you want to delete this buddy from your address book as well?"
+msgstr ""
+
+msgid "The username specified is invalid."
+msgstr ""
+
+msgid "The PIN you entered is invalid."
+msgstr ""
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr ""
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+msgid "The two PINs you entered do not match."
+msgstr ""
+
+msgid "The Display Name you entered is invalid."
+msgstr ""
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr ""
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "प�रोफाइल"
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr ""
+
+msgid "Your UID"
+msgstr ""
+
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr ""
+
+msgid "Verify PIN"
+msgstr ""
+
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "प�रदर�शित नाम"
+
+#. hidden
+msgid "Hide my number"
+msgstr ""
+
+#. mobile number
+msgid "Mobile Number"
+msgstr ""
+
+msgid "Update your Profile"
+msgstr ""
+
+msgid "Here you can update your MXit profile"
+msgstr ""
+
+msgid "View Splash"
+msgstr ""
+
+msgid "There is no splash-screen currently available"
+msgstr ""
+
+msgid "About"
+msgstr "क' बारेमे"
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr ""
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr ""
+
+#. display plugin version
+msgid "About..."
+msgstr ""
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr ""
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+
+msgid "Logging In..."
+msgstr ""
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+
+msgid "Connecting..."
+msgstr "कनेक�ट क� रहल अछि...."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr ""
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr ""
+
+msgid "Please fill in the following fields:"
+msgstr ""
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr ""
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+
+msgid "Wrong security code entered. Please try again later."
+msgstr ""
+
+msgid "Your session has expired. Please try again later."
+msgstr ""
+
+msgid "Invalid country selected. Please try again."
+msgstr ""
+
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+
+msgid "Internal error. Please try again later."
+msgstr ""
+
+msgid "You did not enter the security code"
+msgstr ""
+
+msgid "Security Code"
+msgstr ""
+
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr ""
+
+msgid "Your Country"
+msgstr ""
+
+msgid "Your Language"
+msgstr ""
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr ""
+
+msgid "MXit account validation"
+msgstr ""
+
+msgid "Retrieving User Information..."
+msgstr ""
+
+msgid "Loading menu..."
+msgstr ""
+
+msgid "Status Message"
+msgstr ""
+
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
+msgid "Hidden Number"
+msgstr ""
+
+msgid "Your MXit ID..."
+msgstr ""
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr ""
+
+msgid "Connect via HTTP"
+msgstr ""
+
+msgid "Enable splash-screen popup"
+msgstr ""
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+msgid "_Room Name:"
+msgstr ""
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+msgstr ""
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr ""
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr ""
+
+msgid "Unable to process your request at this time"
+msgstr ""
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr ""
+
+msgid "Successfully Logged In..."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
+msgid "Message Error"
+msgstr ""
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr ""
+
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
+msgid "Contact Error"
+msgstr ""
+
+msgid "Message Sending Error"
+msgstr ""
+
+msgid "Status Error"
+msgstr ""
+
+msgid "Mood Error"
+msgstr ""
+
+msgid "Invitation Error"
+msgstr ""
+
+msgid "Contact Removal Error"
+msgstr ""
+
+msgid "Subscription Error"
+msgstr ""
+
+msgid "Contact Update Error"
+msgstr ""
+
+msgid "File Transfer Error"
+msgstr ""
+
+msgid "Cannot create MultiMx room"
+msgstr ""
+
+msgid "MultiMx Invitation Error"
+msgstr ""
+
+msgid "Profile Error"
+msgstr ""
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr ""
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr ""
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr ""
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr ""
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr ""
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr ""
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr ""
+
+msgid "In Love"
+msgstr "प�यारमे"
+
+msgid "Pending"
+msgstr "लंबित"
+
+msgid "Invited"
+msgstr ""
+
+msgid "Rejected"
+msgstr "अस�वीकृत"
+
+msgid "Deleted"
+msgstr "मेटा�ल"
+
+msgid "MXit Advertising"
+msgstr ""
+
+msgid "More Information"
+msgstr "बेसी सूचना"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "कोनो वहिना प�रयोक�ता नहि: %s"
+
+msgid "User lookup"
+msgstr "प�रयोक�ता देखनाइ"
+
+msgid "Reading challenge"
+msgstr "पढ़बाक च�नौती"
+
+msgid "Unexpected challenge length from server"
+msgstr "सर�वरस� अप�रत�याशित च�नौती नमाइ"
+
+msgid "Logging in"
+msgstr "लौगिंग इन"
+
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - कोनो प�रयोक�तानाम सेट नहि अछि"
+
+msgid "You appear to have no MySpace username."
+msgstr "अहा�क स�ग कोनो MySpace प�रयोक�तानाम संभवतः नहि अछि."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "की अहा�क �कटा सेट करबाक लेल चाहैत छी? (नोट: ई बदलि नहि सकैत अछि!)"
+
+msgid "Lost connection with server"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
+msgid "New mail messages"
+msgstr "नव मेल सन�देश"
+
+msgid "New blog comments"
+msgstr "नव ब�लौग टिप�पणी"
+
+msgid "New profile comments"
+msgstr "नव प�रोफाइल टिप�पणी"
+
+msgid "New friend requests!"
+msgstr "नव मित�रक आग�रह!"
+
+msgid "New picture comments"
+msgstr "नव चित�र टिप�पणी"
+
+msgid "MySpace"
+msgstr "MySpace"
+
+msgid "IM Friends"
+msgstr "IM मित�र"
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Add contacts from server"
+msgstr "सर�वरस� संपर�क जोड़ू"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "प�रोटोकाल त�र�टि, कोड %d: %s"
+
+#, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+msgid "Incorrect username or password"
+msgstr ""
+
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM त�र�टि"
+
+msgid "Invalid input condition"
+msgstr "अवैध इनप�ट स�थिति"
+
+msgid "Failed to add buddy"
+msgstr "मीतक ज�डबामे विफल"
+
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' कमा�ड विफल."
+
+msgid "persist command failed"
+msgstr "persist कमा�ड विफल"
+
+msgid "Failed to remove buddy"
+msgstr "मीतके� हटाबैमे विफल"
+
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' कमा�ड विफल"
+
+msgid "blocklist command failed"
+msgstr "blocklist कमा�ड विफल"
+
+msgid "Missing Cipher"
+msgstr "ग�म सिफर"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 साइफर नहि भेटि सकल"
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"libpurple मे RC4 समर�थनक स�ग उन�नयन करू (>= 2.0.1). MySpaceIM प�लगिन लोड नहि क�ल "
+"ज�ताह."
+
+msgid "Add friends from MySpace.com"
+msgstr "MySpace.com स� दोस�त जोड़ू"
+
+msgid "Importing friends failed"
+msgstr "मित�र आननाइ विफल"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "लोकनिसभक खोजू..."
+
+msgid "Change IM name..."
+msgstr "IM नाम बदलू..."
+
+msgid "myim URL handler"
+msgstr "myim URL निय�त�रक"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "कोनो उपय�क�त MySpaceIM खाता ई myim URL क' खोलबाक लेल नहि खोजल जा� सकल."
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "उचित MySpaceIM खाता सक�रिय करू आओर फिन� कओसिस करू."
+
+msgid "Show display name in status text"
+msgstr "स�थिति पाठमे प�रदर�शन नाम देखाउ"
+
+msgid "Show headline in status text"
+msgstr "स�थिति पाठमे हेडलाइन देखाउ"
+
+msgid "Send emoticons"
+msgstr "भावचिन�ह भेजू"
+
+msgid "Screen resolution (dots per inch)"
+msgstr "स�क�रीन रिजाल�यूशन (डाट प�रति इंच)"
+
+msgid "Base font size (points)"
+msgstr "बेस फोन�ट आकार (बिंद�)"
+
+msgid "User"
+msgstr "प�रयोक�ता"
+
+msgid "Headline"
+msgstr "हेडलाइन"
+
+msgid "Song"
+msgstr "गाना"
+
+msgid "Total Friends"
+msgstr "क�ल दोस�त"
+
+msgid "Client Version"
+msgstr "क�ला�ंट संस�करण"
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - प�रयोक�तानाम उपलब�ध"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "ई प�रयोक�तानाम उपलब�ध अछि. की अहा� �करा सेट करबा लेल चाहैत छी?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "�कबेर सेट ह�पर, ई बदलल नहि जा� सकैछ!"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - कृप�या प�रयोक�तानाम सेट करू"
+
+msgid "This username is unavailable."
+msgstr "ई प�रयोक�तानाम नहि मोज�द अछि."
+
+msgid "Please try another username:"
+msgstr "कृप�या दोसर प�रयोक�तानामक लेल कओसिस करू:"
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "कोनो प�रयोक�ता नाम सेट नहि"
+
+msgid "Please enter a username to check its availability:"
+msgstr "�कर उपलब�धता जा�चबाक लेल �कटा प�रयोक�तानाम दाखिल करू:"
+
+#. TODO: icons for each zap
+#. 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."
+msgid "Zap"
+msgstr "जैप"
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s अहा�क जैप करनैछ"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "%s जैपिंग..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "पिटाइ"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s अहा�क पिटनै अछि!"
+
+#, c-format
+msgid "Whacking %s..."
+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.
+msgid "Torch"
+msgstr "टार�च"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s अहा�क टार�च क�लक!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "टार�चि�ग %s..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "च�म�मा"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s अहा�क च�म�मा लेलक."
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s के� च�म�मा ल� रहल अछि..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "गर लगा�नाइ"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s अहा�स� गर लागल!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s स� गर लागि रहल अछि..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "चा�ट"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s अहा�क चा�ट देलक!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s के� चा�ट लगा� रहल अछि..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "च�ट�टी काटनाइ"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s अहा�क च�ट�टी काटलक!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "च�ट�टी काटि रहल अछि %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.
+msgid "High-five"
+msgstr "दिअ' ताली"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s अहा�क दिअ' ताली क�लक!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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.
+msgid "Punk"
+msgstr "पंक"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s अहा�क स�ग विनोद क�लक!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "%s विनोद क� रहल अछि..."
+
+#. 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.
+msgid "Raspberry"
+msgstr "डी�ग हा�कनाइ"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s अहा�स� डी�ग हा�कलक!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s डी�ग हा�कि रहल अछि..."
+
+msgid "Required parameters not passed in"
+msgstr "आवश�यक पैरामीटर नहि पास भेल"
+
+msgid "Unable to write to network"
+msgstr "संजाल पर लिखैमे असमर�थ"
+
+msgid "Unable to read from network"
+msgstr "संजाल स� पढ़ैमे असमर�थ"
+
+msgid "Error communicating with server"
+msgstr "सर�वर स� बात करैमे त�र�टि"
+
+msgid "Conference not found"
+msgstr "सम�मेलन नहि भेटल"
+
+msgid "Conference does not exist"
+msgstr "सम�मेलन मोज�द नहि अछि"
+
+msgid "A folder with that name already exists"
+msgstr "ओहि नामक �कटा फोल�डर पहिनेस� मोज�द अछि"
+
+msgid "Not supported"
+msgstr "समर�थन नहि अछि"
+
+msgid "Password has expired"
+msgstr "कूटशब�दक समय खतम भ' गेल"
+
+msgid "Incorrect password"
+msgstr "गलत ग�ड़किल�ली"
+
+msgid "Account has been disabled"
+msgstr "खाताके� निष�क�रिय क� देल गेल अछि"
+
+msgid "The server could not access the directory"
+msgstr "सर�वर निर�देशिका तक पह��च नहि सकल"
+
+msgid "Your system administrator has disabled this operation"
+msgstr "अहा�क सिस�टम प�रशासक �हि कार�यवाहीके� निष�क�रिय क� देलक"
+
+msgid "The server is unavailable; try again later"
+msgstr "सर�वर उपलब�ध नहि अछि; फिन� प�रयास करू"
+
+msgid "Cannot add a contact to the same folder twice"
+msgstr "ओहि फोल�डरमे संपर�क द�बारा नहि जोड़ सकैछ"
+
+msgid "Cannot add yourself"
+msgstr "अहा� अपने के� जोड़ नहि सकैछ"
+
+msgid "Master archive is misconfigured"
+msgstr "प�रम�ख अभिलेख क�बिन�यस�त अछि"
+
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"अहा�क खाताके� निष�क�रिय क�ल जा� रहल अछि कारण कतेको अवैध ग�ड़किल�ली दाखिल क� देल गेल छल"
+
+msgid "You cannot add the same person twice to a conversation"
+msgstr "अहा� ओहि प�रयोक�ताके� दोसर बेर �कटा संवादमे नहि जोड़ सकैछ"
+
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "जत� संपर�क जोड़े सकैछ अहा� ओहि सीमा पर अछि"
+
+msgid "You have entered an incorrect username"
+msgstr ""
+
+msgid "An error occurred while updating the directory"
+msgstr "निर�देशिका के� अद�यतन करैमे त�र�टि भेल"
+
+msgid "Incompatible protocol version"
+msgstr "बेमेल प�रोटोकोल संस�करण"
+
+msgid "The user has blocked you"
+msgstr "प�रयोक�ता अहा�के� रोकलक अछि"
+
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr "�हि मूल�यांकन संस�करणमे दसस� बेसीक�ता �कसौग लागइन नहि क� सकैछ"
+
+msgid "The user is either offline or you are blocked"
+msgstr "प�रयोक�ता अथवा त' आफलाइन अछि अथवा अहा� रोकल गेल छी"
+
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "अनचिन�ह त�र�टि: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "संदेश पठाब�मे असमर�थ. प�रयोक�ताक सूचनाक विवरण नहि पाबि सकल (%s)."
+
+#, 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?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "संदेश पठाबैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "प�रयोक�ताक आमंत�रित करैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s के� संदेश पठाब�मे असमर�थ. सम�मेलन नहि बना� सकल (%s)."
+
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "संदेश पठाब�मे असमर�थ. सम�मेलन नहि बना� सकल (%s)."
+
+#, 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) बनबैमे त�र�टि."
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr "%s के� मीत सूचीमे नहि जोड़ सकल. सर�वरक तरफ फोल�डर बनबैमे त�र�टि (%s)."
+
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "प�रयोक�ता %s लेल विवरण नहि लाबि सकल (%s)."
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "प�रयोक�ताके� ग�प�तता सूचीमे जोड़ैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "%s के� निषिद�ध सूचीमे जोड़ैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "%s के� अन�मति सूचीमे जोड़ैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "प�रयोक�ता %s के� ग�प�तता सूचीस� निकालैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "सर�वरक ग�प�तता सेटिंग बदल सकैमे असमर�थ (%s)."
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "सम�मेलन बनाबैमे असमर�थ (%s)."
+
+msgid "Error communicating with server. Closing connection."
+msgstr "सर�वर तक पह�ंचाबैमे त�र�टि. संबंधन बन�न क� रहल अछि"
+
+msgid "Telephone Number"
+msgstr "टेलीफोन नंबर"
+
+msgid "Personal Title"
+msgstr "निज उपाधि"
+
+msgid "Mailstop"
+msgstr "मेलबन�न"
+
+msgid "User ID"
+msgstr "प�रयोक�ता आइडी"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+msgid "Full name"
+msgstr "पूरा नाम"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "ग�र�पवाइज सम�मेलन %d"
+
+msgid "Authenticating..."
+msgstr "प�रमाणित क� रहल अछि"
+
+msgid "Waiting for response..."
+msgstr "उत�तरक प�रतीक�षा क� रहल अछि..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s के� �हि वार�तालाप लेल आमंत�रित क�ल गेल अछि."
+
+msgid "Invitation to Conversation"
+msgstr "वार�तालाप लेल आमंत�रण"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"स� निमंत�रण: %s\n"
+"\n"
+"पठा� देलक: %s"
+
+msgid "Would you like to join the conversation?"
+msgstr "की अहा� संवादमे सामिल हो�बाक लेल चाहबै?"
+
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s आफलाइन लागैत अछि आओर संदेश नहि भेटल जे अहा� �खन पठै�लह��."
+
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "ई सम�मेलन बन�न क� देल गेल अछि. आओर संदेश नहि भेजल जा� सकैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "नोवेल ग�र�पवाइज़ मेसेंजर प�रोटोकोल प�लग-इन"
+
+msgid "Server address"
+msgstr "सर�वर पता"
+
+msgid "Server port"
+msgstr "सर�वर पोर�ट"
+
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr "कोनो कारण नहि देल अछि"
+
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr "प�रमाणीकरणक मनाही संदेश:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s"
+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 ""
+"अहा� बेर-बेर संबंधित आओर बिसंबंधित भ' रहल छी. दस मिनट प�रतीक�षा करू फिन� प�रयास करू. ज� "
+"अहा� बिना र�कल प�रयास करैत रहै छी त' अहा�के� बेसी प�रतीक�षा करै पड़त."
+
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr ""
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 ""
+
+msgid "Could not join chat room"
+msgstr "गप�प सप�प कक�षमे सामिल नहि भ' सकल"
+
+msgid "Invalid chat room name"
+msgstr "अवैध गप�प सप�प कक�ष नाम"
+
+msgid "Invalid error"
+msgstr "अवैध त�र�टि"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+msgid "Cannot send SMS"
+msgstr ""
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr ""
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr ""
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr ""
+
+msgid "Bot account cannot IM this user"
+msgstr ""
+
+msgid "Bot account reached IM limit"
+msgstr ""
+
+msgid "Bot account reached daily IM limit"
+msgstr ""
+
+msgid "Bot account reached monthly IM limit"
+msgstr ""
+
+msgid "Unable to receive offline messages"
+msgstr ""
+
+msgid "Offline message store full"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "संदेश पठाब�मे असमर�थ: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr ""
+
+msgid "Thinking"
+msgstr ""
+
+msgid "Shopping"
+msgstr "खरीदारी"
+
+msgid "Questioning"
+msgstr ""
+
+msgid "Eating"
+msgstr ""
+
+msgid "Watching a movie"
+msgstr ""
+
+msgid "Typing"
+msgstr "टंकित करैत अछि"
+
+msgid "At the office"
+msgstr ""
+
+msgid "Taking a bath"
+msgstr ""
+
+msgid "Watching TV"
+msgstr ""
+
+msgid "Having fun"
+msgstr ""
+
+msgid "Sleeping"
+msgstr "स�प�त"
+
+msgid "Using a PDA"
+msgstr ""
+
+msgid "Meeting friends"
+msgstr ""
+
+msgid "On the phone"
+msgstr ""
+
+msgid "Surfing"
+msgstr ""
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "मोबाइल"
+
+msgid "Searching the web"
+msgstr ""
+
+msgid "At a party"
+msgstr ""
+
+msgid "Having Coffee"
+msgstr ""
+
+#. Playing video games
+msgid "Gaming"
+msgstr ""
+
+msgid "Browsing the web"
+msgstr ""
+
+msgid "Smoking"
+msgstr ""
+
+msgid "Writing"
+msgstr "लिखि रहल अछि"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr ""
+
+msgid "Listening to music"
+msgstr "स�गीत स�नि रहल अछि"
+
+msgid "Studying"
+msgstr ""
+
+msgid "In the restroom"
+msgstr ""
+
+msgid "Received invalid data on connection with server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM प�रोटोकोल प�लगिन"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ प�रोटोकोल प�लगिन"
+
+msgid "Encoding"
+msgstr "�नकोडिंग"
+
+msgid "The remote user has closed the connection."
+msgstr "दूरस�थ प�रयोक�ता संबंधन बन�न क� देलकाह."
+
+msgid "The remote user has declined your request."
+msgstr "दूरस�थ प�रयोक�ता अहा�के� आग�रहक ठोकराय देलक"
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "दूरस�थ प�रयोक�ताक स�ग संबंधन खत�म भ' गेल:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "दूरस�थ प�रयोक�ताक स�ग संबंधन पर अवैध आंकड़ा प�राप�त क�लकाह."
+
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
+
+msgid "Direct IM established"
+msgstr "सीधा IM स�थापित"
+
+#, 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 तकि के� Direct IM पर फाइलसभके� "
+"अन�मति देत अछि.  फाइल हस�ता�तरणक कओसिस बदलामे करू.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "फाइल %s अछि %s, जे %s क' अधिकतम आकार स� पैघ अछि."
+
+msgid "Free For Chat"
+msgstr "गप�प-सप�प लेल तैआर"
+
+msgid "Not Available"
+msgstr "उपलब�ध नहि"
+
+msgid "Occupied"
+msgstr "व�यस�त"
+
+msgid "Web Aware"
+msgstr "वैब परिचित"
+
+msgid "Invisible"
+msgstr "अदृश�य"
+
+msgid "Evil"
+msgstr ""
+
+msgid "Depression"
+msgstr ""
+
+msgid "At home"
+msgstr ""
+
+msgid "At work"
+msgstr ""
+
+msgid "At lunch"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr ""
+
+msgid "Username sent"
+msgstr "प�रयोक�तानाम प�रेषित"
+
+msgid "Connection established, cookie sent"
+msgstr "संबंधन भेल, क�की पठा� देलक"
+
+#. TODO: Don't call this with ssi
+msgid "Finalizing connection"
+msgstr "संबंधन के� निर�णय क� रहल अछि"
+
+#, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "वैध AIM लागिन हैश आनैमे असमर�थ छल"
+
+msgid "Unable to get a valid login hash."
+msgstr "वैध लागिन हैश आनैमे असमर�थ छलाह"
+
+msgid "Received authorization"
+msgstr "प�रमाणीकरण प�राप�त क�लकाह"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr ""
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr ""
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "AOL इंस�टेंट मैसंजर सेवा अस�थाइ र�पस� उपलब�ध नहि अछि."
+
+#. username connecting too frequently
+msgid ""
+"Your username has 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
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "ई क�लायंट संस�करण बड़ प�रान अछि. कृप�या उन�नत करू �त� %s"
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has been connecting and disconnecting too frequently. Wait a "
+"minute and try again. If you continue to try, you will need to wait even "
+"longer."
+msgstr ""
+
+msgid "The SecurID key entered is invalid"
+msgstr ""
+
+msgid "Enter SecurID"
+msgstr "स�रक�षित ID डालू"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "डिजीटल डिसप�लेस� 6 अंकक नंबर डालू"
+
+msgid "Password sent"
+msgstr "ग�ड़किल�ली पठा� देल गेल"
+
+msgid "Unable to initialize connection"
+msgstr "संबंधन बनाबैमे असमर�थ."
+
+#, 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"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ प�रमाणीकरण मनाही।"
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "प�रयोक�ता %u  अहा�क मीत सूचीमे डाल�कै अन�रोधके� मानि लेने अछि."
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"अहा�के� �कटा विशेष संदेश भेटल अछि\n"
+"\n"
+"स�: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"अहा�के� �कटा ICQ पन�ना भेटल अछि\n"
+"\n"
+"स�: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ प�रयोक�ता %u अहा�के� �कटा मीत पठा�ल अछि: %s (%s)"
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "की अहा� �हि मीतके� मीत सूचीमे डालै चाहे छी?"
+
+msgid "_Add"
+msgstr "जोड़ू (_A)"
+
+msgid "_Decline"
+msgstr "मना करू (_D)"
+
+#, 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 स�, कारण ई अवैध छल"
+
+#, 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 स�, कारण ई बड़ पैघ अछि"
+
+#, 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 स�, कारण दर सीमा स� आगा� बढ़ गेल"
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, 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] "अहा� %hu संदेश के� %s स� छो�ड़ देलाह कोनह� अनचिन�ह कारणस�"
+
+msgid "Your AIM connection may be lost."
+msgstr "अहा�क AIM संबंधन संभवतः टूटि गेल अछि."
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "अहा� %s गप�प-सप�प कक�षस� बिसंबंधित भ' गेल छी"
+
+msgid "Pop-Up Message"
+msgstr "पौप-अप संदेश"
+
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "निम�न स�क�रीन-नाम %s के� संग ज�डल अछि."
+msgstr[1] "निम�न स�क�रीन-नाम %s के� संग ज�डल अछि."
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+msgid "Account Confirmation Requested"
+msgstr "खाता प�ष�टिकरण लेल अन�रोध"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"त�र�टि 0x%04x: प�रयोक�तानामक संरूपित करैमे असमर�थ कारण मा�गल गेल नाम प�रारंभिक नामस� भिन�न "
+"अछि."
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr "त�र�टि 0x%04x: प�रयोक�तानामक संरूपणमे असमर�थ कारण ई अवैध अछि."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr "त�र�टि 0x%04x: प�रयोक�तानामक रचनामे असमर�थ कारण मा�गल नाम बड़ नमहर अछि."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "त�र�टि 0x%04x: अनचिन�ह त�र�टि."
+
+msgid "Error Changing Account Info"
+msgstr "खाता सूचना बदलैमे त�र�टि"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+msgid "Account Info"
+msgstr "खाता विवरण"
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "IM चित�र नहि पठा�ल गेल छल. IM चित�र भेज� लेल अहा�क सीधा संबंधन हो�बाक चाही."
+
+msgid "Unable to set AIM profile."
+msgstr "AIM प�रोफाइल नियत करैमे असमर�थ."
+
+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 ""
+"अहा� संभवतः अपन प�रोफाइलके� लागिन प�रक�रियाक के� पूर�ण भ' स� पहिने नियत करैले चाहलह��. अहा�क "
+"प�रोफाइल �खन सेट नहि भेल. फिन� प�रयास करू पूर�ण रूपस� लागिन करबाक बाद."
+
+#, 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 बाइटस� उप�पर भ' गेल अछि. �करा अहा�क लेल काटि देल गेल अछि"
+
+msgid "Profile too long."
+msgstr "प�रोफाइल बड़ नमहर अछि."
+
+#, 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 बाइटस� उप�पर भ' गेल अछि. �करा अहा�क लेल काटि देल गेल अछि"
+
+msgid "Away message too long."
+msgstr "अन�पस�थिति संदेश बड़ नमहर अछि."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+msgid "Unable to Retrieve Buddy List"
+msgstr ""
+
+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 सर�वरस� अहा�क मीत सूचीक भेजि नहि जा� सकल. अहा�क मीत सूची ग�म नहि अछि आओर किछ� "
+"मिनटमे उपलब�ध भ' जा�त."
+
+msgid "Orphans"
+msgstr "अनाथ"
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+msgid "(no name)"
+msgstr "(कोनो नाम नहि)"
+
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+
+msgid "Authorization Given"
+msgstr "प�रमाणीकरण देल"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "अपन मीत सूचीमे ह�नका जोडै लेल प�रयोक�ता %s अहा�क आग�रह देलकाह"
+
+msgid "Authorization Granted"
+msgstr "प�रमाणीकरण देल गेल"
+
+#. Denied
+#, 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"
+
+msgid "Authorization Denied"
+msgstr "प�रमाणीकरण मनाही"
+
+msgid "_Exchange:"
+msgstr "अदला-बदली (_E)"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "अहा�क IM चित�र नहि पठा�ल गेल. अहा� AIMमे IM चित�र नहि पठा� सकैछी"
+
+msgid "iTunes Music Store Link"
+msgstr "iTunes संगीत स�टोर लिंक"
+
+msgid "Lunch"
+msgstr ""
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s लेल मीत टिप�पणी"
+
+msgid "Buddy Comment:"
+msgstr "मीत टिप�पणी"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "अहा� %s के� संग सीधा IM खोल�कै च�नाव क�लह��"
+
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"कि�क ई अहा�क IP पता देखाबै अछि ई अहा� ग�प�तता लेल खतरा भ' सकैछ. की अहा� आबो आगा� बढ़ै "
+"चाहैछ?"
+
+msgid "C_onnect"
+msgstr "जोड़ू (_o)"
+
+msgid "You closed the connection."
+msgstr ""
+
+msgid "Get AIM Info"
+msgstr "AIM सूचना पाउ"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "मीत टिप�पणीक संपादन करू"
+
+msgid "Get X-Status Msg"
+msgstr ""
+
+msgid "End Direct IM Session"
+msgstr ""
+
+msgid "Direct IM"
+msgstr "सीधा IM"
+
+msgid "Re-request Authorization"
+msgstr "प�नः प�रमाणीकरण लेल अन�रोध करू"
+
+msgid "Require authorization"
+msgstr "प�रमाणीकरण जरूरी"
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "वेब परिचित (�करा सक�रिय क�नाइ अहा�क स�पैमक समस�याक जनम दैत!)"
+
+msgid "ICQ Privacy Options"
+msgstr "ICQ ग�प�तता विकल�प"
+
+msgid "The new formatting is invalid."
+msgstr "नव संरूपण अवैध अछि."
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "प�रयोक�तानाम संरूपण केवल खाली ठाम आओर पैघअक�षरसभ बदलि सकैछ"
+
+msgid "Change Address To:"
+msgstr "पता बदलू:"
+
+msgid "you are not waiting for authorization"
+msgstr ""
+
+msgid "You are awaiting authorization from the following buddies"
+msgstr "निम�नलिखित मीत स� अहा� प�रमाणीकरणक प�रतीक�षा क� रहल छी"
+
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"अहा� दहिन�ना क�लिक क� आओर \"प�नः प�रमाणीकरण लेल आग�रह करू\" च�निकै प�नः प�रमाणीकरण लेल "
+"अन�रोध क� सकै छी."
+
+msgid "Find Buddy by Email"
+msgstr ""
+
+msgid "Search for a buddy by email address"
+msgstr ""
+
+msgid "Type the email address of the buddy you are searching for."
+msgstr ""
+
+msgid "_Search"
+msgstr "खोजू (_S)"
+
+msgid "Set User Info (web)..."
+msgstr "प�रयोक�ताक सूचना नियत करू (वेब)..."
+
+#. This only happens when connecting with the old-style BUCP login
+msgid "Change Password (web)"
+msgstr "ग�ड़किल�ली बदलू (वेब)"
+
+msgid "Configure IM Forwarding (web)"
+msgstr "IM फौरवार�डिंग (वेब) के� बिन�यस�त करू"
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr "ग�प�तता विकल�प सेट अप करू..."
+
+msgid "Show Visible List"
+msgstr ""
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "निमंत�रण सूची"
+
+#. AIM actions
+msgid "Confirm Account"
+msgstr "खाता संप�ष�ट करू"
+
+msgid "Display Currently Registered Email Address"
+msgstr ""
+
+msgid "Change Currently Registered Email Address..."
+msgstr ""
+
+msgid "Show Buddies Awaiting Authorization"
+msgstr "प�रमाणीकरणक प�रतीक�षारत मीत देखाउ"
+
+msgid "Search for Buddy by Email Address..."
+msgstr ""
+
+msgid "Use clientLogin"
+msgstr ""
+
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+"हरदम AIM/ICQ प�रोक�सी सर�वर प�रयोग करू\n"
+"फाइल हस�तांतरण आओर सीधा IM (बेसी धीरे,\n"
+"म�दा अहा�क IP पता खोलै नहि अछि) क' लेल"
+
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "%s के� %s पर संबंध करबाक लेल पूछै अछि: सीधा IM लेल %hu."
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s मे संपर�कक प�रयास करैछ:%hu."
+
+msgid "Attempting to connect via proxy server."
+msgstr "प�रौक�सी सर�वरक द�वारा संबंधनक प�रयास करैछ."
+
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s %s स� सीधा संबंधित करबाक लेल पूछलकाह"
+
+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 पता देखबैछ �करा अहा�क ग�प�तता लेल खतरा बू�ल जा� सकैछ."
+
+msgid "Invalid SNAC"
+msgstr "अवैध SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "सेवा उपलब�ध नहि अछि "
+
+msgid "Service not defined"
+msgstr "सेवा परिभाषित नहि"
+
+msgid "Obsolete SNAC"
+msgstr "प�रान SNAC"
+
+msgid "Not supported by host"
+msgstr "मेजबान द�वारा समर�थित नहि"
+
+msgid "Not supported by client"
+msgstr "क�लायंट द�वारा समर�थित नहि"
+
+msgid "Refused by client"
+msgstr "क�लायंट द�वारा अस�वीकृत"
+
+msgid "Reply too big"
+msgstr "उत�तर बड़ पैघ अछि"
+
+msgid "Responses lost"
+msgstr "उत�तर ग�म भ' गेल"
+
+msgid "Request denied"
+msgstr "अन�रोध निषेध"
+
+msgid "Busted SNAC payload"
+msgstr "टूटल SNAC पेलोड"
+
+msgid "Insufficient rights"
+msgstr "अपर�याप�त अधिकार"
+
+msgid "In local permit/deny"
+msgstr "स�थानीयमे स�वीकारू/अस�वीकारू"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "प�रयोक�ता अस�थाइ रूप स� उपलब�ध नहि अछि."
+
+msgid "No match"
+msgstr "बेमेल"
+
+msgid "List overflow"
+msgstr "सूची अधिकता"
+
+msgid "Request ambiguous"
+msgstr "अस�पष�ट अन�रोध"
+
+msgid "Queue full"
+msgstr "कतार भरल"
+
+msgid "Not while on AOL"
+msgstr "AOL दौरान नहि"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "मीत प�रतीक"
+
+msgid "Voice"
+msgstr "आवाज"
+
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "सीधा IM"
+
+#, fuzzy
+msgid "Get File"
+msgstr "फाइल पठाउ"
+
+#, fuzzy
+msgid "Games"
+msgstr "असामी"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "मीत सूची"
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+#, fuzzy
+msgid "AP User"
+msgstr "औथ प�रयोक�ता"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+#, fuzzy
+msgid "ICQ Server Relay"
+msgstr "सर�वर बड़ लादल अछि"
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+#, fuzzy
+msgid "Security Enabled"
+msgstr "सक�षम"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "विडियो कैमरा"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "गप�प-सप�प"
+
+#, fuzzy
+msgid "Live Video"
+msgstr "वीडियो"
+
+#, fuzzy
+msgid "Camera"
+msgstr "विडियो कैमरा"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "आइपी पता"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "चेतावनी"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "मीत टिप�पणी"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "प�रयोक�ता अस�थाइ रूप स� उपलब�ध नहि अछि."
+
+msgid "Mobile Phone"
+msgstr "मोबाइल फोन"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "निजी मोबाइल"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "वैकल�पिक सूचना"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "बेसी सूचना"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "विवरण"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "पहिल पन�ना"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "स� औनलाइन"
+
+msgid "Member Since"
+msgstr "स� सदस�य"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "औनलाइन रहू"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "औनलाइन रहू"
+
+msgid "Appear Offline"
+msgstr "आफलाइन देखाउ"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "आफलाइन देखाउ"
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"अहा� दहिन�ना क�लिक क� आओर \"प�नः प�रमाणीकरण लेल आग�रह करू\" च�निकै प�नः प�रमाणीकरण लेल "
+"अन�रोध क� सकै छी."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "दृष�टिगोचर"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "निमंत�रण सूची"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
+msgid "Aquarius"
+msgstr "�क�वेरियस"
+
+msgid "Pisces"
+msgstr "पिसेज"
+
+msgid "Aries"
+msgstr "�रीस"
+
+msgid "Taurus"
+msgstr "टारस"
+
+msgid "Gemini"
+msgstr "जेमिनी"
+
+msgid "Cancer"
+msgstr "कैंसर"
+
+msgid "Leo"
+msgstr "लियो"
+
+msgid "Virgo"
+msgstr "वर�गो"
+
+msgid "Libra"
+msgstr "लिब�रा"
+
+msgid "Scorpio"
+msgstr "स�कोरपियो"
+
+msgid "Sagittarius"
+msgstr "सैजिटैरियस"
+
+msgid "Capricorn"
+msgstr "कैप�रिकोर�न"
+
+msgid "Rat"
+msgstr "चूहा"
+
+msgid "Ox"
+msgstr "बैल"
+
+msgid "Tiger"
+msgstr "बाघ"
+
+msgid "Rabbit"
+msgstr "खरगोश"
+
+msgid "Dragon"
+msgstr "ड�रैगन"
+
+msgid "Snake"
+msgstr "सा�प"
+
+msgid "Horse"
+msgstr "घोड़ा"
+
+msgid "Goat"
+msgstr "बकड़ी"
+
+msgid "Monkey"
+msgstr "बंदर"
+
+msgid "Rooster"
+msgstr "रूस�टर"
+
+msgid "Dog"
+msgstr "क�त�ता"
+
+msgid "Pig"
+msgstr "सूग�गर"
+
+msgid "Other"
+msgstr "आन"
+
+msgid "Visible"
+msgstr "दृष�टिगोचर"
+
+msgid "Friend Only"
+msgstr ""
+
+msgid "Private"
+msgstr "निजी"
+
+msgid "QQ Number"
+msgstr "QQ संख�या"
+
+msgid "Country/Region"
+msgstr "देश/क�षेत�र"
+
+msgid "Province/State"
+msgstr "प�रदेश/स�थिति"
+
+msgid "Zipcode"
+msgstr "जिप कोड"
+
+msgid "Phone Number"
+msgstr "फोन नंबर"
+
+msgid "Authorize adding"
+msgstr ""
+
+msgid "Cellphone Number"
+msgstr "सेलफोन नंबर"
+
+msgid "Personal Introduction"
+msgstr "निज परिचय"
+
+msgid "City/Area"
+msgstr ""
+
+msgid "Publish Mobile"
+msgstr ""
+
+msgid "Publish Contact"
+msgstr ""
+
+msgid "College"
+msgstr "कालेज"
+
+msgid "Horoscope"
+msgstr ""
+
+msgid "Zodiac"
+msgstr ""
+
+msgid "Blood"
+msgstr ""
+
+msgid "True"
+msgstr "सही"
+
+msgid "False"
+msgstr "गलत"
+
+msgid "Modify Contact"
+msgstr ""
+
+msgid "Modify Address"
+msgstr ""
+
+msgid "Modify Extended Information"
+msgstr ""
+
+msgid "Modify Information"
+msgstr ""
+
+msgid "Update"
+msgstr "अद�यतन"
+
+msgid "Could not change buddy information."
+msgstr ""
+
+msgid "Note"
+msgstr "नोट"
+
+#. callback
+msgid "Buddy Memo"
+msgstr ""
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr "संशोधित करू (_M)"
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr ""
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification: %s"
+msgstr ""
+
+msgid "Add buddy question"
+msgstr ""
+
+msgid "Enter answer here"
+msgstr ""
+
+msgid "Send"
+msgstr "पठाउ"
+
+msgid "Invalid answer."
+msgstr ""
+
+msgid "Authorization denied message:"
+msgstr "प�रमाणीकरणक मनाही संदेश:"
+
+msgid "Sorry, you're not my style."
+msgstr ""
+
+#, c-format
+msgid "%u needs authorization"
+msgstr ""
+
+msgid "Add buddy authorize"
+msgstr ""
+
+msgid "Enter request here"
+msgstr ""
+
+msgid "Would you be my friend?"
+msgstr "की अहा� हमर मित�र बनबै?"
+
+msgid "QQ Buddy"
+msgstr ""
+
+msgid "Add buddy"
+msgstr ""
+
+msgid "Invalid QQ Number"
+msgstr ""
+
+msgid "Failed sending authorize"
+msgstr ""
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr ""
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr ""
+
+msgid "No reason given"
+msgstr ""
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "अहा� %s द�वारा जोड़ल गेल छी"
+
+msgid "Would you like to add him?"
+msgstr "की अहा� ह�नका जोड़बाक लेल चाहैछी?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr ""
+
+#, c-format
+msgid "Message: %s"
+msgstr "संदेश: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "समूह ID"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+msgid "Please enter Qun number"
+msgstr ""
+
+msgid "You can only search for permanent Qun\n"
+msgstr ""
+
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
+msgid "Not member"
+msgstr ""
+
+msgid "Member"
+msgstr "सदस�य"
+
+msgid "Requesting"
+msgstr ""
+
+msgid "Admin"
+msgstr "प�रशासन"
+
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
+msgid "Notice"
+msgstr "सूचना"
+
+msgid "Detail"
+msgstr "विवरण"
+
+msgid "Creator"
+msgstr "निर�माता"
+
+msgid "About me"
+msgstr ""
+
+msgid "Category"
+msgstr "श�रेणी"
+
+msgid "The Qun does not allow others to join"
+msgstr ""
+
+msgid "Join QQ Qun"
+msgstr ""
+
+msgid "Input request here"
+msgstr "इनप�ट आग�रह �त�"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr ""
+
+msgid "Successfully joined Qun"
+msgstr ""
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr ""
+
+msgid "QQ Qun Operation"
+msgstr "QQ Qun औपरेशन"
+
+msgid "Failed:"
+msgstr ""
+
+msgid "Join Qun, Unknown Reply"
+msgstr ""
+
+msgid "Quit Qun"
+msgstr ""
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"टिप�पणी, ज� अहा� बनोअनिहार छी, \n"
+"ई औपरेशन ई Qun के� अंततः हटा� देत."
+
+msgid "Sorry, you are not our style"
+msgstr ""
+
+msgid "Successfully changed Qun members"
+msgstr ""
+
+msgid "Successfully changed Qun information"
+msgstr ""
+
+msgid "You have successfully created a Qun"
+msgstr "अहा� सफलतापूर�वक Qun बनैने छी."
+
+msgid "Would you like to set up detailed information now?"
+msgstr ""
+
+msgid "Setup"
+msgstr "सेटअप"
+
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr ""
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr ""
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr ""
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr ""
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "अनचिन�ह-%d"
+
+msgid "Level"
+msgstr "स�तर"
+
+msgid " VIP"
+msgstr ""
+
+msgid " TCP"
+msgstr ""
+
+msgid " FromMobile"
+msgstr ""
+
+msgid " BindMobile"
+msgstr ""
+
+msgid " Video"
+msgstr ""
+
+msgid " Zone"
+msgstr ""
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
+
+msgid "Invalid name"
+msgstr "अवैध नाम"
+
+msgid "Select icon..."
+msgstr ""
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Client Tag</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>संबंधन मोड</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Sent</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Resend</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received Duplicate</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>IP</b>: %s<br>\n"
+msgstr ""
+
+msgid "Login Information"
+msgstr "लागिन सूचना"
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Code Contributors</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Acknowledgement</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
+msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
+msgstr ""
+
+msgid "<i>Feel free to join us!</i> :)"
+msgstr ""
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr ""
+
+msgid "Change Icon"
+msgstr "प�रतीक बदलू"
+
+msgid "Change Password"
+msgstr "ग�ड़किल�ली बदलू"
+
+msgid "Account Information"
+msgstr ""
+
+msgid "Update all QQ Quns"
+msgstr ""
+
+msgid "About OpenQ"
+msgstr ""
+
+msgid "Modify Buddy Memo"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr ""
+
+msgid "Auto"
+msgstr "स�वचालित"
+
+msgid "Select Server"
+msgstr ""
+
+msgid "QQ2005"
+msgstr ""
+
+msgid "QQ2007"
+msgstr ""
+
+msgid "QQ2008"
+msgstr ""
+
+msgid "Connect by TCP"
+msgstr ""
+
+msgid "Show server notice"
+msgstr ""
+
+msgid "Show server news"
+msgstr ""
+
+msgid "Show chat room when msg comes"
+msgstr ""
+
+msgid "Keep alive interval (seconds)"
+msgstr ""
+
+msgid "Update interval (seconds)"
+msgstr ""
+
+msgid "Unable to decrypt server reply"
+msgstr ""
+
+#, c-format
+msgid "Failed requesting token, 0x%02X"
+msgstr ""
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr ""
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr ""
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr ""
+
+msgid "Requesting captcha"
+msgstr ""
+
+msgid "Checking captcha"
+msgstr ""
+
+msgid "Failed captcha verification"
+msgstr ""
+
+msgid "Captcha Image"
+msgstr ""
+
+msgid "Enter code"
+msgstr ""
+
+msgid "QQ Captcha Verification"
+msgstr ""
+
+msgid "Enter the text from the image"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+
+msgid "Socket error"
+msgstr "सौकेट त�र�टि"
+
+msgid "Getting server"
+msgstr ""
+
+msgid "Requesting token"
+msgstr ""
+
+msgid "Unable to resolve hostname"
+msgstr ""
+
+msgid "Invalid server or port"
+msgstr ""
+
+msgid "Connecting to server"
+msgstr ""
+
+msgid "QQ Error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
+#, c-format
+msgid "From %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+
+msgid "Unknown SERVER CMD"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+
+msgid "QQ Qun Command"
+msgstr ""
+
+msgid "Unable to decrypt login reply"
+msgstr ""
+
+msgid "Unknown LOGIN CMD"
+msgstr ""
+
+msgid "Unknown CLIENT CMD"
+msgstr ""
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d %s फाइलक मनाही करलकै"
+
+msgid "File Send"
+msgstr "फाइल पठा�ब"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>समूह शीर�षक:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>नोट�स समूह ID:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "%s समूह लेल सूचना"
+
+msgid "Notes Address Book Information"
+msgstr "नोट�स पता प�स�तिका सूचना"
+
+msgid "Invite Group to Conference..."
+msgstr "सम�मेलनमे समूहक न�यौतू..."
+
+msgid "Get Notes Address Book Info"
+msgstr "नोट�स पता प�स�तिका सूचना आनू"
+
+msgid "Sending Handshake"
+msgstr "हैंडशेक पठा� रहल अछि"
+
+msgid "Waiting for Handshake Acknowledgement"
+msgstr "हैंडशेक ज�ञापन लेल प�रतीक�षारत"
+
+msgid "Handshake Acknowledged, Sending Login"
+msgstr "हैंडशेक ज�ञापित, लागिन पठा� रहल अछि"
+
+msgid "Waiting for Login Acknowledgement"
+msgstr "लागिन ज�ञापन लेल प�रतीक�षारत"
+
+msgid "Login Redirected"
+msgstr "लागिन प�नर�निदेशित"
+
+msgid "Forcing Login"
+msgstr "लागिनक' लेल बाध�य:"
+
+msgid "Login Acknowledged"
+msgstr "लागिन ज�ञापित"
+
+msgid "Starting Services"
+msgstr "सेवा आरंभ क� रहल अछि"
+
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr "�कटा सेमटाइम प�रशासक %s सर�वर पर निम�न घोषणाके� निर�गत क� देलक"
+
+msgid "Sametime Administrator Announcement"
+msgstr "सेमटाइम प�रशासक घोषणा"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s स� घोषणा"
+
+msgid "Conference Closed"
+msgstr "सम�मेलन बन�न"
+
+msgid "Unable to send message: "
+msgstr "संदेश पठाब�मे असमर�थ: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s के� संदेश पठाब�मे असमर�थ"
+
+msgid "Place Closed"
+msgstr "स�थान बन�न"
+
+msgid "Microphone"
+msgstr "माइक�रोफोन"
+
+msgid "Speakers"
+msgstr "स�पीकर"
+
+msgid "Video Camera"
+msgstr "विडियो कैमरा"
+
+msgid "File Transfer"
+msgstr "फाइल हस�तांतरण"
+
+msgid "Supports"
+msgstr "समर�थन"
+
+msgid "External User"
+msgstr "बाहरी प�रयोक�ता"
+
+msgid "Create conference with user"
+msgstr "प�रयोक�ताक संग सम�मेलन बनाबू"
+
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"कृप�या नव सम�मेलन लेल �कटा विषय दिअ', आओर �कटा आमंत�रण संदेश %s क' पठा�ल जा�नाइ अछि"
+
+msgid "New Conference"
+msgstr "नव सम�मेलन"
+
+msgid "Create"
+msgstr "बनाबू"
+
+msgid "Available Conferences"
+msgstr "उपलब�ध सम�मेलन"
+
+msgid "Create New Conference..."
+msgstr "नव सम�मेलन बनाबू..."
+
+msgid "Invite user to a conference"
+msgstr "�कटा सम�मेलनमे प�रयोक�ताके� निमंत�रित करू"
+
+#, 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 के� आमंत�रित पठाबै� लेल नींच�चास� �कटा सम�मेलन च�नू. \"नव सम�मेलन बनाबू\" च�नू ज� "
+"अहा� ई प�रयोक�ता आमंत�रित करबाक लेल �कटा नव सम�मेलन बनबै चाहब."
+
+msgid "Invite to Conference"
+msgstr "सम�मेलनमे आमंत�रित करू"
+
+msgid "Invite to Conference..."
+msgstr "सम�मेलनमे आमंत�रित करू..."
+
+msgid "Send TEST Announcement"
+msgstr "जा�च घोषणा पठाउ"
+
+msgid "Topic:"
+msgstr "विषय:"
+
+msgid "No Sametime Community Server specified"
+msgstr "कोनो सेमटाइम सम�दाय सर�वर निर�दिष�ट नहि छल"
+
+#, 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 पता बिन�यस�त नहि क�ल गेल अछि. कृप�या "
+"लागिन जारी रखबाक लेल नींच�चा �कटा डालू."
+
+msgid "Meanwhile Connection Setup"
+msgstr "बीचबिचाऊ संबंधन सेटअप"
+
+msgid "No Sametime Community Server Specified"
+msgstr "कोनो सेमटाइम सम�दाय सर�वर निर�दिष�ट नहि"
+
+msgid "Connect"
+msgstr "जोड़ू"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "अनचिन�ह (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "अंतिम जानल क�ला�ंट"
+
+msgid "User Name"
+msgstr "प�रयोक�तानाम"
+
+msgid "Sametime ID"
+msgstr "सेमटाइम ID"
+
+msgid "An ambiguous user ID was entered"
+msgstr "�कटा द�विविधाय�क�त प�रयोक�ता ID दाखिल भेलाह"
+
+#, 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' निम�नलिखित प�रयोक�तामे स� ककरो लेल संभवतः कह सकैछ. मीत सूची स� सही "
+"प�रयोक�ताके� मीत सूचीमे जोड़बाक लेल च�नू."
+
+msgid "Select User"
+msgstr "प�रयोक�ताक च�नू"
+
+msgid "Unable to add user: user not found"
+msgstr "प�रयोक�ताके� जोड़ैमे असमर�थ: प�रयोक�ता नहि भेटल"
+
+#, 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' अहा�क सेमटाइम सम�दायमे कोनो प�रयोक�तासभस� मेल नहि खाइ छल. ई प�रविष�टि "
+"अहा�क मीत सूचीस� हटा� देल गेल अछि."
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"%s पढ़ैमे त�र�टि :\n"
+"%s\n"
+
+msgid "Remotely Stored Buddy List"
+msgstr "दूरस�थरूपे� भंडारित मीत सूची"
+
+msgid "Buddy List Storage Mode"
+msgstr "मीत सूची भंडारण मोड"
+
+msgid "Local Buddy List Only"
+msgstr "सिर�फ स�थानीय मीत सूची"
+
+msgid "Merge List from Server"
+msgstr "सर�वरस� सूची मिलाबू"
+
+msgid "Merge and Save List to Server"
+msgstr "सर�वरमे सूची मिलाबू आ सहेजू"
+
+msgid "Synchronize List with Server"
+msgstr "सर�वरस� सूची त�ल�यकालित करू"
+
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "%s खाता लेल सेमटाइम सूची आयात करू"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "%s खाता लेल सेमटाइम सूची निर�यात करू"
+
+msgid "Unable to add group: group exists"
+msgstr "समूह जोड़ैमे असमर�थ: समूह मोज�द"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "'%s' नामक समूह पहलेस� अहा�क मीत सूचीमे मोज�द अछि."
+
+msgid "Unable to add group"
+msgstr "समूह जोड़ैमे असमर�थ"
+
+msgid "Possible Matches"
+msgstr "संभावित मिलान"
+
+msgid "Notes Address Book group results"
+msgstr "नोट�स पता प�स�तिका समूह परिणाम"
+
+#, 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' संभवतः कोनो नोट�स पता प�स�तिकाके� संदर�भित क� सकैछ. कृप�या अपन मीत सूचीमे "
+"�करा जोड़बाक लेल सही समूहक च�नू."
+
+msgid "Select Notes Address Book"
+msgstr "नोट�स पता प�स�तिका च�नू"
+
+msgid "Unable to add group: group not found"
+msgstr "समूह जोड़ैमे असमर�थ: समूह नहि भेटल"
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr "पहिचानकर�ता '%s' अहा�क सेमटाइम सम�दायमे कोनह� नोट�स पता प�स�तिका मेल नहि खाइ छल."
+
+msgid "Notes Address Book Group"
+msgstr "पता प�स�तिका समूह नोट"
+
+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 ""
+"अपन मीत सूचीमे समूह आ �कर सदस�यसभके� जोडबाकलेल नींच�चा देल क�षेत�रमे �कटा नोट�स पता प�स�तिका "
+"समूहक नाम डालू."
+
+#, c-format
+msgid "Search results for '%s'"
+msgstr "'%s' लेल खोज नतीजा"
+
+#, 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' कोनह� निम�नलिखित प�रयोक�तासभ के� संदर�भित क� सकैछ. अहा� ई प�रयोक�तासभके� "
+"नींच�चा देल बटनक संग अपन मीत सूचीमे जोड़ सकै छी अथवा ह�नका संदेश पठा� सकैछ."
+
+msgid "Search Results"
+msgstr "खोजक परिणाम"
+
+msgid "No matches"
+msgstr "कोनो मेल नहि"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr "पहिचानकर�ता '%s' अपन सेमटाइम सम�दायमे कोनह� प�रयोक�तास� मेल नहि खाइ छल."
+
+msgid "No Matches"
+msgstr "बेमेल"
+
+msgid "Search for a user"
+msgstr "प�रयोक�ताक लेल खोजू"
+
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"�कटा नाम अथवा आंशिक ID क नींच�चा देल क�षेत�रमे मेल खा�ल प�रयोक�ताक लेल डालू अपन सेमटाइम "
+"सम�दायमे."
+
+msgid "User Search"
+msgstr "प�रयोक�ता खोज"
+
+msgid "Import Sametime List..."
+msgstr "सेमटाइम सूची आयात करू..."
+
+msgid "Export Sametime List..."
+msgstr "सेमटाइम सूची निर�यात करू..."
+
+msgid "Add Notes Address Book Group..."
+msgstr "पता प�स�तिका समूहमे नोट�स जोडू..."
+
+msgid "User Search..."
+msgstr "प�रयोक�ता खोज..."
+
+msgid "Force login (ignore server redirects)"
+msgstr "लागिन लेल बाध�य करू (सर�वर प�नर�प�रेषण अनदेखा करू)"
+
+#. pretend to be Sametime Connect
+msgid "Hide client identity"
+msgstr "क�लाइंट पहिचान न�काबू"
+
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "प�रयोक�ता %s संजालमे मोज�द नहि अछि"
+
+msgid "Key Agreement"
+msgstr "क��जी अन�बंध"
+
+msgid "Cannot perform the key agreement"
+msgstr "क�ंजी अन�बंध निष�पादित नहि क� सकल"
+
+msgid "Error occurred during key agreement"
+msgstr "क�ंजी अन�बंधक� दोरान त�र�टि"
+
+msgid "Key Agreement failed"
+msgstr "क�ंजी अन�बंध विफल"
+
+msgid "Timeout during key agreement"
+msgstr "क�ंजी अन�बंधक� दौरान समय समाप�त"
+
+msgid "Key agreement was aborted"
+msgstr "क�ंजी अन�बंध रूक गेल"
+
+msgid "Key agreement is already started"
+msgstr "क�ंजी अन�बंध पहिनेस� श�र� भ' च�कल अछि"
+
+msgid "Key agreement cannot be started with yourself"
+msgstr "क�ंजी अन�बंध स�वयं अहा�क संग श�र� नहि भ' सकैछ"
+
+msgid "The remote user is not present in the network any more"
+msgstr "दूरस�थ प�रयोक�ता संजालमे आब मोज�द नहि अछि"
+
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr "%s स� क�ंजी मसौदा आग�रह भेटल अछि. की अहा� मसौदा क�ंजी करबाक लेल चाहै छी?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"दूरस�थ प�रयोक�ता क�ंजी मसौदा लेल प�रतीक�षा क� रहल अछि:\n"
+"दूरस�थ मेजबान: %s\n"
+"दूरस�थ पोर�ट: %d"
+
+msgid "Key Agreement Request"
+msgstr "क�ंजी अन�बंध अन�रोध"
+
+msgid "IM With Password"
+msgstr "कूटशब�दक संग IM"
+
+msgid "Cannot set IM key"
+msgstr "IM क�ंजी नियत नहि क� सकैछ"
+
+msgid "Set IM Password"
+msgstr "IM क' ग�ड़किल�ली नियत करू"
+
+msgid "Get Public Key"
+msgstr "सार�वजनिक क�ंजी आनू"
+
+msgid "Cannot fetch the public key"
+msgstr "सार�वजनिक क�ंजी नहि पाबि सकल"
+
+msgid "Show Public Key"
+msgstr "सार�वजनिक क�ंजी देखाउ"
+
+msgid "Could not load public key"
+msgstr "सार�वजनिक क�ंजी नहि लोड क� सकल"
+
+msgid "User Information"
+msgstr "प�रयोक�ता सूचना"
+
+msgid "Cannot get user information"
+msgstr "प�रयोक�ताक सूचना नहि आन सकल"
+
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "%s मीत पर विश�वास नहि अछि"
+
+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.
+msgid "Open..."
+msgstr "खोलू..."
+
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "प�रयोक�ता %s संजालमे मोज�द नहि अछि"
+
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"मीत जोड़बाक लेल ओकर सार�वजनिक क�ंजी आयात करू. सार�वजनिक क�ंजी आयात करबाक लेल आयात दबाबू"
+
+msgid "_Import..."
+msgstr "आयात करू (_I)..."
+
+msgid "Select correct user"
+msgstr "सही प�रयोक�ता च�नू"
+
+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 ""
+"�कटास� बेसी प�रयोक�ता समान सार�वजनिक क�ंजीक संग मिलल छलाह. मीत सूचीमे जोड़बाक लेल सही "
+"प�रयोक�ताके� च�नू."
+
+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 ""
+"�कटास� बेसी प�रयोक�ता समान नामके मिलल छलाह. सही प�रयोक�ताके� मीत सूचीमे जोड़बाक लेल च�नू."
+
+msgid "Detached"
+msgstr "पृथक"
+
+msgid "Indisposed"
+msgstr "अन�पय�क�त"
+
+msgid "Wake Me Up"
+msgstr "हमरा जगा� देब"
+
+msgid "Hyper Active"
+msgstr "अति सक�रिय"
+
+msgid "Robot"
+msgstr "रोबोट"
+
+msgid "User Modes"
+msgstr "प�रयोक�ता मोड"
+
+msgid "Preferred Contact"
+msgstr "पसंदीदा संपर�क"
+
+msgid "Preferred Language"
+msgstr "पसंदीदा भाषा"
+
+msgid "Device"
+msgstr "डिवाइस"
+
+msgid "Timezone"
+msgstr "समय क�षेत�र"
+
+msgid "Geolocation"
+msgstr "भू-अवस�थिति"
+
+msgid "Reset IM Key"
+msgstr "IM क�ंजीके� प�नः नियत करू"
+
+msgid "IM with Key Exchange"
+msgstr "क�ंजी विनिमयक' संग IM"
+
+msgid "IM with Password"
+msgstr "कूटशब�दक संग IM"
+
+msgid "Get Public Key..."
+msgstr "सार�वजनिक क�ंजी आनू..."
+
+msgid "Kill User"
+msgstr "प�रयोक�ताके� मारू"
+
+msgid "Draw On Whiteboard"
+msgstr "उज�जरबोर�ड पर खींचू"
+
+msgid "_Passphrase:"
+msgstr "ग�ड़किल�ली वाक�यांश (_P)"
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "चैनल %s संजालमे मोज�द नहि अछि"
+
+msgid "Channel Information"
+msgstr "चैनलक सूचना"
+
+msgid "Cannot get channel information"
+msgstr "चैनलक सूचना नहि मिलल"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>चैनल नाम:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>प�रयोक�ता संख�या:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>चैनल संस�थापक:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>चैनल सिफर:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>चैनल HMAC:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>चैनल विषय:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>चैनल विधि:</b> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b> संस�थापक क�ंजी आङ�रक छाप:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>संस�थापक क�ंजी बैबलप�रिंट:</b><br>%s"
+
+msgid "Add Channel Public Key"
+msgstr "चैनल सार�वजनिक क�ंजी जोड़ू"
+
+#. Add new public key
+msgid "Open Public Key..."
+msgstr "सार�वजनिक क�ंजी खोलू..."
+
+msgid "Channel Passphrase"
+msgstr "चैनल ग�ड़किल�ली वाक�यांश"
+
+msgid "Channel Public Keys List"
+msgstr "चैनल सार�वजनिक क�ंजीसभ सूची"
+
+#, 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 ""
+"चैनलक प�रमाणीकरणक प�रयोग चैनलके� गैर प�राधिकृत पह�ंचस� स�रक�षित करैछ. प�रमाणीकरण ग�ड़किल�ली "
+"वाक�यांश अथवा डिजीटल हस�ताक�षर पर निर�भर रहैछ. ज� ग�ड़किल�ली वाक�यांश नियत अछि त' चैनलमे "
+"सामिल हो�बाक लेल ओ जरूरी अछि. ज� सार�वजनिक क�ंजीक जर�रत अछि त' अहा�क सार�वजनिक क�ंजी "
+"सूचीमे हो�बाक चाही."
+
+msgid "Channel Authentication"
+msgstr "चैनल प�रमाणीकरण"
+
+msgid "Add / Remove"
+msgstr "जोड़ू / हटाबू"
+
+msgid "Group Name"
+msgstr "समूह नाम"
+
+msgid "Passphrase"
+msgstr "ग�ड़किल�ली वाक�यांश"
+
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "%s चैनल निजी समूह नाम आओर ग�ड़किल�ली वाक�यांश डालू."
+
+msgid "Add Channel Private Group"
+msgstr "चैनल निज समूह जोड़ू"
+
+msgid "User Limit"
+msgstr "प�रयोक�ता सीमा"
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"चैनल पर प�रयोक�ता सीमा लगा� दिअ'. शून�य पर प�रयोक�ता सीमाक फिन� नियत करै लेल नियत करू."
+
+msgid "Invite List"
+msgstr "निमंत�रण सूची"
+
+msgid "Ban List"
+msgstr "प�रतिबन�ध सूची"
+
+msgid "Add Private Group"
+msgstr "निज समूह जोड़ू"
+
+msgid "Reset Permanent"
+msgstr "स�थायीके� प�नः नियत करू"
+
+msgid "Set Permanent"
+msgstr "स�थायीके� नियत करू"
+
+msgid "Set User Limit"
+msgstr "प�रयोक�ता सीमाके� नियत करू"
+
+msgid "Reset Topic Restriction"
+msgstr "शीर�षक बंधनके� प�नः नियत करू"
+
+msgid "Set Topic Restriction"
+msgstr "शीर�षक बंधनके� नियत करू "
+
+msgid "Reset Private Channel"
+msgstr "निजी चैनलके� प�नः नियत करू"
+
+msgid "Set Private Channel"
+msgstr "निजी चैनलके� नियत करू"
+
+msgid "Reset Secret Channel"
+msgstr "ग�प�त चैनलके� प�नः नियत करू"
+
+msgid "Set Secret Channel"
+msgstr "ग�प�त चैनलके� नियत करू"
+
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr "निजी समूहमे ज�ड़ैस� समर�थ ह�बाक पहिने अहा� %s चैनलमे ज�ड़ू"
+
+msgid "Join Private Group"
+msgstr "निजी समूहमे सामिल होउ"
+
+msgid "Cannot join private group"
+msgstr "निजी समूहमे नहि ज�ड़ि सकैछ"
+
+msgid "Call Command"
+msgstr "कौल कमांड"
+
+msgid "Cannot call command"
+msgstr "कमांडके� बजा� नहि सकल"
+
+msgid "Unknown command"
+msgstr "अनचिन�ह कमांड"
+
+msgid "Secure File Transfer"
+msgstr "स�रक�षित फाइल हस�तांतरण"
+
+msgid "Error during file transfer"
+msgstr "फाइल हस�तांतरणक दौरान त�र�टि"
+
+msgid "Remote disconnected"
+msgstr "दूरस�थ विसंबंधित"
+
+msgid "Permission denied"
+msgstr "अन�मति निषेध"
+
+msgid "Key agreement failed"
+msgstr "क�ंजी अन�बंध विफल"
+
+msgid "Connection timed out"
+msgstr "कनेक�शन मियाद खतम भ' गेल"
+
+msgid "Creating connection failed"
+msgstr "संबंधन बनओनाइ विफल"
+
+msgid "File transfer session does not exist"
+msgstr "फाइल हस�तांतरणक सत�र मोज�द नहि अछि"
+
+msgid "No file transfer session active"
+msgstr "कोनहो फाइल हस�तांतरण सत�र सक�रिय अछि"
+
+msgid "File transfer already started"
+msgstr "फाइल हस�तांतरण पहिनेस� चालू अछि"
+
+msgid "Could not perform key agreement for file transfer"
+msgstr "फाइल हस�तांतरण लेल क�ंजी अन�बंध नहि क� सकल"
+
+msgid "Could not start the file transfer"
+msgstr "फाइल हस�तांतरण नहि श�र� क� सकल"
+
+msgid "Cannot send file"
+msgstr "फाइल नहि भेज सकैछ"
+
+msgid "Error occurred"
+msgstr "त�र�टि घटित भेल"
+
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s <I>%s</I> क' विषय बद�ल क� ई राखलक: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I>  चैनल<I>%s</I> मोड नियत ई क�लक: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> सभ चैनल <I>%s</I> मोडस� हटाबू"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I>  <I>%s's</I> क मोड नियत कर�लक: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I>  <I>%s's</I> क� सभ मोड हट�लक"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "अहा�के� <I>%s</I> स� निकाल देल गेल अछि <I>%s</I> द�वारा (%s)"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "अहा�के� %s द�वारा मारल गेल अछि (%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s (%s) क द�वारा मारल गेल छल"
+
+msgid "Server signoff"
+msgstr "सर�वर साइनऔफ"
+
+msgid "Personal Information"
+msgstr "निज सूचना"
+
+msgid "Birth Day"
+msgstr "जन�म दिन"
+
+msgid "Job Role"
+msgstr "काज भूमिका"
+
+msgid "Organization"
+msgstr "संस�था"
+
+msgid "Unit"
+msgstr "�काइ"
+
+msgid "Join Chat"
+msgstr "गप�प-सप�पमे सामिल होउ"
+
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "अहा� <I>%s</I> चैनल पर संस�थापक छी"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> चैनल पर संस�थापक <I>%s</I> अछि"
+
+msgid "Real Name"
+msgstr "असल नाम"
+
+msgid "Status Text"
+msgstr "पाठ स�थिति"
+
+msgid "Public Key Fingerprint"
+msgstr "सार�वजनिक क�ंजी फिंगरप�रिंट"
+
+msgid "Public Key Babbleprint"
+msgstr "सार�वजनिक क�ंजी बैबलप�रिंट"
+
+msgid "_More..."
+msgstr "आओर (_M)..."
+
+msgid "Detach From Server"
+msgstr "सर�वरस� अलग करू"
+
+msgid "Cannot detach"
+msgstr "अलग नहि क� सकैछ"
+
+msgid "Cannot set topic"
+msgstr "विषय सेट नहि क� सकैछ"
+
+msgid "Failed to change nickname"
+msgstr "उपनाम बदलैमे विफल"
+
+msgid "Roomlist"
+msgstr "कक�ष सूची"
+
+msgid "Cannot get room list"
+msgstr "कक�ष सूची नहि पाबि सकल"
+
+msgid "Network is empty"
+msgstr "संजाल रिक�त अछि"
+
+msgid "No public key was received"
+msgstr "कोनो सार�वजनिक क�ंजी नहि भेटल"
+
+msgid "Server Information"
+msgstr "सर�वरक सूचना"
+
+msgid "Cannot get server information"
+msgstr "सर�वरक सूचना नहि मिलल"
+
+msgid "Server Statistics"
+msgstr "सर�वरक आंकड़ा"
+
+msgid "Cannot get server statistics"
+msgstr "सर�वरक आंकड़ा नहि आन सकल"
+
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"स�थानीय सर�वर आरंभ समय: %s\n"
+"स�थानीय सर�वर चालूसमय: %s\n"
+"स�थानीय सर�वर क�लायंट: %d\n"
+"स�थानीय सर�वर चैनल: %d\n"
+"स�थानीय सर�वर संचालक: %d\n"
+"स�थानीय राउटर संचालक: %d\n"
+"स�थानीय सेल क�लायंट: %d\n"
+"स�थानीय सेल चैनल: %d\n"
+"स�थानीय सेल सर�वर: %d\n"
+"क�ल क�लायंट: %d\n"
+"क�ल चैनल: %d\n"
+"क�ल सर�वर: %d\n"
+"क�ल राउटर: %d\n"
+"क�ल सर�वर संचालक: %d\n"
+"क�ल राउटर संचालक: %d\n"
+
+msgid "Network Statistics"
+msgstr "संजालक आंकड़ा"
+
+msgid "Ping"
+msgstr "पिंग"
+
+msgid "Ping failed"
+msgstr "पिंग विफल"
+
+msgid "Ping reply received from server"
+msgstr "सर�वरस� पिंग उत�तर भेटल"
+
+msgid "Could not kill user"
+msgstr "प�रयोक�ताके� मार नहि सकल"
+
+msgid "WATCH"
+msgstr "देखू"
+
+msgid "Cannot watch user"
+msgstr "प�रयोक�ताक देखि नहि सकैत अछि"
+
+msgid "Resuming session"
+msgstr "सत�र दोबारा चालू क� रहल अछि"
+
+msgid "Authenticating connection"
+msgstr "संबंधन प�रमाण क� रहल अछि"
+
+msgid "Verifying server public key"
+msgstr "सर�वरक सार�वजनिक क�ंजी जांच रहल अछि"
+
+msgid "Passphrase required"
+msgstr "ग�ड़किल�ली वाक�यांश आवश�यक"
+
+#, 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 क सार�वजनिक क�ंजी प�राप�त क�लक. अहा�क स�थानिक प�रतिलिपि मेल नहि खाइछ. की अहा� अखनो "
+"ई सार�वजनिक क�ंजीक स�वीकार करबाक लेल चाहै छी?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "%s क' सार�वजनिक क�ंजी प�राप�त क�लक. की अहा� ई सार�वजनिक क�ंजी स�वीकारब?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s क�ंजी लेल फिंगरप�रिंट आओर बैबलप�रिंट अछि:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+msgid "Verify Public Key"
+msgstr "सार�वजनिक क�ंजीके� जा�चू"
+
+msgid "_View..."
+msgstr "दृश�य (_V)..."
+
+msgid "Unsupported public key type"
+msgstr "असमर�थित सार�वजनिक क�ंजी प�रकार"
+
+msgid "Disconnected by server"
+msgstr "सर�वर संबंधन तोड़लक"
+
+msgid "Error connecting to SILC Server"
+msgstr ""
+
+msgid "Key Exchange failed"
+msgstr "क�ंजी विनिमय विफल"
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"अलग करल सत�रक फिन� आननाइ विफल भ' गेल. �कटा नया संबंधन बन�बाक लेल प�नर�संबंधित करू दबाबू"
+
+msgid "Performing key exchange"
+msgstr "क�ंजी विनियम क� रहल अछि"
+
+msgid "Unable to load SILC key pair"
+msgstr ""
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SILC सर�वर स� संबंधन क� रहल अछि"
+
+msgid "Out of memory"
+msgstr "स�मृति स� बाहर"
+
+msgid "Unable to initialize SILC protocol"
+msgstr ""
+
+msgid "Error loading SILC key pair"
+msgstr "SILC क��जी जोड़ा लोड करबामे त�र�टि"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr ""
+
+msgid "Your Current Mood"
+msgstr "अहा�क वर�तमान स�वभाव"
+
+#, c-format
+msgid "Normal"
+msgstr "सामान�य"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"अहा�क पसंदीदा संपर�क विधि"
+
+msgid "SMS"
+msgstr "SMS"
+
+msgid "MMS"
+msgstr "MMS"
+
+msgid "Video conferencing"
+msgstr "विडियो सम�मेलन"
+
+msgid "Your Current Status"
+msgstr "अहा�क वर�तमान स�थिति"
+
+msgid "Online Services"
+msgstr "औनलाइन सेवा"
+
+msgid "Let others see what services you are using"
+msgstr "दोसरके� देख� दिअ' अहा� कओन सेवाक प�रयोग क� रहल छी"
+
+msgid "Let others see what computer you are using"
+msgstr "दोसराके� देखै दिअ' अहा� कओन कंप�यूटरक प�रयोग क� रहल छी"
+
+msgid "Your VCard File"
+msgstr "अहा�क वीकार�ड फाइल"
+
+msgid "Timezone (UTC)"
+msgstr "समय क�षेत�र (UTC)"
+
+msgid "User Online Status Attributes"
+msgstr "प�रयोक�ता औनलाइन वस�त�स�थिति ग�ण"
+
+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 ""
+"अहा� दोसरके� अपन औनलाइन वस�त�स�थिति आओर निजी सूचना देखै द� सकैत छी. कृप�या ओ सूचना भरू "
+"जेकरा अहा� दोसरक संग बांटि सकै छी."
+
+msgid "Message of the Day"
+msgstr "दिनक संदेश"
+
+msgid "No Message of the Day available"
+msgstr "कोनो दिनक संदेश उपलब�ध नहि"
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr "�हि संबंधनक संग कोनो दिनक संदेश ज�ड़ल नहि अछि"
+
+msgid "Create New SILC Key Pair"
+msgstr "SILC क�ंजी जोड़ा बनाबू..."
+
+msgid "Passphrases do not match"
+msgstr "ग�ड़किल�ली मेल नहि खाइछ."
+
+msgid "Key Pair Generation failed"
+msgstr "क�ंजी जोड़ा जनन विफल"
+
+msgid "Key length"
+msgstr "क�ंजीक नमाइ"
+
+msgid "Public key file"
+msgstr "सार�वजनिक क�ंजी फाइल"
+
+msgid "Private key file"
+msgstr "व�यक�तिगत क�ंजी फाइल"
+
+msgid "Passphrase (retype)"
+msgstr "ग�ड़किल�ली वाक�यांश (फिन� टंकित करू)"
+
+msgid "Generate Key Pair"
+msgstr "क�ंजी जोड़ा उत�पन�न करू"
+
+msgid "Online Status"
+msgstr "औनलाइन वस�त�स�थिति"
+
+msgid "View Message of the Day"
+msgstr "दिनक संदेश देखू"
+
+msgid "Create SILC Key Pair..."
+msgstr "SILC क�ंजी जोड़ा बनाबू..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "प�रयोक�ता <I>%s</I> संजालमे मोज�द नहि अछि"
+
+msgid "Topic too long"
+msgstr "विषय बड़ नमहर अछि"
+
+msgid "You must specify a nick"
+msgstr "उपनाम देनाइ आवश�यक अछि"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "%s चैनल भेटल नहि"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s: %s लेल चैनल विधि"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s पर कोनह� चैनल मोड नियत नहि अछि"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s लेल सीमोड तय करैमे विफल"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "अनचिन�ह कमा�ड: %s, (संभवतः क�ला�ंट बग भ' सकैत अछि)"
+
+msgid "part [channel]:  Leave the chat"
+msgstr "छोड़ू [चैनल]: वार�तालापके� छोड़ू"
+
+msgid "leave [channel]:  Leave the chat"
+msgstr "छोड़ू [चैनल]: वार�तालापके� छोड़ू"
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "विषय [&lt;नव विषय&gt;]: विषय देखू अथवा बदलू"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "सामिल &lt;चैनल&gt; [&lt;ग�ड़किल�ली&gt;]: �हि संजाल पर गप�प-सप�पमे सामिल होउ"
+
+msgid "list:  List channels on this network"
+msgstr "सूची: �हि संजाल पर चैनलसभक सूची देखाउ"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;उपनाम&gt;:  उपनामक संबंधमे सूचना देखू"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr "संदेश &lt;उपनाम&gt; &lt;संदेश&gt;:  �कटा प�रयोक�ताके� निजी संदेश पठाउ"
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr "प�रश�न &lt;उपनाम&gt; [&lt;संदेश&gt;]: प�रयोक�ताके� निजी संदेश पठाउ"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: सर�वरक दिनक संदेश देखू"
+
+msgid "detach:  Detach this session"
+msgstr "detach: सत�रके� पृथक करू"
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [संदेश]: सर�वरस� विसंबंधित करू वैकल�पिक संदेशक संग"
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;कमांड&gt;: कोनह� silc क�लाइंट कमांडक प�रयोग करू"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: उपनामके� खतम करू"
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;: अपन उपनाम बदलू"
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;: उपनामक सूचना देखू"
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  चैनलक ढंग देखू अथवा बदलू"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: चैनलमे उपनामक ढंग बदलू"
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;: संजालमे अपन ढंग नियत करू"
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]:  सर�वर संचालक अधिकार पाउ"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  चैनल आमंत�रण सूची स� उपनाम आमंत�रित करू "
+"अथवा जोड़ू/निकालू"
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]: क�लायंट के� चैनल स� लाइत मारू"
+
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]:  सर�वर व�यवस�था विवरण देखू"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]: क�लायंटके� चैनलस� निषेध करू"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;nick|server&gt;: क�लायंट अथवा सर�वरक सार�वजनिक क�ंजी प�राप�त करू"
+
+msgid "stats:  View server and network statistics"
+msgstr "stats:  सर�वर आओर संजालक आंकड़ा देखू"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "ping: संबंधित सर�वरके� पिंग पठाउ"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;channel&gt;: चैनलक प�रयोक�ताक सूची देखाउ"
+
+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;channel(s)&gt;: चैनलक बता�ल "
+"गेल प�रयोक�तासभक सूची देखाउ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC प�रोटोकोल प�लगिन"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "सेक�योर इन�टरनेट लाइव कॉफ�रेंसिंग (SILC) प�रोटोकोल"
+
+msgid "Network"
+msgstr "नेटवर�क"
+
+msgid "Public Key file"
+msgstr "सार�वजनिक क�ंजी फाइल"
+
+msgid "Private Key file"
+msgstr "व�यक�तिगत क�ंजी फाइल"
+
+msgid "Cipher"
+msgstr "सिफर"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "पूर�ण अग�रसारण गोपनक प�रयोग करू"
+
+msgid "Public key authentication"
+msgstr "सार�वजनिक क�ंजी प�रमाणीकरण"
+
+msgid "Block IMs without Key Exchange"
+msgstr "बिन� क�ंजी विनिमयक IM रोकि दिअ'"
+
+msgid "Block messages to whiteboard"
+msgstr "उज�जरबोर�डमे संदेश रोकू"
+
+msgid "Automatically open whiteboard"
+msgstr "उज�जरबोर�डके� स�वतः खोलू"
+
+msgid "Digitally sign and verify all messages"
+msgstr "सभटा संदेशके� डिजीटल हस�ताक�षर आ जा�च करू"
+
+msgid "Creating SILC key pair..."
+msgstr "SILC क�ंजी जोड़ा बना� रहलैछ..."
+
+msgid "Unable to create SILC key pair"
+msgstr ""
+
+#. 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)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "असल नाम: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "प�रयोक�ता नाम: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "मेजबान नाम: \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "संस�था: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "देश: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "�लगोरिदम: \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "क�ंजीक नमाइ: \t%d बिट\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "स�स�करण: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"सार�वजनिक क�ंजी फिंगरप�रिंट:\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"सार�वजनिक क�ंजी बैबलप�रिंट:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "सार�वजनिक क�ंजी सूचना"
+
+msgid "Paging"
+msgstr "पेजिंग"
+
+msgid "Video Conferencing"
+msgstr "विडियो सम�मेलन"
+
+msgid "Computer"
+msgstr "कम�प�यूटर"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "टर�मिनल"
+
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s संदेश उज�जरबोर�डमे पठैलकाह. की अहा� उज�जरबोर�डके� खोलबाक लेल चाही छी?"
+
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr "%s उज�जरबोर�डमे %s चैनल पर संदेश पठ�लकाह. की अहा� उज�जरबोर�ड खोलबाक लेल चाही छी?"
+
+msgid "Whiteboard"
+msgstr "उज�जरबोर�ड"
+
+msgid "No server statistics available"
+msgstr "सर�वरक आंकड़ा उपलब�ध नहि अछि"
+
+msgid "Error during connecting to SILC Server"
+msgstr "SILC संबंधनक दौरान त�र�टि"
+
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "असफलता: संस�करण बेमेल, क�ला�ंटके� अपग�रेड करू"
+
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "असफलता: दूरस�थ अहा�क सार�वजनिक क�ंजी पर विश�वास/समर�थन नहि करैछ"
+
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "असफलता: दूरस�थ प�रस�तावितके� ई समूहक समर�थन नहि करैछ"
+
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "असफलता: दूरस�थ प�रस�तावित सिफरक समर�थन नहि करैछ"
+
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "असफलता: दूरस�थ प�रस�तावित PKCS समर�थन नहि करैछ"
+
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "असफलता: दूरस�थ प�रस�तावित हैश प�रकार�य समर�थन नहि करैछ"
+
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "असफलता: दूरस�थ प�रस�तावित HMAC समर�थन नहि करैछ"
+
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr "असफलता: गलत हस�ताक�षर"
+
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr "असफलता: अवैध क�की"
+
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr "असफलता: प�रमाणीकरण विफल"
+
+msgid "Unable to initialize SILC Client connection"
+msgstr ""
+
+msgid "John Noname"
+msgstr "जोन कोनो नाम नहि"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr ""
+
+msgid "Unable to create connection"
+msgstr "संबंधन बनाबैमे असमर�थ."
+
+msgid "Unknown server response"
+msgstr ""
+
+msgid "Unable to create listen socket"
+msgstr ""
+
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr ""
+
+msgid "SIP connect server not specified"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE प�रोटोकोल प�लगिन"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE प�रोटोकोल प�लगिन"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "स�थिति छापू (नोट: सभ अहा�क देख सकैछ)"
+
+msgid "Use UDP"
+msgstr "UDP प�रयोग करू"
+
+msgid "Use proxy"
+msgstr "प�रौक�सी प�रयोग करू"
+
+msgid "Proxy"
+msgstr "प�राक�सी"
+
+msgid "Auth User"
+msgstr "औथ प�रयोक�ता"
+
+msgid "Auth Domain"
+msgstr "औथ डोमेन"
+
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  याहू संजाल पर �कटा गप�प-सप�प कक�षमे जाउ"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "सूची: Yahoo संजाल पर कक�षक सूचीबद�ध करू"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: �कटा डूडल सत�र श�रू करबाक लेल प�रयोक�ताके� आग�रह करू"
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr ""
+
+msgid "Pager port"
+msgstr "पेजर पोर�ट"
+
+msgid "File transfer server"
+msgstr "फाइल हस�तांतरण सर�वर"
+
+msgid "File transfer port"
+msgstr "फाइल हस�तांतरण पोर�ट"
+
+msgid "Chat room locale"
+msgstr "गप�प-सप�प कक�ष लोकेल"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "सम�मेलन आ गप�प सप�प कक�षक आमंत�रणके� अनदेखा करू"
+
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr "गप�प-सप�प कक�ष सूची URL"
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s अहा�क �कटा वेबकैम आमंत�रण पठैलकाह, जे अखनतक समर�थित नहि अछि."
+
+msgid "Your SMS was not delivered"
+msgstr ""
+
+msgid "Your Yahoo! message did not get sent."
+msgstr "अहा�क याहू! संदेश पठा�ल नहि गेल"
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "%s लेल याहू! तंत�र संदेश: "
+
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr "%s अहा� ह�नका मीत सूचीमे जोडबाक लेल अन�रोध के� ठोकराइ देलह��, ई कारण स�: %s."
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s अहा� ह�नका मीत सूचीमे जोड़ैक अन�रोधके� ठोकराइ देलह��"
+
+msgid "Add buddy rejected"
+msgstr "मीतके� जोड़ना� मना भ' गेल"
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr ""
+
+#, 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 देखू."
+
+msgid "Failed Yahoo! Authentication"
+msgstr "याहू! प�रमाणीकरण विफल"
+
+#, 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 अनदेख करैक प�रयास केलह��, म�दा प�रयोक�ता अहा�क मीतक सूचीमे अछि. \"ह�\" क' क�लिक "
+"मीतक हटा� आओर अनदेखा क� देताह."
+
+msgid "Ignore buddy?"
+msgstr "मीतक उपेक�षा करू?"
+
+msgid "Invalid username or password"
+msgstr ""
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "अनचिन�ह त�र�टि संख�या %d. याहूमे लागिन करैस� संभवतः ई नीक भ' जाइत."
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+msgid "Unable to add buddy to server list"
+msgstr ""
+
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ स�नै योग�य %s/%s/%s.swf ] %s"
+
+msgid "Received unexpected HTTP response from server"
+msgstr ""
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr ""
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+msgid "Not at Home"
+msgstr "घर पर नहि"
+
+msgid "Not at Desk"
+msgstr "डेस�क पर नहि"
+
+msgid "Not in Office"
+msgstr "दफ�तरमे नहि"
+
+msgid "On Vacation"
+msgstr "छ�ट�टी पर अछि"
+
+msgid "Stepped Out"
+msgstr "बाहर निकलल छलाह"
+
+msgid "Not on server list"
+msgstr "सर�वर सूचीमे नहि"
+
+msgid "Appear Permanently Offline"
+msgstr "स�थायी आफलाइन रहू"
+
+msgid "Presence"
+msgstr "उपस�थिति"
+
+msgid "Don't Appear Permanently Offline"
+msgstr "स�थायी आफलाइन नहि होउ"
+
+msgid "Join in Chat"
+msgstr "गप�प-सप�पमे ज�ड़ू"
+
+msgid "Initiate Conference"
+msgstr "सम�मेलन आरंभ करू"
+
+msgid "Presence Settings"
+msgstr "उपस�थिति सेटिंग"
+
+msgid "Start Doodling"
+msgstr "डूडलिंग श�रू करू"
+
+msgid "Select the ID you want to activate"
+msgstr ""
+
+msgid "Join whom in chat?"
+msgstr "गप�प-सप�पमे किनका संग सामिल हो�बाक चाही?"
+
+msgid "Activate ID..."
+msgstr "ID सक�रिय करू..."
+
+msgid "Join User in Chat..."
+msgstr "गप�प सप�पमे प�रयोक�ताके� सामिल करू..."
+
+msgid "Open Inbox"
+msgstr "इनबौक�स खोलू"
+
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr ""
+
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr ""
+
+msgid "Getting mobile carrier to send the SMS."
+msgstr ""
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+msgid "Sent Doodle request."
+msgstr "डूडल आग�रह पठाउ."
+
+msgid "Unable to connect."
+msgstr "संबंधित करैमे असमर�थ"
+
+msgid "Unable to establish file descriptor."
+msgstr "फाइल विवरणकर�ता स�थापित करैमे असमर�थ."
+
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s अहा�क %d फाइलके� पठाबैक कओसिस क� रहल अछि.\n"
+
+msgid "Write Error"
+msgstr "लेखन त�र�टि"
+
+msgid "Yahoo! Japan Profile"
+msgstr "याहू जापान प�रोफाइल"
+
+msgid "Yahoo! Profile"
+msgstr "याहू प�रोफाइल"
+
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr "क�षमा करू, व�यस�क तत�वकरूपे� चिह�नित सामग�री प�रोफाइल अखन समर�थित नहि अछि."
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+"ज� अहा� �हि प�रोफाइलके� देखबा चाहैत छी त' अहा�के� �हि कड़ीके� अपन वेब ब�राउजरमे देख� पड़त:"
+
+msgid "Yahoo! ID"
+msgstr "याहू! ID"
+
+msgid "Hobbies"
+msgstr "र�चि"
+
+msgid "Latest News"
+msgstr "ताजा समाचार"
+
+msgid "Home Page"
+msgstr "पहिल पन�ना"
+
+msgid "Cool Link 1"
+msgstr "नीक कड़ी 1"
+
+msgid "Cool Link 2"
+msgstr "नीक कड़ी 2"
+
+msgid "Cool Link 3"
+msgstr "नीक कड़ी 3"
+
+msgid "Last Update"
+msgstr "अंतिम अद�यतन"
+
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr ""
+
+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 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 "The user's profile is empty."
+msgstr "प�रयोक�ताक प�रोफाइल रिक�त अछि"
+
+#, c-format
+msgid "%s has declined to join."
+msgstr ""
+
+msgid "Failed to join chat"
+msgstr "गप�प-सप�पमे ज�ड़ैमे विफल"
+
+#. -6
+msgid "Unknown room"
+msgstr "अनचिन�ह कक�ष"
+
+#. -15
+msgid "Maybe the room is full"
+msgstr "संभवतः कक�ष भरल अछि"
+
+#. -35
+msgid "Not available"
+msgstr "उपलब�ध नहि"
+
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"अनचिन�ह त�र�टि. अहा�क लौग आउट करै क� जरूरत पड़ सकैछ और पांच मिनटक लेल रूकू गप�प सप�प कक�षके� "
+"फिन�स� सामिल हो� लेल"
+
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "आब अहा� %s मे गप�प-सप�प क� रहल अछि."
+
+msgid "Failed to join buddy in chat"
+msgstr "मीतक संग गप�प-सप�पमे ज�ड़ैमे विफल"
+
+msgid "Maybe they're not in a chat?"
+msgstr "संभवतः ओ गप�प-सप�पमे नहि अछि?"
+
+msgid "Fetching the room list failed."
+msgstr "कक�ष सूची आनेमे विफल"
+
+msgid "Voices"
+msgstr "आवाज़"
+
+msgid "Webcams"
+msgstr "वेब कैमरा"
+
+msgid "Connection problem"
+msgstr "संबंधनमे कठिनाइ"
+
+msgid "Unable to fetch room list."
+msgstr "कक�ष सूची आनेमे असमर�थ"
+
+msgid "User Rooms"
+msgstr "प�रयोक�ता कक�ष"
+
+msgid "Connection problem with the YCHT server"
+msgstr ""
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr "(�हि संदेशके� बदलैमे त�र�टि भेल.\t खाता संपादकमे '�नकोडिंग' विकल�प के� जांचू)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "%s,%s,%s गप�प-सप�पमे भेजेमे विफल"
+
+msgid "Hidden or not logged-in"
+msgstr "न�का�ल अथवा लौग-इन नहि क�ल"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>%s पर %s स�"
+
+msgid "Anyone"
+msgstr "कोनो"
+
+msgid "_Class:"
+msgstr "वर�ग (_C):"
+
+msgid "_Instance:"
+msgstr "दृष�टान�त (_I):"
+
+msgid "_Recipient:"
+msgstr "प�राप�तकर�ता (_R):"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s मे सदस�यता लेबाक प�रयास विफल"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: प�रयोक�ता खोजू"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: प�रयोक�ता खोजू"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instance&gt;: ई वर�ग पर प�रय�क�त उदाहरण नियत करू"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: ई वर�ग पर प�रय�क�त उदाहरण नियत करू"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;instance&gt;: ई वर�ग पर प�रय�क�त उदाहरण नियत करू"
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&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>दृष�टांत</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;"
+
+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;recipient&gt;:  &lt;<i>वर�ग</i>,"
+"<i>दृष�टांत</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;recipient&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt; क' �कटा संदेश पठाउ"
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: �कटा संदेश &lt;<i>class</i>,PERSONAL,*&gt; मे पठाउ"
+
+msgid "Resubscribe"
+msgstr "फिन� सदस�यता लिअ'"
+
+msgid "Retrieve subscriptions from server"
+msgstr "सर�वरस� सदस�यता आनू."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Zephyr Protocol Plugin"
+msgstr "जैफर प�रोटॅकोल प�लगिन"
+
+msgid "Use tzc"
+msgstr "tzc क' प�रयोग करू"
+
+msgid "tzc command"
+msgstr "tzc कमांड"
+
+msgid "Export to .anyone"
+msgstr ".anyone मे निर�यात करू"
+
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.subs मे निर�यात करू"
+
+msgid "Import from .anyone"
+msgstr ".anyone स� निर�यात करू"
+
+msgid "Import from .zephyr.subs"
+msgstr ".zephyr.subs स� निर�यात करू"
+
+msgid "Realm"
+msgstr "असल"
+
+msgid "Exposure"
+msgstr "देखाबा"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr ""
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP प�रौक�सी संबंधन त�र�टि %d"
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s हल करैमे त�र�टि"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s क' ध�यानक आग�रह क� रहल अछि..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s अहा�क ध�यान घी�चन� छै!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "ह� (_Y)"
+
+msgid "_No"
+msgstr "नहि (_N)"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
+msgid "_Accept"
+msgstr "स�वीकारू (_A)"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+msgid "I'm not here right now"
+msgstr "हम अखन �त� नहि छी"
+
+msgid "saved statuses"
+msgstr "सहेजल स�थिति"
+
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s आब %s स� जानल जैताह.\n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s %s के� %s गप�प-सप�प कक�षमे आमन�त�रित क�लकाह\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s %s के� %s गप�प-सप�प कक�षमे आमन�त�रित क�लकाह\n"
+
+msgid "Accept chat invitation?"
+msgstr "गप�प-सप�प आमंत�रण स�वीकारू?"
+
+#. Shortcut
+msgid "Shortcut"
+msgstr "शार�टकट"
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+msgid "Stored Image"
+msgstr ""
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
+msgid "SSL Connection Failed"
+msgstr "SSL संबंधन विफल"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL हैंडशेक विफल भ' गेल"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL पीयर �कटा अवैध प�रमाणपत�र प�रस�त�त क�लक"
+
+msgid "Unknown SSL error"
+msgstr "अनचिन�ह SSL त�र�टि"
+
+msgid "Unset"
+msgstr "अनियत"
+
+msgid "Do not disturb"
+msgstr "त�ग नहि करू"
+
+msgid "Extended away"
+msgstr "बिस�तारित दूरि"
+
+msgid "Feeling"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) स�थितिके� %s स� %s मे बदललक"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) आब %s अछि"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) आब %s नहि अछि"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s निष�क�रिय भ' गेल."
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s सक�रिय भ' गेल."
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s निष�क�रिय भ' गेल."
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s सक�रिय भ' गेल."
+
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+msgid "Calculating..."
+msgstr "गणनामे... "
+
+msgid "Unknown."
+msgstr "अनचिन�ह"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d सकेंड"
+msgstr[1] "%d सकेंड"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d दिन"
+msgstr[1] "%d दिन"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d घंटा"
+msgstr[1] "%s, %d घंटा"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d घंटा"
+msgstr[1] "%d घंटा"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d मिनट"
+msgstr[1] "%s, %d मिनट"
+
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d मिनट"
+msgstr[1] "%d मिनट"
+
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "%s के� खोलि नहि सकल: कतेक बार प�नर�निर�देशित करै पड़ल"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s मे संबंधित करैमे असमर�थ"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"%s स� सामग�रीके� रखबाक लेल पर�याप�त स�मृति आबंटनमे असमर�थ.  वेब सर�वर संभवतः किछ� द�ष�ट चीजक "
+"लेल कओसिस क� रहल अछि."
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s स� पढैमे त�र�टि: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s मे लिखैमे त�र�टि: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%s मे संबंधित करैमे असमर�थ: %s"
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+msgid "Connection interrupted by other software on your computer."
+msgstr "दोसर सोफ�टवेयरक द�वारा अहा�क कंप�यूटर पर संबंधन बाधित भेल."
+
+#. 10054
+msgid "Remote host closed connection."
+msgstr "दूरस�थ मेजबान बन�न संबंधन."
+
+#. 10060
+msgid "Connection timed out."
+msgstr "संबंधनक समय समाप�त"
+
+#. 10061
+msgid "Connection refused."
+msgstr "संबंधन फिन� सेट."
+
+#. 10048
+msgid "Address already in use."
+msgstr ""
+
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s पढ़ैमे त�र�टि"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+
+msgid "Internet Messenger"
+msgstr "इंटरनेट मेसेंजर"
+
+msgid "Pidgin Internet Messenger"
+msgstr "पिजिन इंटरनेट मेसेंजर"
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "लागिन विकल�पसभ"
+
+msgid "Pro_tocol:"
+msgstr "प�रोटोकाल (_t):"
+
+msgid "_Username:"
+msgstr "प�रयोक�ता नाम (_U):"
+
+msgid "Remember pass_word"
+msgstr "ग�ड़किल�ली याद राखू (_w)"
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "प�रयोक�ता विकल�प"
+
+msgid "_Local alias:"
+msgstr "स�थानीय उपनाम (_L):"
+
+msgid "New _mail notifications"
+msgstr "नव डाक सूचना (_m)"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "ई खाताक लेल ई मीत प�रतीकक प�रयोग करू (_i):"
+
+msgid "Ad_vanced"
+msgstr "उन�नत (_v)"
+
+msgid "Use GNOME Proxy Settings"
+msgstr "ग�नोम प�राक�सी सेटिंगक प�रयोग करू"
+
+msgid "Use Global Proxy Settings"
+msgstr "सर�वव�यापी प�रौक�सी सेटिंगक प�रयोग करू"
+
+msgid "No Proxy"
+msgstr "कोनो प�रौक�सी नहि"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+msgid "Use Environmental Settings"
+msgstr "वातावरण सेटिंगक उपयोग करू"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. 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.
+msgid "If you look real closely"
+msgstr "ज� अहा� ध�यानस� देखू"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+msgid "you can see the butterflies mating"
+msgstr "अहा� तितलीके� मिलन करैत देख सकै छी"
+
+msgid "Proxy _type:"
+msgstr "प�रोक�सीक प�रकार (_t):"
+
+msgid "_Host:"
+msgstr "मेजबान (_H):"
+
+msgid "_Port:"
+msgstr "पोर�ट (_P):"
+
+msgid "Pa_ssword:"
+msgstr "ग�ड़किल�ली (_s):"
+
+msgid "Unable to save new account"
+msgstr "नव खाताके� सहेजबामे असमर�थ."
+
+msgid "An account already exists with the specified criteria."
+msgstr "निर�दिष�ट मापदंडक स�ग �कटा खाता पहिनेस� मोज�द अछि."
+
+msgid "Add Account"
+msgstr "खाता जोड़ू"
+
+msgid "_Basic"
+msgstr "मौलिक (_B)"
+
+msgid "Create _this new account on the server"
+msgstr ""
+
+msgid "P_roxy"
+msgstr ""
+
+msgid "Enabled"
+msgstr "सक�षम"
+
+msgid "Protocol"
+msgstr "प�रोटोकॉल"
+
+#, 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->Manage Accounts</b> in the Buddy List window"
+msgstr ""
+
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
+#. Buddy List
+msgid "Background Color"
+msgstr "पृष�ठभूमि र�ग"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr "लेआउट"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr ""
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr ""
+
+msgid "The text information for when a buddy is offline"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr ""
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+#, 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 नामक अछि. की अहा� ह�नका मिलाबै लेल चाहैत छी?"
+
+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 ""
+"ई संपर�कसभक मेलओनाइ मीत सूची पर �कल प�रविष�टि सा�ा करबाक कारण बनत आओर �कटा �कल "
+"वार�तालाप विंडोके� प�रयोग करू. अहा� ह�नका 'Expand' के� च�निक� संपर�कक संदर�भ मेनूस� अलग क� सकैत "
+"छी"
+
+msgid "Please update the necessary fields."
+msgstr ""
+
+msgid "A_ccount"
+msgstr ""
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"कृप�या जाहि गप�प-सप�पमे अहा� सामिल हो�बाक लेल चाहैत छी ओकरा संबंधमे उचित सूचना भरू.\n"
+
+msgid "Room _List"
+msgstr "कक�ष सूची (_L)"
+
+msgid "_Block"
+msgstr "रोकू (_B)"
+
+msgid "Un_block"
+msgstr "नहि रोकू (_b)"
+
+msgid "Move to"
+msgstr "�करामे जाउ"
+
+msgid "Get _Info"
+msgstr "सूचना पाउ (_I)"
+
+msgid "I_M"
+msgstr "I_M"
+
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+msgid "_Send File..."
+msgstr "फाइल पठाउ (_S)"
+
+msgid "Add Buddy _Pounce..."
+msgstr "मीत थाप जोड़ू (_P)"
+
+msgid "View _Log"
+msgstr "लौग देखू (_L)"
+
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
+msgstr ""
+
+msgid "_Alias..."
+msgstr "उपनाम (_A)..."
+
+msgid "_Remove"
+msgstr "हटाबू (_R)"
+
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr "मनपसंद प�रतीक निकालू"
+
+msgid "Add _Buddy..."
+msgstr "मीत जोड़ू (_B)..."
+
+msgid "Add C_hat..."
+msgstr "गप�प-सप�प जोड़ू (_h)..."
+
+msgid "_Delete Group"
+msgstr "समूह मेटाउ (_D)"
+
+msgid "_Rename"
+msgstr "नाम बदलू (_R)"
+
+#. join button
+msgid "_Join"
+msgstr "सामिल होउ (_J)"
+
+msgid "Auto-Join"
+msgstr "स�वतः सामिल होउ"
+
+msgid "Persistent"
+msgstr "स�थिर"
+
+msgid "_Edit Settings..."
+msgstr ""
+
+msgid "_Collapse"
+msgstr "घोकचाबू (_C)"
+
+msgid "_Expand"
+msgstr "पसारू (_E)"
+
+msgid "/Tools/Mute Sounds"
+msgstr "/अओजार/गूंगा आवाज"
+
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "अहा� आब �हन कोनो खाताक संग नहि अछि जे ओ मीतके� जोड़ सकैछ."
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr "अनचिन�ह नोड प�रकार"
+
+msgid "Please select your mood from the list"
+msgstr ""
+
+msgid "Message (optional)"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr "प�रयोक�ता मूड संपादित करू"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/मीत (_B)"
+
+msgid "/Buddies/New Instant _Message..."
+msgstr "/मीत/नव इंस�टेंट संदेश (_M)..."
+
+msgid "/Buddies/Join a _Chat..."
+msgstr "/मीत/�कटा गप�प-सप�पमे सामिल होउ (_C)..."
+
+msgid "/Buddies/Get User _Info..."
+msgstr "/मीत/प�रयोक�ता सूचना पाउ (_I)..."
+
+msgid "/Buddies/View User _Log..."
+msgstr "/मीत/प�रयोक�ता लौग देखू (_L)..."
+
+msgid "/Buddies/Sh_ow"
+msgstr "/मीत/देखाउ (_o)"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/मीत/देखाउ/आफलाइन मीत (_O)"
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/मीत/देखाउ/खाली समूह (_E)"
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/मीत/देखाउ/मीत विवरण (_D)"
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/मीत/देखाउ/बेकार समय (_T)"
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/मीत/देखाउ/प�रोटोकाल प�रतीक (_P)"
+
+msgid "/Buddies/_Sort Buddies"
+msgstr "/मीत/मीतसभ छांटू (_S)"
+
+msgid "/Buddies/_Add Buddy..."
+msgstr "/मीत/मीत जोड़ू(_A)..."
+
+msgid "/Buddies/Add C_hat..."
+msgstr "/मीत/गप�प-सप�प जोड़ू(_h)..."
+
+msgid "/Buddies/Add _Group..."
+msgstr "/मीत/समूह जोड़ू(_G)..."
+
+msgid "/Buddies/_Quit"
+msgstr "/मीत/छोडू (_Q)"
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/खाता (_A)"
+
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+msgid "/_Tools"
+msgstr "/अओजार (_T)"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr "/अओजार/मीत थाप (_P)"
+
+msgid "/Tools/_Certificates"
+msgstr "/अओजार/प�रमाणपत�र (_C)"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
+msgid "/Tools/Plu_gins"
+msgstr "/अओजार/प�लगिन (_g)"
+
+msgid "/Tools/Pr_eferences"
+msgstr "/अओजार/वरीयता (_e)"
+
+msgid "/Tools/Pr_ivacy"
+msgstr "/अओजार/गोपनीय (_i)"
+
+msgid "/Tools/Set _Mood"
+msgstr ""
+
+msgid "/Tools/_File Transfers"
+msgstr "/अओजार/फाइल हस�तांतरण (_F)"
+
+msgid "/Tools/R_oom List"
+msgstr "/अओजार/कक�ष सूची (_o)"
+
+msgid "/Tools/System _Log"
+msgstr "/अओजार/सिस�टम लौग  (_L)"
+
+msgid "/Tools/Mute _Sounds"
+msgstr "/अओजार/ध�वनि बन�न करू (_S)"
+
+#. Help
+msgid "/_Help"
+msgstr "/मदति (_H)"
+
+msgid "/Help/Online _Help"
+msgstr "/मदति/औनलाइन मदति (_H)"
+
+msgid "/Help/_Build Information"
+msgstr ""
+
+msgid "/Help/_Debug Window"
+msgstr "/मदति/डिबग विंडो (_D)"
+
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+msgid "/Help/_Translator Information"
+msgstr ""
+
+msgid "/Help/_About"
+msgstr "/मदति/क� बारेमे (_A)"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>खाता:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>विषय:</b> %s"
+
+msgid "(no topic set)"
+msgstr "(कोनो विषय सेट नहि)"
+
+msgid "Buddy Alias"
+msgstr "मीत उपनाम"
+
+msgid "Logged In"
+msgstr "लागिन भेल"
+
+msgid "Last Seen"
+msgstr "पछिला बेर देखल गेल"
+
+msgid "Spooky"
+msgstr "स�पूकी"
+
+msgid "Awesome"
+msgstr "अद�भ�त"
+
+msgid "Rockin'"
+msgstr "जोरदार"
+
+msgid "Total Buddies"
+msgstr "क�ल मीतसभ"
+
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "बेकार %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "बेकार %dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "बेकार %dm"
+
+msgid "/Buddies/New Instant Message..."
+msgstr "/मीत/नव इंस�टेंट संदेश..."
+
+msgid "/Buddies/Join a Chat..."
+msgstr "/मीत/गप�प-सप�पमे सामिल होउ..."
+
+msgid "/Buddies/Get User Info..."
+msgstr "/मीत/प�रयोक�ता सूचना पाउ..."
+
+msgid "/Buddies/Add Buddy..."
+msgstr "/मीत/मीत जोड़ू..."
+
+msgid "/Buddies/Add Chat..."
+msgstr "/मीत/बतिआउ..."
+
+msgid "/Buddies/Add Group..."
+msgstr "/मीत/समूह जोड़ू..."
+
+msgid "/Tools/Privacy"
+msgstr "/अओजार/ग�प�तता"
+
+msgid "/Tools/Room List"
+msgstr "/अओजार/कक�ष सूची"
+
+#, 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"
+
+msgid "Manually"
+msgstr "दस�ती"
+
+msgid "By status"
+msgstr "वस�त�स�थिति द�वारा"
+
+msgid "By recent log activity"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s विसंबंधित"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s निष�क�रिय"
+
+msgid "Reconnect"
+msgstr "फिन� जोड़ू"
+
+msgid "Re-enable"
+msgstr "प�नर�सक�रिय करू"
+
+msgid "SSL FAQs"
+msgstr ""
+
+msgid "Welcome back!"
+msgstr "फिन� स�वागत अछि!"
+
+#, 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 खाता निष�क�रिय छल कि�क अहा� दोसर स�थानस� साइन ओन क�लह��:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>प�रयोक�तानाम:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>ग�ड़किल�ली:</b>"
+
+msgid "_Login"
+msgstr "लागिन (_L)"
+
+msgid "/Accounts"
+msgstr "/खाता"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#, 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->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/मीत/देखाउ/आफलाइन मीत"
+
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/मीत/देखाउ/खाली समूह"
+
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/मीत/देखाउ/मीत विवरण"
+
+msgid "/Buddies/Show/Idle Times"
+msgstr "/मीत/देखाउ/बेकार समय"
+
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/मीत/देखाउ/प�रोटोकाल प�रतीक"
+
+msgid "Add a buddy.\n"
+msgstr "मीत जोड़ू.\n"
+
+msgid "Buddy's _username:"
+msgstr ""
+
+msgid "(Optional) A_lias:"
+msgstr "(वैकल�पिक) उपनाम (_l):"
+
+msgid "Add buddy to _group:"
+msgstr "समूहमे मीत जोड़ू (_g):"
+
+msgid "This protocol does not support chat rooms."
+msgstr "�हि प�रोटोकोलमे गप�प-सप�प कक�षक लेल समर�थन नहि अछि"
+
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "अहा� वर�तमानमे कोनह� प�रोटॅकोलमे लागिन नहि छी जाहिमे गप�प-सप�प करैक क�षमता अछि."
+
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"कृप�या उपनाम भरू आओर जाहि गप�प-सप�पके� अहा� मीत सूचीमे जोड़ैल' चाहे छी ह�नका संबंधकमे उचित "
+"सूचना भरू.\n"
+
+msgid "A_lias:"
+msgstr "उपनाम (_l):"
+
+msgid "_Group:"
+msgstr "समूह (_G):"
+
+msgid "Auto_join when account connects."
+msgstr ""
+
+msgid "_Remain in chat after window is closed."
+msgstr ""
+
+msgid "Please enter the name of the group to be added."
+msgstr "कृप�या ओ समूहक नाम भरू जेकरा अहा� जोड़ै चाहैत छी."
+
+msgid "Enable Account"
+msgstr "खाता सक�रिय करू"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/खाता/खाता सक�रिय करू"
+
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/खाता/"
+
+msgid "_Edit Account"
+msgstr "खाता संपादित करू (_E)"
+
+msgid "Set _Mood..."
+msgstr ""
+
+msgid "No actions available"
+msgstr "कोनो काज उपलब�ध नहि अछि"
+
+msgid "_Disable"
+msgstr "निष�क�रिय करू (_D)"
+
+msgid "/Tools"
+msgstr "/अओजार"
+
+msgid "/Buddies/Sort Buddies"
+msgstr "/मीत/मीत क�रमबद�ध करू"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL सर�वर"
+
+msgid "Unknown command."
+msgstr "अनचिन�ह कमा�ड"
+
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "ओ मीत प�रोटोकोलमे नहि अछि जे ई गप�प-सप�पमे अछि."
+
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr "अहा� आब �हन कोनह� खाताक संग नहि छी जे मीतके� आमंत�रण पठा� सकैछ."
+
+msgid "Invite Buddy Into Chat Room"
+msgstr "मीतके� गप�प-सप�प कक�षमे आमंत�रित करू"
+
+msgid "_Buddy:"
+msgstr "मीत (_B):"
+
+msgid "_Message:"
+msgstr "संदेश (_M)"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1> %s क' संग वार�तालाप</h1>\n"
+
+msgid "Save Conversation"
+msgstr "वार�तालाप सहेजू"
+
+msgid "Un-Ignore"
+msgstr "अपेक�षा"
+
+msgid "Ignore"
+msgstr "उपेक�षा"
+
+msgid "Get Away Message"
+msgstr "अन�पस�थिति संदेश पाउ"
+
+msgid "Last Said"
+msgstr ""
+
+msgid "Unable to save icon file to disk."
+msgstr "प�रतीक फाइलके� डिस�कमे सहेजबामे असमर�थ"
+
+msgid "Save Icon"
+msgstr "प�रतीक सहेजू"
+
+msgid "Animate"
+msgstr "संजीवित करू"
+
+msgid "Hide Icon"
+msgstr "प�रतीक न�काबू"
+
+msgid "Save Icon As..."
+msgstr "प�रतीक �हि तरहे� सहेजू..."
+
+msgid "Set Custom Icon..."
+msgstr "मनपसंद प�रतीक सेट करू..."
+
+msgid "Change Size"
+msgstr "आकार बदलू"
+
+msgid "Show All"
+msgstr "सभटा देखाउ"
+
+#. Conversation menu
+msgid "/_Conversation"
+msgstr "/वार�तालाप (_C)"
+
+msgid "/Conversation/New Instant _Message..."
+msgstr "/वार�तालाप/नव इंस�टेंट संदेश (_M)..."
+
+msgid "/Conversation/Join a _Chat..."
+msgstr ""
+
+msgid "/Conversation/_Find..."
+msgstr "/वार�तालाप/खोजू (_F)..."
+
+msgid "/Conversation/View _Log"
+msgstr "/वार�तालाप/लौग देखू (_L)"
+
+msgid "/Conversation/_Save As..."
+msgstr "/वार�तालाप/�हिना सहेजू (_S)..."
+
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/वार�तालाप/स�क�रौलबैक साफ करू (_r)"
+
+msgid "/Conversation/M_edia"
+msgstr ""
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
+msgid "/Conversation/Se_nd File..."
+msgstr "/वार�तालाप/फाइल पठाउ (_n)..."
+
+msgid "/Conversation/Get _Attention"
+msgstr ""
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/वार�तालाप/नव मीत पर थाप जोड़ू (_P)..."
+
+msgid "/Conversation/_Get Info"
+msgstr "/वार�तालाप/सूचना आनू (_G)"
+
+msgid "/Conversation/In_vite..."
+msgstr "/वार�तालाप/आमंत�रण (_v)..."
+
+msgid "/Conversation/M_ore"
+msgstr "/वार�तालाप/आओर (_o)"
+
+msgid "/Conversation/Al_ias..."
+msgstr "/वार�तालाप/उपनाम (_i)..."
+
+msgid "/Conversation/_Block..."
+msgstr "/वार�तालाप/रोकू (_B)..."
+
+msgid "/Conversation/_Unblock..."
+msgstr "/वार�तालाप/नहि रोकू (_U)..."
+
+msgid "/Conversation/_Add..."
+msgstr "/वार�तालाप/जोड़ू (_A)..."
+
+msgid "/Conversation/_Remove..."
+msgstr "/वार�तालाप/निकालू (_R)..."
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/वार�तालाप/कड़ी भरू (_k)..."
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/वार�तालाप/चित�र डालू (_e)..."
+
+msgid "/Conversation/_Close"
+msgstr "/वार�तालाप/बन�न (_C)"
+
+#. Options
+msgid "/_Options"
+msgstr "/विकल�प (_O)"
+
+msgid "/Options/Enable _Logging"
+msgstr "/विकल�प/लागिन चालू करू (_L)"
+
+msgid "/Options/Enable _Sounds"
+msgstr "/विकल�प/ध�वनि सक�रिय करू (_S)"
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/विकल�प/संरूपण अओजारपट�टी देखाउ (_T)"
+
+msgid "/Options/Show Ti_mestamps"
+msgstr "/विकल�प/टाइमस�टेंप देखाउ (_m)"
+
+msgid "/Conversation/More"
+msgstr "/वार�तालाप/आओर"
+
+msgid "/Options"
+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.
+msgid "/Conversation"
+msgstr "/वार�तालाप"
+
+msgid "/Conversation/View Log"
+msgstr "/वार�तालाप/लौग देखू"
+
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
+msgid "/Conversation/Send File..."
+msgstr "/वार�तालाप/फाइल पठाउ..."
+
+msgid "/Conversation/Get Attention"
+msgstr ""
+
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/विकल�प/मीत थाप जोड़ू..."
+
+msgid "/Conversation/Get Info"
+msgstr "/वार�तालाप/सूचना आनू"
+
+msgid "/Conversation/Invite..."
+msgstr "/वार�तालाप/आमंत�रण..."
+
+msgid "/Conversation/Alias..."
+msgstr "/वार�तालाप/उपनाम..."
+
+msgid "/Conversation/Block..."
+msgstr "/वार�तालाप/रोकू..."
+
+msgid "/Conversation/Unblock..."
+msgstr "/वार�तालाप/ नहि रोकू..."
+
+msgid "/Conversation/Add..."
+msgstr "/वार�तालाप/जोड़ू..."
+
+msgid "/Conversation/Remove..."
+msgstr "/वार�तालाप/हटाबू..."
+
+msgid "/Conversation/Insert Link..."
+msgstr "/वार�तालाप/कड़ी भरू..."
+
+msgid "/Conversation/Insert Image..."
+msgstr "/वार�तालाप/चित�र डालू..."
+
+msgid "/Options/Enable Logging"
+msgstr "/विकल�प/लौग सक�रिय करू"
+
+msgid "/Options/Enable Sounds"
+msgstr "/विकल�प/ध�वनि सक�रिय करू"
+
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/विकल�प/रचना अओजारपट�टी देखाउ"
+
+msgid "/Options/Show Timestamps"
+msgstr "/विकल�प/टाइमस�टेंपसभ देखाउ"
+
+msgid "User is typing..."
+msgstr "प�रयोक�ता टंकित क� रहल अछि..."
+
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s अहा�क टाइपिंग करैस� रोकलक"
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr "�हिमे पठाउ (_e)"
+
+msgid "_Send"
+msgstr "भेजू (_S)"
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr "कक�षमे 0 लोग अछि"
+
+msgid "Close Find bar"
+msgstr "खोज पट�टी बन�न करू"
+
+msgid "Find:"
+msgstr "खोजू:"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "कक�षमे %d लोग अछि"
+msgstr[1] "कक�षमे %d लोग अछि"
+
+msgid "Stopped Typing"
+msgstr "टंकित करबा रोकू"
+
+msgid "Nick Said"
+msgstr "उपनाम कहलक"
+
+msgid "Unread Messages"
+msgstr "अपठित संदेश"
+
+msgid "New Event"
+msgstr "नव घटना"
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "साफ करू: सभटा वार�तालाप स�क�रौलबैक साफ करैत अछि"
+
+msgid "Confirm close"
+msgstr "बन�न स�निश�चित करू"
+
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "अहा�क पास अपठित संदेश अछि. जे अहा� निश�चित छी अहा� विंडो बन�न करबाक लेल चाहै छी?"
+
+msgid "Close other tabs"
+msgstr "दोसर टैब बन�न करू"
+
+msgid "Close all tabs"
+msgstr "टैबसभ बन�न करू"
+
+msgid "Detach this tab"
+msgstr "ई टैब अलग करू"
+
+msgid "Close this tab"
+msgstr "ई टैब बन�न करू"
+
+msgid "Close conversation"
+msgstr "वार�तालाप बन�न करू"
+
+msgid "Last created window"
+msgstr "अंतिम बना�ल विन�डो"
+
+msgid "Separate IM and Chat windows"
+msgstr "IM विंडो आओर गप�प-सप�प विंडो अलग करू"
+
+msgid "New window"
+msgstr "नव विन�डो"
+
+msgid "By group"
+msgstr "समूहस�"
+
+msgid "By account"
+msgstr "खातास�"
+
+msgid "Find"
+msgstr "खोजू"
+
+msgid "_Search for:"
+msgstr "लेल खोजू (_S):"
+
+msgid "Save Debug Log"
+msgstr "डिबग लौग सहेजू"
+
+msgid "Invert"
+msgstr "उनटू"
+
+msgid "Highlight matches"
+msgstr "मिलान उभारू"
+
+msgid "_Icon Only"
+msgstr "सिर�फ प�रतीक (_I)"
+
+msgid "_Text Only"
+msgstr "केवल पाठ (_T)"
+
+msgid "_Both Icon & Text"
+msgstr "प�रतीक आ पाठ दूनू (_B)"
+
+msgid "Filter"
+msgstr "फिल�टर"
+
+msgid "Right click for more options."
+msgstr "आओर विकल�प लेल दहिन�ना क�लिक करू"
+
+msgid "Level "
+msgstr "स�तर "
+
+msgid "Select the debug filter level."
+msgstr "डिबग फिल�टर स�तर च�नू"
+
+msgid "All"
+msgstr "सभ"
+
+msgid "Misc"
+msgstr "विविध"
+
+msgid "Warning"
+msgstr "चेतावनी"
+
+msgid "Error "
+msgstr "त�र�टि"
+
+msgid "Fatal Error"
+msgstr "गंभीर त�र�टि"
+
+msgid "bug master"
+msgstr ""
+
+msgid "artist"
+msgstr ""
+
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
+msgid "voice and video"
+msgstr ""
+
+msgid "support"
+msgstr "समर�थन"
+
+msgid "webmaster"
+msgstr ""
+
+msgid "win32 port"
+msgstr "विन32 पोर�ट"
+
+msgid "maintainer"
+msgstr "अन�रक�षक"
+
+msgid "libfaim maintainer"
+msgstr "libfaim अन�रक�षक"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+msgid "hacker and designated driver [lazy bum]"
+msgstr "हैकर आओर ओहदेदार चालक [लेजी बम]"
+
+msgid "support/QA"
+msgstr "समर�थन/QA"
+
+msgid "XMPP"
+msgstr ""
+
+msgid "original author"
+msgstr "मूल लेखक"
+
+msgid "lead developer"
+msgstr "म�ख�य विकास क�निहार"
+
+msgid "Senior Contributor/QA"
+msgstr "वरिष�ठ योगदानकर�ता/QA"
+
+msgid "Afrikaans"
+msgstr "अफ�रीकी"
+
+msgid "Arabic"
+msgstr "अरबी"
+
+msgid "Assamese"
+msgstr "असामी"
+
+msgid "Belarusian Latin"
+msgstr "बेलारूसी लैटिन"
+
+msgid "Bulgarian"
+msgstr "ब�ल�गारियाइ"
+
+msgid "Bengali"
+msgstr "बंगाली"
+
+msgid "Bengali-India"
+msgstr ""
+
+msgid "Bosnian"
+msgstr "बोस�नियाइ"
+
+msgid "Catalan"
+msgstr "केटालान"
+
+msgid "Valencian-Catalan"
+msgstr "वैलेंसियन कैटालन"
+
+msgid "Czech"
+msgstr "चेक"
+
+msgid "Danish"
+msgstr "डैनिश"
+
+msgid "German"
+msgstr "जर�मन"
+
+msgid "Dzongkha"
+msgstr "ड�जोंग�खा"
+
+msgid "Greek"
+msgstr "ग�रीक"
+
+msgid "Australian English"
+msgstr "आस�ट�रेलियन अंग�रेजी"
+
+msgid "Canadian English"
+msgstr "कनाडियन अंग�रेजी"
+
+msgid "British English"
+msgstr "ब�रिटिश अंग�रेजी"
+
+msgid "Esperanto"
+msgstr "�स�पेरांटो"
+
+msgid "Spanish"
+msgstr "स�पेनी"
+
+msgid "Estonian"
+msgstr "�स�तोनियाई"
+
+msgid "Basque"
+msgstr "बास�क"
+
+msgid "Persian"
+msgstr "फारसी"
+
+msgid "Finnish"
+msgstr "फिनिश"
+
+msgid "French"
+msgstr "फ�रेंच"
+
+msgid "Irish"
+msgstr "आइरिश"
+
+msgid "Galician"
+msgstr "गेलिसियन"
+
+msgid "Gujarati"
+msgstr "ग�जराती"
+
+msgid "Gujarati Language Team"
+msgstr "ग�जराती भाषा दल"
+
+msgid "Hebrew"
+msgstr "हिब�रू"
+
+msgid "Hindi"
+msgstr "हिन�दी"
+
+msgid "Hungarian"
+msgstr "हंगेरियाई"
+
+msgid "Armenian"
+msgstr "आर�मेनियाइ"
+
+msgid "Indonesian"
+msgstr "इंडोनेशियन"
+
+msgid "Italian"
+msgstr "इतालवी"
+
+msgid "Japanese"
+msgstr "जापानी"
+
+msgid "Georgian"
+msgstr "ज�यॉर�जियाइ"
+
+msgid "Ubuntu Georgian Translators"
+msgstr "उबंट� ज�यार�जियाइ अन�वादक"
+
+msgid "Khmer"
+msgstr "ख�मेर"
+
+msgid "Kannada"
+msgstr "कन�नड"
+
+msgid "Kannada Translation team"
+msgstr "कन�नड़ अन�वाद दल"
+
+msgid "Korean"
+msgstr "कोरियाइ"
+
+msgid "Kurdish"
+msgstr "क�र�दिश"
+
+msgid "Lao"
+msgstr "लाओ"
+
+msgid "Macedonian"
+msgstr "मेसिडोनियाइ"
+
+msgid "Malayalam"
+msgstr "मलयालम"
+
+msgid "Mongolian"
+msgstr "मंगोलियाइ"
+
+msgid "Marathi"
+msgstr "मराठी"
+
+msgid "Malay"
+msgstr "मलय"
+
+msgid "Bokmål Norwegian"
+msgstr "बोक�माल नार�वेजियन"
+
+msgid "Nepali"
+msgstr "नेपाली"
+
+msgid "Dutch, Flemish"
+msgstr "डच; फ�लेमिश"
+
+msgid "Norwegian Nynorsk"
+msgstr "नार�वेजियन न�योनोर�स�क"
+
+msgid "Occitan"
+msgstr "ओकितन"
+
+msgid "Oriya"
+msgstr "उड़िया"
+
+msgid "Punjabi"
+msgstr "पंजाबी"
+
+msgid "Polish"
+msgstr "पोलिश"
+
+msgid "Portuguese"
+msgstr "प�र�तगाली"
+
+msgid "Portuguese-Brazil"
+msgstr "प�र�तगाली-ब�राजील"
+
+msgid "Pashto"
+msgstr "पश�तो"
+
+msgid "Romanian"
+msgstr "रोमानियाइ"
+
+msgid "Russian"
+msgstr "रूसी"
+
+msgid "Slovak"
+msgstr "स�लोवाक"
+
+msgid "Slovenian"
+msgstr "स�लोवानियाइ"
+
+msgid "Albanian"
+msgstr "अल�बानियाइ"
+
+msgid "Serbian"
+msgstr "सर�बियन"
+
+msgid "Sinhala"
+msgstr "सिंहला"
+
+msgid "Swedish"
+msgstr "स�वीडिश"
+
+msgid "Swahili"
+msgstr "स�वाहिली"
+
+msgid "Tamil"
+msgstr "तमिल"
+
+msgid "Telugu"
+msgstr "तेल�ग�"
+
+msgid "Thai"
+msgstr "थाइ"
+
+msgid "Turkish"
+msgstr "त�र�की"
+
+msgid "Ukranian"
+msgstr "यूक�रैनियाइ"
+
+msgid "Urdu"
+msgstr "उर�दू"
+
+msgid "Vietnamese"
+msgstr "वि�तनामी"
+
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "टी. �म. थान�ह आओर गनोम-वीआई मण�डली"
+
+msgid "Simplified Chinese"
+msgstr "सरल चीनी"
+
+msgid "Hong Kong Chinese"
+msgstr "हा�ग का�ग चीनी"
+
+msgid "Traditional Chinese"
+msgstr "पारम�परिक चीनी"
+
+msgid "Amharic"
+msgstr "अम�हारिक"
+
+msgid "Lithuanian"
+msgstr "लिथ�आनियाइ"
+
+#, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+
+#, c-format
+msgid "About %s"
+msgstr "क' संबंधमे %s"
+
+msgid "Build Information"
+msgstr ""
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr ""
+
+msgid "Current Developers"
+msgstr "मोज�दा विकास क�निहारसभ"
+
+msgid "Crazy Patch Writers"
+msgstr "क�रेजी पैच लेखकगण"
+
+msgid "Retired Developers"
+msgstr "सेवानिवृत�त विकास क�निहारसभ"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "अवकाशलेल क�रैजी पैच लेखकसभ"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
+
+msgid "Current Translators"
+msgstr "संगीता क�मारी (sangeeta09@gmail.com)"
+
+msgid "Past Translators"
+msgstr "संगीता क�मारी, राजेश रंजन"
+
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s अन�वादक सूचना"
+
+msgid "_Name"
+msgstr "नाम (_N)"
+
+msgid "_Account"
+msgstr "खाता (_A)"
+
+msgid "Get User Info"
+msgstr "प�रयोक�ताक सूचना पाउ"
+
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+
+msgid "View User Log"
+msgstr "प�रयोक�ताक लौग देखू"
+
+msgid "Alias Contact"
+msgstr "उपनाम संपर�क"
+
+msgid "Enter an alias for this contact."
+msgstr "�हि संपर�कक लेल उपनाम भरू."
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "%s क' लेल उपनाम भरू."
+
+msgid "Alias Buddy"
+msgstr "मीत उपनाम"
+
+msgid "Alias Chat"
+msgstr "उपनाम गप�प-सप�प"
+
+msgid "Enter an alias for this chat."
+msgstr "�हि गप�प-सप�पक उपनाम भरू."
+
+#, 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 दोसर मीत अछि, ओकरा मेटाबै लेल जा� रहल "
+"छी. की अहा� आगा� बढ़ै चाहै छी?"
+
+msgid "Remove Contact"
+msgstr "संपर�क निकालू"
+
+msgid "_Remove Contact"
+msgstr "संपर�क निकालू (_R)"
+
+#, 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 समूहस� मिलावै ल� जा� रहल छी. की अहा� आगा� बढै चाहैछी?"
+
+msgid "Merge Groups"
+msgstr "समूह मिलाबू"
+
+msgid "_Merge Groups"
+msgstr "समूह मिलाबू (_M)"
+
+#, 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 समूहके� मिटाबैले जा� रहल छी. की अहा� आगा� बढ� चाहै छी?"
+
+msgid "Remove Group"
+msgstr "समूह मेटाउ"
+
+msgid "_Remove Group"
+msgstr "समूह हटाबू (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "अहा� अपन मीत सूचीस� %s के� मिटाबै लेल जा� रहल छी. की अहा� आगा� बढ़ै चाहै छी?"
+
+msgid "Remove Buddy"
+msgstr "मीत निकालू"
+
+msgid "_Remove Buddy"
+msgstr "मीत निकालू (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"अहा� अपन मीत सूचीस� %s गप�प-सप�पके� मिटावै ल� जा� रहल छी. की अहा� आगा� बढै चाहै छी?"
+
+msgid "Remove Chat"
+msgstr "गप�प-सप�प हटाबू"
+
+msgid "_Remove Chat"
+msgstr "गप�प-सप�प हटाबू (_R)"
+
+msgid "Right-click for more unread messages...\n"
+msgstr "आओर अपठित संदेशक लेल दहिन�ना क�लिक करू...\n"
+
+msgid "_Change Status"
+msgstr ""
+
+msgid "Show Buddy _List"
+msgstr ""
+
+msgid "_Unread Messages"
+msgstr ""
+
+msgid "New _Message..."
+msgstr ""
+
+msgid "_Accounts"
+msgstr "खाता (_A)"
+
+msgid "Plu_gins"
+msgstr ""
+
+msgid "Pr_eferences"
+msgstr "पसिन�न (_e)"
+
+msgid "Mute _Sounds"
+msgstr ""
+
+msgid "_Blink on New Message"
+msgstr ""
+
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+msgid "Not started"
+msgstr "आरंभ नहि"
+
+msgid "<b>Receiving As:</b>"
+msgstr "<b>�हिना प�राप�त करैछ:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b>स� प�राप�त करैछ:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>मे पठाबैत अछि:</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>�हन पठाबैत अछि:</b>"
+
+msgid "There is no application configured to open this type of file."
+msgstr "�हि प�रकारक फाइलके� खोलबाक लेल कोनो कार�यक�रम बिन�यस�त नहि अछि."
+
+msgid "An error occurred while opening the file."
+msgstr "फाइलके� खोलबाक दौरान त�र�टि भेल"
+
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "%s श�रू करैमे त�र�टि: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "%s चलाबैमे त�र�टि"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "प�रक�रिया त�र�टि कोड %d देलक"
+
+msgid "Filename:"
+msgstr "फाइलनाम:"
+
+msgid "Local File:"
+msgstr "स�थानीय फाइल"
+
+msgid "Speed:"
+msgstr "गति:"
+
+msgid "Time Elapsed:"
+msgstr "बीतल समय:"
+
+msgid "Time Remaining:"
+msgstr "बचल समय:"
+
+msgid "Close this window when all transfers _finish"
+msgstr "ई बिंडो बन�न करू जखन हस�तांतरण सभ समाप�त भ' जा� (_f)"
+
+msgid "C_lear finished transfers"
+msgstr "समाप�त हस�तांतरण मेटाउ (_C)"
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr "फाइल हस�तांतरण विवरण (_d)"
+
+msgid "Paste as Plain _Text"
+msgstr "सादा पाठक' रूपे� साटू (_T)"
+
+msgid "_Reset formatting"
+msgstr "संरूपण फिन� सेट करू (_R)"
+
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+msgid "Hyperlink color"
+msgstr "हाइपरलिंक रंग"
+
+msgid "Color to draw hyperlinks."
+msgstr "हाइपरलिंक खींचबाक लेल रंग."
+
+msgid "Hyperlink visited color"
+msgstr ""
+
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+
+msgid "Hyperlink prelight color"
+msgstr "हाइपरलिंक प�रीलाइट रंग"
+
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "हाइपरलिंक खींचबाकक लेल रंग करू जखन माउस ह�नका पर अछि"
+
+msgid "Sent Message Name Color"
+msgstr "प�रेषित संदेश नाम रंग"
+
+msgid "Color to draw the name of a message you sent."
+msgstr "संदेशक नाम घींचबाक लेल रंग जकरा अहा� पठेलह��."
+
+msgid "Received Message Name Color"
+msgstr "पा�ल संदेश नाम रंग"
+
+msgid "Color to draw the name of a message you received."
+msgstr "संदेशक नाम घींचबाक लेल रंग जकरा अहा� प�लह��."
+
+msgid "\"Attention\" Name Color"
+msgstr "\"ध�यान\" नाम रंग"
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "संदेशक नाम घींचबाक लेल रंग जकरा अहा� अपन नामक समाहित क�ल प�लह��."
+
+msgid "Action Message Name Color"
+msgstr "क�रिया संदेश नाम रंग"
+
+msgid "Color to draw the name of an action message."
+msgstr "�कटा काज संदेशक नाम घींचबाक लेल रंग."
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
+msgid "Typing notification color"
+msgstr ""
+
+msgid "The color to use for the typing notification"
+msgstr ""
+
+msgid "Typing notification font"
+msgstr ""
+
+msgid "The font to use for the typing notification"
+msgstr ""
+
+msgid "Enable typing notification"
+msgstr ""
+
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>अनचिन�ह फाइल रूप</span>\n"
+"\n"
+"PNG मे पूर�वनिर�धारित."
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>चित�र सहेजबामे त�र�टि</span>\n"
+"\n"
+"%s"
+
+msgid "Save Image"
+msgstr "चित�र सहेजू"
+
+msgid "_Save Image..."
+msgstr "चित�र सहेजू...(_S)"
+
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+msgid "Select Font"
+msgstr "फोन�ट च�नू"
+
+msgid "Select Text Color"
+msgstr "पाठ रंग च�नू"
+
+msgid "Select Background Color"
+msgstr "पृष�ठभूमिक रंग च�नू"
+
+msgid "_URL"
+msgstr "_URL"
+
+msgid "_Description"
+msgstr "वर�णन (_D)"
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"कृप�या ओ कड़ीक URL आओर विवरण भरू जकरा अहा� डालै चाहै छी. ओकर विवरण वैकल�पिक अछि."
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "कृप�या कड़ीक URL भरू जकरा अहा� दिअ' चाहै छी."
+
+msgid "Insert Link"
+msgstr "कड़ी डालू"
+
+msgid "_Insert"
+msgstr "प�रविष�ट करू (_I)"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "चित�र संचयनमे विफल: %s\n"
+
+msgid "Insert Image"
+msgstr "चित�र डालू"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+msgid "Smile!"
+msgstr "म�स�क�राबू!"
+
+msgid "_Manage custom smileys"
+msgstr ""
+
+msgid "This theme has no available smileys."
+msgstr "�हि थीमक पास कोनो स�माइली उपलब�ध नहि अछि."
+
+msgid "_Font"
+msgstr "फौन�ट (_F)"
+
+msgid "Group Items"
+msgstr "समूह मद"
+
+msgid "Ungroup Items"
+msgstr "मदसभ विसमूहित करू"
+
+msgid "Bold"
+msgstr "मोट"
+
+msgid "Italic"
+msgstr "तिरछा"
+
+msgid "Underline"
+msgstr "रेखांकित"
+
+msgid "Strikethrough"
+msgstr "आरपार काटनाइ"
+
+msgid "Increase Font Size"
+msgstr "फोन�ट आकार घटाबू"
+
+msgid "Decrease Font Size"
+msgstr "फोन�ट आकार घटाबू"
+
+msgid "Font Face"
+msgstr "फोन�टक चेहरा"
+
+msgid "Foreground Color"
+msgstr "अग�रभूमि र�ग"
+
+msgid "Reset Formatting"
+msgstr "संरूपणके� फिन� सेट करू"
+
+msgid "Insert IM Image"
+msgstr "IM चित�र दिअ'"
+
+msgid "Insert Smiley"
+msgstr "स�माइली दिअ'"
+
+msgid "Send Attention"
+msgstr ""
+
+msgid "<b>_Bold</b>"
+msgstr "<b>मोट (_B)</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>तिरछा (_I)</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>रेखांकित (_U)</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>आर पार काटू</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>पैघ (_L)</span>"
+
+msgid "_Normal"
+msgstr "सामान�य (_N)"
+
+msgid "<span size='smaller'>_Smaller</span>"
+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'
+msgid "_Font face"
+msgstr "फोन�टक चेहरा (_F)"
+
+msgid "Foreground _color"
+msgstr "अग�रभूमि र�ग (_c)"
+
+msgid "Bac_kground color"
+msgstr "पृष�ठभूमि रंग (_k)"
+
+msgid "_Image"
+msgstr "चित�र (_I)"
+
+msgid "_Link"
+msgstr "लिंक (_L)"
+
+msgid "_Horizontal rule"
+msgstr "क�षैतिज नियम (_H)"
+
+msgid "_Smile!"
+msgstr "म�स�क�राबू (_S)!"
+
+msgid "_Attention!"
+msgstr ""
+
+msgid "Log Deletion Failed"
+msgstr "विलोपनक लोग विफल"
+
+msgid "Check permissions and try again."
+msgstr "अन�मति जा�चू आ फिन� कओसिस करू."
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr "की अहा� निश�चित छी जे अहा� %s क' स�ग %s क स�ग वार�तालापक लागके� मेटओनाइ चाहैत छी?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+"की अहा� निश�चित छी जे अहा� %s वार�तालापक लागके� मेटओनाइ चाहैत छी जे %s पर आरंभ होइछ?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr ""
+"की अहा� निश�चित छी जे अहा� सिस�टम लागके� स�थायी रूपस� मेटओनाइ चाहैत छी जे %s पर आरंभ होइछ?"
+
+msgid "Delete Log?"
+msgstr "लौग मेटाउ?"
+
+msgid "Delete Log..."
+msgstr "लौग मेटाउ..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s मे %s पर वार�तालाप</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s मे %s पर वार�तालाप</span>"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr "लौग फोल�डर ब�राउज करू (_B)"
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. `%s -h' क' बेसी सूचनाक लेल कओसिस करू.\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "use DIR for config files"
+msgstr ""
+
+msgid "print debugging messages to stdout"
+msgstr ""
+
+msgid "force online, regardless of network status"
+msgstr ""
+
+msgid "display this help and exit"
+msgstr ""
+
+msgid "allow multiple instances"
+msgstr ""
+
+msgid "don't automatically login"
+msgstr ""
+
+msgid "NAME"
+msgstr "नाम"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled)."
+msgstr ""
+
+msgid "X display to use"
+msgstr "उपयोग मे �क�स प�रदर�शक"
+
+msgid "display the current version and exit"
+msgstr ""
+
+#, 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"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\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"
+"%swiki/GetABacktrace\n"
+msgstr ""
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "_Media"
+msgstr "मीडिया (_M)"
+
+msgid "_Hangup"
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr "ठहरू (_P)"
+
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s मे %d नव संदेश अछि."
+msgstr[1] "%s मे %d नव संदेश अछि."
+
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "ब�राउजर कमांड \"%s\" अवैध अछि."
+
+msgid "Unable to open URL"
+msgstr "URL खोलबामे असमर�थ"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" श�रू करैमे त�र�टि: %s"
+
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "'दस�ती' ब�राउजर कमांड च�नल गेल अछि, परंच कोनो कमांडके� नियत नहि क�ल गेल अछि."
+
+msgid "No message"
+msgstr ""
+
+msgid "Open All Messages"
+msgstr "संदेशसभ खोलू"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">अहा�क लेल मेल अछि!</span>"
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr "बर�खास�त"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
+msgid "The following plugins will be unloaded."
+msgstr "नीच�चा� देल प�लगिन अनलोड क�ल जैताह"
+
+msgid "Multiple plugins will be unloaded."
+msgstr "बह�ल प�लगिन अनलोड क�ल जैताह."
+
+msgid "Unload Plugins"
+msgstr "प�लगिन अनलोड करू"
+
+msgid "Could not unload plugin"
+msgstr "प�लगिन नहि अनलोड क� सकल"
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr "प�लगिन अनलोड आब नहि क�ल जा� सकल म�दा अगिला आरंभ पर निष�क�रिय क�ल जा�त."
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+msgid "Author"
+msgstr "लेखक"
+
+msgid "<b>Written by:</b>"
+msgstr ""
+
+msgid "<b>Web site:</b>"
+msgstr ""
+
+msgid "<b>Filename:</b>"
+msgstr ""
+
+msgid "Configure Pl_ugin"
+msgstr "प�लगिन बिन�यस�त करू (_u)"
+
+msgid "<b>Plugin Details</b>"
+msgstr "<b>प�लगिन विवरण</b>"
+
+msgid "Select a file"
+msgstr "�कटा फाइल च�नू"
+
+msgid "Modify Buddy Pounce"
+msgstr ""
+
+#. Create the "Pounce on Whom" frame.
+msgid "Pounce on Whom"
+msgstr "किनकापर �पटू"
+
+msgid "_Account:"
+msgstr "खाता: (_A)"
+
+msgid "_Buddy name:"
+msgstr "मीत नाम (_B):"
+
+msgid "Si_gns on"
+msgstr "साइनऔन (_g)"
+
+msgid "Signs o_ff"
+msgstr "साइनऔफ (_f)"
+
+msgid "Goes a_way"
+msgstr "दूरि चलि गेल (_w)"
+
+msgid "Ret_urns from away"
+msgstr "अन�पस�थितिस� वापस लौटू (_R)"
+
+msgid "Becomes _idle"
+msgstr "निष�क�रिय भ' गेल (_i)"
+
+msgid "Is no longer i_dle"
+msgstr "आब निष�क�रिय नहि अछि."
+
+msgid "Starts _typing"
+msgstr "टंकण श�रू करैछ (_t)"
+
+msgid "P_auses while typing"
+msgstr "टंकणक दौरान ठहरैछ (_a)"
+
+msgid "Stops t_yping"
+msgstr "टाइप क�नाइ बन�न करैछ (_y)"
+
+msgid "Sends a _message"
+msgstr "�कटा सन�देश पठाबैछ (_m)"
+
+msgid "Ope_n an IM window"
+msgstr "�कटा IM विंडो खोलू (_n)"
+
+msgid "_Pop up a notification"
+msgstr "अधिसूचना पौपअप करू (_P)"
+
+msgid "Send a _message"
+msgstr "�कटा सन�देश पठाउ (_m)"
+
+msgid "E_xecute a command"
+msgstr "�कटा कमांड चालू करू(_x)"
+
+msgid "P_lay a sound"
+msgstr "ध�वनि बजाउ (_l)"
+
+msgid "Brows_e..."
+msgstr "ब�राउज...(_e)"
+
+msgid "Br_owse..."
+msgstr "ब�राउज...(_o)"
+
+msgid "Pre_view"
+msgstr "�लक (_v)"
+
+msgid "P_ounce only when my status is not Available"
+msgstr "थाप केवल तखन जखन हमर स�थिति उपलब�ध नहि अछि (_o)"
+
+msgid "_Recurring"
+msgstr "आवृति (_R)"
+
+msgid "Pounce Target"
+msgstr "थाप लक�ष�य"
+
+msgid "Started typing"
+msgstr ""
+
+msgid "Paused while typing"
+msgstr ""
+
+msgid "Signed on"
+msgstr ""
+
+msgid "Returned from being idle"
+msgstr ""
+
+msgid "Returned from being away"
+msgstr ""
+
+msgid "Stopped typing"
+msgstr ""
+
+msgid "Signed off"
+msgstr ""
+
+msgid "Became idle"
+msgstr ""
+
+msgid "Went away"
+msgstr ""
+
+msgid "Sent a message"
+msgstr ""
+
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "(Custom)"
+msgstr "(पसंदीदा)"
+
+msgid "Penguin Pimps"
+msgstr "पे�ग�इन पिंप"
+
+msgid "The default Pidgin sound theme"
+msgstr ""
+
+msgid "The default Pidgin buddy list theme"
+msgstr ""
+
+msgid "The default Pidgin status icon theme"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
+msgid "Theme Selections"
+msgstr ""
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+msgid "Buddy List Theme:"
+msgstr ""
+
+msgid "Status Icon Theme:"
+msgstr ""
+
+msgid "Sound Theme:"
+msgstr ""
+
+msgid "Smiley Theme:"
+msgstr ""
+
+msgid "Keyboard Shortcuts"
+msgstr "क�ंजीपटल शार�टकट"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr "तंत�र तश�तरी प�रतीक"
+
+msgid "_Show system tray icon:"
+msgstr "तंत�र तश�तरी प�रतीक देखाउ (_S):"
+
+msgid "On unread messages"
+msgstr "अपठित सन�देश पर"
+
+msgid "Conversation Window"
+msgstr ""
+
+msgid "_Hide new IM conversations:"
+msgstr "नव IM वार�तालाप न�काबू:"
+
+msgid "When away"
+msgstr "जखन अन�पस�थित"
+
+msgid "Minimi_ze new conversation windows"
+msgstr "नव वार�तालाप विंडो न�यूनतम करू (_z)"
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "टैब"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "IM आओर गप�प-सप�प के� टैब�ड विंडोमे देखाउ (_t)"
+
+msgid "Show close b_utton on tabs"
+msgstr "टैब पर बन�न क� बटन देखाउ (_u)"
+
+msgid "_Placement:"
+msgstr "प�लेसमेंट"
+
+msgid "Top"
+msgstr "उप�पर"
+
+msgid "Bottom"
+msgstr "नीच�चा�"
+
+msgid "Left"
+msgstr "बामा�"
+
+msgid "Right"
+msgstr "दहिन�ना"
+
+msgid "Left Vertical"
+msgstr "बम�मा लंबबत"
+
+msgid "Right Vertical"
+msgstr "दहिन�ना लंबवत"
+
+msgid "N_ew conversations:"
+msgstr "नव वार�तालाप (_e)"
+
+msgid "Show _formatting on incoming messages"
+msgstr "आगत संदेश पर संरूपण देखाउ (_f)"
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr "जखन टैब बन�न होइछ IM के� तत�काल बन�न करू"
+
+msgid "Show _detailed information"
+msgstr "विस�तृत सूचना देखाउ (_d)"
+
+msgid "Enable buddy ic_on animation"
+msgstr "�नीमेशन पर मीत प�रतीकके� समर�थ करू (_o)"
+
+msgid "_Notify buddies that you are typing to them"
+msgstr "मीतके� बताबू की अहा� ओपर टंकित क� रहल छी (_N)"
+
+msgid "Highlight _misspelled words"
+msgstr "गलत हिज�जे शब�दके� उभारू (_m)"
+
+msgid "Use smooth-scrolling"
+msgstr "आसान स�क�रौलिंग प�रयोग करू"
+
+msgid "F_lash window when IMs are received"
+msgstr "फ�लैश विंडो जखन IM प�राप�त करल जाइत अछि (_l)"
+
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+msgid "Font"
+msgstr "फोन�ट"
+
+msgid "Use font from _theme"
+msgstr "थीमस� फोन�टक प�रयोग करू (_t)"
+
+msgid "Conversation _font:"
+msgstr "वार�तालाप फोन�ट (_f):"
+
+msgid "Default Formatting"
+msgstr "पूर�वनिर�धारित संरूप"
+
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"बाहर ज�निहार पाठ �हिना देखाइ पड़त जखन अहा� समर�थन क�निहार प�रोटोकालसभक प�रयोग करब."
+
+msgid "Cannot start proxy configuration program."
+msgstr "प�राक�सी बिन�यास प�रोग�राम आरंभ नहि क� सकल."
+
+msgid "Cannot start browser configuration program."
+msgstr "ब�राउजर बिन�यास प�रोग�राम आरंभ नहि क� सकल."
+
+msgid "Disabled"
+msgstr "अक�षम"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr ""
+
+msgid "ST_UN server:"
+msgstr "STUN सर�वर (_U):"
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">उदाहरण: stunserver.org</span>"
+
+msgid "Public _IP:"
+msgstr "सार�वजनिक IP:(_I)"
+
+msgid "Ports"
+msgstr "पोर�ट"
+
+msgid "_Enable automatic router port forwarding"
+msgstr "स�वचालित रौटर पोर�ट अग�रसारण सक�रिय करू (_E)"
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr ""
+
+msgid "_Start:"
+msgstr "आरंभ करू (_S):"
+
+msgid "_End:"
+msgstr ""
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
+msgid "_TURN server:"
+msgstr ""
+
+msgid "_UDP Port:"
+msgstr ""
+
+msgid "Use_rname:"
+msgstr ""
+
+msgid "Pass_word:"
+msgstr ""
+
+msgid "Seamonkey"
+msgstr "सीमंकी"
+
+msgid "Opera"
+msgstr "ओपेरा"
+
+msgid "Netscape"
+msgstr "नेटस�केप"
+
+msgid "Mozilla"
+msgstr "मोजिला"
+
+msgid "Konqueror"
+msgstr "कोन�करर"
+
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+msgid "Desktop Default"
+msgstr "डेस�कटोप पूर�वनिर�धारित"
+
+msgid "GNOME Default"
+msgstr "गनोम पूर�वनिर�धारित"
+
+msgid "Galeon"
+msgstr "गेलियन"
+
+msgid "Firefox"
+msgstr "फायरफाक�स"
+
+msgid "Firebird"
+msgstr "फायरबर�ड"
+
+msgid "Epiphany"
+msgstr "�पीफनी"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
+msgid "Manual"
+msgstr "दस�ती"
+
+msgid "Browser Selection"
+msgstr "ब�राउजर च�नाव"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ब�राउज बिन�यास प�रोग�राम नहि भेटल.</b>"
+
+msgid "Configure _Browser"
+msgstr "ब�राउजर बिन�यस�त करू (_B)"
+
+msgid "_Browser:"
+msgstr "ब�राउजर (_B):"
+
+msgid "_Open link in:"
+msgstr "कड़ी के� �हिमे खोलू:(_O)"
+
+msgid "Browser default"
+msgstr "ब�राउजर पूर�वनिर�धारित"
+
+msgid "Existing window"
+msgstr "विंडोस� निकलि रहल अछि"
+
+msgid "New tab"
+msgstr "नव टैब"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"दस�ती (_M):\n"
+"(%s URL लेल)"
+
+msgid "Proxy Server"
+msgstr "प�रौक�सी सर�वर"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>प�राक�सी बिन�यास प�रोग�राम नहि भेटल.</b>"
+
+msgid "Configure _Proxy"
+msgstr "प�राक�सीके� बिन�यस�त करू (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr ""
+
+msgid "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr "कोनो प�रौक�सी नहि"
+
+msgid "P_ort:"
+msgstr ""
+
+msgid "User_name:"
+msgstr ""
+
+msgid "Log _format:"
+msgstr "लौग रचना (_f)"
+
+msgid "Log all _instant messages"
+msgstr "इंस�टेंट संदेशसभ लौग करू (_i)"
+
+msgid "Log all c_hats"
+msgstr "बतियानाई लौग करू (_h)"
+
+msgid "Log all _status changes to system log"
+msgstr "सिस�टम लौगमे स�थितिसभक परिवर�तनक लौग करू (_s)"
+
+msgid "Sound Selection"
+msgstr "ध�वनि चयन"
+
+#, c-format
+msgid "Quietest"
+msgstr "सबस� शांत"
+
+#, c-format
+msgid "Quieter"
+msgstr "शांत"
+
+#, c-format
+msgid "Quiet"
+msgstr "शांत"
+
+#, c-format
+msgid "Loud"
+msgstr "ध�वनि"
+
+#, c-format
+msgid "Louder"
+msgstr "आओर तेज ध�वनि"
+
+#, c-format
+msgid "Loudest"
+msgstr "सबस� तेज ध�वनि"
+
+msgid "_Method:"
+msgstr "विधि (_M):"
+
+msgid "Console beep"
+msgstr "कंसोल बीप"
+
+msgid "No sounds"
+msgstr "कोनो ध�वनि नहि"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"ध�वनि कमांड:\n"
+"(फाइलनाम लेल %s)"
+
+msgid "M_ute sounds"
+msgstr ""
+
+msgid "Sounds when conversation has _focus"
+msgstr "ध�वनि करू जखन वार�तालाप केंद�रित रहैछ (_f)"
+
+msgid "_Enable sounds:"
+msgstr ""
+
+msgid "V_olume:"
+msgstr ""
+
+msgid "Play"
+msgstr "बजाउ"
+
+msgid "_Browse..."
+msgstr "ब�राउज...(_B)"
+
+msgid "_Reset"
+msgstr "रिसेट करू (_R)"
+
+msgid "_Report idle time:"
+msgstr "निष�क�रिय समय देखाउ (_R)"
+
+msgid "Based on keyboard or mouse use"
+msgstr "क�ंजीपटल वा माउसक प�रयोग पर आधारित"
+
+msgid "_Minutes before becoming idle:"
+msgstr "निष�क�रिय ह�बास� पहिने मिनट (_M)"
+
+msgid "Change to this status when _idle:"
+msgstr ""
+
+msgid "_Auto-reply:"
+msgstr "स�वतः जबाब दिअ' (_A) :"
+
+msgid "When both away and idle"
+msgstr "जखन दूनू बेकार आओर अन�पस�थित अछि"
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr "आरंभन पर स�थिति"
+
+msgid "Use status from last _exit at startup"
+msgstr "आरंभन पर प�रस�थितिक प�रयोग करू अंतिम निकास (_e)"
+
+msgid "Status to a_pply at startup:"
+msgstr "आरंभ पर लागू करै लेल स�थिति (_p):"
+
+msgid "Interface"
+msgstr "अंतरफलक"
+
+msgid "Browser"
+msgstr "ब�राउज़र"
+
+msgid "Status / Idle"
+msgstr "स�थिति / बेकार"
+
+msgid "Themes"
+msgstr "प�रसंग"
+
+msgid "Allow all users to contact me"
+msgstr "प�रयोक�तासभ के� हमरास� संपर�कक अन�मति दिअ'"
+
+msgid "Allow only the users on my buddy list"
+msgstr "केवल हमर मीतसूचीमे मोज�द प�रयोक�ताके� अन�मति दिअ'"
+
+msgid "Allow only the users below"
+msgstr "केवल निचला प�रयोक�ताके� अन�मति दिअ'"
+
+msgid "Block all users"
+msgstr "प�रयोक�तासभ के� रोकू"
+
+msgid "Block only the users below"
+msgstr "केवल निचला प�रयोक�तासभके� रोकू"
+
+msgid "Privacy"
+msgstr "ग�प�तता"
+
+msgid "Changes to privacy settings take effect immediately."
+msgstr "ग�प�तता विक�लपमे परिवर�तन त�रत प�रभावी होइछ."
+
+msgid "Set privacy for:"
+msgstr "ई लेल ग�प�तता नियत करू:"
+
+#. Remove All button
+msgid "Remove Al_l"
+msgstr "सभटा हटाबू (_l)"
+
+msgid "Permit User"
+msgstr "प�रयोक�ता के� अन�मति दिअ'"
+
+msgid "Type a user you permit to contact you."
+msgstr "प�रयोक�ताक नाम टंकित करू जिनका अहा� संपर�क करबाक स�वीकृति दैछी."
+
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "कृप�या ओहि प�रयोक�ताक नाम दिअ' जिनकास� अहा� संपर�क करब चाहैछी."
+
+msgid "_Permit"
+msgstr "स�वीकारू (_P)"
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s के� अपनास� संपर�क कर� लेल अन�मति दिअ'?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "की अहा� निश�चित र�प स� %s के� अहांस� संपर�क कर� लेल अन�मति देबाक लेल चाहैत छी?"
+
+msgid "Block User"
+msgstr "प�रयोक�ताके� रोकू"
+
+msgid "Type a user to block."
+msgstr "रोकबाक लेल प�रयोक�ता टंकित करू"
+
+msgid "Please enter the name of the user you wish to block."
+msgstr "कृप�या ओहि प�रयोक�ताका नाम दिअ' जिनका अहा� रोकबाक लेल चाहैत छी."
+
+#, c-format
+msgid "Block %s?"
+msgstr "%s के� रोकू?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "की अहा� निश�चित र�प स� %s के� रोकबाक लेल चाहैत छी?"
+
+msgid "Apply"
+msgstr "लागू करू"
+
+msgid "That file already exists"
+msgstr "ओ फाइल पहिनेस� अछि"
+
+msgid "Would you like to overwrite it?"
+msgstr "की अहा� �करा उप�पर लिखै चाहैत छी?"
+
+msgid "Overwrite"
+msgstr "�करास� उप�पर लिखू"
+
+msgid "Choose New Name"
+msgstr "नव नाम च�नू"
+
+msgid "Select Folder..."
+msgstr "फोल�डर च�नू..."
+
+#. list button
+msgid "_Get List"
+msgstr "सूची आनू (_G)"
+
+#. add button
+msgid "_Add Chat"
+msgstr "बतियाउ (_A)"
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "की अहा� च�नलका सहेजल स�थितिके� मेटओनाइ चाहैत छी?"
+
+#. Use button
+msgid "_Use"
+msgstr "उपयोग (_U)"
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr "शीर�षक पहिनेस� प�रयोगमे अछि.  अहा� जरूर �कटा बेजोड़ शीर�षक च�नू."
+
+msgid "Different"
+msgstr "भिन�न"
+
+msgid "_Title:"
+msgstr "शीर�षक (_T):"
+
+msgid "_Status:"
+msgstr "वस�त�स�थिति:"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr "किछ� खाताक लेल भिन�न स�थितिक प�रयोग करू (_d)"
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr "सहेजू आ प�रयोग (_v)"
+
+#, c-format
+msgid "Status for %s"
+msgstr "%s क' लेल स�थिति"
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
+msgid "Custom Smiley"
+msgstr ""
+
+msgid "Duplicate Shortcut"
+msgstr ""
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr ""
+
+msgid "_Image:"
+msgstr "छविः (_I)"
+
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr ""
+
+msgid "Smiley"
+msgstr ""
+
+msgid "Shortcut Text"
+msgstr ""
+
+msgid "Custom Smiley Manager"
+msgstr ""
+
+msgid "Select Buddy Icon"
+msgstr ""
+
+msgid "Click to change your buddyicon for this account."
+msgstr ""
+
+msgid "Click to change your buddyicon for all accounts."
+msgstr ""
+
+msgid "Waiting for network connection"
+msgstr "संजाल संबंधनक लेल प�रतीक�षा करैछ"
+
+msgid "New status..."
+msgstr "नव स�थिति..."
+
+msgid "Saved statuses..."
+msgstr "सहेजल स�थिति..."
+
+msgid "Status Selector"
+msgstr ""
+
+msgid "Google Talk"
+msgstr "गूगल बातचीत"
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%s क' लोड कर�मे निम�न त�र�टि भेल: %s"
+
+msgid "Failed to load image"
+msgstr "चित�र सहेजबामे विफल"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "%s फोल�डर नहि भेजि सकैछ."
+
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"%s �कटा फोल�डर नहि हस�तांतरित क� सकैत अछि. अहा� सभ फाइलके� अलग-अलग पठा� सकैत छी."
+
+msgid "You have dragged an image"
+msgstr "अहा� �कटा चित�र घींचलह��"
+
+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 ""
+"अहा� ई चित�र के� फाइल हस�तांतरण रूपे� पठा�ब सकैत छी अथवा ई संदेशमे �ंबेड क� सकैछी, अथवा ई "
+"प�रयोक�ताक लेल �करा मीत चिह�नक रूपे� प�रयोग क� सकैछी"
+
+msgid "Set as buddy icon"
+msgstr "मीत प�रतीकरूपे� नियत करू"
+
+msgid "Send image file"
+msgstr "चित�र फाइल पठाउ"
+
+msgid "Insert in message"
+msgstr "संदेशमे डालू"
+
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "की अहा� �करा ई प�रयोक�ताक लेल मीत प�रतीकक रूपे� नियत करबाक लेल चाहब."
+
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"अहा� ई चित�रके� फाइल हस�तांतरण रूपे� पठा� सकैत छी अथवा ई प�रयोक�ताक लेल �करा मीत चिन�हक रूपे� "
+"प�रयोग क� सकैत छी."
+
+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
+msgid "Cannot send launcher"
+msgstr "लांचर नहि पठा�ल जा� सकैछ"
+
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+
+#, 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"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "'%s' फाइल %s क' लेल बह�त पैघ अछि.  कृप�या �कटा छोट चित�र क' लेल कओसिस करू.\n"
+
+msgid "Icon Error"
+msgstr "प�रतीक त�र�टि"
+
+msgid "Could not set icon"
+msgstr "प�रतीक सेट नहि क� सकल"
+
+msgid "_Open Link"
+msgstr "लिंक खोलू (_O)"
+
+msgid "_Copy Link Location"
+msgstr "कड़ी स�थानक प�रतिलिपि बनाबू (_C)"
+
+msgid "_Copy Email Address"
+msgstr "इमेल पता कॉपी करू (_C)"
+
+msgid "_Open File"
+msgstr ""
+
+msgid "Open _Containing Directory"
+msgstr ""
+
+msgid "Save File"
+msgstr "फाइल सहेजू"
+
+msgid "_Play Sound"
+msgstr ""
+
+msgid "_Save File"
+msgstr ""
+
+msgid "Do you really want to clear?"
+msgstr ""
+
+msgid "Select color"
+msgstr "रंग च�नू"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "पिजिन"
+
+msgid "_Alias"
+msgstr "उपनाम (_A)"
+
+msgid "Close _tabs"
+msgstr "टैब बन�न करू (_t)"
+
+msgid "_Get Info"
+msgstr "सूचना पाउ (_G)"
+
+msgid "_Invite"
+msgstr "आमंत�रण दिअ' (_I)"
+
+msgid "_Modify..."
+msgstr ""
+
+msgid "_Add..."
+msgstr "जोड़ू (_A)..."
+
+msgid "_Open Mail"
+msgstr "डाक खोलू (_O)"
+
+msgid "_Edit"
+msgstr "संपादन (_E)"
+
+msgid "Pidgin Tooltip"
+msgstr "पिजिन टूलटिप"
+
+msgid "Pidgin smileys"
+msgstr "पिजिन स�माइली"
+
+msgid "Selecting this disables graphical emoticons."
+msgstr "�करा च�ननाइ आलेखी भावप�रतीकके� निष�क�रिय करैत अछि."
+
+msgid "none"
+msgstr "किछ� नहि"
+
+msgid "Small"
+msgstr "छोट"
+
+msgid "Smaller versions of the default smileys"
+msgstr ""
+
+msgid "Response Probability:"
+msgstr "अन�क�रिया प�रायिकता:"
+
+msgid "Statistics Configuration"
+msgstr "सांख�यिकी बिन�यास"
+
+#. msg_difference spinner
+msgid "Maximum response timeout:"
+msgstr "अधिकतम अन�क�रिया समय समाप�ति:"
+
+msgid "minutes"
+msgstr "मिनट"
+
+#. last_seen spinner
+msgid "Maximum last-seen difference:"
+msgstr "अधिकतम अंतिम देखल अंतर:"
+
+#. threshold spinner
+msgid "Threshold:"
+msgstr "दहलीज:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Availability Prediction"
+msgstr "उपलब�धता अन�मानस� संपर�क करू."
+
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr "उपलब�धता अन�मान प�लगिनके� संपर�क करू."
+
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+msgstr ""
+
+msgid "Buddy is idle"
+msgstr "मीत निष�क�रिय अछि"
+
+msgid "Buddy is away"
+msgstr "मीत दूरि अछि"
+
+msgid "Buddy is \"extended\" away"
+msgstr "मीत \"विस�तारित\" दूरि अछि"
+
+#. Not used yet.
+msgid "Buddy is mobile"
+msgstr "मीत मोबाइल अछि"
+
+msgid "Buddy is offline"
+msgstr "मीत आफलाइन अछि"
+
+msgid "Point values to use when..."
+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"
+
+msgid "Use last buddy when scores are equal"
+msgstr "अंतिम मीत प�रयोग करू जखन स�कोर समान अछि"
+
+msgid "Point values to use for account..."
+msgstr "खाताक लेल उपयोगमे अंक मान..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr "सम�पर�क प�राथमिकता"
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "भिन�न मीत अवस�था स� सम�बद�ध मानक नियंत�रण करै दैछ."
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr "मीतसभक सम�पर�क प�राथमिकताक गणन हेत� निष�क�रिय/दूर/आफलाइन अवस�थाक अंक मान बदलब दैछ"
+
+msgid "Conversation Colors"
+msgstr "वार�तालाप र�ग"
+
+msgid "Customize colors in the conversation window"
+msgstr "वार�तालाप विंडोमे र�ग पसंदीदा करू"
+
+msgid "Error Messages"
+msgstr "त�र�टि संदेश"
+
+msgid "Highlighted Messages"
+msgstr "संदेश उभारू"
+
+msgid "System Messages"
+msgstr "सिस�टम संदेश"
+
+msgid "Sent Messages"
+msgstr "पठा�ल सन�देश"
+
+msgid "Received Messages"
+msgstr "पा�ल सन�देश"
+
+#, c-format
+msgid "Select Color for %s"
+msgstr "%s क' लेल रंग च�नू"
+
+msgid "Ignore incoming format"
+msgstr "आगत प�रारूप अनदेखा करू"
+
+msgid "Apply in Chats"
+msgstr "गप�प-सप�पमे लागू करू"
+
+msgid "Apply in IMs"
+msgstr "IM मे लागू करू"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr "गेटवे"
+
+msgid "Directory"
+msgstr "निर�देशिका"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "सेवा डिस�कवरी"
+
+msgid "_Browse"
+msgstr "ब�राउज़ (_B)"
+
+msgid "Server does not exist"
+msgstr "सर�वर मोज�द नहि अछि."
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+msgid "By conversation count"
+msgstr "वार�तालाप गिनती स�"
+
+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
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"नोट: \"नव वार�तालाप\" क' लेल वरीयताके� \"वार�तालाप गिनतीक द�वारा\" मे सेट जरूर क�ल "
+"ज�नाइ चाही."
+
+msgid "Number of conversations per window"
+msgstr "वार�तालाप गिनती प�रति विंडो"
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "अंक रखबाक काल IM आ गप�प-सप�प विन�डोके� अलग करू"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr "बाइली बातचीत रखबाक विकल�प"
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"वार�तालापक संख�याके� प�रति विंडो सीमाबद�ध करू, वैकल�पिकरूपे� IM आओर वार�तालापक अलग करैत"
+
+#. Configuration frame
+msgid "Mouse Gestures Configuration"
+msgstr "माउस संकेतक बिन�यास"
+
+msgid "Middle mouse button"
+msgstr "माउसक मध�य बटन"
+
+msgid "Right mouse button"
+msgstr "माउसक दहिन�ना बटन"
+
+#. "Visual gesture display" checkbox
+msgid "_Visual gesture display"
+msgstr "दृश�य संकेत प�रदर�शन (_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr "माउस संकेत"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides support for mouse gestures"
+msgstr "माउस संकेतक' लेल समर�थन दैछ"
+
+#. *  description
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+msgid "Instant Messaging"
+msgstr "इंस�टेंट मैसेजिंग"
+
+#. Add the label.
+msgid "Select a person from your address book below, or add a new person."
+msgstr "पता प�स�तिकास� �कटा व�यक�ति च�नू वा नव व�यक�तिके� जोडू."
+
+msgid "Group:"
+msgstr "समूह:"
+
+#. "New Person" button
+msgid "New Person"
+msgstr "नव व�यक�ति"
+
+#. "Select Buddy" button
+msgid "Select Buddy"
+msgstr "मीत च�नू"
+
+#. Add the label.
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr "ई मीतक जोड़बाक लेल अपन पता सूचीस� व�यक�ति च�नू वा नव व�यक�ति बनाबू."
+
+#. Add the expander
+msgid "User _details"
+msgstr "प�रयोक�ता विवरण (_d)"
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr "मीत सामिल करू (_A)"
+
+msgid "Unable to send email"
+msgstr ""
+
+msgid "The evolution executable was not found in the PATH."
+msgstr "PATH मे �वोल�यूशन निष�पादनीय नहि भेटल."
+
+msgid "An email address was not found for this buddy."
+msgstr ""
+
+msgid "Add to Address Book"
+msgstr "पता प�स�तिकामे जोडू"
+
+msgid "Send Email"
+msgstr ""
+
+#. Configuration frame
+msgid "Evolution Integration Configuration"
+msgstr "�वोल�यूशन समाकलन बिन�यास"
+
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "सभ खाता च�नू जत� मीतसभक अपने �त� स�वतः ज�ड़ि ज�नाइ चाही."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr "�वोल�यूशन समाकलन"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr "�वोल�यूशनक संग समाकलन दैछ."
+
+msgid "Please enter the person's information below."
+msgstr "कृप�या व�यक�तिक सूचना नीच�चा� दिअ'"
+
+msgid "Please enter the buddy's username and account type below."
+msgstr ""
+
+msgid "Account type:"
+msgstr "खाताक प�रकार:"
+
+#. Optional Information section
+msgid "Optional information:"
+msgstr "वैकल�पिक सूचना"
+
+msgid "First name:"
+msgstr "पहिल नाम"
+
+msgid "Last name:"
+msgstr "अंतिम नाम"
+
+msgid "Email:"
+msgstr "इमेलः"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GTK Signals Test"
+msgstr "GTK संकेत परीक�षण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "ई देखबाक लेल परीक�षण करू जे सभ ui संकेत ठीकस� काज क� रहल अछि."
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>मीत नोट:</b> %s"
+
+msgid "History"
+msgstr "इतिहास"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr "दूर ह�बा पर प�रतीक बनाबू"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "जखन अहा� दूरि होइछ, तहन अहा�क वार�तालाप आ मीत सूचीक प�रतीक बनबैछ."
+
+msgid "Mail Checker"
+msgstr "डाक देखनिहार"
+
+msgid "Checks for new local mail."
+msgstr "नव स�थानीय डाक देखू."
+
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "ई �कटा छोट डिब�बा मीत सूचीक संग जोड़ैछ.  ई डिब�बा नव डाक देखाबैछ."
+
+msgid "Markerline"
+msgstr "चिन�हकपंक�ति"
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "वार�तालापमे नव संदेशके� संकेत करबा लेल पंक�ति घींचू"
+
+msgid "Jump to markerline"
+msgstr ""
+
+msgid "Draw Markerline in "
+msgstr "मार�करलाइन �करामे घींचू"
+
+msgid "_IM windows"
+msgstr "IM विंडोज (_I)"
+
+msgid "C_hat windows"
+msgstr "गप�प-सप�प विंडोज (_h)"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"�कटा संगीत मेसेजिंग कालक लेल आग�रह क�ल गेल अछि. कृप�या MM प�रतीकके� स�वीकार करबा लेल क�लिक "
+"करू."
+
+msgid "Music messaging session confirmed."
+msgstr "संगीत संदेश सत�र प�ष�ट छलाह."
+
+msgid "Music Messaging"
+msgstr "संगीत मैसेजिंग"
+
+msgid "There was a conflict in running the command:"
+msgstr "कमांड चलाबैमे �कटा विरोध छलाह:"
+
+msgid "Error Running Editor"
+msgstr "संपादक चलाबैमे त�र�टि"
+
+msgid "The following error has occurred:"
+msgstr "नीच�चा� देल गेल त�र�टि भेल:"
+
+#. Configuration frame
+msgid "Music Messaging Configuration"
+msgstr "संगीत मेसेजिंग बिन�यास"
+
+msgid "Score Editor Path"
+msgstr "स�कोर संपादक पथ"
+
+msgid "_Apply"
+msgstr "लागू करू (_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "सहयोगी संघठन लेल संगीत मेसेजिंग प�लगिन"
+
+#. *  summary
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr "�करा लेल सूचित करू"
+
+msgid "\t_Only when someone says your username"
+msgstr ""
+
+msgid "_Focused windows"
+msgstr "संके�द�रित विंडोज (_F)"
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "अधिसूचना विधि"
+
+msgid "Prepend _string into window title:"
+msgstr "विंडो शीर�षकमे स�ट�रिंग जोड़ू (_s):"
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "विंडो शीर�षकमे भरल नव संदेशके� गिन� (_o)"
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "नव संदेशक गिनतीके� X ग�णमे जोडू (_X)"
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "विंडो मैनेजर \"अत�यावश�यक\" संकेत नियत करू (_U)"
+
+msgid "_Flash window"
+msgstr ""
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "वार�तालाप विंडो बढाबू (_a)"
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr "अधिसूचक विस�थापन"
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr "जखन वार�तालाप विंडोके� फोकस मिलबा पर तखन हटाबू (_g)"
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr "वार�तालाप विंडोमे क�लिक मिलै पर हटाबू (_r)"
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr "वार�तालाप विंडोमे टंकित करबाक काल हटाबू (_t)"
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr "जखन संदेश पठा�ल जा� च�कल त' हटाबू (_m)"
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr "वार�तालाप टैबमे बदल� पर हटाबू (_b)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr "संदेश सूचना"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "बिन पढ़ल संदेशक संबंधमे कतेक प�रकार स� सूचना दैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Pidgin Demonstration Plugin"
+msgstr "पिजिन प�रदर�शन प�लगिन"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "An example plugin that does stuff - see the description."
+msgstr "�कटा प�लगिन उदाहरण जाहि काम करैछ - �कर विवरण देखू"
+
+#. *  description
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"ई �कटा नीक प�लगिन थीक जे बह�ते काज करैछ.:\n"
+" जखन अहा� लागिन करै छी त' ई बताबैछ जे कओन प�रोग�राम के� लिखलक अछि\n"
+" - ई अ�निहार शब�दसभक उलट दैछ\n"
+" -ई अहा�क सूची पर व�यक�ति के� त�रत संदेश भेजैछ जखन ओलोकनि लागिन करैछ."
+
+msgid "Hyperlink Color"
+msgstr "हाइपरलिंक रंग"
+
+msgid "Visited Hyperlink Color"
+msgstr ""
+
+msgid "Highlighted Message Name Color"
+msgstr "उभारल संदेश नाम रंग"
+
+msgid "Typing Notification Color"
+msgstr ""
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView क�षैतिज अलगाव"
+
+msgid "Conversation Entry"
+msgstr "वार�तालाप प�रविष�टि"
+
+msgid "Conversation History"
+msgstr ""
+
+msgid "Request Dialog"
+msgstr "संवाद अन�रोध"
+
+msgid "Notify Dialog"
+msgstr "संवाद सूचित करू"
+
+msgid "Select Color"
+msgstr "रंग च�नू"
+
+#, c-format
+msgid "Select Interface Font"
+msgstr "अंतरफलक फौन�ट च�नू"
+
+#, c-format
+msgid "Select Font for %s"
+msgstr "%s क लेल फौन�ट च�नू"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+ अंतरफलक फौन�ट"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ पाठ सार�टकट विषय"
+
+msgid "Disable Typing Notification Text"
+msgstr ""
+
+msgid "GTK+ Theme Control Settings"
+msgstr ""
+
+msgid "Colors"
+msgstr "र�ग"
+
+msgid "Fonts"
+msgstr "फान�ट"
+
+msgid "Miscellaneous"
+msgstr "विविध"
+
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc फाइल अओजार"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc-2.0 मे सेटिंग लिखू"
+
+msgid "Re-read gtkrc files"
+msgstr "gtkrc फाइलके� फिन� पढू"
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr "पिजिन GTK+ विषय नियंत�रण"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "सामान�यतः प�रय�क�त gtkrc सेटिंगमे पह�ंच दिअ'."
+
+msgid "Raw"
+msgstr "कच�चा"
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr "पाठ आधारित प�रोटॅकोल पर अपूर�ण इनप�ट भेज� दैछ."
+
+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). पठैबाक "
+"लेल प�रविष�टि बक�सा पर �न�टर बटन दाबू. डिबग विंडो देखू."
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr ""
+
+msgid "New Version Available"
+msgstr "नव संस�करण उपलब�ध अछि"
+
+msgid "Later"
+msgstr "बादमे"
+
+msgid "Download Now"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Release Notification"
+msgstr "रिलीज सूचना"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Checks periodically for new releases."
+msgstr "नव रिलीजक लेल आवधिक जांच करैछ"
+
+#. *  description
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "नव रिलीजक लेल आवधिक जांच करैछ आ प�रयोक�ताक चेंजलौगक मार�फत सूचित करैछ"
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+
+msgid "Duplicate Correction"
+msgstr "नकल जांच"
+
+msgid "The specified word already exists in the correction list."
+msgstr "निर�दिष�ट शब�द श�द�धिसूचीमे पहिनेस� मोज�द अछि"
+
+msgid "Text Replacements"
+msgstr "पाठ प�रतिस�थापन"
+
+msgid "You type"
+msgstr "अहा� टंकित करू"
+
+msgid "You send"
+msgstr "अहा� पठाउ"
+
+msgid "Whole words only"
+msgstr "खाली पूर�ण शब�द"
+
+msgid "Case sensitive"
+msgstr "स�थितिक प�रति संवेदनशील"
+
+msgid "Add a new text replacement"
+msgstr "�कटा नव पाठ प�रतिस�थापन जोड़ू"
+
+msgid "You _type:"
+msgstr "अहा� टंकित करू (_t):"
+
+msgid "You _send:"
+msgstr "अहा� पठाउ (_s):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "�कदम स�थिति मिलान (_E) (स�वतः स�थिति नियंत�रण अनचेक करू)"
+
+msgid "Only replace _whole words"
+msgstr "सिर�फ संपूर�ण शब�द हटाबू (_w)"
+
+msgid "General Text Replacement Options"
+msgstr "सामान�य पाठ प�रतिस�थापन विकल�प"
+
+msgid "Enable replacement of last word on send"
+msgstr "पठावैपर अंतिम शब�दक प�रतिस�थापनके� सक�रिय करू"
+
+msgid "Text replacement"
+msgstr "पाठ प�रतिस�थापन"
+
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "प�रयोक�ताक द�वारा पारिभाषित नियमक तहत बाहर ज�निहार संदेशमे पाठ बदलैछ"
+
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+msgid "Ignored"
+msgstr ""
+
+msgid "Founder"
+msgstr ""
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "आपरेटर"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr "प�रश�न संवाद"
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+msgid "Contact"
+msgstr "संपर�क"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr "मीत टिकर"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "मीत सूचीक क�षैतिज स�क�रोलिंग संस�करण"
+
+msgid "Display Timestamps Every"
+msgstr "टाइमस�टैंप प�रत�येक देखाउ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Timestamp"
+msgstr "टाइमस�टेंप"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr "iChat शैली टाइमस�टैंप देखाउ"
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "हर N मिनटमे iChat प�रकारक टाइमस�टैंप�स देखाउ"
+
+msgid "Timestamp Format Options"
+msgstr "टाइपस�टैंप प�रारूप विकल�प"
+
+#, c-format
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
+msgstr ""
+
+msgid "Show dates in..."
+msgstr "�त� तिथि देखाउ..."
+
+msgid "Co_nversations:"
+msgstr "वार�तालाप (_n):"
+
+msgid "For delayed messages"
+msgstr "विलंबित संदेश लेल"
+
+msgid "For delayed messages and in chats"
+msgstr "विलंबित संदेश लेल आ गप�प -सप�पमे"
+
+msgid "_Message Logs:"
+msgstr "संदेश लौग (_M)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr "संदेश टाइमस�टैंप प�रारूप"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Customizes the message timestamp formats."
+msgstr "संदेश टाइमस�टैंप प�रारूपक मनपसंद बनाबू"
+
+#. *  description
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"ई प�लगिन प�रयोक�ताके� वार�तालाप आओर लागिंग संदेश टाइमस�टैंप प�रारूपके� मनपसंद बनबैक' अन�मति दैछ."
+
+msgid "Audio"
+msgstr "ऑडियो"
+
+msgid "Video"
+msgstr "वीडियो"
+
+msgid "Output"
+msgstr "आउटप�ट"
+
+msgid "_Plugin"
+msgstr ""
+
+msgid "_Device"
+msgstr "डिवायस (_D)"
+
+msgid "Input"
+msgstr "इनप�ट"
+
+msgid "P_lugin"
+msgstr ""
+
+msgid "D_evice"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr ""
+
+msgid "Voice and Video Settings"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr ""
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+
+msgid "Opacity:"
+msgstr "अपारदर�शिताः"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM वार�तालाप विंडो"
+
+msgid "_IM window transparency"
+msgstr "IM विंडो पारदर�शिता (_I)"
+
+msgid "_Show slider bar in IM window"
+msgstr "IM विंडोमे स�लाइडर बार देखाउ (_S)"
+
+msgid "Remove IM window transparency on focus"
+msgstr "IM बिंडो पारदर�शिता फोकस पर हटाबू"
+
+msgid "Always on top"
+msgstr "सभकाल सभस� उप�पर"
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "मीत सूची विंडो"
+
+msgid "_Buddy List window transparency"
+msgstr "मीत सूची विंडो पारदर�शिता (_B)"
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr "मीत सूची विंडो पारदर�शिता फोकस पर हटाबू"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr "पारदर�शिता"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "मीत सूची आ संवादक लेल परिवर�तनशील पारदर�शिता"
+
+#. *  description
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"ई प�लगिन वार�तालाप विंडो आ मीत सूचीमे बदलबा योग�य अल�फा पारदर�शिता लावैछ.\n"
+"\n"
+" * नोट: ई प�लगिनक लेल Win2000 वा उप�परक संस�करण जरूरी अछि."
+
+#. Autostart
+msgid "Startup"
+msgstr "प�रारंभमे"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "विंडोज स�टार�टअप पर %s आरंभ करू (_S)"
+
+msgid "Allow multiple instances"
+msgstr ""
+
+msgid "_Dockable Buddy List"
+msgstr "डौकेबल मीत सूची (_D)"
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "मीत सूची विंडोक उप�पर राखू (_K)"
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr "सिर�फ तहन जखन डाक�ड छल"
+
+msgid "Windows Pidgin Options"
+msgstr "विंडोज प�लगिन विकल�पसभ"
+
+msgid "Options specific to Pidgin for Windows."
+msgstr "विंडोजक लेल पिजिनमे विशेष विकल�पसभ"
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>लोग आउट.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP कंसोल"
+
+msgid "Account: "
+msgstr "खाता:"
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP मे ज�ड़ल नहि अछि </font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "कच�चा XMPP स�टा�जा पठाउ आ पाउ."
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "डेस�कटाप"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr ""
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "आगा� >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "शार�टकटसभ"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 865431754f..a844786d5e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2008-05-07 12:24+0200\n"
 "Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -536,7 +536,6 @@ msgstr "Потврда за бришење на �ертификатот"
 msgid "Certificate Manager"
 msgstr "Менаџер за �ертификати"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Име на хо�т"
 
@@ -806,7 +805,7 @@ msgstr "Стопирај"
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да започне прено�от"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажано"
 
 msgid "Failed"
@@ -1700,7 +1699,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Ланецот за �ертификатот презентиран за %s не е валиден."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4787,11 +4788,20 @@ msgstr "XMPP додаток за протокол"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Барa SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Барај авторизација"
 
-msgid "Force old (port 5223) SSL"
-msgstr "�аметни �тара (порта 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Информациите за кори�никот %s не �е до�тапни"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Вр�ката �е ре�етира"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Дозволувај обичен тек�т преку некодирани протоци"
@@ -6077,7 +6087,7 @@ msgid "The two PINs you entered do not match."
 msgstr "�овите лозинки не �е �овпаѓаат."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "SecurID клучот кој го вне�овте е невалиден."
 
 msgid ""
@@ -6184,10 +6194,6 @@ msgid "Connecting..."
 msgstr "Поврзување"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "SecurID клучот кој го вне�овте е невалиден."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "SecurID клучот кој го вне�овте е невалиден."
 
@@ -7065,6 +7071,16 @@ msgstr "�дре�а на �ерверот"
 msgid "Server port"
 msgstr "Порта на �ерверот"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Те молам авторизирај ме за да можам да те додадам во ли�тата �о пријатели."
+
+msgid "No reason given."
+msgstr "�е е дадена причина."
+
+msgid "Authorization Denied Message:"
+msgstr "Порака за одбиена авторизација:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Добив неочекуван HTTP одговор од �ерверот."
@@ -7098,6 +7114,25 @@ msgstr ""
 msgid "Error requesting %s"
 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 �мета.)"
+
+#, 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 има клиент �о грешки.)"
+
 msgid "Could not join chat room"
 msgstr "�е можам да �е приклучам на �обата за чет"
 
@@ -7329,95 +7364,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Датотеката %s е %s, што е поголемо од мак�ималната големина на %s."
 
-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 �мета.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "Икона на пријател:"
-
-msgid "Voice"
-msgstr "Гла�"
-
-msgid "AIM Direct IM"
-msgstr "AIM директни ин�тант пораки"
-
-msgid "Get File"
-msgstr "Собери датотека"
-
-msgid "Games"
-msgstr "Игри"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Додатоци"
-
-msgid "Send Buddy List"
-msgstr "И�прати ли�та на пријатели"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ директно поврзување"
-
-msgid "AP User"
-msgstr "AP кори�ник"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "�ихили�т"
-
-msgid "ICQ Server Relay"
-msgstr "Прене�ување на ICQ �ервер"
-
-msgid "Old ICQ UTF8"
-msgstr "Стар ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian енкрипција"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Безбедно�та е овозможена"
-
-msgid "Video Chat"
-msgstr "Видео разговор"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Видео во живо"
-
-msgid "Camera"
-msgstr "Камера"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr "Слободен/на за разговор"
 
@@ -7453,15 +7399,6 @@ msgstr "Мрежа"
 msgid "At lunch"
 msgstr "�а ручек"
 
-msgid "IP Address"
-msgstr "IP адре�а"
-
-msgid "Warning Level"
-msgstr "�иво на предупредување"
-
-msgid "Buddy Comment"
-msgstr "Коментар за пријател"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7563,16 +7500,6 @@ msgstr "Лозинката е пратена"
 msgid "Unable to initialize connection"
 msgstr "�е можам да иницијализирам вр�ка"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Те молам авторизирај ме за да можам да те додадам во ли�тата �о пријатели."
-
-msgid "No reason given."
-msgstr "�е е дадена причина."
-
-msgid "Authorization Denied Message:"
-msgstr "Порака за одбиена авторизација:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7695,60 +7622,13 @@ msgstr[0] "Пропуштивте %hu порака од %s поради непо
 msgstr[1] "Пропуштивте %hu пораки од %s поради непозната причина."
 msgstr[2] "Пропуштивте %hu пораки од %s поради непозната причина."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Информациите за кори�никот не �е до�тапни: %s"
-
-msgid "Online Since"
-msgstr "Поврзан од"
-
-msgid "Member Since"
-msgstr "Член од"
-
-msgid "Capabilities"
-msgstr "Можно�ти"
-
 msgid "Your AIM connection may be lost."
 msgstr "Вашата AIM вр�ка можеби е прекината."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[�е можам да ја прикажам пораката од овој кори�ник, бидејќи �одржеше "
-"невалиднизнаци.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "И�клучени �те од �обата за разговор %s."
 
-msgid "Mobile Phone"
-msgstr "Мобилен телефон"
-
-msgid "Personal Web Page"
-msgstr "Лична веб �траница"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Дополнителни информации"
-
-msgid "Zip Code"
-msgstr "Поштен�ки код"
-
-msgid "Work Information"
-msgstr "Работа информација"
-
-msgid "Division"
-msgstr "Оддел"
-
-msgid "Position"
-msgstr "Позиција"
-
-msgid "Web Page"
-msgstr "Web �траница"
-
 msgid "Pop-Up Message"
 msgstr "Скокачка порака"
 
@@ -8045,7 +7925,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Промени ја адре�ата на:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ако не чекате за авторизација</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8084,6 +7965,14 @@ msgstr "Конфигурирај на�очување на ин�тант пор
 msgid "Set Privacy Options..."
 msgstr "По�тави опции за приватно�т..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Покажи ли�та на пријатели"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Ли�та на поканети"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Потврди ја �метката"
@@ -8100,9 +7989,6 @@ msgstr "Прикажи ги пријателите кои чекаат автоÑ
 msgid "Search for Buddy by Email Address..."
 msgstr "Барај пријател преку е-пошта..."
 
-msgid "Search for Buddy by Information"
-msgstr "Барај пријател �о некоја информација"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Кори�никот не е најавен"
@@ -8212,6 +8098,165 @@ msgstr "Редот е полн"
 msgid "Not while on AOL"
 msgstr "�е додека �ум на AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Икона на пријател:"
+
+msgid "Voice"
+msgstr "Гла�"
+
+msgid "AIM Direct IM"
+msgstr "AIM директни ин�тант пораки"
+
+msgid "Get File"
+msgstr "Собери датотека"
+
+msgid "Games"
+msgstr "Игри"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Додатоци"
+
+msgid "Send Buddy List"
+msgstr "И�прати ли�та на пријатели"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ директно поврзување"
+
+msgid "AP User"
+msgstr "AP кори�ник"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "�ихили�т"
+
+msgid "ICQ Server Relay"
+msgstr "Прене�ување на ICQ �ервер"
+
+msgid "Old ICQ UTF8"
+msgstr "Стар ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian енкрипција"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Безбедно�та е овозможена"
+
+msgid "Video Chat"
+msgstr "Видео разговор"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Видео во живо"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP адре�а"
+
+msgid "Warning Level"
+msgstr "�иво на предупредување"
+
+msgid "Buddy Comment"
+msgstr "Коментар за пријател"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Информациите за кори�никот не �е до�тапни: %s"
+
+msgid "Mobile Phone"
+msgstr "Мобилен телефон"
+
+msgid "Personal Web Page"
+msgstr "Лична веб �траница"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Дополнителни информации"
+
+msgid "Zip Code"
+msgstr "Поштен�ки код"
+
+msgid "Work Information"
+msgstr "Работа информација"
+
+msgid "Division"
+msgstr "Оддел"
+
+msgid "Position"
+msgstr "Позиција"
+
+msgid "Web Page"
+msgstr "Web �траница"
+
+msgid "Online Since"
+msgstr "Поврзан од"
+
+msgid "Member Since"
+msgstr "Член од"
+
+msgid "Capabilities"
+msgstr "Можно�ти"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Покажи �е онлајн"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Покажи �е онлајн"
+
+msgid "Appear Offline"
+msgstr "Изгледај и�клучен"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Изгледај и�клучен"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Бевте и�фрлени од %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Можете одново да побарате авторизација од овие пријатели �о де�ен клик врз "
+"нив и одбирање на \"Повторно побарај авторизација\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "�евидлив"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Ли�та на поканети"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолија"
 
@@ -8412,7 +8457,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Барај авторизација"
 
 #, fuzzy
@@ -10710,18 +10755,12 @@ msgstr "Излегов"
 msgid "Not on server list"
 msgstr "�е е на ли�тата �о �ервери"
 
-msgid "Appear Online"
-msgstr "Покажи �е онлајн"
-
 msgid "Appear Permanently Offline"
 msgstr "Покажи �е привремено офлајн"
 
 msgid "Presence"
 msgstr "При�у�тво"
 
-msgid "Appear Offline"
-msgstr "Изгледај и�клучен"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�е �е покажувај привремено офлајн"
 
@@ -11284,27 +11323,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Вр�ката е прекината од друг �офтвер на Вашиот компјутер."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Оддалечениот кори�ник ја прекина вр�ката."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Времето за вр�ката и�тече."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Вр�ката е одбиена."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Ова име на разговор веќе по�тои"
 
@@ -11455,6 +11490,12 @@ msgstr ""
 "от�транувате �метки преку избирање на <b>Сметки->Додај/Уреди</b> од "
 "прозорецот �о ли�тата на пријатели."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s �ака да го додаде %s на неговата или нејзината ли�та на пријатели%s"
+"%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Боја на позадина"
@@ -11729,6 +11770,8 @@ msgstr "�лија� (додатно)"
 msgid "Edit User Mood"
 msgstr "Уреди ра�поло жение"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Пријатели"
@@ -12502,9 +12545,6 @@ msgstr "поддршка"
 msgid "webmaster"
 msgstr "програмер и вебма�тер"
 
-msgid "Senior Contributor/QA"
-msgstr "Сениор придоне�увачи/QA"
-
 msgid "win32 port"
 msgstr "win32 порт"
 
@@ -12530,6 +12570,9 @@ msgstr "оригинален автор"
 msgid "lead developer"
 msgstr "главен програмер"
 
+msgid "Senior Contributor/QA"
+msgstr "Сениор придоне�увачи/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13930,6 +13973,10 @@ msgid "_TURN server:"
 msgstr "ST_UN �ервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Порта:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Кори�ничко име:"
 
@@ -13952,6 +13999,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Стандардно"
 
@@ -13970,6 +14022,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Рачно"
 
@@ -14542,7 +14602,7 @@ msgstr "ништо"
 msgid "Small"
 msgstr "Е-пошта"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15622,6 +15682,10 @@ msgstr "Уред"
 msgid "Voice/Video Settings"
 msgstr "Уреди по�тавувања"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Уреди по�тавувања"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15751,7 +15815,7 @@ msgstr "И�прати и прими чи�ти XMPP делови."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Овој приклучок е кори�ен за дебагирање на XMPP �ервери или клиенти."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15882,6 +15946,26 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Барa SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "�аметни �тара (порта 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "SecurID клучот кој го вне�овте е невалиден."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[�е можам да ја прикажам пораката од овој кори�ник, бидејќи �одржеше "
+#~ "невалиднизнаци.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Барај пријател �о некоја информација"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Ланецот за �ертификатот презентиран за %s не е валиден."
@@ -16427,9 +16511,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Вр�ката �е затвори (пишувам)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Вр�ката �е ре�етира"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Грешка при читање од �окетот: %s"
 
@@ -16667,7 +16748,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "�е можам да ја отворам %s за запишување!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Размената на датотека не у�пеа. Другата �трана веројатно откажа."
 
 #~ msgid "Could not connect for transfer."
@@ -16693,9 +16774,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "Приклучок за TOC протоколот"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Информациите за кори�никот %s не �е до�тапни"
-
 #~ msgid "%s Options"
 #~ msgstr "%s Опции"
 
diff --git a/po/ml.po b/po/ml.po
index 9b70ddfd11..caf16d087e 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -788,7 +788,7 @@ msgstr "നിര��ത�ത�ക"
 msgid "Waiting for transfer to begin"
 msgstr "ഇടപാട�� ആരംഭിക�ക�ന�നതിനായി കാത�തിരിക�ക�ന�ന�"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "റദ�ദാക�കിയിരിക�ക�ന�ന�"
 
 msgid "Failed"
diff --git a/po/mn.po b/po/mn.po
index 6217312a74..cd4d71f482 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2005-06-17 23:22-0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -517,7 +517,6 @@ msgstr "Сертификат у�тгалтыг баталгаажуулах"
 msgid "Certificate Manager"
 msgstr "Сертификатын Менежер"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Хо�тын н�р"
 
@@ -774,7 +773,7 @@ msgstr "Зог�оох"
 msgid "Waiting for transfer to begin"
 msgstr "Файл шилжүүл�лт �хлүүл�хийг хүл��ж байна"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Цуцлагд�ан"
 
 msgid "Failed"
@@ -1649,7 +1648,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4595,12 +4596,20 @@ msgstr "XMPP Протоколын програм"
 msgid "Domain"
 msgstr "Дом�йн"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS шаардах"
+msgid "Require encryption"
+msgstr ""
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Х�р�гл�гчийн м�д��л�л б�л�н биш байна:%s"
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Холболтыг дахин тохируулах"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5835,7 +5844,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Шин� нууц үг тохирохгүй байна"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Оруул�ан SecurID түлхүүр буруу байна."
 
 msgid ""
@@ -5937,10 +5946,6 @@ msgid "Connecting..."
 msgstr "Серверт холбогдох"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Оруул�ан SecurID түлхүүр буруу байна."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Оруул�ан SecurID түлхүүр буруу байна."
 
@@ -6801,6 +6806,15 @@ msgstr "Серверийн ха�г"
 msgid "Server port"
 msgstr "Серверийн порт"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6832,6 +6846,24 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "%s ажилуулахад алдаа гарлаа"
 
+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 бүртг�лд зааж өгч болно.)"
+
+#, 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, та хоёр өөр өөр кодчилол "
+"ашиглаж байна.)"
+
 msgid "Could not join chat room"
 msgstr "Чат өрөөнд холбогдох боломжгүй"
 
@@ -7064,94 +7096,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 бүртг�лд зааж өгч болно.)"
-
-#, 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, та хоёр өөр өөр кодчилол "
-"ашиглаж байна.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Харилцагчийн Зураг"
-
-msgid "Voice"
-msgstr "Дуу"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr "Файл �вах"
-
-msgid "Games"
-msgstr "Тоглоом"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr "Харилцагчийн Жаг�аалтыг Илг��х"
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr "AP Х�р�гл�гч"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Серверийн Хариу"
-
-msgid "Old ICQ UTF8"
-msgstr "Хуучин ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Триллиан Кодчилол"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr "Хамгаалалтыг ид�вхт�й болго�он"
-
-msgid "Video Chat"
-msgstr "Видео Чат"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Шууд "
-
-msgid "Camera"
-msgstr "Камер"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr "Чатад үн�гүй"
 
@@ -7187,15 +7131,6 @@ msgstr "Сүлж��"
 msgid "At lunch"
 msgstr "Үдийн цайндаа �в�ан"
 
-msgid "IP Address"
-msgstr "IP Ха�г"
-
-msgid "Warning Level"
-msgstr "�нхааруулах Түвшин"
-
-msgid "Buddy Comment"
-msgstr "Харилцагчийн Тайлбар"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7291,15 +7226,6 @@ msgstr "�ууц үгийг илг����н"
 msgid "Unable to initialize connection"
 msgstr "Холболтыг �хлүүл�х боломжгүй байна"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7405,58 +7331,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Х�р�гл�гчийн м�д��л�л б�л�н биш байна:%s"
-
-msgid "Online Since"
-msgstr "Онлайн бол�оноо� хойш"
-
-msgid "Member Since"
-msgstr "Гишүүн бол�оноо� хойш"
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr "Таны  AIM -ын холболт та�ар�ан байж магадгүй."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "Гар Ута�"
-
-msgid "Personal Web Page"
-msgstr "Хувийн В�б Хууда�"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "��м�лт М�д��л�л"
-
-msgid "Zip Code"
-msgstr "Зип Код"
-
-msgid "Work Information"
-msgstr "�жлын газрын танилцуулга"
-
-msgid "Division"
-msgstr "Салбар"
-
-msgid "Position"
-msgstr "�жлын байр"
-
-msgid "Web Page"
-msgstr "В�б Хууда�"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7704,7 +7585,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>та зөвшөөрөл хүл��хгүй байна</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7741,6 +7623,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Харилцагчийн Жаг�аалтыг Харах"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Жаг�аалтыг урих"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Бүртг�лийг баталгаажуулах"
@@ -7757,9 +7647,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7862,6 +7749,163 @@ msgstr "Дараалал дүүр�н байна"
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Харилцагчийн Зураг"
+
+msgid "Voice"
+msgstr "Дуу"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "Файл �вах"
+
+msgid "Games"
+msgstr "Тоглоом"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr "Харилцагчийн Жаг�аалтыг Илг��х"
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr "AP Х�р�гл�гч"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Серверийн Хариу"
+
+msgid "Old ICQ UTF8"
+msgstr "Хуучин ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Триллиан Кодчилол"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Хамгаалалтыг ид�вхт�й болго�он"
+
+msgid "Video Chat"
+msgstr "Видео Чат"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Шууд "
+
+msgid "Camera"
+msgstr "Камер"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP Ха�г"
+
+msgid "Warning Level"
+msgstr "�нхааруулах Түвшин"
+
+msgid "Buddy Comment"
+msgstr "Харилцагчийн Тайлбар"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Х�р�гл�гчийн м�д��л�л б�л�н биш байна:%s"
+
+msgid "Mobile Phone"
+msgstr "Гар Ута�"
+
+msgid "Personal Web Page"
+msgstr "Хувийн В�б Хууда�"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "��м�лт М�д��л�л"
+
+msgid "Zip Code"
+msgstr "Зип Код"
+
+msgid "Work Information"
+msgstr "�жлын газрын танилцуулга"
+
+msgid "Division"
+msgstr "Салбар"
+
+msgid "Position"
+msgstr "�жлын байр"
+
+msgid "Web Page"
+msgstr "В�б Хууда�"
+
+msgid "Online Since"
+msgstr "Онлайн бол�оноо� хойш"
+
+msgid "Member Since"
+msgstr "Гишүүн бол�оноо� хойш"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Онлайн харагдах"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Онлайн харагдах"
+
+msgid "Appear Offline"
+msgstr "Оффлайн харагдах"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Оффлайн харагдах"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s таныг н�м��н"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Харагдахгүй"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Жаг�аалтыг урих"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8059,7 +8103,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10230,18 +10274,12 @@ msgstr "Гадагшаа гар�ан"
 msgid "Not on server list"
 msgstr "Серверийн жаг�аалтанд байхгүй байна"
 
-msgid "Appear Online"
-msgstr "Онлайн харагдах"
-
 msgid "Appear Permanently Offline"
 msgstr "Тогтмол онлайн харагдах"
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr "Оффлайн харагдах"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Байнга оффлайн битгий харагд"
 
@@ -10776,27 +10814,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Бу�ад програм хангамжууд холболтыг та�алдууллаа."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "�л�ын хо�т холболтыг хаа�ан."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Холболтын хугацаа дуу��ан."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Холболтыг зөвшөөрөөгүй"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Эн� чатын н�рийг ашиглаж байна"
 
@@ -10941,6 +10975,10 @@ msgstr ""
 "Харилцагчийн жаг�аалт цонхны <b>Бүртг�л->��м�х/За�варлах</b>командаар "
 "бүртг�лийг н�мж, за�варлаж, у�тгаж болно."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s %s%s харилцагчийн жаг�аалтанд %s ийг н�м�хийг хү��ж байна"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "�рын д�в�г�р өнгө"
@@ -11208,6 +11246,8 @@ msgstr "Өөр н�р (заавал шаардлагагүй)"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Харилцагч"
@@ -11972,9 +12012,6 @@ msgstr "д�мжл�г"
 msgid "webmaster"
 msgstr "хөгжүүл�г & в�бма�тер"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 порт"
 
@@ -12000,6 +12037,9 @@ msgstr "�нхны зохиогч"
 msgid "lead developer"
 msgstr "�хлах т�ргүүл�гч"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Өмнөд �фрикийн х�л"
 
@@ -13325,6 +13365,10 @@ msgid "_TURN server:"
 msgstr "ST_UN �ервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Порт:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Х�р�гл�гчийн н�р"
 
@@ -13347,6 +13391,11 @@ msgstr "Мозилла"
 msgid "Konqueror"
 msgstr "Конкүерор"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -13365,6 +13414,14 @@ msgstr "Файрбөд"
 msgid "Epiphany"
 msgstr "Эпифани"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Маниул"
 
@@ -13909,7 +13966,7 @@ msgstr ""
 msgid "Small"
 msgstr "Э-м�йл"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14932,6 +14989,10 @@ msgstr "Төхөөрөмж"
 msgid "Voice/Video Settings"
 msgstr "Тохиргоог за�варлах"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Тохиргоог за�варлах"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15053,7 +15114,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15181,6 +15242,13 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS шаардах"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Оруул�ан SecurID түлхүүр буруу байна."
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "X.509 �ертификат импортлолт амжилтгүй боллоо"
@@ -15497,9 +15565,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Холболтыг хаа�ан"
 
-#~ msgid "Connection reset"
-#~ msgstr "Холболтыг дахин тохируулах"
-
 #~ msgid "Unable to connect to host"
 #~ msgstr "Хо�т руу холбогдох боломжгүй"
 
@@ -15602,7 +15667,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Зав�ар хийх��р %sийг н��ж чад�ангүй!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Файл дамжуулалт амжилттгүй боллоо."
 
 #~ msgid "Could not connect for transfer."
diff --git a/po/mr.po b/po/mr.po
index 3a1e1f6da6..f26a0335ea 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-05-03 14:42+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
@@ -519,7 +519,6 @@ msgstr "प�रमाणपत�र खरच नष�ट करायचे
 msgid "Certificate Manager"
 msgstr "प�रमाणपत�र व�यवस�थापक"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "आयोजकनाव"
 
@@ -779,7 +778,7 @@ msgstr "थांबा"
 msgid "Waiting for transfer to begin"
 msgstr "स�थानांतर स�रू करण�याची प�रतिक�षा करत आहे"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद�द केले"
 
 msgid "Failed"
@@ -1657,7 +1656,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "प�रमाणपत�राची वेळ समाप�त �ाली आहे व त�याम�ळे त�यांस वैध सम�णे अशक�य आहे."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4645,11 +4647,20 @@ msgstr "XMPP प�रोटोकॉल प�लगईन"
 msgid "Domain"
 msgstr "क�षेत�र"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS आवश�यक"
+#, fuzzy
+msgid "Require encryption"
+msgstr " अधिकृत परवानगीची आवश�यकता"
 
-msgid "Force old (port 5223) SSL"
-msgstr " ज�न�या (port 5223) SSL चा आग�रह धरा"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "वापरकर�ता माहिती उपलब�ध नाही: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "जोडणीची वेळ संपली"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "अनक�रिप�टेड प�रवाहावर साध�या मजकूर सप�रमाणतेस परवानगी द�या"
@@ -5829,7 +5840,8 @@ msgstr "PIN अवैध आहे. त�यामध�ये फक�त अ
 msgid "The two PINs you entered do not match."
 msgstr "दिलेले दोन PINs ज�ळत नाही."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "दिलेले नाव अवैध आहे."
 
 msgid ""
@@ -5917,10 +5929,6 @@ msgstr "MXit सर�व�हरशी जोडणी अशक�य. कृ
 msgid "Connecting..."
 msgstr "जोडणी करत आहे..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "दिलेले नाव अवैध आहे."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "दिलेल�या PIN ची लांबी अवैध आहे [7-10]."
 
@@ -6761,6 +6769,15 @@ msgstr "सर�व�हरचा पत�ता"
 msgid "Server port"
 msgstr "सर�व�हर पोर�ट"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया मला परवानगी द�या ज�याम�ळे मी आपणास मा��या बड�डी यादीत समाविष�ट करू शकतो."
+
+msgid "No reason given."
+msgstr "काही कारण दिले नाही."
+
+msgid "Authorization Denied Message:"
+msgstr "अधिकृत परवानगी नाकारलेला संदेश:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s पासून अनपेक�षीत प�रतिसाद आढळले: %s"
@@ -6797,6 +6814,24 @@ msgstr "AOL पडदà¥�यावरील नावाची ओळख पटà¤
 msgid "Error requesting %s"
 msgstr "%s करीता विनंती करत आहे"
 
+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  खात�यासाठी प�रगत खात�यात निर�देशित करू शकता. )"
+
+#, 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 "
+"हा बग�गी ग�राहक आहे.)"
+
 msgid "Could not join chat room"
 msgstr "संभाषण रूममध�ये सामिल होणे अशक�य"
 
@@ -7010,94 +7045,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "फाइल %s ही %s आहे जी %s च�या कमाल आकारापेक�षा खूपच मोठी आहे."
 
-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  खात�यासाठी प�रगत खात�यात निर�देशित करू शकता. )"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "बड�डी चिन�ह"
-
-msgid "Voice"
-msgstr "आवाज"
-
-msgid "AIM Direct IM"
-msgstr "AIM डायरेक�ट IM"
-
-msgid "Get File"
-msgstr "फाइल घ�या"
-
-msgid "Games"
-msgstr "खेळ"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "जोड़-स�विधा"
-
-msgid "Send Buddy List"
-msgstr "बड�डी यादी पाठवा "
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ ची प�रत�यक�ष जोडणी"
-
-msgid "AP User"
-msgstr "AP वापरकर�ता"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "निहीलीस�ट"
-
-msgid "ICQ Server Relay"
-msgstr "ICQसर�व�हरचे प�रसारण"
-
-msgid "Old ICQ UTF8"
-msgstr "ज�ना ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ट�रिलैन इनक�रिप�शेन"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "हीपटोप"
-
-msgid "Security Enabled"
-msgstr "सक�षम केलेली स�रक�षा "
-
-msgid "Video Chat"
-msgstr "विडिओ गप�पा"
-
-msgid "iChat AV"
-msgstr "i संभाषण AV"
-
-msgid "Live Video"
-msgstr "प�रत�यक�ष व�हिडीओ"
-
-msgid "Camera"
-msgstr "कॅमेरा"
-
-msgid "Screen Sharing"
-msgstr "स�क�रिन शेअरींग"
-
 msgid "Free For Chat"
 msgstr "संभाषणा साठी विनाम�ल�य"
 
@@ -7128,15 +7075,6 @@ msgstr "कामावर"
 msgid "At lunch"
 msgstr "जेवतेवेळी"
 
-msgid "IP Address"
-msgstr "IP पत�ता"
-
-msgid "Warning Level"
-msgstr "सावधनता स�चनेचा स�तर"
-
-msgid "Buddy Comment"
-msgstr "बड�डी बद�दल टिप�पणी"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ओळख पटवण�यासाठी सर�व�हरशी जोडणी करण�यास अशक�य: %s"
@@ -7230,15 +7168,6 @@ msgstr "पासवर�ड पाठवला"
 msgid "Unable to initialize connection"
 msgstr "जोडणी स�रू करण�यात असमर�थ"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "कृपया मला परवानगी द�या ज�याम�ळे मी आपणास मा��या बड�डी यादीत समाविष�ट करू शकतो."
-
-msgid "No reason given."
-msgstr "काही कारण दिले नाही."
-
-msgid "Authorization Denied Message:"
-msgstr "अधिकृत परवानगी नाकारलेला संदेश:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7348,59 +7277,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "अज�ञात कारणाने %2$s पासून आपण %1$hu संदेश म�काल."
 msgstr[1] "अज�ञात कारणाने %2$s पासून आपण %1$hu संदेश म�काल."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "वापरकर�ता माहिती उपलब�ध नाही: %s"
-
-msgid "Online Since"
-msgstr "पासून चालू  आहे"
-
-msgid "Member Since"
-msgstr "पासून सभासद"
-
-msgid "Capabilities"
-msgstr "कार�यक�षमता"
-
 msgid "Your AIM connection may be lost."
 msgstr "आपली AIM ज�ळणी कदाचित हरवली असेल."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[ह�या वापरकर�त�याकडून संदेश दाखवण�यास असमर�थ कारण त�यात अवैध अक�षरे समाविष�ट केली आहेत.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "  %s संभाषण खोलीतून  आपली जोडणी काढली."
 
-msgid "Mobile Phone"
-msgstr "मोबाईल फोन"
-
-msgid "Personal Web Page"
-msgstr "वैयक�तिक बेब पान"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "अतिरिक�त माहिती"
-
-msgid "Zip Code"
-msgstr "�िप कोड"
-
-msgid "Work Information"
-msgstr "कार�याची माहिती"
-
-msgid "Division"
-msgstr "विभाग "
-
-msgid "Position"
-msgstr "स�थिती"
-
-msgid "Web Page"
-msgstr "वेब पेज"
-
 msgid "Pop-Up Message"
 msgstr "पोप-अप(पटकन येणारे) संदेश"
 
@@ -7667,7 +7550,8 @@ msgstr "वापकर�तानाव रूपण फक�त कॅपी
 msgid "Change Address To:"
 msgstr "करता पत�ता बदला:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i> आपण अधिकृत परवानगीची प�रतीक�षा करत नाही</i> "
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7706,6 +7590,14 @@ msgstr "IM फॉर�वडिंग (वेब) संरचीत करा"
 msgid "Set Privacy Options..."
 msgstr "खाजगी पर�यायांची मांडणी करा..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "बड�डी सूची दाखवा (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "आमंत�रण यादी"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr " खाते निश�चित करा"
@@ -7722,9 +7614,6 @@ msgstr "बड�डीज अधिकृत परवानगीची वा
 msgid "Search for Buddy by Email Address..."
 msgstr "ईमेल पत�त�याद�वारे बड�डी करीता शोधा..."
 
-msgid "Search for Buddy by Information"
-msgstr "माहितीतून बड�डीला शोधा"
-
 msgid "Use clientLogin"
 msgstr "क�ला�ंट प�रवेशचा वापर करा"
 
@@ -7832,6 +7721,165 @@ msgstr "रांग पूर�ण आहे"
 msgid "Not while on AOL"
 msgstr "AOL वर जेंव�हा नाही"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "बड�डी चिन�ह"
+
+msgid "Voice"
+msgstr "आवाज"
+
+msgid "AIM Direct IM"
+msgstr "AIM डायरेक�ट IM"
+
+msgid "Get File"
+msgstr "फाइल घ�या"
+
+msgid "Games"
+msgstr "खेळ"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "जोड़-स�विधा"
+
+msgid "Send Buddy List"
+msgstr "बड�डी यादी पाठवा "
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ची प�रत�यक�ष जोडणी"
+
+msgid "AP User"
+msgstr "AP वापरकर�ता"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "निहीलीस�ट"
+
+msgid "ICQ Server Relay"
+msgstr "ICQसर�व�हरचे प�रसारण"
+
+msgid "Old ICQ UTF8"
+msgstr "ज�ना ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ट�रिलैन इनक�रिप�शेन"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "हीपटोप"
+
+msgid "Security Enabled"
+msgstr "सक�षम केलेली स�रक�षा "
+
+msgid "Video Chat"
+msgstr "विडिओ गप�पा"
+
+msgid "iChat AV"
+msgstr "i संभाषण AV"
+
+msgid "Live Video"
+msgstr "प�रत�यक�ष व�हिडीओ"
+
+msgid "Camera"
+msgstr "कॅमेरा"
+
+msgid "Screen Sharing"
+msgstr "स�क�रिन शेअरींग"
+
+msgid "IP Address"
+msgstr "IP पत�ता"
+
+msgid "Warning Level"
+msgstr "सावधनता स�चनेचा स�तर"
+
+msgid "Buddy Comment"
+msgstr "बड�डी बद�दल टिप�पणी"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "वापरकर�ता माहिती उपलब�ध नाही: %s"
+
+msgid "Mobile Phone"
+msgstr "मोबाईल फोन"
+
+msgid "Personal Web Page"
+msgstr "वैयक�तिक बेब पान"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "अतिरिक�त माहिती"
+
+msgid "Zip Code"
+msgstr "�िप कोड"
+
+msgid "Work Information"
+msgstr "कार�याची माहिती"
+
+msgid "Division"
+msgstr "विभाग "
+
+msgid "Position"
+msgstr "स�थिती"
+
+msgid "Web Page"
+msgstr "वेब पेज"
+
+msgid "Online Since"
+msgstr "पासून चालू  आहे"
+
+msgid "Member Since"
+msgstr "पासून सभासद"
+
+msgid "Capabilities"
+msgstr "कार�यक�षमता"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "चालू असताना दिसते"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "चालू असताना दिसते"
+
+msgid "Appear Offline"
+msgstr "बंज असताना दिसते"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "बंज असताना दिसते"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "त�म�हाला भहिष�कार केले: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"आपण ह�या बड�डीजकडून परवानगीची प�र�नःविनंती करू शकता त�यासाठी बड�डीजवर उजवीकडे क�लिक करून "
+"आणि \"Re-request Authorization.\" निवडून"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "दृष�यास�पद"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "आमंत�रण यादी"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "क�ंभ रास"
 
@@ -8010,8 +8058,8 @@ msgstr "आपली विनंती स�वीकारल�या गे
 msgid "Your request was rejected."
 msgstr "आपली विनंती नकारल�या गेली."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u ला तपासणी आवश�यक आहे"
 
 msgid "Add buddy question"
@@ -10196,18 +10244,12 @@ msgstr "बाहेर गेले"
 msgid "Not on server list"
 msgstr "सर�व�हर यादीवर  नाही"
 
-msgid "Appear Online"
-msgstr "चालू असताना दिसते"
-
 msgid "Appear Permanently Offline"
 msgstr "कायमचे बंद असताना दिसते"
 
 msgid "Presence"
 msgstr "उपस�थिती"
 
-msgid "Appear Offline"
-msgstr "बंज असताना दिसते"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "कायमच बंद असलेले दिसत नाही"
 
@@ -10746,27 +10788,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "जोडणी संगणकावरील इतर सॉफ�टवेअरम�ळे खंडीत �ाली."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "दूरस�थ यजमानने जोडणी बंद केली."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "जोडणी वेळ समाप�ती."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "जोडणी नकारली."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "पत�ता आधिपासूनच वापरणीत आहे."
 
@@ -10914,6 +10951,10 @@ msgstr ""
 "समावेश, संपादन, किंवा बड�डी सूचीतील पटलमधील <b>खाते->खाते व�यवस�थापीत करा</b> पर�याय "
 "पासून खाते काढून टाकण�यासाठी त�म�ही या पटलाकडे प�नः येऊ शकता"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ला %s यांस तो किंवा तीच�या बड�डी यादीत %s%s समाविष�ट करावेसे वाटते"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "पार�श�वभूमी रंग"
@@ -11164,6 +11205,8 @@ msgstr "संदेश (वैकल�पिक)"
 msgid "Edit User Mood"
 msgstr "वापरकर�त�याचा मूड संपादीत करा"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/बड�डीज (_B)"
@@ -11905,9 +11948,6 @@ msgstr "समर�थन"
 msgid "webmaster"
 msgstr "वेबमास�टर"
 
-msgid "Senior Contributor/QA"
-msgstr "वरिष�ठ योगदानकर�ता/QA"
-
 msgid "win32 port"
 msgstr "win32 पोर�ट"
 
@@ -11933,6 +11973,9 @@ msgstr "मूळ लेखक"
 msgid "lead developer"
 msgstr "लिड डेव�हलपर"
 
+msgid "Senior Contributor/QA"
+msgstr "वरिष�ठ योगदानकर�ता/QA"
+
 msgid "Afrikaans"
 msgstr "आफ�रिकान�स�"
 
@@ -13267,6 +13310,10 @@ msgstr "रिले सर�व�हर (TURN)"
 msgid "_TURN server:"
 msgstr "TURN सर�व�हर (_T):"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "पोर�ट (_P):"
+
 msgid "Use_rname:"
 msgstr "वापरकर�तानाव (_r):"
 
@@ -13288,6 +13335,11 @@ msgstr "मो�ीला"
 msgid "Konqueror"
 msgstr "कोनकारार"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "डेस�कटॉप पूर�वनिर�धारीत"
 
@@ -13306,6 +13358,14 @@ msgstr "फायरबर�ड"
 msgid "Epiphany"
 msgstr "�पीफनी"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "प�स�तिका"
 
@@ -13834,7 +13894,8 @@ msgstr "काहिच नाही"
 msgid "Small"
 msgstr "लहान"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "पूर�वनिर�धारीत स�माईलीज�च�या लहान आवृत�ती"
 
 msgid "Response Probability:"
@@ -14851,6 +14912,10 @@ msgstr "साधण (_e)"
 msgid "Voice/Video Settings"
 msgstr "वॉईस/विडिओ सेटिंग�स�"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "वॉईस/विडिओ सेटिंग�स�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14975,7 +15040,7 @@ msgstr "कच�चे XMPP कडवी पाठवा आणि मिळव
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "हे प�लगईन XMPP सर�व�हरच�या डिबगिंगसाठी किंवा ग�राहकांसाठी उपयोगी आहे."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15105,6 +15170,24 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS आवश�यक"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr " ज�न�या (port 5223) SSL चा आग�रह धरा"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "दिलेले नाव अवैध आहे."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ह�या वापरकर�त�याकडून संदेश दाखवण�यास असमर�थ कारण त�यात अवैध अक�षरे समाविष�ट केली आहेत.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "माहितीतून बड�डीला शोधा"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "प�रमाणपत�र अजूनही वैध नाही."
 
diff --git a/po/ms_MY.po b/po/ms_MY.po
index c2674ca2c6..3623744a4e 100644
--- a/po/ms_MY.po
+++ b/po/ms_MY.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-10-23 19:50+0800\n"
 "Last-Translator: Muhammad Najmi bin Ahmad Zabidi <najmi.zabidi@gmail.com>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -495,7 +495,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -741,7 +740,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1598,7 +1597,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4454,10 +4455,16 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
 msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
@@ -5606,7 +5613,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5694,9 +5701,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6508,6 +6512,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6539,6 +6552,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6750,89 +6776,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr ""
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr ""
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -6863,15 +6806,6 @@ msgstr ""
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr ""
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -6958,15 +6892,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7060,58 +6985,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr ""
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-msgid "Position"
-msgstr ""
-
-msgid "Web Page"
-msgstr ""
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7350,7 +7230,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7387,6 +7267,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7403,9 +7289,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7508,6 +7391,158 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr ""
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7687,7 +7722,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -9761,18 +9796,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10289,27 +10318,22 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr ""
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr ""
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr ""
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10445,6 +10469,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10692,6 +10720,8 @@ msgstr ""
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -11421,9 +11451,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11449,6 +11476,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12718,6 +12748,9 @@ msgstr ""
 msgid "_TURN server:"
 msgstr ""
 
+msgid "_UDP Port:"
+msgstr ""
+
 msgid "Use_rname:"
 msgstr ""
 
@@ -12739,6 +12772,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12757,6 +12795,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -13270,7 +13316,7 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14251,6 +14297,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14372,7 +14421,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
diff --git a/po/my_MM.po b/po/my_MM.po
index 2dfe38ff61..1a5b194c31 100644
--- a/po/my_MM.po
+++ b/po/my_MM.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Minn Myat Soe <mmyatsoe@gmail.com>\n"
 "Language-Team: \n"
@@ -560,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Last name:"
@@ -834,7 +833,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1796,7 +1795,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4939,12 +4940,20 @@ msgstr "MSN Protocol Plugin"
 msgid "Domain"
 msgstr "Romanian"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Request Authorisation"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Use TLS if available"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
+msgid "Connection security"
+msgstr "Connection Closed"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -6270,7 +6279,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Password မ္ယား မ�ူက္ရပာ�"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The new formatting is invalid."
 
 msgid ""
@@ -6378,10 +6387,6 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "The new formatting is invalid."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "The new formatting is invalid."
 
@@ -7297,6 +7302,15 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Please authorise me so I can add you to my buddy list."
+
+msgid "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorisation Denied Message:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Invalid response from server."
@@ -7330,6 +7344,21 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Error creating connection"
 
+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 ""
+
+#, 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 ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7572,92 +7601,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "ေဘာ္‌ဒာ Icon"
-
-msgid "Voice"
-msgstr "Voice"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "Get File"
-
-msgid "Games"
-msgstr "Games"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-msgid "AP User"
-msgstr "AP User"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Security Enabled"
-
-msgid "Video Chat"
-msgstr "Video Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Camera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Screen Name"
-
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
@@ -7693,15 +7636,6 @@ msgstr "Network"
 msgid "At lunch"
 msgstr "Out To Lunch"
 
-msgid "IP Address"
-msgstr "IP Address"
-
-msgid "Warning Level"
-msgstr "Warning Level"
-
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
@@ -7806,15 +7740,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to create new connection."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Please authorise me so I can add you to my buddy list."
-
-msgid "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorisation Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7927,60 +7852,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Postcode"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -8269,7 +8147,8 @@ msgstr "Screen name formatting can change only capitalisation and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorisation</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8313,6 +8192,14 @@ msgstr "Configure IM Forwarding (URL)"
 msgid "Set Privacy Options..."
 msgstr "Option မ္ယားမ္ယား ပ္ရပာ"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ဘော္ဒာ စာရင္း"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -8332,9 +8219,6 @@ msgstr "Show Buddies Awaiting Authorisation"
 msgid "Search for Buddy by Email Address..."
 msgstr "Search for Buddy by Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Search for Buddy by Information"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "User is not logged in"
@@ -8442,6 +8326,167 @@ msgstr "Queue full"
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ေဘာ္‌ဒာ Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Screen Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Postcode"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Offline"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8659,7 +8704,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Request Authorisation"
 
 #, fuzzy
@@ -11001,10 +11046,6 @@ msgid "Not on server list"
 msgstr "Not on server list"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Appear Offline"
 
@@ -11012,9 +11053,6 @@ msgstr "Appear Offline"
 msgid "Presence"
 msgstr "စိ�္‌က္ရိုက္‌မ္ယား"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Appear Offline"
@@ -11584,27 +11622,26 @@ msgid " (%s)"
 msgstr "Users on %s: %s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "The remote user is not present in the network any more"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Connection Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Connection Closed"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "That file already exists"
 
@@ -11756,6 +11793,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "The user %s wants to add %s to his or her buddy list."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -12046,6 +12087,8 @@ msgstr "Message Notification"
 msgid "Edit User Mood"
 msgstr "User Modes"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/(_B) ဘော္‌ဒာမ္ယား"
@@ -12887,9 +12930,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "developer & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12917,6 +12957,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14378,6 +14421,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "(_U) User နာမည္‌:"
 
@@ -14400,6 +14447,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Accept Defaults"
@@ -14420,6 +14472,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -15007,7 +15067,7 @@ msgstr "Anyone"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16121,6 +16181,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Environmental Setting ကိုပဲသံုးမယ္‌"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Environmental Setting ကိုပဲသံုးမယ္‌"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16255,7 +16319,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16388,6 +16452,24 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The new formatting is invalid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "The new formatting is invalid."
 
@@ -16827,10 +16909,6 @@ msgstr ""
 #~ msgstr "Connection Closed"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Connection Closed"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Error while reading from socket."
 
@@ -17057,7 +17135,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
@@ -17840,9 +17918,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber Protocol Plugin"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Use TLS if available"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "The user %s wants to add %s to his or her buddy list."
 
diff --git a/po/nb.po b/po/nb.po
index 603b4f815b..c6d1c0c23d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-02-11 12:17+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -533,7 +533,6 @@ msgstr "Bekreft sletting av sertifikat"
 msgid "Certificate Manager"
 msgstr "Sertifikatshåndterer"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Vertsnavn"
 
@@ -803,7 +802,7 @@ msgstr "Stopp"
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overføringen skal starte"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbrutt"
 
 msgid "Failed"
@@ -1692,7 +1691,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Sertifikatet har utgått og bør ikke regnes som gyldig."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4727,11 +4729,20 @@ msgstr "XMPP-protokolltillegg"
 msgid "Domain"
 msgstr "Domene"
 
-msgid "Require SSL/TLS"
-msgstr "Krever SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Krever godkjenning"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Tving bruk av gammel (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Tilkobling nullstilt"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillat identitetsbekreftelse i ren tekst over ukrypterte forbindelser"
@@ -5975,7 +5986,8 @@ msgstr "PIN-koden er ugyldig. Den skal bare bestå av tall [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "De nye PIN-kodene du tastet inn stemmer ikke overens."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Navnet du skrev er ugyldig."
 
 msgid ""
@@ -6066,10 +6078,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Kobler til ..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Navnet du skrev er ugyldig."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Den inntastede PIN-koden har feil lengde [7-10]."
 
@@ -6917,6 +6925,16 @@ msgstr "Tjeneradresse"
 msgid "Server port"
 msgstr "Tjenerport"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
+
+msgid "No reason given."
+msgstr "Ingen grunn spesifisert."
+
+msgid "Authorization Denied Message:"
+msgstr "Godkjenning nektet, grunn:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Mottok uventet svar fra %s: %s"
@@ -6952,6 +6970,25 @@ msgstr "AOL tillater ikke at ditt skjermnavn autentiserer her"
 msgid "Error requesting %s"
 msgstr "Feil ved forespørsel %s: %s"
 
+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 ""
+"(Det oppsto en feil i mottak av denne beskjeden.  Kontakten du snakker med "
+"bruker sannsynligvis en annen koding enn forventet.  Om du vet hvilken "
+"koding han bruker, kan du spesifisere dette i avanserte kontoinstillinger "
+"for din AIM/ICQ konto.)"
+
+#, 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 ""
+"(Det oppstod en feil under mottaket av denne beskjeden. Enten har du og %s "
+"valgt ulike tegnkoding, eller så bruker %s en klient med feil i.)"
+
 msgid "Could not join chat room"
 msgstr "Klarte ikke ble med i samtalerom"
 
@@ -7181,95 +7218,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Filen %s er %s, som er større enn det som er max. størrelse av %s."
 
-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 ""
-"(Det oppsto en feil i mottak av denne beskjeden.  Kontakten du snakker med "
-"bruker sannsynligvis en annen koding enn forventet.  Om du vet hvilken "
-"koding han bruker, kan du spesifisere dette i avanserte kontoinstillinger "
-"for din AIM/ICQ konto.)"
-
-#, 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 ""
-"(Det oppstod en feil under mottaket av denne beskjeden. Enten har du og %s "
-"valgt ulike tegnkoding, eller så bruker %s en klient med feil i.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Kontaktikon"
-
-msgid "Voice"
-msgstr "Stemme"
-
-msgid "AIM Direct IM"
-msgstr "AIM direkte samtale"
-
-msgid "Get File"
-msgstr "Laste ned fil"
-
-msgid "Games"
-msgstr "Spill"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Tillegg"
-
-msgid "Send Buddy List"
-msgstr "Send kontaktliste"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktekobling"
-
-msgid "AP User"
-msgstr "AP-bruker"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ tjenervideresending"
-
-msgid "Old ICQ UTF8"
-msgstr "Gammel ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian-kryptering"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sikkerhet slått på"
-
-msgid "Video Chat"
-msgstr "Videosamtale"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Skjermdeling"
-
 msgid "Free For Chat"
 msgstr "Tilgjengelig for samtale"
 
@@ -7305,15 +7253,6 @@ msgstr "Nettverk"
 msgid "At lunch"
 msgstr "Ute til lunsj"
 
-msgid "IP Address"
-msgstr "IP-adresse"
-
-msgid "Warning Level"
-msgstr "Advarselsnivåer"
-
-msgid "Buddy Comment"
-msgstr "Kontakt Kommentar"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Klarte ikke koble til autentiseringstjener: %s"
@@ -7409,16 +7348,6 @@ msgstr "Passord sendt"
 msgid "Unable to initialize connection"
 msgstr "Klarte ikke lage ny tilkobling"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
-
-msgid "No reason given."
-msgstr "Ingen grunn spesifisert."
-
-msgid "Authorization Denied Message:"
-msgstr "Godkjenning nektet, grunn:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7539,60 +7468,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du har gått glipp av %hu beskjed fra %s, ingen grunn oppgitt."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s, ingen grunn oppgitt."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Brukerinformasjon er ikke tilgjengelig: %s"
-
-msgid "Online Since"
-msgstr "PÃ¥logget siden"
-
-msgid "Member Since"
-msgstr "Medlem siden"
-
-msgid "Capabilities"
-msgstr "Evner"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-tilkoblingen kan være brutt."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige "
-"tegn.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blitt koblet fra samtalegruppen %s."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Personlig hjemmeside"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Tilleggsinformasjon"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Arbeid ekstra info"
-
-msgid "Division"
-msgstr "Avdeling"
-
-msgid "Position"
-msgstr "Stilling"
-
-msgid "Web Page"
-msgstr "Hjemmeside"
-
 msgid "Pop-Up Message"
 msgstr "Varslingsbeskjed"
 
@@ -7874,7 +7756,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Endre adresse til:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>du venter ikke på godkjenning</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7913,6 +7796,14 @@ msgstr "Sette opp beskjedvideresending (nett)"
 msgid "Set Privacy Options..."
 msgstr "Sett personvernvalg"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vis _kontaktliste"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Inviteringsliste"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bekrefte konto"
@@ -7929,9 +7820,6 @@ msgstr "Vis kontakter som venter på godkjenning"
 msgid "Search for Buddy by Email Address..."
 msgstr "Søk etter kontakter ved hjelp av e-postadresser..."
 
-msgid "Search for Buddy by Information"
-msgstr "Vennesøk etter informasjon"
-
 msgid "Use clientLogin"
 msgstr "Bruk clientLogin"
 
@@ -8040,6 +7928,165 @@ msgstr "Køen er full"
 msgid "Not while on AOL"
 msgstr "Ikke mens du er på AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Kontaktikon"
+
+msgid "Voice"
+msgstr "Stemme"
+
+msgid "AIM Direct IM"
+msgstr "AIM direkte samtale"
+
+msgid "Get File"
+msgstr "Laste ned fil"
+
+msgid "Games"
+msgstr "Spill"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Tillegg"
+
+msgid "Send Buddy List"
+msgstr "Send kontaktliste"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktekobling"
+
+msgid "AP User"
+msgstr "AP-bruker"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ tjenervideresending"
+
+msgid "Old ICQ UTF8"
+msgstr "Gammel ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-kryptering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sikkerhet slått på"
+
+msgid "Video Chat"
+msgstr "Videosamtale"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skjermdeling"
+
+msgid "IP Address"
+msgstr "IP-adresse"
+
+msgid "Warning Level"
+msgstr "Advarselsnivåer"
+
+msgid "Buddy Comment"
+msgstr "Kontakt Kommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Brukerinformasjon er ikke tilgjengelig: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Personlig hjemmeside"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Tilleggsinformasjon"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Arbeid ekstra info"
+
+msgid "Division"
+msgstr "Avdeling"
+
+msgid "Position"
+msgstr "Stilling"
+
+msgid "Web Page"
+msgstr "Hjemmeside"
+
+msgid "Online Since"
+msgstr "PÃ¥logget siden"
+
+msgid "Member Since"
+msgstr "Medlem siden"
+
+msgid "Capabilities"
+msgstr "Evner"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Fremstå som pålogget"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Fremstå som pålogget"
+
+msgid "Appear Offline"
+msgstr "Fremstå som avlogget"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Fremstå som avlogget"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du har blitt sparket: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan spørre om godkjenning på nytt hos disse kontaktene ved å høyreklikke "
+"på dem og velge «Spør på nytt om godkjenning»."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synlig"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Inviteringsliste"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vannmannen"
 
@@ -8219,8 +8266,8 @@ msgstr "Din forespørsel ble akseptert."
 msgid "Your request was rejected."
 msgstr "Forespørselen din ble avvist."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u krever godkjenning"
 
 msgid "Add buddy question"
@@ -10435,18 +10482,12 @@ msgstr "Ute"
 msgid "Not on server list"
 msgstr "Ikke på tjenerlisten"
 
-msgid "Appear Online"
-msgstr "Fremstå som pålogget"
-
 msgid "Appear Permanently Offline"
 msgstr "Fremstå som permanent avlogget"
 
 msgid "Presence"
 msgstr "Nærvær"
 
-msgid "Appear Offline"
-msgstr "Fremstå som avlogget"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikke fremstå som permanent avlogget"
 
@@ -10993,27 +11034,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Forbindelsen ble avbrutt av annen programvare på din datamaskin."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjern vert lukket forbindelsen."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Tilkoblingen lyktes ikke innenfor tidsgrensen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Tilkoblingen avvist."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adressen er allerede i bruk"
 
@@ -11161,6 +11197,10 @@ msgstr ""
 "Du kan komme tilbake til dette vinduet for å legge til, redigere eller "
 "fjerne kontoer fra <b>Kontoer->HÃ¥ndter kontoer</b> i kontaktliste-vinduet."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ønsker å legge til %s i sin kontaktliste%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
@@ -11415,6 +11455,8 @@ msgstr "Alias (valgfritt)"
 msgid "Edit User Mood"
 msgstr "Rediger brukertilstander"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kontakter"
@@ -12169,9 +12211,6 @@ msgstr "støtte"
 msgid "webmaster"
 msgstr "nettansvarlig"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/QA"
-
 msgid "win32 port"
 msgstr "win32-portering"
 
@@ -12197,6 +12236,9 @@ msgstr "opprinnelig laget av"
 msgid "lead developer"
 msgstr "hovedutvikler"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13540,6 +13582,10 @@ msgstr "Relay-tjener (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-tjener:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
 msgid "Use_rname:"
 msgstr "_Brukernavn:"
 
@@ -13561,6 +13607,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Skrivebordsstandard"
 
@@ -13579,6 +13630,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Egendefinert"
 
@@ -14109,7 +14168,8 @@ msgstr "ingen"
 msgid "Small"
 msgstr "Liten"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre utgaver av standard smilefjes"
 
 msgid "Response Probability:"
@@ -15144,6 +15204,10 @@ msgstr "_Enhet"
 msgid "Voice/Video Settings"
 msgstr "Lyd/videoinnstillinger"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Lyd/videoinnstillinger"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15276,7 +15340,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dette tillegget er kjekt å ha for debugging av XMPP servere og klienter."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15406,6 +15470,25 @@ msgstr "Besøk Pidgin for Windows' Nettside"
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikke rettigheter til å avinstallere denne applikasjonen."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Krever SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Tving bruk av gammel (port 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Navnet du skrev er ugyldig."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige "
+#~ "tegn.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Vennesøk etter informasjon"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Sertifikatet er ikke gyldig enda."
 
@@ -16001,9 +16084,6 @@ msgstr "Du har ikke rettigheter til å avinstallere denne applikasjonen."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Tilkoblingen lukket (skriver)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Tilkobling nullstilt"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Feil ved lesing fra endepunkt: %s"
 
@@ -16208,7 +16288,7 @@ msgstr "Du har ikke rettigheter til å avinstallere denne applikasjonen."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Klarte ikke åpne %s for skriving!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
 
@@ -16301,9 +16381,6 @@ msgstr "Du har ikke rettigheter til å avinstallere denne applikasjonen."
 #~ msgid "Failed to send IM."
 #~ msgstr "Feilet i å sende lynmelding."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "En gruppe med dette navnet eksisterer allerede."
 
diff --git a/po/ne.po b/po/ne.po
index e2216ebe04..6ab0cf9a0e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2006-06-27 21:08+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -553,7 +553,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "गइसकेको होस�ट"
@@ -824,7 +823,7 @@ msgstr "हिपटप"
 msgid "Waiting for transfer to begin"
 msgstr "स�थानान�तरण स�रू गर�नकोलागि पर�खिरहेको"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद�द गरियो"
 
 msgid "Failed"
@@ -1781,7 +1780,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4923,12 +4924,20 @@ msgstr "MSN प�रोटोकल प�लगइन"
 msgid "Domain"
 msgstr "रोमानियन"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "प�रमाणीकरण अन�रोध गर�न�होस�"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "यदि उपलब�ध भ�को खण�डमा TLS प�रयोग गर�न�होस�"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "प�रानो SSL लाई जोड गर�न�होस�"
+msgid "Connection security"
+msgstr "जडान बन�द भयो"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ग�प�तिकृत नभ�को स�ट�रीमहरू माथि खाली पाठ प�रमाणीकरण अन�मति दिन�होस�"
@@ -6255,7 +6264,7 @@ msgid "The two PINs you entered do not match."
 msgstr "नया� पासवर�डहरू मेल खा�न ।"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "प�रविष�ट गरि�को स�रक�षित ID क�ञ�जी अवैध छ ।"
 
 msgid ""
@@ -6363,10 +6372,6 @@ msgid "Connecting..."
 msgstr "जडान"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "प�रविष�ट गरि�को स�रक�षित ID क�ञ�जी अवैध छ ।"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "प�रविष�ट गरि�को स�रक�षित ID क�ञ�जी अवैध छ ।"
 
@@ -7267,6 +7272,15 @@ msgstr "सर�भर ठेगाना"
 msgid "Server port"
 msgstr "सर�भर पोर�ट"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया मलाईं अधिकार दिन�होस� ताकी म तपाई�ंलाई मेरो साथी सूचीमा थप�न सकू�।"
+
+msgid "No reason given."
+msgstr "कारण दिइ�को छैन ।"
+
+msgid "Authorization Denied Message:"
+msgstr "प�रमाणीकरण अस�विकृत सन�देश:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "सर�भरबाट अवैध जवाफ ।"
@@ -7301,6 +7315,21 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+"(यो सन�देश प�राप�त गर�दा �उटा त�र�टि भ�को थियो ।  तपाई� क�रा गरिरहन�भ�को साथी स�ग  �उटा "
+"बगी ग�राहक छ जस�तो छ ।)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "जडान गर�न सकि�न"
@@ -7542,92 +7571,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(यो सन�देश प�राप�त गर�दा �उटा त�र�टि भ�को थियो ।  तपाई� क�रा गरिरहन�भ�को साथी स�ग  �उटा "
-"बगी ग�राहक छ जस�तो छ ।)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "साथी प�रतिमा"
-
-msgid "Voice"
-msgstr "स�वर"
-
-msgid "AIM Direct IM"
-msgstr "AIM प�रत�यक�ष IM"
-
-msgid "Get File"
-msgstr "फाइल प�राप�त गर�न�होस�"
-
-msgid "Games"
-msgstr "खेलहरू"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Ins-थप�न�होस�"
-
-msgid "Send Buddy List"
-msgstr "साथी सूची पठाउन�होस�"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ सिधा जडान"
-
-msgid "AP User"
-msgstr "AP प�रयोगकर�ता"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "निहिलिस�ट"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ सर�भर रिले"
-
-msgid "Old ICQ UTF8"
-msgstr "प�रानो ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ट�रिलियन ग�प�तिकरण"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "हिपटप"
-
-msgid "Security Enabled"
-msgstr "स�रक�षा सक�षम गरियो"
-
-msgid "Video Chat"
-msgstr "भिडियो क�राकानी"
-
-msgid "iChat AV"
-msgstr "iक�राकानी AV"
-
-msgid "Live Video"
-msgstr "प�रत�यक�ष भिडियो"
-
-msgid "Camera"
-msgstr "क�यामेरा"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "पर�दा नाम"
-
 msgid "Free For Chat"
 msgstr "क�राकानी गर�न स�वतन�त�र"
 
@@ -7663,15 +7606,6 @@ msgstr "सञ�जाल"
 msgid "At lunch"
 msgstr "खानाका लागि बाहिर "
 
-msgid "IP Address"
-msgstr "IP ठेगाना"
-
-msgid "Warning Level"
-msgstr "चेतावनी स�तर"
-
-msgid "Buddy Comment"
-msgstr "साथी टिप�पणी"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "स�थान�तरणका लागि जडान गर�न सकि�न"
@@ -7779,15 +7713,6 @@ msgstr "पासवर�ड पठाइयो"
 msgid "Unable to initialize connection"
 msgstr "नया� जडान सिर�जना गर�न अक�षम ।"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "कृपया मलाईं अधिकार दिन�होस� ताकी म तपाई�ंलाई मेरो साथी सूचीमा थप�न सकू�।"
-
-msgid "No reason given."
-msgstr "कारण दिइ�को छैन ।"
-
-msgid "Authorization Denied Message:"
-msgstr "प�रमाणीकरण अस�विकृत सन�देश:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7900,60 +7825,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "तपाई�ले �उटा अज�ञात कारणका लागि %hu सन�देश %s बाट हराउन� भयो ।"
 msgstr[1] "तपाई�ले �उटा अज�ञात कारणका लागि %hu सन�देश %s बाट हराउन� भयो ।"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "प�रयोगकर�ता सूचना उपलब�ध छैन: %s"
-
-msgid "Online Since"
-msgstr "अनलाइन अवधि"
-
-msgid "Member Since"
-msgstr "सदस�य अवधि"
-
-msgid "Capabilities"
-msgstr "क�षमताहरू"
-
 msgid "Your AIM connection may be lost."
 msgstr "तपाई�ंको AIM जडान हरा�को ह�न�पर�छ ।"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[यो प�रयोगकर�ताबाट �उटा सन�देश प�रदर�शन गर�न अक�षम छ किनभने यसले अवैध क�यारेक�टरहरू समाविष�ट "
-"गर�दछ ।]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "तपाई� क�राकानी कोठाबाट विच�छेदन ह�न�भयो %s ।"
 
-msgid "Mobile Phone"
-msgstr "मोबाइल फोन"
-
-msgid "Personal Web Page"
-msgstr "व�यक�तिगत वेब पृष�ठ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "थप सूचना"
-
-msgid "Zip Code"
-msgstr "जिप कोड"
-
-msgid "Work Information"
-msgstr "कार�य सूचना"
-
-msgid "Division"
-msgstr "विभाजन"
-
-msgid "Position"
-msgstr "अवस�था"
-
-msgid "Web Page"
-msgstr "वेब पृष�ठ"
-
 msgid "Pop-Up Message"
 msgstr "पप-अप सन�देश"
 
@@ -8235,7 +8113,8 @@ msgstr "परà¥�दा नाम ढाà¤�चाले मातà¥�र ठूà¤
 msgid "Change Address To:"
 msgstr "ठेगाना परिवर�तन गर�न�होस�:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>तपाई� प�रमाणीकरणका लागि पर�खिरहेको होइन</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8280,6 +8159,14 @@ msgstr "IM को फर�वाड (URL) कन�फिगर गर�न�
 msgid "Set Privacy Options..."
 msgstr "निम�नका लागि गोपनियता सेट गर�न�होस�:"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "साथी सूची"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "निमन�त�रणा सूची"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "खाता यकिन गर�न�होस�"
@@ -8299,9 +8186,6 @@ msgstr "पà¥�रमाणीकरण पà¥�रतिकà¥�षा गरिरà
 msgid "Search for Buddy by Email Address..."
 msgstr "इमेल द�वारा साथीको खोजी गर�न�होस�..."
 
-msgid "Search for Buddy by Information"
-msgstr "सूचना द�वारा साथीको खोजी गर�न�होस�"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "प�रयोगकर�ता लगइन भ�को छैन"
@@ -8408,6 +8292,167 @@ msgstr "भरि�को लाम"
 msgid "Not while on AOL"
 msgstr "AOL मा क�षण छैन"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "साथी प�रतिमा"
+
+msgid "Voice"
+msgstr "स�वर"
+
+msgid "AIM Direct IM"
+msgstr "AIM प�रत�यक�ष IM"
+
+msgid "Get File"
+msgstr "फाइल प�राप�त गर�न�होस�"
+
+msgid "Games"
+msgstr "खेलहरू"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Ins-थप�न�होस�"
+
+msgid "Send Buddy List"
+msgstr "साथी सूची पठाउन�होस�"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ सिधा जडान"
+
+msgid "AP User"
+msgstr "AP प�रयोगकर�ता"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "निहिलिस�ट"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ सर�भर रिले"
+
+msgid "Old ICQ UTF8"
+msgstr "प�रानो ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ट�रिलियन ग�प�तिकरण"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "हिपटप"
+
+msgid "Security Enabled"
+msgstr "स�रक�षा सक�षम गरियो"
+
+msgid "Video Chat"
+msgstr "भिडियो क�राकानी"
+
+msgid "iChat AV"
+msgstr "iक�राकानी AV"
+
+msgid "Live Video"
+msgstr "प�रत�यक�ष भिडियो"
+
+msgid "Camera"
+msgstr "क�यामेरा"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "पर�दा नाम"
+
+msgid "IP Address"
+msgstr "IP ठेगाना"
+
+msgid "Warning Level"
+msgstr "चेतावनी स�तर"
+
+msgid "Buddy Comment"
+msgstr "साथी टिप�पणी"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "प�रयोगकर�ता सूचना उपलब�ध छैन: %s"
+
+msgid "Mobile Phone"
+msgstr "मोबाइल फोन"
+
+msgid "Personal Web Page"
+msgstr "व�यक�तिगत वेब पृष�ठ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "थप सूचना"
+
+msgid "Zip Code"
+msgstr "जिप कोड"
+
+msgid "Work Information"
+msgstr "कार�य सूचना"
+
+msgid "Division"
+msgstr "विभाजन"
+
+msgid "Position"
+msgstr "अवस�था"
+
+msgid "Web Page"
+msgstr "वेब पृष�ठ"
+
+msgid "Online Since"
+msgstr "अनलाइन अवधि"
+
+msgid "Member Since"
+msgstr "सदस�य अवधि"
+
+msgid "Capabilities"
+msgstr "क�षमताहरू"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "अफलाइन ह�न�होस�"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "अफलाइन ह�न�होस�"
+
+msgid "Appear Offline"
+msgstr "अफलाइन ह�न�होस�"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "अफलाइन ह�न�होस�"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "तपाई� %s द�वारा बाहिरिन� भ�को छ : (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"तपाई� तिनीहर�लाई दाया� क�लिक गरेर र \"Re-request Authorization.\" चयन गरेर यी "
+"साथीहर� बाट प�रमाणीकरण प�न-अन�रोध गर�न सक�न�ह�न�छ"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "अदृश�य"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "निमन�त�रणा सूची"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8627,7 +8672,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "प�रमाणीकरण अन�रोध गर�न�होस�"
 
 #, fuzzy
@@ -10967,10 +11012,6 @@ msgid "Not on server list"
 msgstr "सर�भर सूचीमा छैन"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "अफलाइन ह�न�होस�"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "अफलाइन ह�न�होस�"
 
@@ -10978,9 +11019,6 @@ msgstr "अफलाइन ह�न�होस�"
 msgid "Presence"
 msgstr "प�राथमिकताहरू"
 
-msgid "Appear Offline"
-msgstr "अफलाइन ह�न�होस�"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "अफलाइन ह�न�होस�"
@@ -11554,27 +11592,26 @@ msgid " (%s)"
 msgstr "%s (%s)मा%s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "टाढा प�रयोगकर�ता क�नै पनि सञ�जालमा उपस�थित छैन"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "जडान टाइम आउट भयो"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "जडान बन�द भयो"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "त�यो फाइल पहिलेनै अवस�थित छ"
 
@@ -11726,6 +11763,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "प�रयोगकर�ता %s ले उ वा उनीको साथी सूचीमा %s%s मा %s थप गर�न चाहन�छ ।"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -12016,6 +12057,8 @@ msgstr "सन�देश (वैकल�पिक) :"
 msgid "Edit User Mood"
 msgstr "प�रयोगकर�ता मोडहरू"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/साथीहरू"
@@ -12854,9 +12897,6 @@ msgstr "समर�थन"
 msgid "webmaster"
 msgstr "विकासकर�ता र वेब मास�टर"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 पोर�ट"
 
@@ -12884,6 +12924,9 @@ msgstr "मौलिक लेखक"
 msgid "lead developer"
 msgstr "प�रम�ख विकासकर�ता"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14351,6 +14394,10 @@ msgid "_TURN server:"
 msgstr "सर�भर:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "पोर�ट:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "प�रयोगकर�ता नाम:"
 
@@ -14373,6 +14420,11 @@ msgstr "मोजिल�ला"
 msgid "Konqueror"
 msgstr "कन�क�वेरर�"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "पूर�वनिर�धारणहरू स�विकार गर�न�होस�"
@@ -14393,6 +14445,14 @@ msgstr "फा�रबर�ड"
 msgid "Epiphany"
 msgstr "इपिफ�यानी"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "म�यान�अल"
 
@@ -14978,7 +15038,7 @@ msgstr "कोही पनि"
 msgid "Small"
 msgstr "इमेल"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16086,6 +16146,10 @@ msgstr "यन�त�र"
 msgid "Voice/Video Settings"
 msgstr "परिवेष सेटिङ�हरू प�रयोग गर�न�होस�"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "परिवेष सेटिङ�हरू प�रयोग गर�न�होस�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16219,7 +16283,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16351,6 +16415,24 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "प�रानो SSL लाई जोड गर�न�होस�"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "प�रविष�ट गरि�को स�रक�षित ID क�ञ�जी अवैध छ ।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[यो प�रयोगकर�ताबाट �उटा सन�देश प�रदर�शन गर�न अक�षम छ किनभने यसले अवैध क�यारेक�टरहरू "
+#~ "समाविष�ट गर�दछ ।]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "सूचना द�वारा साथीको खोजी गर�न�होस�"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "निर�दिष�ट गरि�को पर�दा नाम अवैध हो।"
 
@@ -16795,10 +16877,6 @@ msgstr ""
 #~ msgstr "जडान बन�द भयो"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "जडान बन�द भयो"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "सकेटबाट पढ�दा त�र�टि ।"
 
@@ -17025,7 +17103,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "लेख�नका लागि %s खोल�न सकिदैन!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "फाइल स�थान�तरणमा असफल; अन�य साइड सम�भवत: रद�द गरियो ।"
 
 #~ msgid "Could not connect for transfer."
@@ -18354,9 +18432,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "ज�याबर प�रोटोकल प�लगइन"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "यदि उपलब�ध भ�को खण�डमा TLS प�रयोग गर�न�होस�"
-
 #~ msgid "Hidden"
 #~ msgstr "ल�काइ�को"
 
diff --git a/po/nl.po b/po/nl.po
index 9a6ae4b274..8219d03160 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
-"PO-Revision-Date: 2010-08-01 09:08+0100\n"
-"Last-Translator: Dingoe <translations@gvmelle.com>\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 10:55+0100\n"
+"Last-Translator: Gideon van Melle <translations@gvmelle.com>\n"
 "Language-Team: Dutch <translations@gvmelle.com>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -534,7 +534,6 @@ msgstr "Verwijderen van het certificaat bevestigen."
 msgid "Certificate Manager"
 msgstr "Certificaatbeheer"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Computernaam"
 
@@ -804,7 +803,7 @@ msgstr "Stoppen"
 msgid "Waiting for transfer to begin"
 msgstr "Wacht op starten van overdracht"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Geannuleerd"
 
 msgid "Failed"
@@ -1700,8 +1699,12 @@ msgstr ""
 "Het certificaat is niet geldig. Controleer of uw computer's datum en tijd "
 "goed is ingesteld."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Het certificaat is verlopen en moet als ongeldig worden beschouwd. "
+"Controleer of uw computer's datum en tijd goed staan ingesteld."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4769,11 +4772,17 @@ msgstr "XMPP-protocol plug-in"
 msgid "Domain"
 msgstr "Domein"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS Vereist"
+msgid "Require encryption"
+msgstr "Vereist encryptie"
+
+msgid "Use encryption if available"
+msgstr "Gebruik encryptie indien aanwezig"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Oude SSL (poort 5223) forceren"
+msgid "Use old-style SSL"
+msgstr "Gebruik de oude stijl SSL"
+
+msgid "Connection security"
+msgstr "Verbindingsveiligheid"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tekstaanmelding over ongecodeerde datastroom toestaan"
@@ -6920,6 +6929,15 @@ msgstr "Serveradres"
 msgid "Server port"
 msgstr "Serverpoort"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn vriendenlijst."
+
+msgid "No reason given."
+msgstr "Geen reden gegeven."
+
+msgid "Authorization Denied Message:"
+msgstr "Tekst van weigeringsbericht:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Onverwacht antwoord ontvangen van %s: %s"
@@ -6955,6 +6973,25 @@ msgstr "AOL laat niet toe uw schermnaam hier te waarmerken"
 msgid "Error requesting %s"
 msgstr "Fout opvragen  %s"
 
+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 ""
+"(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt "
+"waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke "
+"tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde "
+"instellingen van uw AIM/ICQ-account.)"
+
+#, 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 ""
+"(Er was een fout tijdens het ontvangen van het bericht. Of jij en %s hebben "
+"verschillende coderingmethoden ingesteld, of %s heeft een instabiele cliënt.)"
+
 msgid "Could not join chat room"
 msgstr "Kon chatruimte niet binnenkomen"
 
@@ -7168,99 +7205,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Bestand %s is %s, welke is groter dan de maximale grootte van %s."
 
-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 ""
-"(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt "
-"waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke "
-"tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde "
-"instellingen van uw AIM/ICQ-account.)"
-
-#, 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 ""
-"(Er was een fout tijdens het ontvangen van het bericht. Of jij en %s hebben "
-"verschillende coderingmethoden ingesteld, of %s heeft een instabiele cliënt.)"
-
-# msgstr ""
-# "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
-# "hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
-# "een chatprogramma met fouten.)"
-#. Label
-msgid "Buddy Icon"
-msgstr "pictogram"
-
-msgid "Voice"
-msgstr "Stem"
-
-msgid "AIM Direct IM"
-msgstr "AIM direct bericht"
-
-msgid "Get File"
-msgstr "Bestanden ophalen"
-
-msgid "Games"
-msgstr "Spelletjes"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Extra's"
-
-msgid "Send Buddy List"
-msgstr "Vriendenlijst verzenden"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Directe verbinding"
-
-msgid "AP User"
-msgstr "AP-gebruiker"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Oude ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian codering"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Beveiliging ingeschakeld"
-
-msgid "Video Chat"
-msgstr "Video-chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Camera"
-
-msgid "Screen Sharing"
-msgstr "Gedeelde schermen"
-
 msgid "Free For Chat"
 msgstr "Vrij om te chatten"
 
@@ -7291,15 +7235,6 @@ msgstr "Op het werk"
 msgid "At lunch"
 msgstr "Aan 't Lunchen"
 
-msgid "IP Address"
-msgstr "IP-adres"
-
-msgid "Warning Level"
-msgstr "Waarschuwingsniveau"
-
-msgid "Buddy Comment"
-msgstr "Opmerking bij Vriend"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7399,15 +7334,6 @@ msgstr "Wachtwoord verzonden"
 msgid "Unable to initialize connection"
 msgstr "Kan verbinding niet initialiseren"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn vriendenlijst."
-
-msgid "No reason given."
-msgstr "Geen reden gegeven."
-
-msgid "Authorization Denied Message:"
-msgstr "Tekst van weigeringsbericht:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7530,58 +7456,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "%hu bericht van %s is niet overgekomen om een onbekende reden."
 msgstr[1] "%hu berichten van %s zijn niet overgekomen om een onbekende reden."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Gebruikersinformatie niet beschikbaar: %s"
-
-msgid "Online Since"
-msgstr "Online sinds"
-
-msgid "Member Since"
-msgstr "Lid sinds"
-
-msgid "Capabilities"
-msgstr "Mogelijkheden"
-
 msgid "Your AIM connection may be lost."
 msgstr "Uw AIM-verbinding is misschien verbroken."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chatruimte %s is verbroken"
 
-msgid "Mobile Phone"
-msgstr "Mobiel nummer"
-
-msgid "Personal Web Page"
-msgstr "Persoonlijke webpagina"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Extra informatie"
-
-msgid "Zip Code"
-msgstr "Postcode"
-
-msgid "Work Information"
-msgstr "Werkinformatie"
-
-msgid "Division"
-msgstr "Afdeling"
-
-msgid "Position"
-msgstr "Positie"
-
-msgid "Web Page"
-msgstr "Webpagina"
-
 msgid "Pop-Up Message"
 msgstr "Pop-up bericht"
 
@@ -7863,8 +7744,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Adres veranderen in: "
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>u wacht niet op toestemming</i>"
+msgid "you are not waiting for authorization"
+msgstr "u wacht niet op autorisatie"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "U wacht op toestemming van de volgende vrienden"
@@ -7902,6 +7783,14 @@ msgstr "IM-doorsturen configureren (web)"
 msgid "Set Privacy Options..."
 msgstr "Privacy-opties instellen..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vriendenlijst _weergeven"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Uitnodigingslijst"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Account bevestigen"
@@ -7918,9 +7807,6 @@ msgstr "Vrienden weergeven die op toestemming wachten"
 msgid "Search for Buddy by Email Address..."
 msgstr "Vriend zoeken door middel van e-mail..."
 
-msgid "Search for Buddy by Information"
-msgstr "Vriend zoeken via informatie"
-
 msgid "Use clientLogin"
 msgstr "Gebruik clientLogin"
 
@@ -8030,6 +7916,169 @@ msgstr "Wachtrij vol"
 msgid "Not while on AOL"
 msgstr "Niet tijdens AOL"
 
+# msgstr ""
+# "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
+# "hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
+# "een chatprogramma met fouten.)"
+#. Label
+msgid "Buddy Icon"
+msgstr "pictogram"
+
+msgid "Voice"
+msgstr "Stem"
+
+msgid "AIM Direct IM"
+msgstr "AIM direct bericht"
+
+msgid "Get File"
+msgstr "Bestanden ophalen"
+
+msgid "Games"
+msgstr "Spelletjes"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Extra's"
+
+msgid "Send Buddy List"
+msgstr "Vriendenlijst verzenden"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Directe verbinding"
+
+msgid "AP User"
+msgstr "AP-gebruiker"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Oude ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian codering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Beveiliging ingeschakeld"
+
+msgid "Video Chat"
+msgstr "Video-chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+msgid "Screen Sharing"
+msgstr "Gedeelde schermen"
+
+msgid "IP Address"
+msgstr "IP-adres"
+
+msgid "Warning Level"
+msgstr "Waarschuwingsniveau"
+
+msgid "Buddy Comment"
+msgstr "Opmerking bij Vriend"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Gebruik encryptie indien aanwezig"
+
+msgid "Mobile Phone"
+msgstr "Mobiel nummer"
+
+msgid "Personal Web Page"
+msgstr "Persoonlijke webpagina"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Extra informatie"
+
+msgid "Zip Code"
+msgstr "Postcode"
+
+msgid "Work Information"
+msgstr "Werkinformatie"
+
+msgid "Division"
+msgstr "Afdeling"
+
+msgid "Position"
+msgstr "Positie"
+
+msgid "Web Page"
+msgstr "Webpagina"
+
+msgid "Online Since"
+msgstr "Online sinds"
+
+msgid "Member Since"
+msgstr "Lid sinds"
+
+msgid "Capabilities"
+msgstr "Mogelijkheden"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Online weergeven"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Online weergeven"
+
+msgid "Appear Offline"
+msgstr "offline weergeven"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "offline weergeven"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "U bent uit deze MultiMX gegooid."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
+"vrienden te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Beschikbaar"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Uitnodigingslijst"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Waterman"
 
@@ -8209,8 +8258,8 @@ msgid "Your request was rejected."
 msgstr "De aanvraag werd afgewezen."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u vereist identificatie"
+msgid "%u requires verification: %s"
+msgstr "%u vereist verificatie: %s"
 
 msgid "Add buddy question"
 msgstr "Vraag van Vriend toevoegen"
@@ -10438,18 +10487,12 @@ msgstr "Even weg"
 msgid "Not on server list"
 msgstr "Niet in de serverlijst"
 
-msgid "Appear Online"
-msgstr "Online weergeven"
-
 msgid "Appear Permanently Offline"
 msgstr "Altijd offline weergeven"
 
 msgid "Presence"
 msgstr "Aanwezigheid"
 
-msgid "Appear Offline"
-msgstr "offline weergeven"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Niet altijd offline weergeven"
 
@@ -10997,27 +11040,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Verbinding verbroken door andere software op uw computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "De andere gebruiker heeft de verbinding verbroken."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbinding verlopen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbinding geweigerd."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adres al in gebruik."
 
@@ -11166,6 +11204,10 @@ msgstr ""
 "of te verwijderen uit <b>Accounts->Accountbeheer</b> in het Vriendennlijst "
 "venster."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s wil u toevoegen (%s) aan zijn of haar vriendenlijst%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Achtergrondkleur"
@@ -11422,6 +11464,8 @@ msgstr "Bericht (optioneel)"
 msgid "Edit User Mood"
 msgstr "Stemming instellen"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Vrienden"
@@ -12178,9 +12222,6 @@ msgstr "ondersteuning"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior meewerker/QA"
-
 msgid "win32 port"
 msgstr "win32 versie"
 
@@ -12206,6 +12247,9 @@ msgstr "originele maker"
 msgid "lead developer"
 msgstr "hoofdontwikkelaar"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior meewerker/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13555,6 +13599,9 @@ msgstr "Relay Server (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN server:"
 
+msgid "_UDP Port:"
+msgstr "_UDP Poort:"
+
 msgid "Use_rname:"
 msgstr "Gebruike_rsnaam:"
 
@@ -13576,6 +13623,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop standaard"
 
@@ -13594,6 +13646,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -14128,7 +14188,7 @@ msgstr "geen"
 msgid "Small"
 msgstr "Klein"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Kleinere versies van de standaard emoticons"
 
 msgid "Response Probability:"
@@ -15184,6 +15244,9 @@ msgstr "A_pparaat"
 msgid "Voice/Video Settings"
 msgstr "Voice/Video Instellingen"
 
+msgid "Voice and Video Settings"
+msgstr "Voice en Video Instellingen"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15314,7 +15377,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Deze plug-in is handig voor het fouten oplossen van XMPP servers of cliënten."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15462,6 +15525,24 @@ msgstr "Neem een kijkje op de Pidgin webpagina"
 msgid "You do not have permission to uninstall this application."
 msgstr "U mag dit programma niet verwijderen."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr ""
+#~ "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS Vereist"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Oude SSL (poort 5223) forceren"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Vriend zoeken via informatie"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "De naam die u invoerde is ongeldig."
 
diff --git a/po/nn.po b/po/nn.po
index 104192cb46..25511351af 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
-"PO-Revision-Date: 2010-08-01 22:11+0200\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-11 01:26+0100\n"
 "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
 "Language-Team: Norwegian Nynorsk <l10n@landro.net>\n"
 "Language: nn\n"
@@ -523,7 +523,6 @@ msgstr "Stadfest sertifikatslettinga"
 msgid "Certificate Manager"
 msgstr "Sertifikatbehandling"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Vertsnamn"
 
@@ -797,7 +796,7 @@ msgstr "Stopp"
 msgid "Waiting for transfer to begin"
 msgstr "Ventar på at overføringa skal begynna"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbroten"
 
 msgid "Failed"
@@ -1700,8 +1699,12 @@ msgstr ""
 "Sertifikatet er enno ikkje gyldig. Sjå til at tenaren nyttar rette dato- og "
 "tidsinnstillingar."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Sertifikatet har gått ut og kan ikkje reknast for å vera gyldig."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Sertifikatet er utgått og bør ikkje reknast for å vera gyldig. Sjå til at "
+"datamaskina di nyttar rett dato- og tid."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4722,11 +4725,18 @@ msgstr "XMPP-protokolltillegg"
 msgid "Domain"
 msgstr "Domene"
 
-msgid "Require SSL/TLS"
-msgstr "Krev SSL/TLS"
+msgid "Require encryption"
+msgstr "Krev kryptering"
+
+# 20101010 ylan meiner "mogleg" er betre enn "tilgjengeleg"
+msgid "Use encryption if available"
+msgstr "Bruk kryptering om mogleg"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Overstyr med gammal SSL (port 5223)"
+msgid "Use old-style SSL"
+msgstr "Bruk gammal SSL-stil"
+
+msgid "Connection security"
+msgstr "Sambandstryggleik"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillat autentisering i klartekst over ukrypterte samband"
@@ -6855,6 +6865,15 @@ msgstr "Tenaradresse"
 msgid "Server port"
 msgstr "Tenarport"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Om du godtek meg, kan eg leggja deg til i vennelista mi."
+
+msgid "No reason given."
+msgstr "Ingen årsak oppgjeven."
+
+msgid "Authorization Denied Message:"
+msgstr "Avvist godkjenning:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Fekk uventa svar frå %s: %s"
@@ -6890,6 +6909,24 @@ msgstr "AOL tillèt ikkje at brukarnamnet ditt kan autentiserast her"
 msgid "Error requesting %s"
 msgstr "Klarte ikkje å spørja etter %s"
 
+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 ""
+"(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du "
+"pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han "
+"nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
+
+#, 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 ""
+"(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald "
+"ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
+
 msgid "Could not join chat room"
 msgstr "Klarte ikkje å bli med i praterommet"
 
@@ -7105,94 +7142,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fila %s er %s, noko som er større enn høgste storleik av %s."
 
-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 ""
-"(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du "
-"pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han "
-"nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
-
-#, 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 ""
-"(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald "
-"ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Venneikon"
-
-msgid "Voice"
-msgstr "Stemme"
-
-msgid "AIM Direct IM"
-msgstr "AIM direktelynmelding"
-
-msgid "Get File"
-msgstr "Hent fil"
-
-msgid "Games"
-msgstr "Spel"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Tillegg"
-
-msgid "Send Buddy List"
-msgstr "Send vennelista"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktetilkopling"
-
-msgid "AP User"
-msgstr "AP-brukar"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ tenarvidaresending"
-
-msgid "Old ICQ UTF8"
-msgstr "Gammal ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian-kryptiering"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Tryggleik er slått på"
-
-msgid "Video Chat"
-msgstr "Videoprat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Sanntidsvideo"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Skjermdeling"
-
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
@@ -7223,15 +7172,6 @@ msgstr "PÃ¥ arbeid"
 msgid "At lunch"
 msgstr "Er til lunsj"
 
-msgid "IP Address"
-msgstr "IP-adresse"
-
-msgid "Warning Level"
-msgstr "Åtvaringsnivå"
-
-msgid "Buddy Comment"
-msgstr "Vennenotat"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Klarte ikkje å kopla opp mot autentiseringstenaren: %s"
@@ -7326,15 +7266,6 @@ msgstr "Passordet er sendt"
 msgid "Unable to initialize connection"
 msgstr "Klarte ikkje å setja i gang sambandet"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Om du godtek meg, kan eg leggja deg til i vennelista mi."
-
-msgid "No reason given."
-msgstr "Ingen årsak oppgjeven."
-
-msgid "Authorization Denied Message:"
-msgstr "Avvist godkjenning:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7450,60 +7381,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du fekk ikkje %hu melding frå %s av uviss årsak."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s av uviss årsak."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
-
-msgid "Online Since"
-msgstr "Tilkopla sidan"
-
-msgid "Member Since"
-msgstr "Medlem sidan"
-
-msgid "Capabilities"
-msgstr "Evner"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
-"teikn.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du er blitt fråkopla praterommet %s."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Personelg nettside"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Tilleggsinformasjon"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Arbeidsinformasjon"
-
-msgid "Division"
-msgstr "Avdeling"
-
-msgid "Position"
-msgstr "Stilling"
-
-msgid "Web Page"
-msgstr "Nettside"
-
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
@@ -7781,8 +7665,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>du ventar ikkje på godkjenning</i>"
+msgid "you are not waiting for authorization"
+msgstr "du ventar ikkje på godkjenning"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du ventar på godkjenning frå desse vennene"
@@ -7820,6 +7704,14 @@ msgstr "Innstillingar for vidaresending (nett)"
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vis venne_liste"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invitasjonsliste"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Stadfest konto"
@@ -7836,9 +7728,6 @@ msgstr "Vis venner som ventar på godkjenning"
 msgid "Search for Buddy by Email Address..."
 msgstr "Finn venn utfrå e-postadressa…"
 
-msgid "Search for Buddy by Information"
-msgstr "Søk etter venn utfrå opplysningar"
-
 msgid "Use clientLogin"
 msgstr "Bruk klientpålogging"
 
@@ -7947,6 +7836,166 @@ msgstr "Køen er full"
 msgid "Not while on AOL"
 msgstr "Ikkje når pålogga AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Venneikon"
+
+msgid "Voice"
+msgstr "Stemme"
+
+msgid "AIM Direct IM"
+msgstr "AIM direktelynmelding"
+
+msgid "Get File"
+msgstr "Hent fil"
+
+msgid "Games"
+msgstr "Spel"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Tillegg"
+
+msgid "Send Buddy List"
+msgstr "Send vennelista"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktetilkopling"
+
+msgid "AP User"
+msgstr "AP-brukar"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ tenarvidaresending"
+
+msgid "Old ICQ UTF8"
+msgstr "Gammal ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-kryptiering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Tryggleik er slått på"
+
+msgid "Video Chat"
+msgstr "Videoprat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Sanntidsvideo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skjermdeling"
+
+msgid "IP Address"
+msgstr "IP-adresse"
+
+msgid "Warning Level"
+msgstr "Åtvaringsnivå"
+
+msgid "Buddy Comment"
+msgstr "Vennenotat"
+
+# 20101010 ylan meiner "mogleg" er betre enn "tilgjengeleg"
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Bruk kryptering om mogleg"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Personelg nettside"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Tilleggsinformasjon"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Arbeidsinformasjon"
+
+msgid "Division"
+msgstr "Avdeling"
+
+msgid "Position"
+msgstr "Stilling"
+
+msgid "Web Page"
+msgstr "Nettside"
+
+msgid "Online Since"
+msgstr "Tilkopla sidan"
+
+msgid "Member Since"
+msgstr "Medlem sidan"
+
+msgid "Capabilities"
+msgstr "Evner"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Framstå som tilkopla"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Framstå som tilkopla"
+
+msgid "Appear Offline"
+msgstr "Verkar vera fråkopla"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Verkar vera fråkopla"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du er blitt sparka ut frå denne MultiMX-en."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan be om godkjenning frå desse vennene igjen ved å høgreklikka dei og "
+"velja \"Spør om ny godkjenning.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synleg"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invitasjonsliste"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vassmannen"
 
@@ -8126,8 +8175,8 @@ msgid "Your request was rejected."
 msgstr "Førespurnaden din blei avvist."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u krev stadfesting"
+msgid "%u requires verification: %s"
+msgstr "%u krev stadfesting: %s"
 
 msgid "Add buddy question"
 msgstr "Legg til vennespørsmål"
@@ -10347,18 +10396,12 @@ msgstr "Ute eit bel"
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-msgid "Appear Online"
-msgstr "Framstå som tilkopla"
-
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
 msgid "Presence"
 msgstr "Nærvær"
 
-msgid "Appear Offline"
-msgstr "Verkar vera fråkopla"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
@@ -10903,27 +10946,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Sambandet avbrote av annan programvare på datamaskina di."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjerntenaren kopla ned sambandet."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Tidsavbrot på sambandet."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Tilkoplinga blei avvist."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adressa er allereie i bruk."
 
@@ -11073,6 +11111,10 @@ msgstr ""
 "Du kan koma attende til dette vindauget for å leggja til, endra eller fjerna "
 "kontoar frå <b>Kontoar->Kontobehandling</b> i vennelistevindauget"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ønskjer å leggja deg (%s) til i vennelista si %s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
@@ -11328,6 +11370,8 @@ msgstr "Melding (valfri)"
 msgid "Edit User Mood"
 msgstr "Endra brukarsinnsstemninga"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Venner"
@@ -12075,9 +12119,6 @@ msgstr "brukarstøtte"
 msgid "webmaster"
 msgstr "nettansvarleg"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior bidragsytar/KS"
-
 msgid "win32 port"
 msgstr "win32-port"
 
@@ -12103,6 +12144,9 @@ msgstr "opprinneleg laga av"
 msgid "lead developer"
 msgstr "sjefsutviklar"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior bidragsytar/KS"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13453,6 +13497,9 @@ msgstr "Vidaresendingstenar (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-tenar:"
 
+msgid "_UDP Port:"
+msgstr "_UDP-port:"
+
 msgid "Use_rname:"
 msgstr "_Brukarnamn:"
 
@@ -13474,6 +13521,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Skrivebordsstandard"
 
@@ -13492,6 +13544,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Sjølvvald"
 
@@ -14024,7 +14084,7 @@ msgstr "ingen"
 msgid "Small"
 msgstr "Liten"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre utgåver av standard smilefjes"
 
 msgid "Response Probability:"
@@ -15052,6 +15112,9 @@ msgstr "_Eining"
 msgid "Voice/Video Settings"
 msgstr "Lyd-/videoinnstillingar"
 
+msgid "Voice and Video Settings"
+msgstr "Lyd- og videoinnstillingar"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15180,7 +15243,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15323,6 +15386,25 @@ msgstr "Besøk Pidgin sin nettstad"
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikkje rettar til å avinstallera dette programmet."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Sertifikatet har gått ut og kan ikkje reknast for å vera gyldig."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Krev SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Overstyr med gammal SSL (port 5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
+#~ "teikn.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Søk etter venn utfrå opplysningar"
+
 #~ msgid "The nick name you entered is invalid."
 #~ msgstr "Kallenamnet du skreiv er ugyldig."
 
diff --git a/po/oc.po b/po/oc.po
index ad939c9540..8792998c3b 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2008-05-09 01:31+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -505,7 +505,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nom d'òste"
 
@@ -754,7 +753,7 @@ msgstr "Arrestar"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anullat"
 
 msgid "Failed"
@@ -1617,7 +1616,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4495,12 +4496,19 @@ msgstr ""
 msgid "Domain"
 msgstr "Domeni"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Connexion perduda"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5698,7 +5706,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr "Los mots de pas son pas los meteisses."
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5791,9 +5799,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connexion"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6633,6 +6638,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6664,6 +6678,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6886,90 +6913,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr "Votz"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr "Jòcs"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr "Aparelh de fotografiar"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nom d'utilisateur"
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7004,15 +6947,6 @@ msgstr "Ret"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr "Adreça IP"
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7099,15 +7033,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7201,58 +7126,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "Telefòn mobil"
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Entresenhas suplementàrias"
-
-msgid "Zip Code"
-msgstr "Còdi postal"
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Posicion"
-
-msgid "Web Page"
-msgstr "Pagina web"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7492,7 +7372,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7529,6 +7409,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Tièra de contactes"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invisible"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7545,9 +7433,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7650,6 +7535,161 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr "Votz"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "Jòcs"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr "Aparelh de fotografiar"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nom d'utilisateur"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Telefòn mobil"
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Entresenhas suplementàrias"
+
+msgid "Zip Code"
+msgstr "Còdi postal"
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Posicion"
+
+msgid "Web Page"
+msgstr "Pagina web"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invisible"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7846,7 +7886,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -9967,18 +10007,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr "Preséncia"
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10498,27 +10532,22 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr ""
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Connectat"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connectat"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10656,6 +10685,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color de fons"
@@ -10915,6 +10948,8 @@ msgstr "Messatge"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -11655,9 +11690,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11683,6 +11715,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -12995,6 +13030,10 @@ msgid "_TURN server:"
 msgstr "_Servidor :"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Pòrt :"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Nom d'utilizaire :"
 
@@ -13017,6 +13056,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -13035,6 +13079,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -13568,7 +13620,7 @@ msgstr "pas cap"
 msgid "Small"
 msgstr "Corrièl"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14576,6 +14628,9 @@ msgstr "Periferic"
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14697,7 +14752,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -14891,9 +14946,6 @@ msgstr ""
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
 
-#~ msgid "Connection lost"
-#~ msgstr "Connexion perduda"
-
 #, fuzzy
 #~ msgid "Incorrect Password"
 #~ msgstr "Picatz lo mot de pas"
diff --git a/po/or.po b/po/or.po
index 9cd168bf55..481e944309 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-03-05 12:37+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
@@ -536,7 +536,6 @@ msgstr "ପà­�ରମାଣପତà­�ର ଅପସାରଣକà­� ନିଶà­�ଚà
 msgid "Certificate Manager"
 msgstr "ପ�ରମାଣପତ�ର ପରିଚାଳକ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ଆଧାର ନାମ"
 
@@ -799,7 +798,7 @@ msgstr "ବନ�ଦକର"
 msgid "Waiting for transfer to begin"
 msgstr "ସ�ଥାନାନ�ତରଣ ଆରମ�ଭ ହେବାକ� ଅପେକ�ଷା କର�ଛି"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ବାତିଲ କରାଗଲା"
 
 msgid "Failed"
@@ -1684,7 +1683,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "ପ�ରମାଣପତ�ରର ସମୟ ସମାପ�ତ ହୋଇଛି �ବଂ �ହାକ� ବୈଧ ଭାବରେ ଗ�ରହଣ କରିବା ଉଚିତ ନ�ହ�।"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4673,11 +4675,20 @@ msgstr "XMPPପ�ରୋଟୋକଲ� ପ�ଲଗ�ଇନ"
 msgid "Domain"
 msgstr "ପରିସର"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS ଆବଶ�ୟକ"
+#, fuzzy
+msgid "Require encryption"
+msgstr "ପ�ରାଧିକାର ଅର�ପଣ ଆବଶ�ଯକ କରେ"
 
-msgid "Force old (port 5223) SSL"
-msgstr "ବାଧ�ଯକର ପ�ର�ଣା (ପୋର�ଟ 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ଉପୟୋଗକର�ତ�ତା ସୂଚନା ଉପଲବ�ଧ ନାହି� : %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "ସଂୟୋଗ ସମଯ ବିତିୟାଇଛି"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ଅନଇନକ�ରିପଟେଡ ସ�ରୋତ ପରିବର�ତ�ତରେ ସରଳ ଟେକ�ସଟ ସ�ବୀକୃତ କର"
@@ -5865,7 +5876,8 @@ msgstr "ସେହି PIN ଟି ଅବୈଧ ଅଟେ। �ହା କେବଳ
 msgid "The two PINs you entered do not match."
 msgstr "ଆପଣ ଭରଣ କରିଥିବା ଦ�ଇଟି PINs ମେଳଖାଉନାହି�।"
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "ଆପଣ ଭରଣ କରିଥିବା ନାମଟି ଅବୈଧ ଅଟେ।"
 
 msgid ""
@@ -5954,10 +5966,6 @@ msgstr "MXit ସରà­�ଭର ସହିତ ସଂଯà­�କà­�ତ ହେବାରà
 msgid "Connecting..."
 msgstr "ସଂଯୋଗ କର�ଅଛି..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "ଆପଣ ଭରଣ କରିଥିବା ନାମଟି ଅବୈଧ ଅଟେ।"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ଆପଣ ଭରଣ କରିଥିବା PIN ଟି ଅବୈଧ ଲମ�ବ ବିଶିଷ�ଟ [7-10]."
 
@@ -6802,6 +6810,15 @@ msgstr "ସରଭର ଠିକଣା"
 msgid "Server port"
 msgstr "ସରଭର ପୋର�ଟ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ଦଯାକରି ମତେ ଅଧିକାର ଦିଅନ�ତ�  କି ୟେ ମ�� ଆପଣଙ�କ� ମୋ ବନ�ଧ� ତାଲିକାରେ ୟୋଗ କରିପାରିବି୤"
+
+msgid "No reason given."
+msgstr "କୌଣସି କାରଣ ଦିଆୟାଇ ନାହି�୤"
+
+msgid "Authorization Denied Message:"
+msgstr "ଅଧିକାର ଅସ�ବୀକୃତି ସଂଦେଶ:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s ର� ଅପ�ରତ�ୟାଶିତ ଉତ�ତର ଗ�ରହଣ କରିଅଛି: %s"
@@ -6837,6 +6854,24 @@ msgstr "à¬�ଠାରେ ବୈଧିକୃତ ହେବା ପାଇà¬� AOL ଆà
 msgid "Error requesting %s"
 msgstr "%s କ� ଅନ�ରୋଧ କରିବାରେ ତ�ର�ଟି: %s"
 
+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 ଆକାଉଣ�ଟରେ ନିର�ଦ�ଦିଷ�ଟ କରିପାରିବେ ୤)"
+
+#, 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 ର �କ ବଗି ଗ�ରାହକ ଅଛି। )"
+
 msgid "Could not join chat room"
 msgstr "ଚାର�ଟ କୋଠରୀରେ ଯୋଗଦାନ କରିପାରିଲା ନାହି�"
 
@@ -7050,94 +7085,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ଫାଇଲ� %s ହେଉଛି %s, ୟାହା  %s ର ସର�ବାଧିକ ଆକାର ଠାର� ବଡ "
 
-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 ଆକାଉଣ�ଟରେ ନିର�ଦ�ଦିଷ�ଟ କରିପାରିବେ ୤)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "ବନ�ଧ� ଆଇକନ"
-
-msgid "Voice"
-msgstr "ବଚନ"
-
-msgid "AIM Direct IM"
-msgstr "AIM ସିଧା IM"
-
-msgid "Get File"
-msgstr "ଫାଇଲ ପ�ରାପ�ତ କର"
-
-msgid "Games"
-msgstr "ଖେଳ"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "ଭିତରେ- ୟୋଗ କର"
-
-msgid "Send Buddy List"
-msgstr "ବନ�ଧ� ତାଲିକା ପଠାଅ"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ ସିଧା ସଂୟୋଗ"
-
-msgid "AP User"
-msgstr "AP ଉପୟୋଗକର�ତ�ତା"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "ନିହିତାଲିକା"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ ସରଭର ରିଲେ"
-
-msgid "Old ICQ UTF8"
-msgstr "ପ�ର�ଣା ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ଟ�ରିଲିଅନ �ନ�କ�ରିପଟ�"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "ହିପଟପ"
-
-msgid "Security Enabled"
-msgstr "ସ�ରକ�ଷା ସକ�ଷମ କରାୟାଇଛି"
-
-msgid "Video Chat"
-msgstr "ଭିଡିଓ ଗପସପ"
-
-msgid "iChat AV"
-msgstr "iଚାଟ AV"
-
-msgid "Live Video"
-msgstr "ପ�ରତ�ଯକ�ଷ ଭିଡିଓ"
-
-msgid "Camera"
-msgstr "କ�ଯାମେରା"
-
-msgid "Screen Sharing"
-msgstr "ପରଦା ସହଭାଗ"
-
 msgid "Free For Chat"
 msgstr "ଚାଟ ପାଇ� ମ�କ�ତ"
 
@@ -7168,15 +7115,6 @@ msgstr "କାର�ଯ�ୟାଳୟରେ ଅଛି"
 msgid "At lunch"
 msgstr "ମଧ�ଯାହ�ନଭୋଜନ କର�ଅଛି"
 
-msgid "IP Address"
-msgstr "ଆଇ.ପି. ଠିକଣା"
-
-msgid "Warning Level"
-msgstr "ଚେତାବନୀ ସ�ତର"
-
-msgid "Buddy Comment"
-msgstr "ବନ�ଧ� ମନ�ତବ�ଯ"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ବୈଧିକରଣ ସର�ଭର ସହିତ ସଂଯୋଗ ହେବାରେ ଅସମର�ଥ: %s"
@@ -7272,15 +7210,6 @@ msgstr "ଗ�ପ�ତଶବ�ଦ ପଠାଗଲା"
 msgid "Unable to initialize connection"
 msgstr "ସଂୟୋଗ ଆରମ�ଭ କରିବା ପାଇ� ଅସମର�ଥ ।"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "ଦଯାକରି ମତେ ଅଧିକାର ଦିଅନ�ତ�  କି ୟେ ମ�� ଆପଣଙ�କ� ମୋ ବନ�ଧ� ତାଲିକାରେ ୟୋଗ କରିପାରିବି୤"
-
-msgid "No reason given."
-msgstr "କୌଣସି କାରଣ ଦିଆୟାଇ ନାହି�୤"
-
-msgid "Authorization Denied Message:"
-msgstr "ଅଧିକାର ଅସ�ବୀକୃତି ସଂଦେଶ:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7390,59 +7319,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ଆପଣ �କ ଅଜ�ଞାତ କାରଣ ପାଇ� %hu ସଂଦେଶକ� %sଠାର� ହରାଇଲ।"
 msgstr[1] "ଆପଣ �କ ଅଜ�ଞାତ କାରଣ ପାଇ� %hu ସଂଦେଶଗ�ଡ଼ିକ� %sଠାର� ହରାଇଲ।"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ଉପୟୋଗକର�ତ�ତା ସୂଚନା ଉପଲବ�ଧ ନାହି� : %s"
-
-msgid "Online Since"
-msgstr "�ପର�ୟ�ଯନ�ତ  ଅନଲାଇନ�"
-
-msgid "Member Since"
-msgstr "�ପର�ୟ�ଯନ�ତ ସଦସ�ଯ"
-
-msgid "Capabilities"
-msgstr "ୟୋଗ�ଯତା"
-
 msgid "Your AIM connection may be lost."
 msgstr "ଆପଣଙ�କର AIM ସଂୟୋଗ ହ��ତ ନଷ�ଟ ହେଇପାରେ୤"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[�ହି ଉପୟୋଗକର�ତ�ତାଙ�କ �କ ସଂଦେଶ ପ�ରଦର�ଶିତ କରିବାକ� ଅସମର�ଥ କାରଣ �ଥିରେ ଅମାନ�ଯ ଅକ�ଷର ଥିଲା ୤]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr " ଚାଟ ର�ମର� %s ଆପଣଙ�କର ସଂୟୋଗ ଛିନ�ନ କରାୟାଇଛି୤"
 
-msgid "Mobile Phone"
-msgstr "ମୋବାଇଲ ଫୋନ"
-
-msgid "Personal Web Page"
-msgstr "ବ�ଯକ�ତିଗତ ଉ�ବ� ପୃଷ�ଠା"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "ଅତିରିକ�ତ ସୂଚନା"
-
-msgid "Zip Code"
-msgstr "Zip କୋଡ"
-
-msgid "Work Information"
-msgstr "କାର�ୟ�ଯ ସୂଚନା"
-
-msgid "Division"
-msgstr "ବିଭାଜନ"
-
-msgid "Position"
-msgstr "ସ�ଥାନ"
-
-msgid "Web Page"
-msgstr "ୱେବ ପ�ର�ଷ�ଠା"
-
 msgid "Pop-Up Message"
 msgstr "ପପ�-ଅପ� ସଂଦେଶ"
 
@@ -7707,7 +7590,8 @@ msgstr "ଚାଳକନାମ ସଜ�ଜିକରଣ କେବଳ �କତ�
 msgid "Change Address To:"
 msgstr "ଠିକଣାକ� ପରିବର�ତ�ତନ କର:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ଆପଣ ଅଧିକାର ପାଇ� ଅପେକ�ଷା କର� ନାହା�ନ�ତି</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7746,6 +7630,14 @@ msgstr "IM ଅଗà­�ରସରକà­� ବିନà­�ୟାସ କରନà­�ତà­� (à­
 msgid "Set Privacy Options..."
 msgstr "ଗୋପନୀଯତା ବିକଳ�ପଗ�ଡିକ ସେଟ କର ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ସାଥୀ ତାଲିକା ଦର�ଶାନ�ତ� (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ତାଲିକା ନିମଂତ�ରିତ କର"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ଆକାଉଣ�ଟ ନିଶ�ଚିତ କର"
@@ -7762,9 +7654,6 @@ msgstr "ଅଧିକାର ଅପେକ�ଷା କର�ଥିବା ବନ�
 msgid "Search for Buddy by Email Address..."
 msgstr "ଇମେଲ ଠିକଣା ମାଧ�ଯମରେ ସାଥୀ ପାଇ� ସନ�ଧାନ କରନ�ତ�..."
 
-msgid "Search for Buddy by Information"
-msgstr "ସୂଚନା ଦ�ବାରା ବନ�ଧ� ପାଇ� ତଦନ�ତ କର"
-
 msgid "Use clientLogin"
 msgstr "clientLogin କ� ବ�ୟବହାର କରନ�ତ�"
 
@@ -7872,6 +7761,165 @@ msgstr "ଧାଡି ପୂର�ଣ�ଣ "
 msgid "Not while on AOL"
 msgstr "AOL ରେ ନ ଥିଲାବେଳେ"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ବନ�ଧ� ଆଇକନ"
+
+msgid "Voice"
+msgstr "ବଚନ"
+
+msgid "AIM Direct IM"
+msgstr "AIM ସିଧା IM"
+
+msgid "Get File"
+msgstr "ଫାଇଲ ପ�ରାପ�ତ କର"
+
+msgid "Games"
+msgstr "ଖେଳ"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ଭିତରେ- ୟୋଗ କର"
+
+msgid "Send Buddy List"
+msgstr "ବନ�ଧ� ତାଲିକା ପଠାଅ"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ସିଧା ସଂୟୋଗ"
+
+msgid "AP User"
+msgstr "AP ଉପୟୋଗକର�ତ�ତା"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "ନିହିତାଲିକା"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ ସରଭର ରିଲେ"
+
+msgid "Old ICQ UTF8"
+msgstr "ପ�ର�ଣା ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ଟ�ରିଲିଅନ �ନ�କ�ରିପଟ�"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ହିପଟପ"
+
+msgid "Security Enabled"
+msgstr "ସ�ରକ�ଷା ସକ�ଷମ କରାୟାଇଛି"
+
+msgid "Video Chat"
+msgstr "ଭିଡିଓ ଗପସପ"
+
+msgid "iChat AV"
+msgstr "iଚାଟ AV"
+
+msgid "Live Video"
+msgstr "ପ�ରତ�ଯକ�ଷ ଭିଡିଓ"
+
+msgid "Camera"
+msgstr "କ�ଯାମେରା"
+
+msgid "Screen Sharing"
+msgstr "ପରଦା ସହଭାଗ"
+
+msgid "IP Address"
+msgstr "ଆଇ.ପି. ଠିକଣା"
+
+msgid "Warning Level"
+msgstr "ଚେତାବନୀ ସ�ତର"
+
+msgid "Buddy Comment"
+msgstr "ବନ�ଧ� ମନ�ତବ�ଯ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ଉପୟୋଗକର�ତ�ତା ସୂଚନା ଉପଲବ�ଧ ନାହି� : %s"
+
+msgid "Mobile Phone"
+msgstr "ମୋବାଇଲ ଫୋନ"
+
+msgid "Personal Web Page"
+msgstr "ବ�ଯକ�ତିଗତ ଉ�ବ� ପୃଷ�ଠା"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "ଅତିରିକ�ତ ସୂଚନା"
+
+msgid "Zip Code"
+msgstr "Zip କୋଡ"
+
+msgid "Work Information"
+msgstr "କାର�ୟ�ଯ ସୂଚନା"
+
+msgid "Division"
+msgstr "ବିଭାଜନ"
+
+msgid "Position"
+msgstr "ସ�ଥାନ"
+
+msgid "Web Page"
+msgstr "ୱେବ ପ�ର�ଷ�ଠା"
+
+msgid "Online Since"
+msgstr "�ପର�ୟ�ଯନ�ତ  ଅନଲାଇନ�"
+
+msgid "Member Since"
+msgstr "�ପର�ୟ�ଯନ�ତ ସଦସ�ଯ"
+
+msgid "Capabilities"
+msgstr "ୟୋଗ�ଯତା"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ଅନ-ଲାଇନ ଦୃଶ�ଯ ହ�ଅ"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ଅନ-ଲାଇନ ଦୃଶ�ଯ ହ�ଅ"
+
+msgid "Appear Offline"
+msgstr "ଅଫ-ଲାଇନ� ଦେଖାଅ "
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ଅଫ-ଲାଇନ� ଦେଖାଅ "
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ଆପଣଙ�କ� ବାହାର କରିଦିଆଯାଇଛି: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"�ହି ବନ�ଧ� ଗ�ଡିକ ଉପରେ ଡାହାଣ-କ�ଳିକ� କରି �ବଂ \"ଅଧିକାର ପାଇ� ପ�ନଃ-ଅନ�ରୋଧ।\"କ� ମନୋନୀତ କରି ତ�ମେ "
+"ଅଧିକାର ପାଇ� ପ�ନଃ-ଅନ�ରୋଧ କରିପାର "
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ଦୃଶ�ଯମାନ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ତାଲିକା ନିମଂତ�ରିତ କର"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "କ�ମ�ଭ"
 
@@ -8050,8 +8098,8 @@ msgstr "ଆପଣଙ�କର ଅନ�ରୋଧକ� ଗ�ରହଣ କରା
 msgid "Your request was rejected."
 msgstr "ଆପଣଙ�କର ଅନ�ରୋଧକ� ପରିତ�ୟାଗ କରାଯାଇଛି।"
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u ଯାଞ�ଚ ଆବଶ�ୟକ କରିଥା�"
 
 msgid "Add buddy question"
@@ -10239,18 +10287,12 @@ msgstr "ବାହାରକ� ୟାଇଛନ�ତି"
 msgid "Not on server list"
 msgstr "ସରବର ତାଲିକାରେ ନାହା�ନ�ତି"
 
-msgid "Appear Online"
-msgstr "ଅନ-ଲାଇନ ଦୃଶ�ଯ ହ�ଅ"
-
 msgid "Appear Permanently Offline"
 msgstr "ସ�ଥାଯୀ ଭାବରେ ଅଫ-ଲାଇନ ଦୃଶ�ଯ ହ�ଅ"
 
 msgid "Presence"
 msgstr "ଉପସ�ଥିତି"
 
-msgid "Appear Offline"
-msgstr "ଅଫ-ଲାଇନ� ଦେଖାଅ "
-
 msgid "Don't Appear Permanently Offline"
 msgstr "ସ�ଥାଯୀଭବରେ ଅଫ-ଲାଇନ ଦୃଶ�ଯ ହ�ଅ ନାହି�"
 
@@ -10783,27 +10825,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "ଆପଣଙ�କ କମ�ପ�ଟରରେ ଅନ�ୟାନ�ୟ ସଫ�ଟୱେର ଦ�ୱାରା ସଂଯୋଗ ବାଧାପ�ରାପ�ତ ହୋଇଛି।"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "ସ�ଦୂର ହୋଷ�ଟ ସଂଯୋଗ ବିଚ�ଛିନ�ନ କରିଛି।"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "ସଂଯୋଗ ସମୟ ସମାପ�ତ।"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "ସଂଯୋଗ ବାରଣ ହୋଇଛି।"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "ଠିକଣାଟି ପୂର�ବର� ବ�ୟବହାରରେ ଅଛି।"
 
@@ -10952,6 +10989,10 @@ msgstr ""
 "ସାଥୀ ତାଲିକା ୱିଣ�ଡୋରେ <b>Accounts->Manage Accounts</b> ଯୋଗ କରିବା, ସମ�ପାଦନ କରିବା, "
 "ଅଥବା ବାହାର କରିବା ପାଇ� ଆପଣ �ହି ୱିଣ�ଡୋକ� ଫେରି ପାରିବେ"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ତା ବନ�ଧ� ତାଲିକା %s %sରେ %s ୟୋଗ କରିବାକ� ଚାହେ�"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "ପୃଷ�ଠଭୂମି ରଙ�ଗ"
@@ -11206,6 +11247,8 @@ msgstr "ଉପନାମ (ବୈକଳ�ପିକ)"
 msgid "Edit User Mood"
 msgstr "ଚାଳକ ଭାବନାକ� ସମ�ପାଦନ କରନ�ତ�"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_ ବନ�ଧ�ଗଣ"
@@ -11950,9 +11993,6 @@ msgstr "ସମର�ଥନ"
 msgid "webmaster"
 msgstr "ୱେବ ପ�ରମୂଖ"
 
-msgid "Senior Contributor/QA"
-msgstr "ମୂଖ�ୟ ସହଯୋଗୀ/QA"
-
 msgid "win32 port"
 msgstr "ବିନ32 ପୋର�ଟ "
 
@@ -11978,6 +12018,9 @@ msgstr "ମୂଳ ରଚଯିତା"
 msgid "lead developer"
 msgstr "ମୂଖ�ଯ ବିକାଶକର�ତ�ତା "
 
+msgid "Senior Contributor/QA"
+msgstr "ମୂଖ�ୟ ସହଯୋଗୀ/QA"
+
 msgid "Afrikaans"
 msgstr "ଆଫ�ରିକାନ"
 
@@ -13310,6 +13353,10 @@ msgstr "ରିଲେ ସର�ଭର (TURN)"
 msgid "_TURN server:"
 msgstr "TURN ସର�ଭର (_T):"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "ସଂଯୋଗିକୀ (_P):"
+
 msgid "Use_rname:"
 msgstr "ଚାଳକନାମ (_r):"
 
@@ -13331,6 +13378,11 @@ msgstr "ମୋଜିଲା"
 msgid "Konqueror"
 msgstr "କଙ�କରର"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ଡେସ�କଟପ ପୂର�ବନିର�ଦ�ଧାରିତ"
 
@@ -13349,6 +13401,14 @@ msgstr "ଫାଯାରବର�ଡ"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ପ�ସ�ତିକା"
 
@@ -13880,7 +13940,8 @@ msgstr "କିଛି ନ�ହେ�"
 msgid "Small"
 msgstr "ଛୋଟ"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ପୂର�ବନିର�ଦ�ଧାରିତ smilies ର ଛୋଟ ସଂସ�କରଣ"
 
 msgid "Response Probability:"
@@ -14904,6 +14965,10 @@ msgstr "ଉପକରଣ (_e)"
 msgid "Voice/Video Settings"
 msgstr "ସ�ୱର/ଭିଡିଓ ସଂରଚନାଗ�ଡ଼ିକ"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ସ�ୱର/ଭିଡିଓ ସଂରଚନାଗ�ଡ଼ିକ"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15030,7 +15095,7 @@ msgstr "ଅପà­�ରସà­�ତà­�ତ XMPP ପଦଗà­�ଡିକà­� ପଠାନà­
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "�ହି ପ�ଲଗଇନ XMPP ସର�ଭରଗ�ଡିକ� କିମ�ବା ଗ�ରାହକଗ�ଡିକ� ତ�ର�ଟିନିବାରଣ କରିବା ପାଇ� ଉପଯୋଗୀ ହୋଇଥା�।"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15160,6 +15225,24 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS ଆବଶ�ୟକ"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ବାଧ�ଯକର ପ�ର�ଣା (ପୋର�ଟ 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ଆପଣ ଭରଣ କରିଥିବା ନାମଟି ଅବୈଧ ଅଟେ।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[�ହି ଉପୟୋଗକର�ତ�ତାଙ�କ �କ ସଂଦେଶ ପ�ରଦର�ଶିତ କରିବାକ� ଅସମର�ଥ କାରଣ �ଥିରେ ଅମାନ�ଯ ଅକ�ଷର ଥିଲା ୤]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ସୂଚନା ଦ�ବାରା ବନ�ଧ� ପାଇ� ତଦନ�ତ କର"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "ପ�ରମାଣପତ�ରଟି �ପର�ଯ�ୟନ�ତ ବୈଧ ହୌଇନାହି�।"
 
diff --git a/po/pa.po b/po/pa.po
index 03c23eedc4..eb22244ddb 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-08-08 07:23+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: testLokalize <punjabi-users@lists.sf.net>\n"
@@ -522,7 +522,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਹਟਾਉਣ ਪ�ਸ਼ਟੀ"
 msgid "Certificate Manager"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮੈਨੇਜਰ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ਹੋਸਟ ਨਾਂ"
 
@@ -784,7 +783,7 @@ msgstr "ਰੋਕੋ"
 msgid "Waiting for transfer to begin"
 msgstr "ਭੇਜਣ ਸ਼�ਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ਰੱਦ ਹੈ"
 
 msgid "Failed"
@@ -1662,8 +1661,11 @@ msgid ""
 "are accurate."
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹਾਲ ਲਾਗੂ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਕੰਪਿਊਟਰ ਦੀ ਮਿਤੀ ਤੇ ਸਮਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਕੀ ਇਹ ਠੀਕ ਹੈ।"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪ�ੱਗ ਚ�ੱਕੀ ਹੈ ਅਤੇ ਜਾਇਜ਼ ਨਹੀਂ ਮੰਨਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਹਾਲ ਲਾਗੂ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਕੰਪਿਊਟਰ ਦੀ ਮਿਤੀ ਤੇ ਸਮਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਕੀ ਇਹ ਠੀਕ ਹੈ।"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4645,11 +4647,20 @@ msgstr "XMPP ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS ਲੋੜੀਦੀ"
+#, fuzzy
+msgid "Require encryption"
+msgstr "ਪ�ਰਮਾਣਿਕਤਾ ਲੋੜੀਦੀ"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "ਫੋਰਸ ਪ�ਰਾਣਾ (ਪੋਰਟ 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "ਕ�ਨੈਕਸ਼ਨ ਮ�ੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ਅਣ-ਇੰਕ�ਰਿਪਟਡ ਸਟਰੀਮ ਉੱਤੇ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਿਕਤਾ ਮਨਜ਼ੂਰ"
@@ -6758,6 +6769,15 @@ msgstr "ਸਰਵਰ �ਡਰੈੱਸ"
 msgid "Server port"
 msgstr "ਸਰਵਰ ਪੋਰਟ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ਮੈਨੂੰ ਪ�ਰਮਾਣਿਤ ਕਰੋ ਜੀ ਤਾਂ ਕਿ ਮੈਂ ਤ�ਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਾਂ।"
+
+msgid "No reason given."
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
+
+msgid "Authorization Denied Message:"
+msgstr "ਪ�ਰਮਾਣਿਕਤਾ ਪਾਬੰਦੀ ਸ�ਨੇਹਾ:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s ਤੋਂ ਅਚਾਨਕ ਜਵਾਬ ਮਿਲਿਆ: %s"
@@ -6795,6 +6815,24 @@ msgstr "AOL ਤ�ਹਾਡੇ ਸਕਰੀਨ ਨਾਂ ਨੂੰ ਇੱਥੇ
 msgid "Error requesting %s"
 msgstr "%s ਮੰਗ ਦੌਰਾਨ ਗਲਤੀ"
 
+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 ਅਕਾਊਂਟ "
+"ਲਈ ਤਕਨੀਕੀ ਅਕਾਊਂਟ ਚੋਣਾਂ ਵਿੱਚ ਇਹ ਸੈੱਟ ਕਰੋ।)"
+
+#, 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 ਇੱਕ ਬੱਗੀ ਕਲਾਇਟ ਹੈ।)"
+
 msgid "Could not join chat room"
 msgstr "ਚੈਟ ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ ਜਾ ਸਕਿਆ"
 
@@ -7011,94 +7049,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s ਫਾਇਲ %s ਹੈ, ਜੋ ਕਿ ਵੱਧੋ-ਵੱਧ ਮਨਜ਼ੂਰ ਸਾਈਜ਼ %s ਤੋਂ ਵੱਡੀ ਹੈ।"
 
-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 ਅਕਾਊਂਟ "
-"ਲਈ ਤਕਨੀਕੀ ਅਕਾਊਂਟ ਚੋਣਾਂ ਵਿੱਚ ਇਹ ਸੈੱਟ ਕਰੋ।)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "ਬੱਡੀ ਆਈਕਾਨ"
-
-msgid "Voice"
-msgstr "ਆਵਾਜ਼"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "ਫਾਇਲ ਲਵੋ"
-
-msgid "Games"
-msgstr "ਖੇਡਾਂ"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "ਹੋਰ"
-
-msgid "Send Buddy List"
-msgstr "ਬੱਡੀ ਲਿਸਟ ਭੇਜੋ"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ ਸਿੱਧੀ ਕ�ਨੈਕਸ਼ਨ"
-
-msgid "AP User"
-msgstr "AP ਯੂਜ਼ਰ"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "ਪ�ਰਾਣਾ ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian ਇਕ�ਰਿਪਸ਼ਨ"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "ਸ�ਰੱਖਿਆ ਯੋਗ"
-
-msgid "Video Chat"
-msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "ਸਿੱਧੀ ਵੀਡਿਓ"
-
-msgid "Camera"
-msgstr "ਕੈਮਰਾ"
-
-msgid "Screen Sharing"
-msgstr "ਸਕਰੀਨ ਸਾਂ�ੀ"
-
 msgid "Free For Chat"
 msgstr "ਗੱਲਬਾਤ ਕਰਨ ਲਈ ਵੇਹਲਾ"
 
@@ -7129,15 +7079,6 @@ msgstr "ਕੰਮ ਉੱਤੇ"
 msgid "At lunch"
 msgstr "ਦ�ਪੈਹਰ ਦੇ ਖਾਣੇ ਲਈ"
 
-msgid "IP Address"
-msgstr "IP �ਡਰੈੱਸ"
-
-msgid "Warning Level"
-msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
-
-msgid "Buddy Comment"
-msgstr "ਸ�ਨੇਹੀ ਟਿੱਪਣੀ"
-
 # , c-format
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7234,15 +7175,6 @@ msgstr "ਪਾਸਵਰਡ ਭੇਜਿਆ"
 msgid "Unable to initialize connection"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਸ਼�ਰੂ ਲਈ ਅਸਫ਼ਲ।"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "ਮੈਨੂੰ ਪ�ਰਮਾਣਿਤ ਕਰੋ ਜੀ ਤਾਂ ਕਿ ਮੈਂ ਤ�ਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਾਂ।"
-
-msgid "No reason given."
-msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
-
-msgid "Authorization Denied Message:"
-msgstr "ਪ�ਰਮਾਣਿਕਤਾ ਪਾਬੰਦੀ ਸ�ਨੇਹਾ:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7350,58 +7282,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ਤ�ਸੀਂ %hu ਸ�ਨੇਹਾ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗ�ਆ ਲਿਆ ਹੈ।"
 msgstr[1] "ਤ�ਸੀਂ %hu ਸ�ਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗ�ਆ ਲਿਆ ਹੈ।"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
-
-msgid "Online Since"
-msgstr "ਆਨਲਾਈਨ ਹੈ"
-
-msgid "Member Since"
-msgstr "ਮੈਂਬਰ ਹੈ"
-
-msgid "Capabilities"
-msgstr "ਯੋਗਤਾ"
-
 msgid "Your AIM connection may be lost."
 msgstr "ਤ�ਹਾਡਾ AIM ਕ�ਨੈਕਸ਼ਨ ਟ�ੱਟ ਗਿਆ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[ਇਸ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤਾ ਸ�ਨੇਹਾ ਵੇਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਸ ਵਿੱਚ ਗਲਤ ਅੱਖਰ ਹਨ।]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ਤ�ਹਾਡਾ %s ਗੱਲਬਾਤ ਰੂਮ ਨਾਲ ਕ�ਨੈਕਸ਼ਨ ਟ�ੱਟ ਗਿਆ ਹੈ।"
 
-msgid "Mobile Phone"
-msgstr "ਮੋਬਾਇਲ ਫੋਨ"
-
-msgid "Personal Web Page"
-msgstr "ਨਿੱਜੀ ਵੈਬ ਸਫ਼ਾ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "ਹੋਰ ਜਾਣਕਾਰੀ"
-
-msgid "Zip Code"
-msgstr "ਡਾਕ ਕੋਡ"
-
-msgid "Work Information"
-msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
-
-msgid "Division"
-msgstr "ਭਾਗ"
-
-msgid "Position"
-msgstr "ਸਥਿਤੀ"
-
-msgid "Web Page"
-msgstr "ਵੈਬ ਸਫਾ"
-
 msgid "Pop-Up Message"
 msgstr "ਪੋਪਅੱਪ ਸ�ਨੇਹਾ"
 
@@ -7669,7 +7556,8 @@ msgstr "ਯੂਜ਼ਰ-ਨਾਂ ਫਾਰਮੈਟ ਵਿੱਚ ਵੱਡੇ à
 msgid "Change Address To:"
 msgstr "�ਡਰੈੱਸ ਬਦਲੋ:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ਤ�ਸੀਂ ਪ�ਰਮਾਣਿਕਤਾ ਦੀ ਉਡੀਕ ਨਹੀਂ ਕਰ ਰਹੇ ਹੋ</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7708,6 +7596,14 @@ msgstr "IM ਫਾਰਵਿਡਿੰਗ ਸੰਰਚਨਾ (ਵੈੱਬ)"
 msgid "Set Privacy Options..."
 msgstr "ਪਰਾਈਵੇਸੀ ਚੋਣਾਂ ਦਿਓ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਵੇਖੋ(_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ਸੱਦਾ ਲਿਸਟ"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ਅਕਾਊਂਟ ਪ�ਸ਼ਟੀ"
@@ -7724,9 +7620,6 @@ msgstr "ਪà©�ਰਮਾਣਿਕਤਾ ਦੀ ਉਡੀਕ ਵਿੱਚ ਬੱà¨
 msgid "Search for Buddy by Email Address..."
 msgstr "ਈ-ਮੇਲ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ..."
 
-msgid "Search for Buddy by Information"
-msgstr "ਜਾਣਕਾਰੀ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
-
 msgid "Use clientLogin"
 msgstr "ਕਲਾਇਟਲਾਗਇਨ ਵਰਤੋਂ"
 
@@ -7833,6 +7726,166 @@ msgstr "ਕਤਾਰ ਭਰੀ ਹੈ"
 msgid "Not while on AOL"
 msgstr "AOL ਉੱਤੇ ਨਹੀਂ"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ਬੱਡੀ ਆਈਕਾਨ"
+
+msgid "Voice"
+msgstr "ਆਵਾਜ਼"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "ਫਾਇਲ ਲਵੋ"
+
+msgid "Games"
+msgstr "ਖੇਡਾਂ"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ਹੋਰ"
+
+msgid "Send Buddy List"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਭੇਜੋ"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ਸਿੱਧੀ ਕ�ਨੈਕਸ਼ਨ"
+
+msgid "AP User"
+msgstr "AP ਯੂਜ਼ਰ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "ਪ�ਰਾਣਾ ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian ਇਕ�ਰਿਪਸ਼ਨ"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "ਸ�ਰੱਖਿਆ ਯੋਗ"
+
+msgid "Video Chat"
+msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ਸਿੱਧੀ ਵੀਡਿਓ"
+
+msgid "Camera"
+msgstr "ਕੈਮਰਾ"
+
+msgid "Screen Sharing"
+msgstr "ਸਕਰੀਨ ਸਾਂ�ੀ"
+
+msgid "IP Address"
+msgstr "IP �ਡਰੈੱਸ"
+
+msgid "Warning Level"
+msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
+
+msgid "Buddy Comment"
+msgstr "ਸ�ਨੇਹੀ ਟਿੱਪਣੀ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
+
+msgid "Mobile Phone"
+msgstr "ਮੋਬਾਇਲ ਫੋਨ"
+
+msgid "Personal Web Page"
+msgstr "ਨਿੱਜੀ ਵੈਬ ਸਫ਼ਾ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "ਹੋਰ ਜਾਣਕਾਰੀ"
+
+msgid "Zip Code"
+msgstr "ਡਾਕ ਕੋਡ"
+
+msgid "Work Information"
+msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
+
+msgid "Division"
+msgstr "ਭਾਗ"
+
+msgid "Position"
+msgstr "ਸਥਿਤੀ"
+
+msgid "Web Page"
+msgstr "ਵੈਬ ਸਫਾ"
+
+msgid "Online Since"
+msgstr "ਆਨਲਾਈਨ ਹੈ"
+
+msgid "Member Since"
+msgstr "ਮੈਂਬਰ ਹੈ"
+
+msgid "Capabilities"
+msgstr "ਯੋਗਤਾ"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ਆਨਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ਆਨਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+msgid "Appear Offline"
+msgstr "ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+# , c-format
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ਤ�ਹਾਨੰ ਇਸ ਮਲਟੀMX ਤੋਂ ਕਿੱਕ ਕੀਤਾ ਗਿਆ।"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ਤ�ਸੀਂ ਉਹਨਾਂ ਬੱਡੀ ਨੂੰ ਸੱਜਾ-ਬਟਨ ਦਬਾ ਕੇ ਅਤੇ \"ਪ�ਰਮਾਣਿਕਤਾ ਮ�ੜ-ਬੇਨਤੀ\" ਚ�ਣ ਕੇ ਮ�ੜ-ਪ�ਰਮਾਣਿਕਤਾ ਲਈ "
+"ਬੇਨਤੀ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ਦਿੱਖ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ਸੱਦਾ ਲਿਸਟ"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "ਕ�ੰਭ ਰਾਸ਼ੀ"
 
@@ -8011,8 +8064,8 @@ msgstr "ਤ�ਹਾਡੀ ਮੰਗ ਮੰਨੀ ਗਈ।"
 msgid "Your request was rejected."
 msgstr "ਤ�ਹਾਡੀ ਮੰਗ ਰੱਦ ਕੀਤੀ ਗਈ।"
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u ਲਈ ਪਰਮਾਣਿਕਤਾ ਦੀ ਲੋੜ"
 
 msgid "Add buddy question"
@@ -10189,18 +10242,12 @@ msgstr "ਬਾਹਰ"
 msgid "Not on server list"
 msgstr "ਸਰਵਰ ਲਿਸਟ ਤੇ ਨਹੀਂ"
 
-msgid "Appear Online"
-msgstr "ਆਨਲਾਈਨ ਜਾਪਦਾ ਹੈ"
-
 msgid "Appear Permanently Offline"
 msgstr "ਪੱਕਾ ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
 
 msgid "Presence"
 msgstr "ਮੌਜੂਦਗੀ"
 
-msgid "Appear Offline"
-msgstr "ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "ਪੱਕਾ ਆਫਲਾਈਨ ਨਹੀਂ ਜਾਪਦਾ ਹੈ"
 
@@ -10741,27 +10788,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਕ�ਨੈਕਸ਼ਨ ਨੂੰ ਹੋਰ ਸਾਫਟਵੇਅਰਾਂ ਵਲੋਂ ਰੋਕਿਆ।"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "ਰਿਮੋਟ ਹੋਸਟ ਨੇ ਕ�ਨੈਕਸ਼ਨ ਬੰਦ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਟਾਈਮ-ਆਉਟ ਹੋਇਆ।"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ।"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "�ਡਰੈੱਸ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ।"
 
@@ -10908,6 +10950,10 @@ msgstr ""
 "ਤ�ਸੀਂ ਇਹ ਵਿੰਡੋ ਉੱਤੇ ਬੇਲੀ (ਬੱਡੀ) ਲਿਸਟ ਵਿੰਡੋ ਵਿੱਚ <b>ਅਕਾਊਂਟ->ਅਕਾਊਂਟ ਪਰਬੰਧ</b> ਰਾਹੀਂ ਅਕਾਊਂਟ "
 "ਸ਼ਾਮਲ, ਸੋਧਣ ਜਾਂ ਹਟਾਉਣ ਵਾਸਤੇ ਆ ਸਕਦੇ ਹੋ।"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s %s ਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚੋਂ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹ�ੰਦਾ/ਚਾਹ�ੰਦੀ ਹੈ%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
@@ -11158,6 +11204,8 @@ msgstr "ਸ�ਨੇਹਾ (ਚੋਣਵਾਂ)"
 msgid "Edit User Mood"
 msgstr "ਯੂਜ਼ਰ ਮੋਡ ਸੋਧ"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/ਬੱਡੀ(_B)"
@@ -11898,9 +11946,6 @@ msgstr "ਸਹਿਯੋਗ"
 msgid "webmaster"
 msgstr "ਵੈੱਬਮਾਸਟਰ"
 
-msgid "Senior Contributor/QA"
-msgstr "ਸੀਨੀਅਰ ਯੋਗਦਾਨੀ/QA"
-
 msgid "win32 port"
 msgstr "win32 ਪੋਰਟ"
 
@@ -11926,6 +11971,9 @@ msgstr "ਅਸਲੀ ਲੇਖਕ"
 msgid "lead developer"
 msgstr "ਮ�ੱਖ ਖੋਜੀ"
 
+msgid "Senior Contributor/QA"
+msgstr "ਸੀਨੀਅਰ ਯੋਗਦਾਨੀ/QA"
+
 msgid "Afrikaans"
 msgstr "ਅਫ਼ਰੀਕੀ"
 
@@ -13260,6 +13308,10 @@ msgstr "ਰੀਲੇਅ ਸਰਵਰ (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN ਸਰਵਰ:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "ਪੋਰਟ(_P):"
+
 msgid "Use_rname:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_r):"
 
@@ -13281,6 +13333,11 @@ msgstr "ਮੋਜ਼ੀਲਾ"
 msgid "Konqueror"
 msgstr "ਕੌਨਕਿਉਰੋਰ"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ਵੇਹੜਾ (ਡੈਸਕਟਾਪ) ਡਿਫਾਲਟ"
 
@@ -13299,6 +13356,14 @@ msgstr "ਫਾਇਰਬਰਡ"
 msgid "Epiphany"
 msgstr "�ਪਾਫਨੀ"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ਦਸਤੀ"
 
@@ -13827,7 +13892,8 @@ msgstr "ਕੋਈ ਨਹੀਂ"
 msgid "Small"
 msgstr "ਛੋਟਾ"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ਡਿਫਾਲਟ ਸਮਾਈਲ ਲਈ ਛੋਟਾ ਵਰਜਨ"
 
 msgid "Response Probability:"
@@ -14830,6 +14896,10 @@ msgstr "ਜੰਤਰ(_e)"
 msgid "Voice/Video Settings"
 msgstr "ਆਵਾਜ਼/ਵਿਡੀਓ ਸੈਟਿੰਗ"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ਆਵਾਜ਼/ਵਿਡੀਓ ਸੈਟਿੰਗ"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14954,7 +15024,7 @@ msgstr "ਰਾਅ XMPP ਪ�ਹੈਰਾ ਭੇਜੋ ਅਤੇ ਲਵੋ"
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ ਡੀਬੱਗ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15093,6 +15163,23 @@ msgstr "ਪਿਡਗਿਨ ਵੈੱਬ ਪੇਜ਼ ਉੱਤੇ ਜਾਓ"
 msgid "You do not have permission to uninstall this application."
 msgstr "ਤ�ਹਾਨੂੰ ਇਹ �ਪਲੀਕੇਸ਼ਨ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪ�ੱਗ ਚ�ੱਕੀ ਹੈ ਅਤੇ ਜਾਇਜ਼ ਨਹੀਂ ਮੰਨਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS ਲੋੜੀਦੀ"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ਫੋਰਸ ਪ�ਰਾਣਾ (ਪੋਰਟ 5223) SSL"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[ਇਸ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤਾ ਸ�ਨੇਹਾ ਵੇਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਸ ਵਿੱਚ ਗਲਤ ਅੱਖਰ ਹਨ।]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ਜਾਣਕਾਰੀ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "ਤ�ਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਨਾਂ ਗਲਤ ਹੈ।"
 
@@ -15686,9 +15773,6 @@ msgstr "ਤ�ਹਾਨੂੰ ਇਹ �ਪਲੀਕੇਸ਼ਨ ਇੰਸਟਾ
 #~ msgid "Connection closed (writing)"
 #~ msgstr "ਕ�ਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ (ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
 
-#~ msgid "Connection reset"
-#~ msgstr "ਕ�ਨੈਕਸ਼ਨ ਮ�ੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "ਸਾਕਟ ਤੋਂ ਪੜ�ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
@@ -15891,7 +15975,7 @@ msgstr "ਤ�ਹਾਨੂੰ ਇਹ �ਪਲੀਕੇਸ਼ਨ ਇੰਸਟਾ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 #~ msgid "Could not connect for transfer."
diff --git a/po/pl.po b/po/pl.po
index 58d5b509ef..11fb9b6ced 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
-"PO-Revision-Date: 2010-08-06 20:24+0200\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-20 12:58+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
@@ -536,7 +536,6 @@ msgstr "Potwierdzenie usunięcia certyfikatu"
 msgid "Certificate Manager"
 msgstr "Menadżer certyfikatów"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nazwa komputera"
 
@@ -818,7 +817,7 @@ msgstr "Zatrzymaj"
 msgid "Waiting for transfer to begin"
 msgstr "Oczekiwanie na rozpoczęcie przesyłu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulowano"
 
 msgid "Failed"
@@ -1712,8 +1711,12 @@ msgstr ""
 "Certyfikat nie jest jeszcze prawidłowy. Proszę sprawdzić, czy data i czas "
 "komputera są dokładne."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Certyfikat wygasł i nie powinien już być uważany za prawidłowy."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Certyfikat wygasł i nie jest więc prawidłowy. Proszę sprawdzić, czy data i "
+"czas komputera są dokładne."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4764,11 +4767,17 @@ msgstr "Wtyczka protokołu XMPP"
 msgid "Domain"
 msgstr "Domena"
 
-msgid "Require SSL/TLS"
-msgstr "Wymaganie SSL/TLS"
+msgid "Require encryption"
+msgstr "Wymaganie szyfrowania"
+
+msgid "Use encryption if available"
+msgstr "Użycie szyfrowania, jeśli jest dostępne"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Wymuszenie użycia starego (port 5223) SSL"
+msgid "Use old-style SSL"
+msgstr "Użycie starego stylu SSL"
+
+msgid "Connection security"
+msgstr "Bezpieczeństwo połączenia"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -6919,6 +6928,15 @@ msgstr "Adres serwera"
 msgid "Server port"
 msgstr "Port serwera"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Proszę o upoważnienie, aby dodać użytkownika do listy znajomych."
+
+msgid "No reason given."
+msgstr "Nie podano powodu."
+
+msgid "Authorization Denied Message:"
+msgstr "Wiadomość odmowy upoważnienia:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Odebrano nieoczekiwaną odpowiedź z %s: %s"
@@ -6955,6 +6973,25 @@ msgstr "AOL nie umożliwia uwierzytelnienia nazwy użytkownika w tym miejscu"
 msgid "Error requesting %s"
 msgstr "Błąd podczas żądania %s"
 
+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 ""
+"(Prawdopodobnie wystąpił błąd podczas pobierania tej wiadomości. Znajomy "
+"prawdopodobnie używa innego kodowania, niż jest oczekiwane. Jeśli wiadomo, "
+"jakiego kodowania używa, można je podać w zaawansowanych opcjach konta AIM/"
+"ICQ)."
+
+#, 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 ""
+"(Wystąpił błąd podczas pobierania tej wiadomości. Użytkownik i znajomy %s "
+"posiadają ustawione inne kodowania lub klient znajomego %s posiada błędy)."
+
 msgid "Could not join chat room"
 msgstr "Nie można dołączyć do pokoju konferencji"
 
@@ -7168,94 +7205,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Plik %s ma %s, czyli więcej niż maksymalny rozmiar %s."
 
-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 ""
-"(Wystąpił błąd podczas odbierania tej wiadomości. Znajomy używa "
-"prawdopodobnie innego kodowania niż oczekiwane. Jeśli wiadomo, jakiego "
-"kodowania używa, można je podać w zaawansowanych opcjach konta AIM/ICQ)."
-
-#, 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 ""
-"(Wystąpił błąd podczas odbierania tej wiadomości. Używane jest inne "
-"kodowanie niż użytkownika %s, lub użytkownik %s posiada klienta z błędami)."
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona znajomego"
-
-msgid "Voice"
-msgstr "GÅ‚os"
-
-msgid "AIM Direct IM"
-msgstr "Połączenie bezpośrednie AIM"
-
-msgid "Get File"
-msgstr "Pobierz plik"
-
-msgid "Games"
-msgstr "Gry"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Dodatki"
-
-msgid "Send Buddy List"
-msgstr "Wyślij listę znajomych"
-
-msgid "ICQ Direct Connect"
-msgstr "Połączenie bezpośrednie ICQ"
-
-msgid "AP User"
-msgstr "Użytkownik AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "Serwer przekazujÄ…cy ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Poprzednie ICQ UTF-8"
-
-msgid "Trillian Encryption"
-msgstr "Szyfrowanie programu Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Bezpieczeństwo jest włączone"
-
-msgid "Video Chat"
-msgstr "Konferencja wideo"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Wideo na żywo"
-
-msgid "Camera"
-msgstr "Aparat"
-
-msgid "Screen Sharing"
-msgstr "Współdzielenie ekranu"
-
 msgid "Free For Chat"
 msgstr "Chce pogadać"
 
@@ -7286,15 +7235,6 @@ msgstr "W pracy"
 msgid "At lunch"
 msgstr "Na obiedzie"
 
-msgid "IP Address"
-msgstr "Adres IP"
-
-msgid "Warning Level"
-msgstr "Poziom ostrzeżenia"
-
-msgid "Buddy Comment"
-msgstr "Komentarz o znajomym"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Nie można połączyć się z serwerem uwierzytelniania: %s"
@@ -7394,15 +7334,6 @@ msgstr "Wysłano hasło"
 msgid "Unable to initialize connection"
 msgstr "Nie można zainicjować połączenia"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Prośba o pozwolenie na dodanie użytkownika do listy znajomych."
-
-msgid "No reason given."
-msgstr "Nie podano powodu."
-
-msgid "Authorization Denied Message:"
-msgstr "Wiadomość odmowy upoważnienia:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7538,60 +7469,13 @@ msgstr[0] "Pominięto %hu wiadomość od użytkownika %s z nieznanego powodu."
 msgstr[1] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
 msgstr[2] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informacje o użytkowniku są niedostępne: %s"
-
-msgid "Online Since"
-msgstr "Zalogowany od"
-
-msgid "Member Since"
-msgstr "Członek od"
-
-msgid "Capabilities"
-msgstr "Możliwości"
-
 msgid "Your AIM connection may be lost."
 msgstr "Połączenie AIM może zostać utracone."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nie można wyświetlić wiadomości od tego użytkownika, ponieważ zawiera ona "
-"nieprawidłowe znaki]."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Rozłączono z pokoju konferencji %s."
 
-msgid "Mobile Phone"
-msgstr "Telefon komórkowy"
-
-msgid "Personal Web Page"
-msgstr "Osobista strona WWW"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatkowe informacje"
-
-msgid "Zip Code"
-msgstr "Kod pocztowy"
-
-msgid "Work Information"
-msgstr "Informacje o pracy"
-
-msgid "Division"
-msgstr "Dział"
-
-msgid "Position"
-msgstr "Stanowisko"
-
-msgid "Web Page"
-msgstr "Strona WWW"
-
 msgid "Pop-Up Message"
 msgstr "Wiadomość wyskakująca"
 
@@ -7879,8 +7763,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Zmiana adresu na:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>upoważnienie nie jest oczekiwane</i>"
+msgid "you are not waiting for authorization"
+msgstr "upoważnienie nie jest oczekiwane"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Oczekiwane jest upoważnienie od następujących znajomych"
@@ -7918,6 +7802,14 @@ msgstr "Skonfiguruj przekierowanie komunikatora (WWW)"
 msgid "Set Privacy Options..."
 msgstr "Ustaw opcje prywatności..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lista widocznych"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista niewidocznych"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potwierdź konto"
@@ -7934,9 +7826,6 @@ msgstr "Wyświetl znajomych oczekujących na upoważnienie"
 msgid "Search for Buddy by Email Address..."
 msgstr "Wyszukaj znajomych według adresu e-mail..."
 
-msgid "Search for Buddy by Information"
-msgstr "Wyszukaj znajomych według informacji"
-
 msgid "Use clientLogin"
 msgstr "Użycie logowania klienta"
 
@@ -8047,6 +7936,162 @@ msgstr "Kolejka jest pełna"
 msgid "Not while on AOL"
 msgstr "Nie podczas używania AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona znajomego"
+
+msgid "Voice"
+msgstr "GÅ‚os"
+
+msgid "AIM Direct IM"
+msgstr "Komunikator bezpośredni AIM"
+
+msgid "Get File"
+msgstr "Pobierz plik"
+
+msgid "Games"
+msgstr "Gry"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Dodatki"
+
+msgid "Send Buddy List"
+msgstr "Wyślij listę znajomych"
+
+msgid "ICQ Direct Connect"
+msgstr "Bezpośrednie połączenia ICQ"
+
+msgid "AP User"
+msgstr "Użytkownik AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Odpowiedź serwera ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Poprzednie kodowanie UTF-8 protokołu ICQ"
+
+msgid "Trillian Encryption"
+msgstr "Szyfrowanie programu Trillian"
+
+msgid "ICQ UTF8"
+msgstr "Kodowanie UTF-8 protokołu ICQ"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Zabezpieczenia są włączone"
+
+msgid "Video Chat"
+msgstr "Rozmowa wideo"
+
+msgid "iChat AV"
+msgstr "Konferencja iChat"
+
+msgid "Live Video"
+msgstr "Wideo na żywo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Współdzielenie ekranu"
+
+msgid "IP Address"
+msgstr "Adres IP"
+
+msgid "Warning Level"
+msgstr "Poziom ostrzeżenia"
+
+msgid "Buddy Comment"
+msgstr "Komentarz o znajomym"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informacje o użytkownicy są niedostępne: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefon komórkowy"
+
+msgid "Personal Web Page"
+msgstr "Osobista strona WWW"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatkowe informacje"
+
+msgid "Zip Code"
+msgstr "Kod pocztowy"
+
+msgid "Work Information"
+msgstr "Informacje o pracy"
+
+msgid "Division"
+msgstr "Wydział"
+
+msgid "Position"
+msgstr "Zawód"
+
+msgid "Web Page"
+msgstr "Strona WWW"
+
+msgid "Online Since"
+msgstr "W trybie online od"
+
+msgid "Member Since"
+msgstr "Członek od"
+
+msgid "Capabilities"
+msgstr "Możliwości"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "WyglÄ…da na tryb online"
+
+msgid "Don't Appear Online"
+msgstr "Nie wyglÄ…da na tryb online"
+
+msgid "Appear Offline"
+msgstr "WyglÄ…da na tryb offline"
+
+msgid "Don't Appear Offline"
+msgstr "Nie wyglÄ…da na tryb offline"
+
+msgid "you have no buddies on this list"
+msgstr "brak znajomych na tej liście"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Można dodać znajomych do tej listy naciskają ma nich prawym przyciskiem "
+"myszy i wybierajÄ…c \"%s\""
+
+msgid "Visible List"
+msgstr "Lista widocznych"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+"Znajomi na tej liście będą widzieli stan użytkownika po przełączeniu na "
+"\"Niewidoczny\""
+
+msgid "Invisible List"
+msgstr "Lista niewidocznych"
+
+msgid "These buddies will always see you as offline"
+msgstr "Znajomi na tej liście będą widzieli stan użytkownika jako tryb offline"
+
 msgid "Aquarius"
 msgstr "Wodnik"
 
@@ -8226,8 +8271,8 @@ msgid "Your request was rejected."
 msgstr "Prośba została odrzucona."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u wymaga sprawdzenia"
+msgid "%u requires verification: %s"
+msgstr "%u wymaga sprawdzenia: %s"
 
 msgid "Add buddy question"
 msgstr "Dodaj pytanie znajomego"
@@ -10435,18 +10480,12 @@ msgstr "Wyszedł na chwilę"
 msgid "Not on server list"
 msgstr "Brak na liście serwera"
 
-msgid "Appear Online"
-msgstr "WyglÄ…da na tryb online"
-
 msgid "Appear Permanently Offline"
 msgstr "Wygląda na trwały tryb offline"
 
 msgid "Presence"
 msgstr "Obecność"
 
-msgid "Appear Offline"
-msgstr "WyglÄ…da na tryb offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nie wygląda na rwały tryb offline"
 
@@ -11002,27 +11041,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Inne oprogramowanie na komputerze przerwało połączenie."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Zdalny komputer zamknął połączenie."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Przekroczono czas oczekiwania na połączenie."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Odrzucono połączenie."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adres jest już używany."
 
@@ -11172,6 +11206,11 @@ msgstr ""
 "Można wrócić do tego okna, aby dodać, zmodyfikować lub usunąć konta z menu "
 "<b>Konta->ZarzÄ…dzaj kontami</b> w oknie listy znajomych"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"Użytkownik %s%s%s%s chce dodać użytkownika (%s) do swojej listy znajomych%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Kolor tła"
@@ -11427,6 +11466,8 @@ msgstr "Wiadomość (opcjonalna)"
 msgid "Edit User Mood"
 msgstr "Zmiana nastroju użytkownika"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Znajomi"
@@ -12175,9 +12216,6 @@ msgstr "wsparcie"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Starszy współtwórca/ocena jakości"
-
 msgid "win32 port"
 msgstr "port dla Win32"
 
@@ -12203,6 +12241,9 @@ msgstr "autor pierwszej wersji"
 msgid "lead developer"
 msgstr "główny programista"
 
+msgid "Senior Contributor/QA"
+msgstr "Starszy współtwórca/ocena jakości"
+
 msgid "Afrikaans"
 msgstr "afrykanerski"
 
@@ -13552,6 +13593,9 @@ msgstr "Serwer przekaźnika (TURN)"
 msgid "_TURN server:"
 msgstr "Serwer _TURN:"
 
+msgid "_UDP Port:"
+msgstr "Port _UDP:"
+
 msgid "Use_rname:"
 msgstr "Na_zwa użytkownika:"
 
@@ -13573,6 +13617,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Domyślna środowiska"
 
@@ -13591,6 +13640,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Ręcznie"
 
@@ -14123,8 +14180,8 @@ msgstr "brak"
 msgid "Small"
 msgstr "Małe"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Mniejsza wersja domyślnych emotikon"
+msgid "Smaller versions of the default smileys"
+msgstr "Mniejsze wersje domyślnych emotikon"
 
 msgid "Response Probability:"
 msgstr "Prawdopodobieństwo odpowiedzi:"
@@ -15159,6 +15216,9 @@ msgstr "UrzÄ…dz_enie"
 msgid "Voice/Video Settings"
 msgstr "Ustawienia dźwięku/wideo"
 
+msgid "Voice and Video Settings"
+msgstr "Ustawienia dźwięku i wideo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15288,7 +15348,7 @@ msgstr "Wysyłanie i odbieranie surowych strof XMPP."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Ta wtyczka jest przydatna do debugowania serwerów lub klientów XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
diff --git a/po/ps.po b/po/ps.po
index 52267c57cf..462161856e 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0beta6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-03-14 13:08+0500\n"
 "Last-Translator: Kashif Masood <masudmails@yahoo.com>\n"
 "Language-Team: Pashto\n"
@@ -523,7 +523,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -779,7 +778,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "�سخ شوه"
 
 msgid "Failed"
@@ -1685,7 +1684,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4618,12 +4619,20 @@ msgstr "د امیسین پروتوکول نښلولی"
 msgid "Domain"
 msgstr "روماني"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "د %s د کاروونکی معلومات نشته"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "رابطه قطع شوه"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5850,7 +5859,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5953,9 +5962,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "رابطه"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6825,6 +6831,15 @@ msgstr "خادم پته"
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6856,6 +6871,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ګپ شپ نښلول ناکام شو"
@@ -7090,89 +7118,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "ملګری تمثال"
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr "أ�م نیغ �وری زیری"
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr "لوب�"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr "ايسیکیو ارټی�"
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr "ايسیکیو یوټی�٨"
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr ""
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7207,15 +7152,6 @@ msgstr "شبکه"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr ""
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7308,15 +7244,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7410,58 +7337,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "کاروونکی معلومات نشته: %s"
-
-msgid "Online Since"
-msgstr "په ليکه د"
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr "ښایی چه د تا د أ�م رابطه به ورانه شي."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "تا د ګپ شپو کوټه %s له قطع شوی."
 
-msgid "Mobile Phone"
-msgstr "ګر�نده پون"
-
-msgid "Personal Web Page"
-msgstr "شخصي ویبپاڼه"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "اضا�ي معلومات"
-
-msgid "Zip Code"
-msgstr "زپ رمز"
-
-msgid "Work Information"
-msgstr "د کارکولو معلومات"
-
-msgid "Division"
-msgstr "تقسیم"
-
-msgid "Position"
-msgstr "مقام"
-
-msgid "Web Page"
-msgstr "ویبپاڼه"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7705,8 +7587,9 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
+#, fuzzy
+msgid "you are not waiting for authorization"
+msgstr "هغه ملګری ښکاره که چه د ته اجازه په انتظار کښی دي"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
@@ -7745,6 +7628,14 @@ msgstr "د �وری زیری مخته بیول (ارل)"
 msgid "Set Privacy Options..."
 msgstr "د پرده ټاکل..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ملګري �هرست ښکاره که"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ناڅرګند"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "شم�رل ثابت که"
@@ -7761,9 +7652,6 @@ msgstr "هغه ملګری ښکاره Ú©Ù‡ Ú†Ù‡ د ته اجازه په انتظØ
 msgid "Search for Buddy by Email Address..."
 msgstr "د بر�شنالیک په توګه د ملګری لټون..."
 
-msgid "Search for Buddy by Information"
-msgstr "د معلومات په توګه د ماګری لټون"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7866,6 +7754,163 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ملګری تمثال"
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr "أ�م نیغ �وری زیری"
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "لوب�"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr "ايسیکیو ارټی�"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ايسیکیو یوټی�٨"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "کاروونکی معلومات نشته: %s"
+
+msgid "Mobile Phone"
+msgstr "ګر�نده پون"
+
+msgid "Personal Web Page"
+msgstr "شخصي ویبپاڼه"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "اضا�ي معلومات"
+
+msgid "Zip Code"
+msgstr "زپ رمز"
+
+msgid "Work Information"
+msgstr "د کارکولو معلومات"
+
+msgid "Division"
+msgstr "تقسیم"
+
+msgid "Position"
+msgstr "مقام"
+
+msgid "Web Page"
+msgstr "ویبپاڼه"
+
+msgid "Online Since"
+msgstr "په ليکه د"
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "�ان په لیکه ښکاره که"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "�ان په لیکه ښکاره که"
+
+msgid "Appear Offline"
+msgstr "�ان لیکه نه لیری ښکاره کول"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "�ان لیکه نه لیری ښکاره کول"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "تا د ګپ شپو کوټه %s له قطع شوی."
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ناڅرګند"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ناڅرګند"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "دلو"
 
@@ -8064,7 +8109,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10218,18 +10263,12 @@ msgstr "بهر تللی"
 msgid "Not on server list"
 msgstr "د خادم په �هرست کی نشته"
 
-msgid "Appear Online"
-msgstr "�ان په لیکه ښکاره که"
-
 msgid "Appear Permanently Offline"
 msgstr "�ان دایمی لیکه نه لیری ښکاره که"
 
 msgid "Presence"
 msgstr "موجودګي"
 
-msgid "Appear Offline"
-msgstr "�ان لیکه نه لیری ښکاره کول"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�ان دایمی لیکه نه لیری ښکاره کول پریښوه"
 
@@ -10756,27 +10795,25 @@ msgid " (%s)"
 msgstr "‫%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "خادم رابطه قطع کړه."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "رابطه ناکامه شوه"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "رابطه ناکامه شوه."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10921,6 +10958,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "‫%s تا د خپل ماګری �هرست څخه خو�ولی"
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -11194,6 +11235,8 @@ msgstr "اړیکه بل نوم"
 msgid "Edit User Mood"
 msgstr "د کاروونکی حالتونه"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "_ملګري"
@@ -11971,9 +12014,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11999,6 +12039,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13353,6 +13396,10 @@ msgid "_TURN server:"
 msgstr "د سټن خادم:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "پټ ټکی:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "کاروونکی نوم:"
 
@@ -13375,6 +13422,11 @@ msgstr "موزیله"
 msgid "Konqueror"
 msgstr "کونکرر"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "اوبسه"
@@ -13394,6 +13446,14 @@ msgstr "�ایربلد"
 msgid "Epiphany"
 msgstr "اپی�انی"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -13942,7 +14002,7 @@ msgstr "(هیڅ نه)"
 msgid "Small"
 msgstr "بر�ښنالیک"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14965,6 +15025,9 @@ msgstr "اله"
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15087,7 +15150,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15215,6 +15278,9 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "د معلومات په توګه د ماګری لټون"
+
 #, fuzzy
 #~ msgid "Nick Name"
 #~ msgstr "کمکی نوم"
@@ -15273,9 +15339,6 @@ msgstr ""
 #~ msgid "MSN Protocol Plugin"
 #~ msgstr "د أ�م پروتوکول نښلولی"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "‫%s تا د خپل ماګری �هرست څخه خو�ولی"
-
 #~ msgid "Debugging Information"
 #~ msgstr "ګونګوټ� وژلو معلومات"
 
@@ -15443,9 +15506,6 @@ msgstr ""
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "د رابطه خادم"
 
-#~ msgid "Connection lost"
-#~ msgstr "رابطه قطع شوه"
-
 #, fuzzy
 #~ msgid "Incorrect Password"
 #~ msgstr "اوسنی پټ ټکی"
@@ -15504,9 +15564,6 @@ msgstr ""
 #~ msgid "Save As..."
 #~ msgstr "تمثال و ساته..."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "د %s د کاروونکی معلومات نشته"
-
 #~ msgid "%s Options"
 #~ msgstr "د %s ټاکل"
 
diff --git a/po/pt.po b/po/pt.po
index 0c907eb2e1..0fc7a6f210 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2005-03-14 17:23+0000\n"
 "Last-Translator: Duarte Henriques <duarte.henriques@gmail.com>\n"
 "Language-Team: \n"
@@ -567,7 +567,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -843,7 +842,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando que a transferência comece"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -1809,7 +1808,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4920,11 +4921,19 @@ msgid "Domain"
 msgstr "Romeno"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "Exigir TLS"
+msgid "Require encryption"
+msgstr "Mandatar autorização"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forçar SSL antigo (porto 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Usar TLS se disponível"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Ligação fechada"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autent. em texto simples sobre ligações não encriptadas"
@@ -6256,7 +6265,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Senhas novas não conferem."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID inserida é inválida."
 
 msgid ""
@@ -6365,10 +6374,6 @@ msgid "Connecting..."
 msgstr "Ligando"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "A chave SecurID inserida é inválida."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "A chave SecurID inserida é inválida."
 
@@ -7278,6 +7283,17 @@ msgstr "Endereço do servidor"
 msgid "Server port"
 msgstr "Porto do servidor"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Por favor autorize-me para que eu possa adicioná-lo à minha lista de "
+"contactos."
+
+msgid "No reason given."
+msgstr "Nenhum motivo foi dado."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensagem de recusa de autorização:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "O servidor retornou uma resposta inválida."
@@ -7311,6 +7327,21 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Erro ao criar a ligação"
 
+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 ""
+
+#, 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 ""
+"(Houve um erro ao receber esta mensagem. O contacto com quem está a falar "
+"provavelmente tem um cliente com bugs.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Não foi possível ligar"
@@ -7551,92 +7582,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(Houve um erro ao receber esta mensagem. O contacto com quem está a falar "
-"provavelmente tem um cliente com bugs.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "�cone do contacto"
-
-msgid "Voice"
-msgstr "Voz"
-
-msgid "AIM Direct IM"
-msgstr "MI Directa AIM"
-
-msgid "Get File"
-msgstr "Receber ficheiro"
-
-msgid "Games"
-msgstr "Jogos"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Enviar lista de contactos"
-
-msgid "ICQ Direct Connect"
-msgstr "Ligação Directa ICQ"
-
-msgid "AP User"
-msgstr "Utilizador AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "Relay do servidor ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 Velho"
-
-msgid "Trillian Encryption"
-msgstr "Criptografia do Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Segurança Activada"
-
-msgid "Video Chat"
-msgstr "Chat Video"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vídeo ao Vivo"
-
-msgid "Camera"
-msgstr "Camâra"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nome de utilizador"
-
 msgid "Free For Chat"
 msgstr "Livre Para Conversa"
 
@@ -7672,15 +7617,6 @@ msgstr "Rede"
 msgid "At lunch"
 msgstr "Em Horário de Almoço"
 
-msgid "IP Address"
-msgstr "Endereço IP"
-
-msgid "Warning Level"
-msgstr "Nível de Alerta"
-
-msgid "Buddy Comment"
-msgstr "Comentário de Contacto"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Não foi possível ligar para transferência."
@@ -7786,17 +7722,6 @@ msgstr "Senha enviada"
 msgid "Unable to initialize connection"
 msgstr "Impossível criar ligação"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Por favor autorize-me para que eu possa adicioná-lo à minha lista de "
-"contactos."
-
-msgid "No reason given."
-msgstr "Nenhum motivo foi dado."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensagem de recusa de autorização:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7908,60 +7833,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informação do utilizador indisponível: %s"
-
-msgid "Online Since"
-msgstr "Desligado Desde"
-
-msgid "Member Since"
-msgstr "Membro Desde"
-
-msgid "Capabilities"
-msgstr "Recursos"
-
 msgid "Your AIM connection may be lost."
 msgstr "A sua ligação AIM pode ter sido perdida."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Incapaz de mostrar uma mensagem deste utilizador porque continha caracteres "
-"inválidos.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Foi desligado da sala %s."
 
-msgid "Mobile Phone"
-msgstr "Telefone móvel"
-
-msgid "Personal Web Page"
-msgstr "Página da web pessoal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informações adicionais"
-
-msgid "Zip Code"
-msgstr "Código Postal (CEP)"
-
-msgid "Work Information"
-msgstr "Informações do trabalho"
-
-msgid "Division"
-msgstr "Divisão"
-
-msgid "Position"
-msgstr "Posição"
-
-msgid "Web Page"
-msgstr "Página da web"
-
 msgid "Pop-Up Message"
 msgstr "Mensagem de Pop-Up"
 
@@ -8250,7 +8128,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>não está à espera de autorização</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8293,6 +8172,14 @@ msgstr "Configurar Redirecção de MI (URL)"
 msgid "Set Privacy Options..."
 msgstr "Definir Opções de Privacidade..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostrar Lista de Contactos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de Convites"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar Conta"
@@ -8312,9 +8199,6 @@ msgstr "Mostrar contactos esperando autorização"
 msgid "Search for Buddy by Email Address..."
 msgstr "Procurar Contacto por Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Procurar Contacto por Informação"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "O utilizador está desligado"
@@ -8422,6 +8306,166 @@ msgstr "Fila cheia"
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "�cone do contacto"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "MI Directa AIM"
+
+msgid "Get File"
+msgstr "Receber ficheiro"
+
+msgid "Games"
+msgstr "Jogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de contactos"
+
+msgid "ICQ Direct Connect"
+msgstr "Ligação Directa ICQ"
+
+msgid "AP User"
+msgstr "Utilizador AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Relay do servidor ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 Velho"
+
+msgid "Trillian Encryption"
+msgstr "Criptografia do Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Segurança Activada"
+
+msgid "Video Chat"
+msgstr "Chat Video"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo ao Vivo"
+
+msgid "Camera"
+msgstr "Camâra"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nome de utilizador"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid "Warning Level"
+msgstr "Nível de Alerta"
+
+msgid "Buddy Comment"
+msgstr "Comentário de Contacto"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informação do utilizador indisponível: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefone móvel"
+
+msgid "Personal Web Page"
+msgstr "Página da web pessoal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informações adicionais"
+
+msgid "Zip Code"
+msgstr "Código Postal (CEP)"
+
+msgid "Work Information"
+msgstr "Informações do trabalho"
+
+msgid "Division"
+msgstr "Divisão"
+
+msgid "Position"
+msgstr "Posição"
+
+msgid "Web Page"
+msgstr "Página da web"
+
+msgid "Online Since"
+msgstr "Desligado Desde"
+
+msgid "Member Since"
+msgstr "Membro Desde"
+
+msgid "Capabilities"
+msgstr "Recursos"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Aparecer Ligado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Aparecer Ligado"
+
+msgid "Appear Offline"
+msgstr "Parecer Desligado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Parecer Desligado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Pode re-requisitar autorização destes contactos clicando com o botão direito "
+"neles e seleccionando \"Re-requisitar autorização.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisível"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de Convites"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8641,7 +8685,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Mandatar autorização"
 
 #, fuzzy
@@ -10958,18 +11002,12 @@ msgstr "Fui embora"
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-msgid "Appear Online"
-msgstr "Aparecer Ligado"
-
 msgid "Appear Permanently Offline"
 msgstr "Aparecer Desligado Permanentemente"
 
 msgid "Presence"
 msgstr "Presença"
 
-msgid "Appear Offline"
-msgstr "Parecer Desligado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Não Aparecer Desligado Permanentemente"
 
@@ -11534,27 +11572,26 @@ msgid " (%s)"
 msgstr "%s em %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "%s fechou a conversa."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Ligação Perdida"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Ligação fechada"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Este nome de chat já está a ser utilizado"
 
@@ -11701,6 +11738,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "O utilizador %s quer adicionar %s à sua lista de contactos%s%s."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11986,6 +12027,8 @@ msgstr "Mensagem (opcional) :"
 msgid "Edit User Mood"
 msgstr "Modos de Utilizador"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contactos"
@@ -12793,9 +12836,6 @@ msgstr "suporte"
 msgid "webmaster"
 msgstr "desenvolvedor & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "port para Win32"
 
@@ -12822,6 +12862,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14269,6 +14312,10 @@ msgid "_TURN server:"
 msgstr "Servidor ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Porto UDP"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Nome de utilizador:"
 
@@ -14291,6 +14338,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "_Aceitar Padrões"
@@ -14310,6 +14362,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14894,7 +14954,7 @@ msgstr "Qualquer um"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16010,6 +16070,10 @@ msgstr "Dispositivo"
 msgid "Voice/Video Settings"
 msgstr "Usar configurações do ambiente"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Usar configurações do ambiente"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16141,7 +16205,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16275,6 +16339,27 @@ msgid "You do not have permission to uninstall this application."
 msgstr "Não tem permissão para desinstalar este programa."
 
 #, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Exigir TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forçar SSL antigo (porto 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "A chave SecurID inserida é inválida."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Incapaz de mostrar uma mensagem deste utilizador porque continha "
+#~ "caracteres inválidos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Procurar Contacto por Informação"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "O nome de utilizador especificado é inválido."
 
@@ -16794,9 +16879,6 @@ msgstr "Não tem permissão para desinstalar este programa."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Ligação fechada (escrevendo)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Ligação fechada"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Erro ao ler do socket: %s"
 
@@ -17029,7 +17111,7 @@ msgstr "Não tem permissão para desinstalar este programa."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Não foi possível abrir %s para escrita!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
 
@@ -17478,9 +17560,6 @@ msgstr "Não tem permissão para desinstalar este programa."
 #~ msgid "TCP port"
 #~ msgstr "Porto TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Porto UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibração de Características"
 
@@ -17738,9 +17817,6 @@ msgstr "Não tem permissão para desinstalar este programa."
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Plugin do Protocolo Jabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Usar TLS se disponível"
-
 #~ msgid "_Authorize"
 #~ msgstr "_Autorizar"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c9c71a3ceb..367737674c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-08-29 14:35-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
@@ -527,7 +527,6 @@ msgstr "Confirmação de remoção de certificado"
 msgid "Certificate Manager"
 msgstr "Gerenciador de certificados"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nome do host"
 
@@ -804,7 +803,7 @@ msgstr "Parar"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o começo da transferência"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelada"
 
 msgid "Failed"
@@ -1698,7 +1697,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "O certificado expirou e não deve ser considerado válido."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4769,11 +4771,20 @@ msgstr "Plug-in do protocolo XMPP"
 msgid "Domain"
 msgstr "Domínio"
 
-msgid "Require SSL/TLS"
-msgstr "Requerer SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Pedir autorização"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forçar SSL antigo (porta 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Informação do usuário %s indisponível"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Conexão redefinida"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
@@ -6045,7 +6056,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Senhas novas não conferem."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID digitada é inválida"
 
 msgid ""
@@ -6152,10 +6163,6 @@ msgid "Connecting..."
 msgstr "Conectando"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "A chave SecurID digitada é inválida"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "A chave SecurID digitada é inválida"
 
@@ -7044,6 +7051,17 @@ msgstr "Endereço do servidor"
 msgid "Server port"
 msgstr "Porta do servidor"
 
+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."
+
+msgid "No reason given."
+msgstr "Nenhum motivo foi dado."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensagem de recusa de autorização:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Recebida resposta inesperada de %s"
@@ -7078,6 +7096,25 @@ msgstr "A AOL não permite que seu nome de tela autentique aqui"
 msgid "Error requesting %s"
 msgstr "Erro solicitando %s: %s"
 
+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 ""
+"(Houve um erro ao receber esta mensagem. O amigo com quem você está falando "
+"deve estar usando uma codificação diferente da esperada. Se você sabe qual a "
+"codificação que ele está usando, você pode especificá-la nas opções "
+"avançadas de conta para a sua conta do AIM/ICQ.)"
+
+#, 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 ""
+"(Houve um erro ao receber esta mensagem. Ou você e %s estão usando "
+"codificações diferentes, ou %s usa um cliente com defeito.)"
+
 msgid "Could not join chat room"
 msgstr "Não foi possível entrar na sala de bate-papo"
 
@@ -7311,95 +7348,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "O arquivo %s tem %s, o que é maior que o tamanho máximo de %s."
 
-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 ""
-"(Houve um erro ao receber esta mensagem. O amigo com quem você está falando "
-"deve estar usando uma codificação diferente da esperada. Se você sabe qual a "
-"codificação que ele está usando, você pode especificá-la nas opções "
-"avançadas de conta para a sua conta do AIM/ICQ.)"
-
-#, 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 ""
-"(Houve um erro ao receber esta mensagem. Ou você e %s estão usando "
-"codificações diferentes, ou %s usa um cliente com defeito.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "�cone de exibição"
-
-msgid "Voice"
-msgstr "Voz"
-
-msgid "AIM Direct IM"
-msgstr "Mensagem instantânea direta do AIM"
-
-msgid "Get File"
-msgstr "Receber arquivo"
-
-msgid "Games"
-msgstr "Jogos"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Enviar lista de amigos"
-
-msgid "ICQ Direct Connect"
-msgstr "Conexão direta do ICQ"
-
-msgid "AP User"
-msgstr "Usuário AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Niilista"
-
-msgid "ICQ Server Relay"
-msgstr "Relay do servidor ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 antigo"
-
-msgid "Trillian Encryption"
-msgstr "Criptografia do Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Segurança ativada"
-
-msgid "Video Chat"
-msgstr "Bate-papo com vídeo"
-
-msgid "iChat AV"
-msgstr "AV do iChat"
-
-msgid "Live Video"
-msgstr "Vídeo ao vivo"
-
-msgid "Camera"
-msgstr "Câmera"
-
-msgid "Screen Sharing"
-msgstr "Compartilhamento de Tela"
-
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
@@ -7435,15 +7383,6 @@ msgstr "Rede"
 msgid "At lunch"
 msgstr "Em horário de almoço"
 
-msgid "IP Address"
-msgstr "Endereço IP"
-
-msgid "Warning Level"
-msgstr "Nível de alerta"
-
-msgid "Buddy Comment"
-msgstr "Comentário do amigo"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Não foi possível conectar ao servidor de autenticação: %s"
@@ -7545,17 +7484,6 @@ msgstr "Senha enviada"
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-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."
-
-msgid "No reason given."
-msgstr "Nenhum motivo foi dado."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensagem de recusa de autorização:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7673,60 +7601,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Você perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informação do usuário indisponível: %s"
-
-msgid "Online Since"
-msgstr "Conectado desde"
-
-msgid "Member Since"
-msgstr "Membro desde"
-
-msgid "Capabilities"
-msgstr "Recursos"
-
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Não foi possível exibir uma mensagem deste usuário porque ela continha "
-"caracteres inválidos.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-msgid "Mobile Phone"
-msgstr "Telefone móvel"
-
-msgid "Personal Web Page"
-msgstr "Página da web pessoal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informações adicionais"
-
-msgid "Zip Code"
-msgstr "Código Postal (CEP)"
-
-msgid "Work Information"
-msgstr "Informações do trabalho"
-
-msgid "Division"
-msgstr "Divisão"
-
-msgid "Position"
-msgstr "Posição"
-
-msgid "Web Page"
-msgstr "Página da web"
-
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
@@ -8010,7 +7891,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>você não está esperando autorização</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8049,6 +7931,14 @@ msgstr "Configurar encaminhamento de mensagens instantâneas (URL)"
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Exibir _lista de amigos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de convidados"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar conta"
@@ -8065,9 +7955,6 @@ msgstr "Mostrar amigos esperando autorização"
 msgid "Search for Buddy by Email Address..."
 msgstr "Procurar por amigos pelo endereço de Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Procurar por amigos por informações"
-
 msgid "Use clientLogin"
 msgstr "Usar clientLogin"
 
@@ -8176,6 +8063,165 @@ msgstr "Fila cheia"
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "�cone de exibição"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "Mensagem instantânea direta do AIM"
+
+msgid "Get File"
+msgstr "Receber arquivo"
+
+msgid "Games"
+msgstr "Jogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de amigos"
+
+msgid "ICQ Direct Connect"
+msgstr "Conexão direta do ICQ"
+
+msgid "AP User"
+msgstr "Usuário AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Niilista"
+
+msgid "ICQ Server Relay"
+msgstr "Relay do servidor ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 antigo"
+
+msgid "Trillian Encryption"
+msgstr "Criptografia do Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Segurança ativada"
+
+msgid "Video Chat"
+msgstr "Bate-papo com vídeo"
+
+msgid "iChat AV"
+msgstr "AV do iChat"
+
+msgid "Live Video"
+msgstr "Vídeo ao vivo"
+
+msgid "Camera"
+msgstr "Câmera"
+
+msgid "Screen Sharing"
+msgstr "Compartilhamento de Tela"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid "Warning Level"
+msgstr "Nível de alerta"
+
+msgid "Buddy Comment"
+msgstr "Comentário do amigo"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informação do usuário indisponível: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefone móvel"
+
+msgid "Personal Web Page"
+msgstr "Página da web pessoal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informações adicionais"
+
+msgid "Zip Code"
+msgstr "Código Postal (CEP)"
+
+msgid "Work Information"
+msgstr "Informações do trabalho"
+
+msgid "Division"
+msgstr "Divisão"
+
+msgid "Position"
+msgstr "Posição"
+
+msgid "Web Page"
+msgstr "Página da web"
+
+msgid "Online Since"
+msgstr "Conectado desde"
+
+msgid "Member Since"
+msgstr "Membro desde"
+
+msgid "Capabilities"
+msgstr "Recursos"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Parecer desconectado"
+
+msgid "Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Você foi expulso: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Você pode re-requisitar autorização destes amigos clicando com o botão "
+"direito neles e selecionando \"Re-requisitar autorização.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visível"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de convidados"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquário"
 
@@ -8354,8 +8400,8 @@ msgstr "Sua requisição foi aceita."
 msgid "Your request was rejected."
 msgstr "Sua requisição foi rejeitada."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u requer verificação"
 
 msgid "Add buddy question"
@@ -10576,18 +10622,12 @@ msgstr "Fui embora"
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-msgid "Appear Online"
-msgstr "Parecer desconectado"
-
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
 msgid "Presence"
 msgstr "Presença"
 
-msgid "Appear Offline"
-msgstr "Parecer desconectado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
@@ -11136,27 +11176,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Conexão interrompida por outro software no seu computador."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "O usuário remoto encerrou a conexão."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Tempo limite de conexão esgotado."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Conexão rejeitada."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "O endereço já está em uso"
 
@@ -11304,6 +11339,10 @@ msgstr ""
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Gerenciar Contas</b> na janela da Lista de Amigos"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%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"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Cor do fundo"
@@ -11561,6 +11600,8 @@ msgstr "Apelidar (opcional)"
 msgid "Edit User Mood"
 msgstr "Editar humor do usuário"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Amigos"
@@ -12318,9 +12359,6 @@ msgstr "suporte"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Contribuidor Sênior/QA"
-
 msgid "win32 port"
 msgstr "port para Win32"
 
@@ -12346,6 +12384,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contribuidor Sênior/QA"
+
 msgid "Afrikaans"
 msgstr "Africâner"
 
@@ -13715,6 +13756,10 @@ msgid "_TURN server:"
 msgstr "_Servidor ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Porta:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Nome de usuário:"
 
@@ -13737,6 +13782,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop Padrão"
 
@@ -13755,6 +13805,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14304,7 +14362,8 @@ msgstr "nenhum"
 msgid "Small"
 msgstr "Pequeno"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versões menores dos emoticons padrão"
 
 msgid "Response Probability:"
@@ -15350,6 +15409,10 @@ msgstr "Dispositivo"
 msgid "Voice/Video Settings"
 msgstr "Definições de Voz/Vídeo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Definições de Voz/Vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15479,7 +15542,7 @@ msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15618,6 +15681,26 @@ msgstr "Visite a página da web do Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "Você não tem permissão para desinstalar essa aplicação."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requerer SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forçar SSL antigo (porta 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "A chave SecurID digitada é inválida"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
+#~ "caracteres inválidos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Procurar por amigos por informações"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "O certificado ainda não é válido."
 
@@ -16218,9 +16301,6 @@ msgstr "Você não tem permissão para desinstalar essa aplicação."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Conexão fechada (escrevendo)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Conexão redefinida"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Erro ao ler do socket: %s"
 
@@ -16432,7 +16512,7 @@ msgstr "Você não tem permissão para desinstalar essa aplicação."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Não foi possível abrir %s para escrita!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
 
@@ -16525,9 +16605,6 @@ msgstr "Você não tem permissão para desinstalar essa aplicação."
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "Você não é um membro da sala \"%s\"\n"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Informação do usuário %s indisponível"
-
 #~ msgid "Primary Information"
 #~ msgstr "Informação primária"
 
diff --git a/po/ro.po b/po/ro.po
index 7ad45ab0a3..cfec6cef73 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,21 +3,21 @@
 # 2002-2010, Mișu Moldovan <dumol@gnome.org>
 # 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.7.0\n"
+"Project-Id-Version: pidgin-2.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
-"PO-Revision-Date: 2010-05-11 00:25+0300\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-20 23:11+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.org>\n"
-"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "Language: ro\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"
+"X-Generator: Virtaal 0.6.1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -62,9 +62,8 @@ msgstr ""
 msgid "Error"
 msgstr "Eroare"
 
-#, fuzzy
 msgid "Account was not modified"
-msgstr "Contul nu a fost adăugat"
+msgstr "Contul nu a fost modificat"
 
 msgid "Account was not added"
 msgstr "Contul nu a fost adăugat"
@@ -75,10 +74,14 @@ msgstr "Numele de utilizator al unui cont nu poate fi gol."
 msgid ""
 "The account's protocol cannot be changed while it is connected to the server."
 msgstr ""
+"Cât timp aveți acest cont conectat la server, nu îi puteți schimba "
+"protocolul."
 
 msgid ""
 "The account's username cannot be changed while it is connected to the server."
 msgstr ""
+"Cât timp aveți acest cont conectat la server, nu vă puteți schimba numele de "
+"utilizator."
 
 msgid "New mail notifications"
 msgstr "Notificare la mail nou"
@@ -528,7 +531,6 @@ msgstr "Confirmare ștergere certificat"
 msgid "Certificate Manager"
 msgstr "Manager de certificate"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nume server"
 
@@ -807,7 +809,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Se așteaptă începerea transferului"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Oprit"
 
 msgid "Failed"
@@ -1697,9 +1699,14 @@ msgid ""
 "The certificate is not valid yet.  Check that your computer's date and time "
 "are accurate."
 msgstr ""
+"Certificatul nu este valid deocamdată. Verificați data și ora calculatorului."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Certificatul a expirat și nu ar trebui considerat valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Certificatul a expirat și nu ar trebui considerat valid. Verificați data și "
+"ora calculatorului."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -3855,17 +3862,17 @@ msgstr "Cerere nevalidă de la server"
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Serverul consideră autentificarea completă, dar clientul nu"
 
-#, fuzzy
 msgid "Server may require plaintext authentication over an unencrypted stream"
-msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
+msgstr ""
+"Serverul ar putea cere autentificare în clar printr-o conexiune necriptată"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s may require plaintext authentication over an unencrypted connection.  "
 "Allow this and continue authentication?"
 msgstr ""
-"%s necesită autentificare în clar printr-o conexiune necriptată. Permiteți "
-"autentificarea în aceste condiții?"
+"%s ar putea cere autentificare în clar printr-o conexiune necriptată. "
+"Permiteți autentificarea în aceste condiții?"
 
 msgid "SASL authentication failed"
 msgstr "Autentificare SASL eșuată"
@@ -4737,11 +4744,17 @@ msgstr "Modul de protocol XMPP"
 msgid "Domain"
 msgstr "Domeniu"
 
-msgid "Require SSL/TLS"
-msgstr "Necesită SSL/TLS"
+msgid "Require encryption"
+msgstr "Necesită criptare"
+
+msgid "Use encryption if available"
+msgstr "Criptează dacă e posibil"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Impune utilizarea versiunii vechi de SSL (pe portul 5223)"
+msgid "Use old-style SSL"
+msgstr "Utilizează SSL pe stil vechi"
+
+msgid "Connection security"
+msgstr "Securitate a conexiunii"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permite autentificarea în clar prin conexiuni necriptate"
@@ -5372,7 +5385,8 @@ msgstr "Contacte de alt tip"
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
-"%s a trimis un wink. <a href='msn-wink://%s'>Apăsați aici pentru a-l reda</a>"
+"%s a trimis un wink. <a href='msn-wink://%s'>Dați clic aici pentru a-l reda</"
+"a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
@@ -5381,7 +5395,7 @@ msgstr "%s a trimis un wink, dar nu a putut fi salvat"
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
-"%s a trimis un clip audio. <a href='audio://%s'>Apăsați aici pentru a-l "
+"%s a trimis un clip audio. <a href='audio://%s'>Dați clic aici pentru a-l "
 "reda</a>"
 
 #, c-format
@@ -5733,9 +5747,8 @@ msgstr "Server pentru metoda HTTP"
 msgid "Show custom smileys"
 msgstr "Arată iconițe simbolice personalizate"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "Nu se poate crea o nouă conexiune"
+msgstr "Permite conectări directe"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:  Sâcâiți un utilizator pentru a-i atrage atenția"
@@ -5842,7 +5855,7 @@ msgid "You have signed on from another location"
 msgstr "V-ați autentificat din altă parte."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu."
+msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu..."
 
 msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."
@@ -5948,19 +5961,17 @@ msgstr "PIN-ul nu este valid. Ar trebui să conțină doar cifre [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "Cele două PIN-uri introduse nu se potrivesc."
 
-msgid "The name you entered is invalid."
-msgstr "Numele introdus este nevalid."
+msgid "The Display Name you entered is invalid."
+msgstr "Aliasul introdus este nevalid."
 
-#, fuzzy
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
-"Ziua de naștere introdusă nu este validă. Formatul corect este: „AAAA-LL-ZZ�"
+"Ziua de naștere introdusă nu este validă. Formatul corect este: „AAAA-LL-ZZ�."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Eroare la scriere"
+msgstr "Eroare la actualizarea profilului"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5968,376 +5979,318 @@ msgid "Profile"
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Detaliile profilului nu v-au fost descărcate. Încercați mai târziu..."
 
 msgid "Your UID"
-msgstr ""
+msgstr "UID propriu"
 
 #. pin
 #. pin (required)
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verificare PIN"
 
 #. display name
 #. nick name (required)
-#, fuzzy
 msgid "Display Name"
-msgstr "Nume de familie"
+msgstr "Alias"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Ascunde-mi numărul"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Număr de telefon mobil"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil Yahoo!"
+msgstr "Actualizați-vă profilul"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Aici vă puteți actualiza profilul MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Arată o imagine de pornire"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Nu e disponibilă nicio imagine de pornire"
 
-#, fuzzy
 msgid "About"
-msgstr "Despre mine"
+msgstr "Despre"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Schimbare parolă..."
+msgstr "Schimbare profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Arată înregistrările..."
+msgstr "Arată imaginea de pornire..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Despre mine"
+msgstr "Despre..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Mesaj în absență prea mare."
+msgstr "Fișierul pe care încercați să îl trimiteți este prea mare!"
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
-"Conectarea la server a eșuat. Introduceți adresa serverului la care doriți "
-"să vă conectați."
+"Conectarea la serverul HTTP MXit a eșuat. Verificați-vă opțiunile de server."
 
-#, fuzzy
 msgid "Logging In..."
 msgstr "Autentificare..."
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Conectarea la server a eșuat. Introduceți adresa serverului la care doriți "
-"să vă conectați."
+"Conectarea la serverul MXit a eșuat. Verificați-vă opțiunile de server."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Autentificare"
+msgstr "Conectare..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Numele introdus este nevalid."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "Cheia SecurID introdusă este nevalidă."
+msgstr "PIN-ul introdus are o lungime nevalidă [7-10]."
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "ID MXit"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "ÃŽnregistrare cont nou XMPP"
+msgstr "ÃŽnregistrare cont nou MXit"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
 msgstr "Completați următoarele câmpuri:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Eroare la contactarea serverului WAP MXit. Reîncercați mai târziu..."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit nu poate procesa momentan această cerere. Reîncercați mai târziu..."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "S-a introdus un cod greșit de securitate. Reîncercați mai târziu..."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "V-a expirat sesiunea. Reîncercați mai târziu..."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "S-a selectat o țară nevalidă. Încercați din nou..."
 
 msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
+"ID-ul MXit introdus nu este înregistrat. Înregistrați-l înainte de a-l "
+"folosi."
 
 msgid "The MXit ID you entered is already registered. Please choose another."
-msgstr ""
+msgstr "ID-ul MXit introdus este deja înregistrat. Alegeți un altul."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Serverul este indisponibil, încercați din nou mai tărziu"
+msgstr "Serverul este indisponibil, reîncercați mai târziu..."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Nu ați introdus codul de securitate"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Securitate activată"
+msgstr "Cod de securitate"
 
 #. ask for input (required)
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Introduceți codul"
+msgstr "Introduceți codul de securitate"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Țară"
+msgstr "Țara de reședință"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Limbă preferată"
+msgstr "Limba preferată"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Solicit autorizare"
+msgstr "Autorizare MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Validare cont MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Informații server"
+msgstr "Se obțin detaliile utilizatorului..."
 
-#, fuzzy
 msgid "Loading menu..."
-msgstr "Autentificare..."
+msgstr "Se încarcă meniul..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Mesaje trimise"
+msgstr "Mesaj de status"
 
-#, fuzzy
 msgid "Rejection Message"
-msgstr "Mesaje primite"
+msgstr "Mesaj de refuz"
 
 #. hidden number
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Inițială"
+msgstr "Număr ascuns"
 
-#, fuzzy
 msgid "Your MXit ID..."
-msgstr "Identitate Yahoo..."
+msgstr "ID propriu MXit..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "Server WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Conectare folosind TCP"
+msgstr "Conectare HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Activare popup pentru imaginea de pornire"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "Ați fost dat afară: (%s)"
+msgstr "Ați fost dat afară din acest MultiMX."
 
-#, fuzzy
 msgid "was kicked"
-msgstr "Bilet (ticket) greșit"
+msgstr "a fost dat afară"
 
-#, fuzzy
 msgid "_Room Name:"
-msgstr "Ca_meră:"
+msgstr "Nume came_ră:"
 
 #. Display system message in chat window
-#, fuzzy
 msgid "You have invited"
-msgstr "Aveți mail nou!"
+msgstr "Ați fost invitat"
 
-#, fuzzy
 msgid "Last Online"
-msgstr "Online"
+msgstr "Ultima oară online"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "S-a pierdut conexiunea la MXit. Reconectați-vă..."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Eroare de mesaj XMPP"
+msgstr "Eroare de trimitere a mesajului"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Nu se poate rezolva numele serverului"
+msgstr "Momentan nu vi se poate procesa cererea"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Timeout în așteptarea unui răspuns de la serverul MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Ați intrat cu succes în Qun"
+msgstr "Autentificare reușită..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
-"%s v-a trimis o invitație de chat audio, pentru care nu există încă suport."
+"%s v-a trimis un mesaj criptat, pentru care nu există încă suport în acest "
+"client."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Eroare de mesaj XMPP"
+msgstr "Eroare de mesaj"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Nu s-a putut efectua redirectarea utilizând protocolul specificat"
 
-#, fuzzy
 msgid "An internal MXit server error occurred."
-msgstr "A apărut o eroare necunoscută de certificat."
+msgstr "A apărut o eroare internă de server MXit."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "Eroare SASL: %s"
+msgstr "Eroare la autentificare: %s (%i)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "Eroare SASL: %s"
+msgstr "Eroare la deconectare: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Eroare la conectare"
+msgstr "Eroare de contact"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Eroare de mesaj XMPP"
+msgstr "Eroare de trimitere a mesajului"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Eroare de flux"
+msgstr "Eroare de status"
 
 msgid "Mood Error"
 msgstr "Eroare privind dispoziția"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Eroare la ștergerea înregistrării"
+msgstr "Eroare de invitare"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Eroare la conectare"
+msgstr "Eroare la ștergerea contactului"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Subscriere"
+msgstr "Eroare de subscriere"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Eroare la conectare"
+msgstr "Eroare la actualizarea contactului"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Transfer de fișiere"
+msgstr "Eroare la transferul de fișiere"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Nu se poate crea întâmpinarea"
+msgstr "Nu se poate crea camera MultiMX"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Eroare la ștergerea înregistrării"
+msgstr "Eroare de invitaţie MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Eroare la scriere"
+msgstr "Eroare de profil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Pachet nevalid primit de la MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x06)"
 
 msgid "In Love"
 msgstr "Îndrăgostit"
 
-#, fuzzy
 msgid "Pending"
-msgstr "Se trimite"
+msgstr "În așteptare"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Invită"
+msgstr "Invitat"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Respingere"
+msgstr "Respins"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Șterge"
+msgstr "Șters"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Reclame MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Informații serviciu"
+msgstr "Mai multe detalii"
 
 #, c-format
 msgid "No such user: %s"
@@ -6424,7 +6377,7 @@ msgid ""
 msgstr ""
 "%s Aveți o parolă de %zu caractere, mai mare decât lungimea maximă de %d. "
 "Puteți introduce o parolă mai scurtă la http://profileedit.myspace.com/index."
-"cfm?fuseaction=accountSettings.changePassword și să încercați din nou."
+"cfm?fuseaction=accountSettings.changePassword și să reîncercați."
 
 msgid "Incorrect username or password"
 msgstr "Nume de utilizator sau parolă incorecte."
@@ -6486,10 +6439,10 @@ msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "Nu s-a găsit un cont MySpaceIM pentru a deschide acest URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr "Activați contul MySpaceIM potrivit și încercați din nou."
+msgstr "Activați contul MySpaceIM potrivit și reîncercați."
 
 msgid "Show display name in status text"
-msgstr "Arată numele afișat în textul statusului"
+msgstr "Arată aliasul în textul statusului"
 
 msgid "Show headline in status text"
 msgstr "Arată titlul în textul statusului"
@@ -6729,7 +6682,7 @@ msgid "Your system administrator has disabled this operation"
 msgstr "Administratorul de sistem a dezactivat această operațiune"
 
 msgid "The server is unavailable; try again later"
-msgstr "Serverul este indisponibil, încercați din nou mai tărziu"
+msgstr "Serverul este indisponibil, reîncercați mai târziu..."
 
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Nu se poate adăuga de două ori un contact în același director"
@@ -6947,6 +6900,17 @@ msgstr "Adresă server"
 msgid "Server port"
 msgstr "Port server"
 
+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."
+
+msgid "No reason given."
+msgstr "Fără motiv."
+
+msgid "Authorization Denied Message:"
+msgstr "Mesajul de autorizare refuzată:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "S-a primit un răspuns neașteptat de la %s: %s"
@@ -6982,6 +6946,25 @@ msgstr "AOL nu permite autentificarea acestui cont aici"
 msgid "Error requesting %s"
 msgstr "Eroare la cererea %s"
 
+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 ""
+"(A intervenit o eroare la primirea acestui mesaj. Contactul ce vi l-a trimis "
+"utilizează probabil un tip neașteptat de codare de caractere. Dacă știți ce "
+"codare este aceasta, o puteți specifica în opțiunile avansate ale contului "
+"AIM/ICQ utilizat.)"
+
+#, 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 ""
+"(A intervenit o eroare la primirea acestui mesaj. Codarea proprie nu se "
+"potrivește cu cea aleasă de %s sau %s utilizează un client problematic)."
+
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"
 
@@ -7196,95 +7179,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fișierul %s are %s, care depășește mărimea maximă de %s."
 
-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 ""
-"(A intervenit o eroare la primirea acestui mesaj. Contactul ce vi l-a trimis "
-"utilizează probabil un tip neașteptat de codare de caractere. Dacă știți ce "
-"codare este aceasta, o puteți specifica în opțiunile avansate ale contului "
-"AIM/ICQ utilizat.)"
-
-#, 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 ""
-"(A intervenit o eroare la primirea acestui mesaj. Codarea proprie nu se "
-"potrivește cu cea aleasă de %s sau %s utilizează un client problematic)."
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Avatar"
-
-msgid "Voice"
-msgstr "Voce"
-
-msgid "AIM Direct IM"
-msgstr "Discuție directă AIM"
-
-msgid "Get File"
-msgstr "Ia fișierul"
-
-msgid "Games"
-msgstr "Jocuri"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Adăugiri"
-
-msgid "Send Buddy List"
-msgstr "Trimite lista de contacte"
-
-msgid "ICQ Direct Connect"
-msgstr "Conectare directă ICQ"
-
-msgid "AP User"
-msgstr "Utilizator AP"
-
-msgid "ICQ RTF"
-msgstr "RTF ICQ"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Schimb de server ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "UTF8 ICQ (vechi)"
-
-msgid "Trillian Encryption"
-msgstr "Criptare Trillian"
-
-msgid "ICQ UTF8"
-msgstr "UTF8 ICQ"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Securitate activată"
-
-msgid "Video Chat"
-msgstr "Videochat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video în direct"
-
-msgid "Camera"
-msgstr "Cameră"
-
-msgid "Screen Sharing"
-msgstr "Partajare ecran"
-
 msgid "Free For Chat"
 msgstr "Disponibil"
 
@@ -7315,15 +7209,6 @@ msgstr "La serviciu"
 msgid "At lunch"
 msgstr "La masă"
 
-msgid "IP Address"
-msgstr "Adresă IP"
-
-msgid "Warning Level"
-msgstr "Nivel de avertizare"
-
-msgid "Buddy Comment"
-msgstr "Comentariu contact"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Conectarea la serverul de autentificare a eșuat: %s"
@@ -7389,8 +7274,8 @@ msgid ""
 "longer."
 msgstr ""
 "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 chiar mai mult "
-"de atât."
+"din nou. Dacă veți continua să încercați, va trebui să așteptați chiar mai "
+"mult de atât."
 
 #. client too old
 #, c-format
@@ -7422,17 +7307,6 @@ msgstr "Parola a fost trimisă"
 msgid "Unable to initialize connection"
 msgstr "Nu se poate inițializa o nouă conexiune"
 
-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."
-
-msgid "No reason given."
-msgstr "Fără motiv."
-
-msgid "Authorization Denied Message:"
-msgstr "Mesajul de autorizare refuzată:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7561,60 +7435,13 @@ msgstr[0] "Ați pierdut %hu mesaj de la %s din motive necunoscute."
 msgstr[1] "Ați pierdut %hu mesaje de la %s din motive necunoscute."
 msgstr[2] "Ați pierdut %hu de mesaje de la %s din motive necunoscute."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
-
-msgid "Online Since"
-msgstr "Online din"
-
-msgid "Member Since"
-msgstr "Membru din"
-
-msgid "Capabilities"
-msgstr "Facilități"
-
 msgid "Your AIM connection may be lost."
 msgstr "S-ar putea să fi pierdut conexiunea AIM."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nu se poate afișa mesajul acestui utilizator deoarece conține caractere "
-"nevalide]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Contul v-a fost deconectat din camera de chat %s."
 
-msgid "Mobile Phone"
-msgstr "Telefon mobil"
-
-msgid "Personal Web Page"
-msgstr "Pagină personală"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Alte informații"
-
-msgid "Zip Code"
-msgstr "Cod poștal"
-
-msgid "Work Information"
-msgstr "Informații serviciu"
-
-msgid "Division"
-msgstr "Departament"
-
-msgid "Position"
-msgstr "Poziție"
-
-msgid "Web Page"
-msgstr "Adresă web"
-
 msgid "Pop-Up Message"
 msgstr "Mesaj popup"
 
@@ -7783,7 +7610,7 @@ msgid ""
 "list.  Please remove one and try again."
 msgstr ""
 "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."
+"de contacte. Ștergeți unul și reîncercați."
 
 msgid "(no name)"
 msgstr "(fără nume)"
@@ -7903,8 +7730,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Schimbă adresa în:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>nu așteptați nicio autorizare</i>"
+msgid "you are not waiting for authorization"
+msgstr "nu așteptați nicio autorizare"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lista contactelor de la care așteptați autorizarea"
@@ -7914,7 +7741,7 @@ msgid ""
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "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."
+"din nou autorizare� după un clic dreapta pe nume în lista contactelor."
 
 msgid "Find Buddy by Email"
 msgstr "Căutare contact după adresa de mail"
@@ -7942,6 +7769,14 @@ msgstr "Opțiuni de înaintare a mesajelor (pe site)"
 msgid "Set Privacy Options..."
 msgstr "Opțiuni de securitate..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Listă de vizibilitate"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Listă de invizibilitate"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmare cont"
@@ -7958,9 +7793,6 @@ msgstr "Afișare contacte ce așteaptă autorizarea"
 msgid "Search for Buddy by Email Address..."
 msgstr "Căutare contact după adresa de mail..."
 
-msgid "Search for Buddy by Information"
-msgstr "Căutare contact după detalii"
-
 msgid "Use clientLogin"
 msgstr "Utilizați clientLogin"
 
@@ -8005,10 +7837,10 @@ msgid "Invalid SNAC"
 msgstr "SNAC nevalid"
 
 msgid "Server rate limit exceeded"
-msgstr ""
+msgstr "S-a depășit limitarea de server"
 
 msgid "Client rate limit exceeded"
-msgstr ""
+msgstr "S-a depășit limitarea de client"
 
 msgid "Service unavailable"
 msgstr "Serviciu indisponibil"
@@ -8070,6 +7902,161 @@ msgstr "Coadă plină"
 msgid "Not while on AOL"
 msgstr "Nu (cât timp e pe AOL)"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Avatar"
+
+msgid "Voice"
+msgstr "Voce"
+
+msgid "AIM Direct IM"
+msgstr "Discuție directă AIM"
+
+msgid "Get File"
+msgstr "Ia fișierul"
+
+msgid "Games"
+msgstr "Jocuri"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Adăugiri"
+
+msgid "Send Buddy List"
+msgstr "Trimite lista de contacte"
+
+msgid "ICQ Direct Connect"
+msgstr "Conectare directă ICQ"
+
+msgid "AP User"
+msgstr "Utilizator AP"
+
+msgid "ICQ RTF"
+msgstr "RTF ICQ"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Schimb de server ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "UTF8 ICQ (vechi)"
+
+msgid "Trillian Encryption"
+msgstr "Criptare Trillian"
+
+msgid "ICQ UTF8"
+msgstr "UTF8 ICQ"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Securitate activată"
+
+msgid "Video Chat"
+msgstr "Videochat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video în direct"
+
+msgid "Camera"
+msgstr "Cameră"
+
+msgid "Screen Sharing"
+msgstr "Partajare ecran"
+
+msgid "IP Address"
+msgstr "Adresă IP"
+
+msgid "Warning Level"
+msgstr "Nivel de avertizare"
+
+msgid "Buddy Comment"
+msgstr "Comentariu contact"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
+msgid "Personal Web Page"
+msgstr "Pagină personală"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Alte informații"
+
+msgid "Zip Code"
+msgstr "Cod poștal"
+
+msgid "Work Information"
+msgstr "Informații serviciu"
+
+msgid "Division"
+msgstr "Departament"
+
+msgid "Position"
+msgstr "Poziție"
+
+msgid "Web Page"
+msgstr "Adresă web"
+
+msgid "Online Since"
+msgstr "Online din"
+
+msgid "Member Since"
+msgstr "Membru din"
+
+msgid "Capabilities"
+msgstr "Facilități"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Apar online"
+
+msgid "Don't Appear Online"
+msgstr "Nu apar online"
+
+msgid "Appear Offline"
+msgstr "Apar offline"
+
+msgid "Don't Appear Offline"
+msgstr "Nu apar offline"
+
+msgid "you have no buddies on this list"
+msgstr "nu aveți contacte în această listă"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Puteți adăuga un contact la această listă selectând „%s� după un clic "
+"dreapta pe nume"
+
+msgid "Visible List"
+msgstr "Listă de vizibilitate"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+"Aceste contacte vă vor vedea statusul când treceți în modul „Invizibil�"
+
+msgid "Invisible List"
+msgstr "Listă de invizibilitate"
+
+msgid "These buddies will always see you as offline"
+msgstr "Aceste contacte vă vor vedea mereu ca fiind offline"
+
 msgid "Aquarius"
 msgstr "Vărsător"
 
@@ -8249,8 +8236,8 @@ msgid "Your request was rejected."
 msgstr "Cererea v-a fost respinsă."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u solicită autorizare"
+msgid "%u requires verification: %s"
+msgstr "%u necesită verificare: %s"
 
 msgid "Add buddy question"
 msgstr "Întrebare la adăugarea contactului"
@@ -10279,9 +10266,8 @@ msgstr "Opțiuni locale chat"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoră invitațiile la conferințe și chat"
 
-#, fuzzy
 msgid "Use account proxy for HTTP and HTTPS connections"
-msgstr "Utilizează proxy-ul contului pentru conexiuni SSL"
+msgstr "Utilizează proxy-ul contului pentru conexiuni HTTP și HTTPS"
 
 msgid "Chat room list URL"
 msgstr "Adresă listă camere de chat"
@@ -10386,8 +10372,9 @@ msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"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."
+"Doriți să ignorați utilizatorul %s, dar acesta e prezent în lista de "
+"contacte. Alegeți „Da� pentru a-l șterge din listă și a-l ignora de acum "
+"înainte."
 
 msgid "Ignore buddy?"
 msgstr "Ignorați contactul?"
@@ -10470,18 +10457,12 @@ msgstr "Ieșit afară"
 msgid "Not on server list"
 msgstr "Nu este în lista de pe server"
 
-msgid "Appear Online"
-msgstr "Apar online"
-
 msgid "Appear Permanently Offline"
 msgstr "Par totdeauna offline"
 
 msgid "Presence"
 msgstr "Prezență"
 
-msgid "Appear Offline"
-msgstr "Apar offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nu par totdeauna offline"
 
@@ -10603,7 +10584,7 @@ msgid ""
 msgstr ""
 "Nu s-a putut descărca profilul utilizatorului, probabil din cauză că "
 "utilizatorul nu există. Totuși, uneori Yahoo! nu reușește să găsească "
-"profilul unui utilizator valid. Mai încercați o dată dacă știți sigur că "
+"profilul unui utilizator valid. Reîncercați mai târziu dacă știți sigur că "
 "acest utilizator există."
 
 msgid "The user's profile is empty."
@@ -11036,27 +11017,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Conexiunea a fost întreruptă de un alt program pornit."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Conexiunea a fost închisă la distanță."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Conexiunea a expirat."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Conexiune resetată."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresa este deja utilizată."
 
@@ -11205,6 +11181,11 @@ msgstr ""
 "conturi utilizând <b>Conturi->Administrare conturi</b> în fereastra listei "
 "de contacte."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s dorește să vă adauge cu identitatea %s în lista sa de contacte%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Culoare fundal"
@@ -11460,6 +11441,8 @@ msgstr "Mesaj (opțional)"
 msgid "Edit User Mood"
 msgstr "Schimbare a propriei dispoziții"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Contact_e"
@@ -12169,7 +12152,7 @@ msgid "Filter"
 msgstr "Filtru"
 
 msgid "Right click for more options."
-msgstr "Click dreapta pentru mai multe opțiuni."
+msgstr "Clic dreapta pentru mai multe opțiuni."
 
 msgid "Level "
 msgstr "Nivel "
@@ -12211,9 +12194,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "programator web"
 
-msgid "Senior Contributor/QA"
-msgstr "Contributor major/CTC"
-
 msgid "win32 port"
 msgstr "portare win32"
 
@@ -12239,15 +12219,17 @@ msgstr "autorul inițial"
 msgid "lead developer"
 msgstr "programator principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contributor major/CTC"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabă"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Rușinat"
+msgstr "Assameză"
 
 msgid "Belarusian Latin"
 msgstr "Bielorusă (alfabet latin)"
@@ -12375,9 +12357,8 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Macedoneană"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Malay"
+msgstr "Malaeză"
 
 msgid "Mongolian"
 msgstr "Mongoleză"
@@ -12688,7 +12669,7 @@ msgid "_Remove Chat"
 msgstr "Șt_ergere chat"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
+msgstr "Clic dreapta pentru mai multe mesaje necitite...\n"
 
 msgid "_Change Status"
 msgstr "_Schimbare status"
@@ -13037,7 +13018,7 @@ msgid "Log Deletion Failed"
 msgstr "Ștergerea înregistrărilor a eșuat"
 
 msgid "Check permissions and try again."
-msgstr "Verificați drepturile și încercați din nou."
+msgstr "Verificați drepturile și reîncercați."
 
 #, c-format
 msgid ""
@@ -13164,13 +13145,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"
 
-#, fuzzy
 msgid "_Media"
-msgstr "/_Media"
+msgstr "_Media"
 
-#, fuzzy
 msgid "_Hangup"
-msgstr "ÃŽnchide"
+msgstr "ÃŽnc_hide"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13592,6 +13571,9 @@ msgstr "Server releu (TURN)"
 msgid "_TURN server:"
 msgstr "Server _TURN:"
 
+msgid "_UDP Port:"
+msgstr "Port _UDP:"
+
 msgid "Use_rname:"
 msgstr "_Nume utilizator:"
 
@@ -13613,6 +13595,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Implicit"
 
@@ -13631,6 +13618,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -14163,7 +14158,7 @@ msgstr "nimic"
 msgid "Small"
 msgstr "Mici"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Versiuni mai mici ale iconițelor implicite"
 
 msgid "Response Probability:"
@@ -14617,7 +14612,7 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"O sesiune de mesaje muzicale a fost inițiată. Un click pe iconița MM o va "
+"O sesiune de mesaje muzicale a fost inițiată. Un clic pe iconița MM o va "
 "accepta."
 
 msgid "Music messaging session confirmed."
@@ -15189,6 +15184,9 @@ msgstr "Dispo_zitiv"
 msgid "Voice/Video Settings"
 msgstr "Opțiuni audio/video"
 
+msgid "Voice and Video Settings"
+msgstr "Opțiuni audio/video"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15319,7 +15317,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15352,7 +15350,7 @@ msgstr "Creează iconiţe Pidgin pe Desktop"
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
+msgstr "Simboluri de depanare (pentru raportare de probleme)"
 
 #. Installer Subsection Text
 msgid "Desktop"
@@ -15364,12 +15362,18 @@ msgid ""
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
+"Eroare la descărcarea GTK+ ($R2).$\\rAceastă componentă este necesară pentru "
+"funcţionarea Pidgin. Dacă reîncercarea eşuează, încercaţi varianta „Offline "
+"Installer� de la http://pidgin.im/download/windows/ ."
 
 #. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
+"Eroare la instalarea simbolurilor de depanare ($R2).$\\rDacă reîncercarea "
+"eşuează, încercaţi varianta 'Offline Installer' from http://pidgin.im/"
+"download/windows/ ."
 
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
@@ -15378,16 +15382,17 @@ msgid ""
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing"
 "%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
+"Eroare la instalarea verificării ortografice ($R3).$\\rDacă reîncercarea "
+"eşuează, găsiţi instrucţiuni de instalare manuală la: http://developer."
+"pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
 msgstr "Mediu GTK+ (obligatoriu)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Loc"
+msgstr "Localizări"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
@@ -15402,6 +15407,8 @@ msgid ""
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
+"Pidgin necesită o instalare GTK+ compatibilă (care nu pare să fie prezentă "
+"deja).$\\rSigur doriţi să omiteţi instalarea bibliotecilor GTK+?"
 
 #. Installer Subsection Text
 msgid "Shortcuts"
@@ -15413,7 +15420,7 @@ msgstr "Scurtături pentru pornirea Pidgin"
 
 #. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
+msgstr "Suport pentru verificare ortografică"
 
 #. Installer Subsection Text
 msgid "Start Menu"
@@ -15422,7 +15429,7 @@ msgstr "Meniu Start"
 #. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
-msgstr ""
+msgstr "Suport pentru verificare ortografică (necesită o conexiune la net)."
 
 msgid "The installer is already running."
 msgstr "Instalarea este deja pornită."
@@ -15436,12 +15443,14 @@ msgstr ""
 
 #. Installer Subsection Text
 msgid "URI Handlers"
-msgstr ""
+msgstr "Comenzi asociate resurselor URI"
 
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
+"Nu s-a putut dezinstala versiunea curent instalată de Pidgin. Noua versiune "
+"va fi instalată peste versiunea curent instalată."
 
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
@@ -15449,45 +15458,3 @@ msgstr "Vizitaţi pagina de web Pidgin"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Nu aveţi drepturile de acces necesare dezinstalării acestei aplicaţii."
-
-#~ msgid "The certificate is not valid yet."
-#~ msgstr "Certificatul nu este încă valid."
-
-#, fuzzy
-#~ msgid "The nick name you entered is invalid."
-#~ msgstr "Cheia SecurID introdusă este nevalidă."
-
-#, fuzzy
-#~ msgid "Nick Name"
-#~ msgstr "Pseudonim"
-
-#, fuzzy
-#~ msgid "Your Mobile Number..."
-#~ msgstr "Introducere număr telefon mobil..."
-
-#~ msgid "Rate to host"
-#~ msgstr "Limitare către server"
-
-#~ msgid "Rate to client"
-#~ msgstr "Limitare către client"
-
-#~ msgid "/Media/_Hangup"
-#~ msgstr "/Media/ÃŽnc_hide"
-
-#~ msgid "Unknown reason."
-#~ msgstr "Motiv necunoscut."
-
-#~ msgid "Current Mood"
-#~ msgstr "Dispoziție curentă"
-
-#~ msgid "New Mood"
-#~ msgstr "Dispoziție nouă"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Schimbați-vă dispoziția"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Cum vă simțiți pe moment?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Schimbare dispoziție..."
diff --git a/po/ru.po b/po/ru.po
index f0de6f15a5..e5abd4442d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 02:16-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: �нтон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -531,7 +531,6 @@ msgstr "Подтвердить удаление �ертификата"
 msgid "Certificate Manager"
 msgstr "Менеджер �ертификатов"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Им� узла"
 
@@ -807,7 +806,7 @@ msgstr "О�тановить"
 msgid "Waiting for transfer to begin"
 msgstr "Ожидание начала передачи"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отменено"
 
 msgid "Failed"
@@ -1703,9 +1702,13 @@ msgstr ""
 "Сертификат ещё не подтверждён.  Проверьте правильно�ть даты и времени на "
 "вашем компьютере."
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
-"Срок дей�тви� �ертификата и�тёк и его больше не �ледует �читать доверенным."
+"Сертификат ещё не подтверждён.  Проверьте правильно�ть даты и времени на "
+"вашем компьютере."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4746,11 +4749,20 @@ msgstr "Модуль протокола XMPP"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Требовать SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Требовать авторизацию"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Принудительно и�пользовать �тарый (порт 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Пользователь�ка� информаци� дл� %s недо�тупна"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Сбро� �оединени�"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию про�тым тек�том через нешифрованные потоки"
@@ -5994,7 +6006,8 @@ msgstr "PIN-код неправильный. Он должен Ñ�одержатÑ
 msgid "The two PINs you entered do not match."
 msgstr "Два введённых PIN-кода не �овпадают."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Введённое им� неправильное."
 
 msgid ""
@@ -6089,10 +6102,6 @@ msgid "Connecting..."
 msgstr "Соединение..."
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Введённое им� неправильное."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Введённый ключ SecurID неверный."
 
@@ -6971,6 +6980,17 @@ msgstr "�дре� �ервера"
 msgid "Server port"
 msgstr "Порт �ервера"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Пожалуй�та, авторизируйте мен�, чтобы � мог добавить ва� в �вой �пи�ок "
+"�обе�едников"
+
+msgid "No reason given."
+msgstr "Причина не указана."
+
+msgid "Authorization Denied Message:"
+msgstr "Сообщение отказа в авторизации:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "От %s получен неожиданный ответ: %s"
@@ -7006,6 +7026,25 @@ msgstr "AOL не позволÑ�ет вашему Ñ�кранному имени Ð
 msgid "Error requesting %s"
 msgstr "Ошибка запро�а %s"
 
+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.)"
+
+#, 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 �одержит ошибки.)"
+
 msgid "Could not join chat room"
 msgstr "�е удало�ь при�оединить�� к комнате чата"
 
@@ -7222,95 +7261,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Файл %s - %s, который больше, чем мак�имальный размер %s."
 
-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.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "Значок �обе�едника"
-
-msgid "Voice"
-msgstr "Голо�"
-
-msgid "AIM Direct IM"
-msgstr "Пр�мое �оединение AIM"
-
-msgid "Get File"
-msgstr "Получить файл"
-
-msgid "Games"
-msgstr "Игры"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Дополнени�"
-
-msgid "Send Buddy List"
-msgstr "Отправить �пи�ок �обе�едников"
-
-msgid "ICQ Direct Connect"
-msgstr "Пр�мое �оединение ICQ"
-
-msgid "AP User"
-msgstr "Пользователь AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "�игили�т"
-
-msgid "ICQ Server Relay"
-msgstr "Релейный �ервер ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Старый ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Шифрование Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Верх"
-
-msgid "Security Enabled"
-msgstr "Безопа�но�ть включена"
-
-msgid "Video Chat"
-msgstr "Видеочат"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Живое видео"
-
-msgid "Camera"
-msgstr "Камера"
-
-msgid "Screen Sharing"
-msgstr "Совме�тное пользование �краном"
-
 msgid "Free For Chat"
 msgstr "Готов пообщать��"
 
@@ -7341,15 +7291,6 @@ msgstr "�а работе"
 msgid "At lunch"
 msgstr "Переку�"
 
-msgid "IP Address"
-msgstr "IP-адре�"
-
-msgid "Warning Level"
-msgstr "Уровень предупреждени�"
-
-msgid "Buddy Comment"
-msgstr "Комментарий �обе�едника"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "�е удаёт�� �оединить�� � �ервером аутентификации: %s"
@@ -7447,17 +7388,6 @@ msgstr "Пароль отправлен"
 msgid "Unable to initialize connection"
 msgstr "�е удаёт�� инициализировать �оединение"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Пожалуй�та, авторизируйте мен�, чтобы � мог добавить ва� в �вой �пи�ок "
-"�обе�едников"
-
-msgid "No reason given."
-msgstr "Причина не указана."
-
-msgid "Authorization Denied Message:"
-msgstr "Сообщение отказа в авторизации:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7591,60 +7521,13 @@ msgstr[0] "Вы не получили %hu �ообщение от %s по неи
 msgstr[1] "Вы не получили %hu �ообщени� от %s по неизве�тной причине."
 msgstr[2] "Вы не получили %hu �ообщений от %s по неизве�тной причине."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Пользователь�ка� информаци� недо�тупна: %s"
-
-msgid "Online Since"
-msgstr "В �ети �"
-
-msgid "Member Since"
-msgstr "Член �"
-
-msgid "Capabilities"
-msgstr "Возможно�ти"
-
 msgid "Your AIM connection may be lost."
 msgstr "Ваше �оединение AIM может быть потер�но."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[�е удаёт�� отобразить �ообщение от �того пользовател�, так как оно �одержит "
-"недопу�тимые �имволы.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были от�оединены от чата %s."
 
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
-msgid "Personal Web Page"
-msgstr "Пер�ональна� web-�траница"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Дополнительна� информаци�"
-
-msgid "Zip Code"
-msgstr "Индек�"
-
-msgid "Work Information"
-msgstr "Информаци� о работе"
-
-msgid "Division"
-msgstr "Отдел"
-
-msgid "Position"
-msgstr "Должно�ть"
-
-msgid "Web Page"
-msgstr "Web-�траница"
-
 msgid "Pop-Up Message"
 msgstr "В�плывающее �ообщение"
 
@@ -7935,7 +7818,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Изменить адре� на:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7974,6 +7858,14 @@ msgstr "Ð�аÑ�троить переадреÑ�ацию мгновенных Ñ�оÐ
 msgid "Set Privacy Options..."
 msgstr "У�тановить параметры конфиденциально�ти..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Показать �пи�ок _�обе�едников"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Спи�ок приглашённых"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запи�ь"
@@ -7990,9 +7882,6 @@ msgstr "Показать �обе�едников без авторизации"
 msgid "Search for Buddy by Email Address..."
 msgstr "И�кать �обе�едника по адре�у email..."
 
-msgid "Search for Buddy by Information"
-msgstr "И�кать �обе�едника по информации"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "И�пользовать clientLogin"
@@ -8102,6 +7991,165 @@ msgstr "Очередь полна"
 msgid "Not while on AOL"
 msgstr "�е в AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Значок �обе�едника"
+
+msgid "Voice"
+msgstr "Голо�"
+
+msgid "AIM Direct IM"
+msgstr "Пр�мое �оединение AIM"
+
+msgid "Get File"
+msgstr "Получить файл"
+
+msgid "Games"
+msgstr "Игры"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Дополнени�"
+
+msgid "Send Buddy List"
+msgstr "Отправить �пи�ок �обе�едников"
+
+msgid "ICQ Direct Connect"
+msgstr "Пр�мое �оединение ICQ"
+
+msgid "AP User"
+msgstr "Пользователь AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "�игили�т"
+
+msgid "ICQ Server Relay"
+msgstr "Релейный �ервер ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Старый ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Шифрование Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Верх"
+
+msgid "Security Enabled"
+msgstr "Безопа�но�ть включена"
+
+msgid "Video Chat"
+msgstr "Видеочат"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Живое видео"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "Screen Sharing"
+msgstr "Совме�тное пользование �краном"
+
+msgid "IP Address"
+msgstr "IP-адре�"
+
+msgid "Warning Level"
+msgstr "Уровень предупреждени�"
+
+msgid "Buddy Comment"
+msgstr "Комментарий �обе�едника"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Пользователь�ка� информаци� недо�тупна: %s"
+
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
+msgid "Personal Web Page"
+msgstr "Пер�ональна� web-�траница"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Дополнительна� информаци�"
+
+msgid "Zip Code"
+msgstr "Индек�"
+
+msgid "Work Information"
+msgstr "Информаци� о работе"
+
+msgid "Division"
+msgstr "Отдел"
+
+msgid "Position"
+msgstr "Должно�ть"
+
+msgid "Web Page"
+msgstr "Web-�траница"
+
+msgid "Online Since"
+msgstr "В �ети �"
+
+msgid "Member Since"
+msgstr "Член �"
+
+msgid "Capabilities"
+msgstr "Возможно�ти"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "По�вл�ет�� в �ети"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "По�вл�ет�� в �ети"
+
+msgid "Appear Offline"
+msgstr "Веро�тно не в �ети"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Веро�тно не в �ети"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ва� выгнали: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Вы можете запро�ить авторизацию от �тих �обе�едников повторно, щёлкнув на "
+"них правой кнопкой мыши и выбрав \"Повторный запро� авторизации\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Видимый"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Спи�ок приглашённых"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолей"
 
@@ -8299,7 +8347,7 @@ msgid "Your request was rejected."
 msgstr "Ваш запро� был отклонён."
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "%u требует подтверждени�"
 
 #, fuzzy
@@ -10576,18 +10624,12 @@ msgstr "Вышел"
 msgid "Not on server list"
 msgstr "�е в �пи�ке на �ервере"
 
-msgid "Appear Online"
-msgstr "По�вл�ет�� в �ети"
-
 msgid "Appear Permanently Offline"
 msgstr "По�то�нно по�вл�ет�� не в �ети"
 
 msgid "Presence"
 msgstr "При�ут�твие"
 
-msgid "Appear Offline"
-msgstr "Веро�тно не в �ети"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�е в�егда не в �ети"
 
@@ -11146,27 +11188,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Соединение прервано другой программой на вашем компьютере."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Удалённый узел разорвал �оединение."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "И�текло врем� ожидани� �оединени�."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Соединение отвергнуто."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "�дре� уже и�пользует��."
 
@@ -11317,6 +11355,10 @@ msgstr ""
 "учётных запи�ей позже через меню <b>Уч.запи�и->Управление учётными запи��ми</"
 "b> в окне �пи�ка �обе�едников."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s хочет добавить %s в �вой �пи�ок �обе�едников%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Цвет фона"
@@ -11583,6 +11625,8 @@ msgstr "Сообщение (не об�зательно)"
 msgid "Edit User Mood"
 msgstr "Изменить на�троение пользовател�"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Собе�едники"
@@ -12338,9 +12382,6 @@ msgstr "поддержка"
 msgid "webmaster"
 msgstr "веб-ма�тер"
 
-msgid "Senior Contributor/QA"
-msgstr "Старший �отрудник/контроль каче�тва"
-
 msgid "win32 port"
 msgstr "порт win32"
 
@@ -12366,6 +12407,9 @@ msgstr "оригинальный автор"
 msgid "lead developer"
 msgstr "ведущий разработчик"
 
+msgid "Senior Contributor/QA"
+msgstr "Старший �отрудник/контроль каче�тва"
+
 msgid "Afrikaans"
 msgstr "�фрикаан�"
 
@@ -13723,6 +13767,10 @@ msgstr "Реле �ервер (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN �ервер:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "П_орт:"
+
 msgid "Use_rname:"
 msgstr "Им_� пользовател�:"
 
@@ -13744,6 +13792,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "И�пользуемый по умолчанию"
 
@@ -13762,6 +13815,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Другой"
 
@@ -14307,7 +14368,8 @@ msgstr "нет"
 msgid "Small"
 msgstr "Маленький"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Меньшие вер�ии �майликов по умолчанию"
 
 msgid "Response Probability:"
@@ -15353,6 +15415,10 @@ msgstr "У_�трой�тво"
 msgid "Voice/Video Settings"
 msgstr "Голо�овые/Видео на�тройки"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Голо�овые/Видео на�тройки"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15480,7 +15546,7 @@ msgstr "Отправл�ть и получать пр�мые XMPP �трофы.
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Этот модуль полезен дл� отладки XMPP �ерверов или клиентов."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15621,6 +15687,30 @@ msgstr "По�етите веб-�траницу Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "У Ва� нет прав на удаление �того приложени�."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr ""
+#~ "Срок дей�тви� �ертификата и�тёк и его больше не �ледует �читать "
+#~ "доверенным."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Требовать SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Принудительно и�пользовать �тарый (порт 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Введённое им� неправильное."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[�е удаёт�� отобразить �ообщение от �того пользовател�, так как оно "
+#~ "�одержит недопу�тимые �имволы.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "И�кать �обе�едника по информации"
+
 #, fuzzy
 #~ msgid "The nick name you entered is invalid."
 #~ msgstr "Введённый вами п�евдоним некорректен."
@@ -16237,9 +16327,6 @@ msgstr "У ВаÑ� нет прав на удаление Ñ�того приложÐ
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Соединение разорвано (запи�ь)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Сбро� �оединени�"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Ошибка при чтении из �окета: %s"
 
@@ -16446,7 +16533,7 @@ msgstr "У ВаÑ� нет прав на удаление Ñ�того приложÐ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "�е удало�ь открыть %s дл� запи�и!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "�е удало�ь произве�ти передачу файлов; веро�тно, отменили на той �тороне."
 
@@ -16522,9 +16609,6 @@ msgstr "У ВаÑ� нет прав на удаление Ñ�того приложÐ
 #~ msgid "Failed to send IM."
 #~ msgstr "�е удало�ь отправить мгновенное �ообщение."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Пользователь�ка� информаци� дл� %s недо�тупна"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "Группа � таким именем уже �уще�твует."
 
diff --git a/po/si.po b/po/si.po
index 95707ee2d3..50d8628750 100644
--- a/po/si.po
+++ b/po/si.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2008-05-17 11:08+0530\n"
 "Last-Translator: Yajith Ajantha Dayarathna <yajith@gmail.com>\n"
 "Language-Team: Sinhala <sinhala@linux.lk>\n"
@@ -508,7 +508,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ධ�රක නම"
 
@@ -757,7 +756,7 @@ msgstr "නවතන්න"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "අහ�සි කරන්න"
 
 msgid "Failed"
@@ -1634,7 +1633,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4517,12 +4518,20 @@ msgstr ""
 msgid "Domain"
 msgstr "කළ�පය"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "නව සංස්කරණයක් නිකුත් වී ඇත"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "SILC සේව�ද�යක සමඟ සම්බන්ධ වෙමින් පවතී"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5726,7 +5735,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr "රහස්පද ග�ල පෙන්නේ න�ත."
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5823,9 +5832,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "සම්බන්ධ (_o)"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6672,6 +6678,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr ""
@@ -6703,6 +6718,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "%s ධ�වනය කිරීමේ ද��යක්."
 
+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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6926,89 +6954,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr "ක්�රිඩ�"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr "ක�මර�ව"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7042,15 +6987,6 @@ msgstr "ජ�ලය"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr "IP ලිපිනය"
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7139,15 +7075,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7241,58 +7168,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "ජංගම දුරකථනය"
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-msgid "Position"
-msgstr "පිහිටීම"
-
-msgid "Web Page"
-msgstr "වෙබ් පිටුව"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7532,7 +7414,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7571,6 +7453,13 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "මිතුරු ල�යිස්තුව පෙන්වන්න"
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7587,9 +7476,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7692,6 +7578,160 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "ක්�රිඩ�"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr "ක�මර�ව"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP ලිපිනය"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "ජංගම දුරකථනය"
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr "පිහිටීම"
+
+msgid "Web Page"
+msgstr "වෙබ් පිටුව"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s අභ�විත විය (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "අක්�රීය (_D)"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7889,7 +7929,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10021,18 +10061,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10553,27 +10587,22 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr ""
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr ""
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr ""
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10710,6 +10739,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr "පසුබිම් වර්�ණය"
@@ -10973,6 +11006,8 @@ msgstr "දිනයේ පණිවුඩය"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -11717,9 +11752,6 @@ msgstr "සහ�ය"
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11745,6 +11777,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13081,6 +13116,10 @@ msgid "_TURN server:"
 msgstr "සේව�ද�යකය (_S):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "තොට (_P):"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "පරි�ීලක නම (_U):"
 
@@ -13103,6 +13142,11 @@ msgstr "මොසිල�"
 msgid "Konqueror"
 msgstr "කොන්ක්වරර්"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "ප්�රකෘතිය"
@@ -13122,6 +13166,14 @@ msgstr "ෆයර්බර්ඩ්"
 msgid "Epiphany"
 msgstr "එපිෆනි"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -13658,7 +13710,7 @@ msgstr "කිසිවක් න�ත"
 msgid "Small"
 msgstr "විද්�යුත් ත�පෑල"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14682,6 +14734,10 @@ msgstr "මෙවලම්"
 msgid "Voice/Video Settings"
 msgstr "සකසුම් ස�කසීම්"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "සකසුම් ස�කසීම්"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14808,7 +14864,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "මෙම ඈඳුතුව XMPP සේව� ද�යකයන්හි නිරවද්�යකරනයන් කිරීමට ප්�රය�ජනවත් වේ."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
diff --git a/po/sk.po b/po/sk.po
index 08f995da43..8fee477455 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-05-05 19:21+0100\n"
 "Last-Translator: loptosko <loptosko@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -532,7 +532,6 @@ msgstr "Potvrdiť odstránenie certifikátu"
 msgid "Certificate Manager"
 msgstr "Správca certifikátov"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Názov hostiteľa"
 
@@ -803,7 +802,7 @@ msgstr "Zastaviť"
 msgid "Waiting for transfer to begin"
 msgstr "Čaká sa na za�iatok prenosu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Zrušené"
 
 msgid "Failed"
@@ -1689,7 +1688,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Certifikát vypršal a nie je platný."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4701,11 +4703,20 @@ msgstr "Modul protokolu XMPP"
 msgid "Domain"
 msgstr "Doména"
 
-msgid "Require SSL/TLS"
-msgstr "Vyžadovať SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Vyžadovať autorizáciu"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vynútiť staré SSL (port 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Podrobnosti o používateľovi %s nie sú dostupné"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Obnovenie spojenia"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Povoliť textovú autentifikáciu cez nezašifrované spojenia"
@@ -5897,7 +5908,8 @@ msgstr "PIN je neplatný. Mal by obsahovať iba �íslice [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "Dva PINy ktoré ste zadali sa nezhodujú."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Zadané meno je neplatné"
 
 msgid ""
@@ -5989,10 +6001,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Pripája sa..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Zadané meno je neplatné"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Zadaný PIN má neplatnú dĺžku [7-10]."
 
@@ -6849,6 +6857,17 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu "
+"priateľov."
+
+msgid "No reason given."
+msgstr "Nebol uvedený dôvod."
+
+msgid "Authorization Denied Message:"
+msgstr "Správa zamietnutia autorizácie:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Bola prijatá neo�akávaná odpove� od %s: %s"
@@ -6884,6 +6903,24 @@ msgstr "AOL neumožňuje vášmu používateľskému menu sa tu autentifikovať"
 msgid "Error requesting %s"
 msgstr "Chyba pri požadovaní %s"
 
+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 ""
+"(Po�as prijímania tejto správy sa vyskytla chyba.  Priateľ, s ktorým si "
+"píšete zrejme používa neo�akávané kódovanie.  Ak viete, aké kódovanie "
+"používa, môžete ho nastaviť v pokro�ílých možnostiach vášho AIM/ICQ ú�tu.)"
+
+#, 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 ""
+"(Po�as prijímania tejto správy sa vyskytla chyba.  Bu� máte nastavené iné "
+"kódovanie ako %s, alebo má %s chybný klient.)"
+
 msgid "Could not join chat room"
 msgstr "Nepodarilo sa pripojiť do miestnosti"
 
@@ -7097,94 +7134,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Súbor %s je %s, ktorý je vä�ší ako maximálna veľkosť %s."
 
-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 ""
-"(Po�as prijímania tejto správy sa vyskytla chyba.  Priateľ, s ktorým si "
-"píšete zrejme používa neo�akávané kódovanie.  Ak viete, aké kódovanie "
-"používa, môžete ho nastaviť v pokro�ílých možnostiach vášho AIM/ICQ ú�tu.)"
-
-#, 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 ""
-"(Po�as prijímania tejto správy sa vyskytla chyba.  Bu� máte nastavené iné "
-"kódovanie ako %s, alebo má %s chybný klient.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona priateľa"
-
-msgid "Voice"
-msgstr "Hlas"
-
-msgid "AIM Direct IM"
-msgstr "AIM - priame IM"
-
-msgid "Get File"
-msgstr "Získať súbor"
-
-msgid "Games"
-msgstr "Hry"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Doplnky"
-
-msgid "Send Buddy List"
-msgstr "Odoslať zoznam priateľov"
-
-msgid "ICQ Direct Connect"
-msgstr "Priame spojenie ICQ"
-
-msgid "AP User"
-msgstr "AP používateľ"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Staré ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Å ifrovanie Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Bezpe�nosť zapnutá"
-
-msgid "Video Chat"
-msgstr "Video chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Živé video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Zdieľanie obrazovky"
-
 msgid "Free For Chat"
 msgstr "Voľný pre rozhovor"
 
@@ -7215,15 +7164,6 @@ msgstr "V práci"
 msgid "At lunch"
 msgstr "Na obede"
 
-msgid "IP Address"
-msgstr "IP adresa"
-
-msgid "Warning Level"
-msgstr "Úroveň upozornenia"
-
-msgid "Buddy Comment"
-msgstr "Komentár priateľa"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Nepodarilo sa pripojiť na autentifika�ný server: %s"
@@ -7322,17 +7262,6 @@ msgstr "Heslo odoslané"
 msgid "Unable to initialize connection"
 msgstr "Spojenie sa nedá inicializovať"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu "
-"priateľov."
-
-msgid "No reason given."
-msgstr "Nebol uvedený dôvod."
-
-msgid "Authorization Denied Message:"
-msgstr "Správa zamietnutia autorizácie:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7453,60 +7382,13 @@ msgstr[0] "Z neznámeho dôvodu ste prišli o %hu správ od používateľa %s."
 msgstr[1] "Z neznámeho dôvodu ste prišli o %hu správu od používateľa %s."
 msgstr[2] "Z neznámeho dôvodu ste prišli o %hu správy od používateľa %s."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informácie o používateľovi sú nedostupné: %s"
-
-msgid "Online Since"
-msgstr "Prihlásený od"
-
-msgid "Member Since"
-msgstr "ÄŒlen od"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaše AIM spojenie je zrejme prerušené."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Správa od používateľa obsahovala nesprávne znaky, preto ju nebolo možné "
-"zobraziť.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojení z miestnosti %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilný telefón"
-
-msgid "Personal Web Page"
-msgstr "Osobná webová stránka"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Doplňujúce informácie"
-
-msgid "Zip Code"
-msgstr "PSČ"
-
-msgid "Work Information"
-msgstr "Pracovné informácie"
-
-msgid "Division"
-msgstr "Oddelenie"
-
-msgid "Position"
-msgstr "Pozícia"
-
-msgid "Web Page"
-msgstr "Web stránka"
-
 msgid "Pop-Up Message"
 msgstr "Vyskakovacia správa"
 
@@ -7793,7 +7675,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Zmeniť adresu na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne�akáte na autorizáciu</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7832,6 +7715,14 @@ msgstr "Nastaviť preposielanie správ (web)"
 msgid "Set Privacy Options..."
 msgstr "Nastaviť možnosti súkromia..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Zobraziť z_oznam priateľov"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Zoznam pozvaných"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdiť ú�et"
@@ -7848,9 +7739,6 @@ msgstr "Zobraziť priateľov, ktorí �akajú na autorizáciu"
 msgid "Search for Buddy by Email Address..."
 msgstr "Hľadať priateľa podľa e-mailovej adresy..."
 
-msgid "Search for Buddy by Information"
-msgstr "Hľadať priateľa podľa podrobností"
-
 msgid "Use clientLogin"
 msgstr "Použiť clientLogin"
 
@@ -7958,6 +7846,165 @@ msgstr "Rad je plný"
 msgid "Not while on AOL"
 msgstr "Nie, pokým ste na AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona priateľa"
+
+msgid "Voice"
+msgstr "Hlas"
+
+msgid "AIM Direct IM"
+msgstr "AIM - priame IM"
+
+msgid "Get File"
+msgstr "Získať súbor"
+
+msgid "Games"
+msgstr "Hry"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Doplnky"
+
+msgid "Send Buddy List"
+msgstr "Odoslať zoznam priateľov"
+
+msgid "ICQ Direct Connect"
+msgstr "Priame spojenie ICQ"
+
+msgid "AP User"
+msgstr "AP používateľ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Staré ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Å ifrovanie Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Bezpe�nosť zapnutá"
+
+msgid "Video Chat"
+msgstr "Video chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Živé video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Zdieľanie obrazovky"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "Úroveň upozornenia"
+
+msgid "Buddy Comment"
+msgstr "Komentár priateľa"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informácie o používateľovi sú nedostupné: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilný telefón"
+
+msgid "Personal Web Page"
+msgstr "Osobná webová stránka"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Doplňujúce informácie"
+
+msgid "Zip Code"
+msgstr "PSČ"
+
+msgid "Work Information"
+msgstr "Pracovné informácie"
+
+msgid "Division"
+msgstr "Oddelenie"
+
+msgid "Position"
+msgstr "Pozícia"
+
+msgid "Web Page"
+msgstr "Web stránka"
+
+msgid "Online Since"
+msgstr "Prihlásený od"
+
+msgid "Member Since"
+msgstr "ÄŒlen od"
+
+msgid "Capabilities"
+msgstr "Schopnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Vyzerať prihlásený"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Vyzerať prihlásený"
+
+msgid "Appear Offline"
+msgstr "Vyzerať odhlásený"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Vyzerať odhlásený"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Boli ste vykopnutý: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Týchto priateľov môžete znovu požiadať o autorizáciu, ke� na nich kliknete "
+"pravým tla�idlom a vyberiete možnosť „Znovu požiadať o autorizáciu“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Viditeľný"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Zoznam pozvaných"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnár"
 
@@ -8136,8 +8183,8 @@ msgstr "Vaša požiadavka bola prijatá."
 msgid "Your request was rejected."
 msgstr "Vaša požiadavka bola zamietnutá."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u vyžaduje overenie"
 
 msgid "Add buddy question"
@@ -10344,18 +10391,12 @@ msgstr "Vyrazil si von"
 msgid "Not on server list"
 msgstr "Nie je na zozname serverov"
 
-msgid "Appear Online"
-msgstr "Vyzerať prihlásený"
-
 msgid "Appear Permanently Offline"
 msgstr "Vyzerať trvale odhlásený"
 
 msgid "Presence"
 msgstr "Prítomnosť"
 
-msgid "Appear Offline"
-msgstr "Vyzerať odhlásený"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nevyzerať trvale odhlásený"
 
@@ -10910,27 +10951,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Pripojenie prerušené iným programom na vašom po�íta�i."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Vzdialený hostiteľ zavrel pripojenie."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Časový interval vypršal"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Pripojenie odmietnuté."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresu už používa niekto iný"
 
@@ -11080,6 +11116,12 @@ msgstr ""
 "toto okno otvoríte v ponuke <b>Ú�ty->Spravovať ú�ty</b> v okne Zoznam "
 "priateľov"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%sPoužívateľ %s si chce pridať používateľa %s do svojho zoznamu priateľov"
+"%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Farba pozadia"
@@ -11336,6 +11378,8 @@ msgstr "Správa (voliteľná)"
 msgid "Edit User Mood"
 msgstr "Zmeniť náladu používateľa"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/P_riatelia"
@@ -12082,9 +12126,6 @@ msgstr "podpora"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Bývalý prispievateľ/QA"
-
 msgid "win32 port"
 msgstr "port na win32"
 
@@ -12110,6 +12151,9 @@ msgstr "pôvodný autor"
 msgid "lead developer"
 msgstr "vedúci vývojár"
 
+msgid "Senior Contributor/QA"
+msgstr "Bývalý prispievateľ/QA"
+
 msgid "Afrikaans"
 msgstr "afrikán�ina"
 
@@ -13452,6 +13496,10 @@ msgstr "Relay Server (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN server:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
 msgid "Use_rname:"
 msgstr "_Používateľské meno:"
 
@@ -13473,6 +13521,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Predvolené prostredia"
 
@@ -13491,6 +13544,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Vlastné"
 
@@ -14022,7 +14083,8 @@ msgstr "žiadne"
 msgid "Small"
 msgstr "Malé"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Menší základní smajlíci"
 
 msgid "Response Probability:"
@@ -15050,6 +15112,10 @@ msgstr "Z_ariadenie"
 msgid "Voice/Video Settings"
 msgstr "Nastavenia hlasu a obrazu"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Nastavenia hlasu a obrazu"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15177,7 +15243,7 @@ msgstr "Odosielanie a prijímanie nespracovaných XMPP slôh."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Tento modul je vhodný na ladenie XMPP serverov alebo klientov."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15306,6 +15372,25 @@ msgstr "Navštíviť webstránku Windows Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemáte oprávnenie na odinštaláciu tejto aplikácie."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vyžadovať SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vynútiť staré SSL (port 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Zadané meno je neplatné"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Správa od používateľa obsahovala nesprávne znaky, preto ju nebolo možné "
+#~ "zobraziť.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Hľadať priateľa podľa podrobností"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Certifikát zatiaľ nie je platný."
 
@@ -15900,9 +15985,6 @@ msgstr "Nemáte oprávnenie na odinštaláciu tejto aplikácie."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Pripojenie uzavreté (zapisuje sa)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Obnovenie spojenia"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Chyba �ítania zo soketu: %s"
 
@@ -16124,7 +16206,7 @@ msgstr "Nemáte oprávnenie na odinštaláciu tejto aplikácie."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nepodarilo sa otvoriť %s pre zápis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila."
 
 #~ msgid "Could not connect for transfer."
@@ -16250,9 +16332,6 @@ msgstr "Nemáte oprávnenie na odinštaláciu tejto aplikácie."
 #~ msgid "Logined"
 #~ msgstr "Prihlásený"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Podrobnosti o používateľovi %s nie sú dostupné"
-
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
diff --git a/po/sl.po b/po/sl.po
index d0b29e621d..ea5e0dc120 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-07-30 14:57+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
@@ -533,7 +533,6 @@ msgstr "Potrditev brisanja digitalnega potrdila"
 msgid "Certificate Manager"
 msgstr "Upravitelj digitalnih potrdil"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
@@ -812,7 +811,7 @@ msgstr "Ustavi"
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na za�etek prenosa"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Preklicano"
 
 msgid "Failed"
@@ -1703,9 +1702,13 @@ msgstr ""
 "Potrdilo še ni veljavno. Preverite, da sta datum in �as vašega sistema "
 "pravilno nastavljena."
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
-"Digitalno potrdilo je poteklo in ga ni priporo�ljivo šteti za veljavnega."
+"Potrdilo še ni veljavno. Preverite, da sta datum in �as vašega sistema "
+"pravilno nastavljena."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4750,11 +4753,20 @@ msgstr "Vti�nik za protokol XMPP"
 msgid "Domain"
 msgstr "Domena"
 
-msgid "Require SSL/TLS"
-msgstr "Zahtevaj SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Zahtevaj pooblastilo"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Podatki o uporabniku niso dostopni: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vsili star SSL (vrata 5223)"
+#, fuzzy
+msgid "Connection security"
+msgstr "ÄŒasovna omejitev povezave potekla"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
@@ -6900,6 +6912,15 @@ msgstr "Naslov strežnika"
 msgid "Server port"
 msgstr "Vrata strežnika"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
+
+msgid "No reason given."
+msgstr "Ni podanega razloga."
+
+msgid "Authorization Denied Message:"
+msgstr "Sporo�ilo o neodobrenem pooblastilu:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Prejet nepri�akovan odgovor s strani osebe %s: %s"
@@ -6937,6 +6958,25 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Napaka pri zahtevanju %s"
 
+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 ""
+"(Pri sprejemu tega sporo�ila je prišlo do napake.  Prijatelj, s katerim se "
+"pogovarjate, je najbrž uporabil drugo kodiranje od pri�akovanega.  Če veste, "
+"za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev "
+"svojega ra�una AIM/ICQ.)"
+
+#, 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 ""
+"(Pri prejemu tega sporo�ila je prišlo do napake. Vi in %s imata izbrane "
+"razli�ni kodni strani ali pa ima %s hroš�avega odjemalca.)"
+
 msgid "Could not join chat room"
 msgstr "Pogovorni sobi se ni mogo�e pridružiti"
 
@@ -7152,95 +7192,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datoteka %s je %s, kar je ve� od najve�je velikosti za %s."
 
-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 ""
-"(Pri sprejemu tega sporo�ila je prišlo do napake.  Prijatelj, s katerim se "
-"pogovarjate, je najbrž uporabil drugo kodiranje od pri�akovanega.  Če veste, "
-"za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev "
-"svojega ra�una AIM/ICQ.)"
-
-#, 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 ""
-"(Pri prejemu tega sporo�ila je prišlo do napake. Vi in %s imata izbrane "
-"razli�ni kodni strani ali pa ima %s hroš�avega odjemalca.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona prijatelja"
-
-msgid "Voice"
-msgstr "Glasovno"
-
-msgid "AIM Direct IM"
-msgstr "Neposredni pogovor AIM"
-
-msgid "Get File"
-msgstr "Sprejmi datoteko"
-
-msgid "Games"
-msgstr "Igre"
-
-msgid "ICQ Xtraz"
-msgstr "Xtraz ICQ"
-
-msgid "Add-Ins"
-msgstr "Dodatki"
-
-msgid "Send Buddy List"
-msgstr "Pošlji seznam prijateljev"
-
-msgid "ICQ Direct Connect"
-msgstr "Neposredna povezava ICQ"
-
-msgid "AP User"
-msgstr "AP uporabnik"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ strežniški posrednik"
-
-msgid "Old ICQ UTF8"
-msgstr "Star ICQ UTF-8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian kodiranje"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Varnost vklju�ena"
-
-msgid "Video Chat"
-msgstr "Video.pomenek"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video v živo"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Skupna raba zaslona"
-
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
@@ -7271,15 +7222,6 @@ msgstr "Na delu"
 msgid "At lunch"
 msgstr "Na kosilu"
 
-msgid "IP Address"
-msgstr "Naslov IP"
-
-msgid "Warning Level"
-msgstr "Stopnja opozoril"
-
-msgid "Buddy Comment"
-msgstr "Komentar prijatelja"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Povezava z overovitvenim strežnikom ni uspela: %s"
@@ -7378,15 +7320,6 @@ msgstr "Geslo poslano"
 msgid "Unable to initialize connection"
 msgstr "Povezave ni mogo�e inicializirati"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
-
-msgid "No reason given."
-msgstr "Ni podanega razloga."
-
-msgid "Authorization Denied Message:"
-msgstr "Sporo�ilo o neodobrenem pooblastilu:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7519,60 +7452,13 @@ msgstr[1] "Spregledali ste %hu sporo�ilo od %s, ker je bilo neveljavno."
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Podatki o uporabniku niso dostopni: %s"
-
-msgid "Online Since"
-msgstr "Na zvezi od"
-
-msgid "Member Since"
-msgstr "ÄŒlan od"
-
-msgid "Capabilities"
-msgstr "Zmožnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Ni mogo�e prikazati sporo�ila tega uporabnika, ker vsebuje neveljavne "
-"znake.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-msgid "Personal Web Page"
-msgstr "Osebna spletna stran"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatne informacije"
-
-msgid "Zip Code"
-msgstr "Poštna številka"
-
-msgid "Work Information"
-msgstr "Informacije o zaposlitvi"
-
-msgid "Division"
-msgstr "Oddelek"
-
-msgid "Position"
-msgstr "Delovno mesto"
-
-msgid "Web Page"
-msgstr "Spletna stran"
-
 msgid "Pop-Up Message"
 msgstr "Pojavno sporo�ilo"
 
@@ -7865,7 +7751,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne �akate na pooblastilo</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7904,6 +7791,14 @@ msgstr "Nastavi posredovanje sporo�il (splet)"
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Poka_ži seznam prijateljev"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Seznam povabljenih"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potrdi ra�un"
@@ -7920,9 +7815,6 @@ msgstr "Pokaži prijatelje, ki �akajo na pooblastilo"
 msgid "Search for Buddy by Email Address..."
 msgstr "Iš�i prijatelja po e-naslovu ..."
 
-msgid "Search for Buddy by Information"
-msgstr "Iš�i prijatelja po informaciji"
-
 msgid "Use clientLogin"
 msgstr "Uporabi prijavo clientLogin"
 
@@ -8031,6 +7923,165 @@ msgstr "Vrsta polna"
 msgid "Not while on AOL"
 msgstr "Ne medtem ko na AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona prijatelja"
+
+msgid "Voice"
+msgstr "Glasovno"
+
+msgid "AIM Direct IM"
+msgstr "Neposredni pogovor AIM"
+
+msgid "Get File"
+msgstr "Sprejmi datoteko"
+
+msgid "Games"
+msgstr "Igre"
+
+msgid "ICQ Xtraz"
+msgstr "Xtraz ICQ"
+
+msgid "Add-Ins"
+msgstr "Dodatki"
+
+msgid "Send Buddy List"
+msgstr "Pošlji seznam prijateljev"
+
+msgid "ICQ Direct Connect"
+msgstr "Neposredna povezava ICQ"
+
+msgid "AP User"
+msgstr "AP uporabnik"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ strežniški posrednik"
+
+msgid "Old ICQ UTF8"
+msgstr "Star ICQ UTF-8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian kodiranje"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF-8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Varnost vklju�ena"
+
+msgid "Video Chat"
+msgstr "Video.pomenek"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video v živo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skupna raba zaslona"
+
+msgid "IP Address"
+msgstr "Naslov IP"
+
+msgid "Warning Level"
+msgstr "Stopnja opozoril"
+
+msgid "Buddy Comment"
+msgstr "Komentar prijatelja"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Podatki o uporabniku niso dostopni: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+msgid "Personal Web Page"
+msgstr "Osebna spletna stran"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatne informacije"
+
+msgid "Zip Code"
+msgstr "Poštna številka"
+
+msgid "Work Information"
+msgstr "Informacije o zaposlitvi"
+
+msgid "Division"
+msgstr "Oddelek"
+
+msgid "Position"
+msgstr "Delovno mesto"
+
+msgid "Web Page"
+msgstr "Spletna stran"
+
+msgid "Online Since"
+msgstr "Na zvezi od"
+
+msgid "Member Since"
+msgstr "ÄŒlan od"
+
+msgid "Capabilities"
+msgstr "Zmožnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Izgledaj povezan"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Izgledaj povezan"
+
+msgid "Appear Offline"
+msgstr "Izgledaj brez povezave"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Izgledaj brez povezave"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Brcnjeni ste bili s tega MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da "
+"desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Viden"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Seznam povabljenih"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnar"
 
@@ -8209,8 +8260,8 @@ msgstr "Vaša zahteva je bila sprejeta."
 msgid "Your request was rejected."
 msgstr "Vaša zahteva je bila zavrnjena."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u zahteva preverjanje"
 
 msgid "Add buddy question"
@@ -10407,18 +10458,12 @@ msgstr "Å el na pavzo"
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-msgid "Appear Online"
-msgstr "Izgledaj povezan"
-
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
 msgid "Presence"
 msgstr "Prisotnost"
 
-msgid "Appear Offline"
-msgstr "Izgledaj brez povezave"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
@@ -10982,27 +11027,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Povezavo je prekinil nek program vašega ra�unalnika."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Oddaljeni gostitelj je zaprl povezavo."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "ÄŒasovna omejitev povezave potekla."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Povezava zavrnjena."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Naslov je že uporabljen."
 
@@ -11151,6 +11191,10 @@ msgstr ""
 "Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite ra�une z "
 "<b>Ra�uni->Upravljaj z ra�uni</b> v oknu seznama prijateljev."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Uporabnik %s%s%s%s želi dodati %s na svoj seznam prijateljev%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Barva ozadja"
@@ -11406,6 +11450,8 @@ msgstr "Sporo�ilo (neobvezno)"
 msgid "Edit User Mood"
 msgstr "Uredi razpoloženje uporabnika"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
@@ -12159,9 +12205,6 @@ msgstr "podpora"
 msgid "webmaster"
 msgstr "skrbnik spletne strani"
 
-msgid "Senior Contributor/QA"
-msgstr "Starejši avtor prispevkov / Zagotavljanje kakovosti"
-
 msgid "win32 port"
 msgstr "razli�ica win32"
 
@@ -12187,6 +12230,9 @@ msgstr "prvotni avtor"
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
+msgid "Senior Contributor/QA"
+msgstr "Starejši avtor prispevkov / Zagotavljanje kakovosti"
+
 msgid "Afrikaans"
 msgstr "afrikansko"
 
@@ -13535,6 +13581,10 @@ msgstr "Relejski strežnik (TURN)"
 msgid "_TURN server:"
 msgstr "Strežnik _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Vrata:"
+
 msgid "Use_rname:"
 msgstr "Upo_rabniško ime:"
 
@@ -13556,6 +13606,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Privzeto za namizje"
 
@@ -13574,6 +13629,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ro�ni"
 
@@ -14105,7 +14168,8 @@ msgstr "brez"
 msgid "Small"
 msgstr "Manjše"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Manjše razli�ice privzetih smej�kov"
 
 msgid "Response Probability:"
@@ -15138,6 +15202,10 @@ msgstr "N_aprava"
 msgid "Voice/Video Settings"
 msgstr "Glasovne/video nastavitve"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Glasovne/video nastavitve"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15268,7 +15336,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Ta vti�nik je uporaben za razhroš�evanje strežnikov ali odjemalcev XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15411,6 +15479,26 @@ msgstr "Obiš�ite spletno stran Pidgin"
 msgid "You do not have permission to uninstall this application."
 msgstr "Za odstranitev programa nimate ustreznih pravic."
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr ""
+#~ "Digitalno potrdilo je poteklo in ga ni priporo�ljivo šteti za veljavnega."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Zahtevaj SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vsili star SSL (vrata 5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Ni mogo�e prikazati sporo�ila tega uporabnika, ker vsebuje neveljavne "
+#~ "znake.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Iš�i prijatelja po informaciji"
+
 #~ msgid "The name you entered is invalid."
 #~ msgstr "Vneseno ime ni veljavno."
 
diff --git a/po/sq.po b/po/sq.po
index 28f9e6d597..490fb62405 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-05-03 11:41+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
@@ -537,7 +537,6 @@ msgstr "Ripohoni fshirje dëshmie"
 msgid "Certificate Manager"
 msgstr "Përgjegjës Dëshmish"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Emërstrehë"
 
@@ -814,7 +813,7 @@ msgstr "Ndal"
 msgid "Waiting for transfer to begin"
 msgstr "Po pritet të fillojë shpërngulja"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anuluar"
 
 msgid "Failed"
@@ -1728,7 +1727,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Dëshmia ka skaduar dhe nuk duhet marrë si e vlefshme."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4982,11 +4984,20 @@ msgstr "Shtojcë Protokolli XMPP"
 msgid "Domain"
 msgstr "Përkatësi"
 
-msgid "Require SSL/TLS"
-msgstr "Lyp SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Kërko autorizim"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Detyro SSL të vjetër (porta 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Të dhëna përdoruesi jo të mundshme: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Rivendosje lidhjeje"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Lejo autorizim në formë teksti të thjeshtë në rrjedha të pakoduara"
@@ -6215,7 +6226,8 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr "Dy PIN-et që dhatë nuk përputhen."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Emri që dhatë është i pavlefshëm."
 
 msgid ""
@@ -6316,10 +6328,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Po lidhet..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Emri që dhatë është i pavlefshëm."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN-i që dhatë ka gjatë të pavlefshme [7-10]."
 
@@ -7201,6 +7209,16 @@ msgstr "Vendndodhje shërbyesi"
 msgid "Server port"
 msgstr "Portë Shërbyesi"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Ju lutem, autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
+
+msgid "No reason given."
+msgstr "Nuk u dha arsye."
+
+msgid "Authorization Denied Message:"
+msgstr "Mesazh Mohimi Autorizimi:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "U mor përgjigje e papritur prej %s: %s"
@@ -7236,6 +7254,25 @@ msgstr "AOL-i nuk e lejon emrin tuaj të ekranit të bëjë mirëfilltësimin kÃ
 msgid "Error requesting %s"
 msgstr "Gabim gjatë kërkimit të %s"
 
+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 ""
+"(Pati një gabim në marrjen e këtij mesazhi.  Shoku me të cilin po flisni "
+"ndofta po përdor tjetër kodim nga ai që prisnit.  Nëse e dini se çfarë kodim "
+"po përdor, mund ta jepni te mundësitë e mëtejshme të llogarisë për llogarinë "
+"tuaj AIM/ICQ.)"
+
+#, 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 ""
+"(Pati një gabim gjatë marrjes së këtij mesazhi.  Ose ju dhe %s keni të "
+"përzgjedhur kodime të ndryshëm, ose %s ka një klient me të meta.)"
+
 msgid "Could not join chat room"
 msgstr "Nuk u bë dot futja në dhomën e fjalosjes"
 
@@ -7475,95 +7512,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Kartela %s është %s, çka i bie më e madhe se sa madhësia maksimum prej %s."
 
-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 ""
-"(Pati një gabim në marrjen e këtij mesazhi.  Shoku me të cilin po flisni "
-"ndofta po përdor tjetër kodim nga ai që prisnit.  Nëse e dini se çfarë kodim "
-"po përdor, mund ta jepni te mundësitë e mëtejshme të llogarisë për llogarinë "
-"tuaj AIM/ICQ.)"
-
-#, 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 ""
-"(Pati një gabim gjatë marrjes së këtij mesazhi.  Ose ju dhe %s keni të "
-"përzgjedhur kodime të ndryshëm, ose %s ka një klient me të meta.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikonë Shoku"
-
-msgid "Voice"
-msgstr "Zë"
-
-msgid "AIM Direct IM"
-msgstr "MA e Drejtpërdrejtë AIM"
-
-msgid "Get File"
-msgstr "Merr Kartelë"
-
-msgid "Games"
-msgstr "Lojra"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Shtesa"
-
-msgid "Send Buddy List"
-msgstr "Dërgo Listë Shokësh"
-
-msgid "ICQ Direct Connect"
-msgstr "Lidhje e Drejtpërdrejtë ICQ"
-
-msgid "AP User"
-msgstr "Përdorues AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Mohues"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 i vjetër"
-
-msgid "Trillian Encryption"
-msgstr "Kodim Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Siguri e Aktivizuar"
-
-msgid "Video Chat"
-msgstr "Fjalosje Video"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Ekrani i Përbashkët"
-
 msgid "Free For Chat"
 msgstr "I lirë Për Fjalosje"
 
@@ -7594,15 +7542,6 @@ msgstr "Në punë"
 msgid "At lunch"
 msgstr "Për drekë"
 
-msgid "IP Address"
-msgstr "Vendndodhje IP"
-
-msgid "Warning Level"
-msgstr "Shkallë Sinjalizimi"
-
-msgid "Buddy Comment"
-msgstr "Koment Shoku"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "I pazoti të lidhet me shërbyesin e mirëfilltësimeve: %s"
@@ -7705,16 +7644,6 @@ msgstr "Fjalëkalim u dërguar"
 msgid "Unable to initialize connection"
 msgstr "I pazoti të gatisë lidhjen"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Ju lutem, autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
-
-msgid "No reason given."
-msgstr "Nuk u dha arsye."
-
-msgid "Authorization Denied Message:"
-msgstr "Mesazh Mohimi Autorizimi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7833,61 +7762,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Humbët %hu mesazh prej %s për një arsye të panjohur."
 msgstr[1] "Humbët %hu mesazhe prej %s për një arsye të panjohur."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Të dhëna përdoruesi jo të mundshme: %s"
-
-msgid "Online Since"
-msgstr "I lidhur që Prej"
-
-msgid "Member Since"
-msgstr "Anëtar që Prej"
-
-msgid "Capabilities"
-msgstr "Aftësi"
-
 msgid "Your AIM connection may be lost."
 msgstr "Mund të ketë humbur lidhja juaj AIM."
 
-#  The conversion failed!
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[I pazoti të shfaqë mesazh prej këtij përdoruesi sepse përmbante shenja të "
-"pavlefshme.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Jeni shkëputur prej dhome fjalosjesh %s."
 
-msgid "Mobile Phone"
-msgstr "Telefon Celular"
-
-msgid "Personal Web Page"
-msgstr "Faqe Web Personale"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Të dhëna Shtesë"
-
-msgid "Zip Code"
-msgstr "Kod Zip"
-
-msgid "Work Information"
-msgstr "Të dhëna Pune"
-
-msgid "Division"
-msgstr "Ndarje"
-
-msgid "Position"
-msgstr "Vendndodhje"
-
-msgid "Web Page"
-msgstr "Faqe Ëeb"
-
 msgid "Pop-Up Message"
 msgstr "Mesazh Flluskë"
 
@@ -8172,7 +8053,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ndrysho Vendndodhje Si:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>nuk po prisni për autorizim</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8211,6 +8093,14 @@ msgstr "Formësoni Përcjellje MA-je (web)"
 msgid "Set Privacy Options..."
 msgstr "Caktoni Mundësi Vetësie..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Shfaq _Listë Shokësh"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Listë Ftesash"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Ripohoni Llogari"
@@ -8227,9 +8117,6 @@ msgstr "Shfaq Shokë që Presin Autorizim"
 msgid "Search for Buddy by Email Address..."
 msgstr "Kërkoni një Shok përmes Vendndodhjes Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Kërko për Shokë sipas Të dhënash"
-
 msgid "Use clientLogin"
 msgstr "Përdor \"clientLogin\""
 
@@ -8338,6 +8225,165 @@ msgstr "Radha plot"
 msgid "Not while on AOL"
 msgstr "Jo kur jeni në AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikonë Shoku"
+
+msgid "Voice"
+msgstr "Zë"
+
+msgid "AIM Direct IM"
+msgstr "MA e Drejtpërdrejtë AIM"
+
+msgid "Get File"
+msgstr "Merr Kartelë"
+
+msgid "Games"
+msgstr "Lojra"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Shtesa"
+
+msgid "Send Buddy List"
+msgstr "Dërgo Listë Shokësh"
+
+msgid "ICQ Direct Connect"
+msgstr "Lidhje e Drejtpërdrejtë ICQ"
+
+msgid "AP User"
+msgstr "Përdorues AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Mohues"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 i vjetër"
+
+msgid "Trillian Encryption"
+msgstr "Kodim Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Siguri e Aktivizuar"
+
+msgid "Video Chat"
+msgstr "Fjalosje Video"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Ekrani i Përbashkët"
+
+msgid "IP Address"
+msgstr "Vendndodhje IP"
+
+msgid "Warning Level"
+msgstr "Shkallë Sinjalizimi"
+
+msgid "Buddy Comment"
+msgstr "Koment Shoku"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Të dhëna përdoruesi jo të mundshme: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefon Celular"
+
+msgid "Personal Web Page"
+msgstr "Faqe Web Personale"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Të dhëna Shtesë"
+
+msgid "Zip Code"
+msgstr "Kod Zip"
+
+msgid "Work Information"
+msgstr "Të dhëna Pune"
+
+msgid "Division"
+msgstr "Ndarje"
+
+msgid "Position"
+msgstr "Vendndodhje"
+
+msgid "Web Page"
+msgstr "Faqe Ëeb"
+
+msgid "Online Since"
+msgstr "I lidhur që Prej"
+
+msgid "Member Since"
+msgstr "Anëtar që Prej"
+
+msgid "Capabilities"
+msgstr "Aftësi"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Shfaqu I lidhur"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Shfaqu I lidhur"
+
+msgid "Appear Offline"
+msgstr "Shfaqet Jo i lidhur"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Shfaqet Jo i lidhur"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Jeni përzënë: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Mund të rikërkoni autorizim prej këtyre shokëve duke djathtas klikuar mbi ta "
+"dhe përzgjedhur \"Rikërko Autorizim.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "I dukshëm"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Listë Ftesash"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Ujori"
 
@@ -8521,8 +8567,8 @@ msgstr "Kërkesa juaj u pranua."
 msgid "Your request was rejected."
 msgstr "Kërkesa juaj u hodh poshtë."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u lyp verifikim"
 
 msgid "Add buddy question"
@@ -10812,18 +10858,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr "Jo në listë shërbyesi"
 
-msgid "Appear Online"
-msgstr "Shfaqu I lidhur"
-
 msgid "Appear Permanently Offline"
 msgstr "Shfaqu Përherë Jo i lidhur"
 
 msgid "Presence"
 msgstr "Prani"
 
-msgid "Appear Offline"
-msgstr "Shfaqet Jo i lidhur"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Mos u Duk Përherë Jo i lidhur"
 
@@ -11390,27 +11430,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Lidhja u ndërpre nga tjetër program në kompjuterin tuaj."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Streha e largët e mbylli ndërlidhjen"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Mbaroi koha e ndërlidhjes."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Ndërlidhje e papranuar."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Vendndodhje tashmë në përdorim."
 
@@ -11562,6 +11597,10 @@ msgstr ""
 "Mund t'i riktheheni kësaj dritareje për shtim, përpunim apo heqje llogarish "
 "nga <b>Llogari->Administroni Llogarira</b> te dritarja e Listave të Shokëve"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s don të shtojë %s te listë e tij ose e saj shokësh%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Ngjyrë Sfondi"
@@ -11821,6 +11860,8 @@ msgid "Edit User Mood"
 msgstr "Përpunoni Humor Përdoruesi"
 
 #  Buddies menu
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Shokë"
@@ -12578,9 +12619,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "\"webmaster\""
 
-msgid "Senior Contributor/QA"
-msgstr "Pjesëmarrës i Vjetër/QA"
-
 msgid "win32 port"
 msgstr "portë win32"
 
@@ -12606,6 +12644,9 @@ msgstr "autori fillestra"
 msgid "lead developer"
 msgstr "udhëheqës zhvillimi"
 
+msgid "Senior Contributor/QA"
+msgstr "Pjesëmarrës i Vjetër/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13966,6 +14007,10 @@ msgstr "Shërbyes Relay (TURN)"
 msgid "_TURN server:"
 msgstr "Shërbyes _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Portë:"
+
 msgid "Use_rname:"
 msgstr "_Emër përdoruesi:"
 
@@ -13987,6 +14032,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Parazgjedhje Desktopi"
 
@@ -14005,6 +14055,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Dorazi"
 
@@ -14547,7 +14605,8 @@ msgstr "asnjë"
 msgid "Small"
 msgstr "E vogël"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versione më të vegjël të emotikoneve parazgjedhje"
 
 msgid "Response Probability:"
@@ -15739,6 +15798,10 @@ msgstr "Pa_jisje"
 msgid "Voice/Video Settings"
 msgstr "Rregullime Zë/Figurë"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Rregullime Zë/Figurë"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15882,7 +15945,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Kjo shtojcë është e dobishme për diagnostikim shërbyesish apo klientësh XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16013,6 +16076,26 @@ msgstr "Vizitoni Faqen Web të Pidgin-it"
 msgid "You do not have permission to uninstall this application."
 msgstr "Nuk keni leje të çinstaloni këtë zbatim."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Lyp SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Detyro SSL të vjetër (porta 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Emri që dhatë është i pavlefshëm."
+
+#  The conversion failed!
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[I pazoti të shfaqë mesazh prej këtij përdoruesi sepse përmbante shenja "
+#~ "të pavlefshme.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Kërko për Shokë sipas Të dhënash"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Dëshmia nuk është ende e vlefshme."
 
@@ -16519,9 +16602,6 @@ msgstr "Nuk keni leje të çinstaloni këtë zbatim."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Lidhja u ndërpre (shkrim)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Rivendosje lidhjeje"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Gabim gjatë leximit prej \"socket\"-i: %s"
 
diff --git a/po/sr.po b/po/sr.po
index 12a3ff643b..7f6d470b99 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -527,7 +527,6 @@ msgstr "Потврда бри�ања �ертификата"
 msgid "Certificate Manager"
 msgstr "Управник �ертификатима"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Име домаћина"
 
@@ -791,7 +790,7 @@ msgstr "Зау�тави"
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да прено� почне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажи"
 
 msgid "Failed"
@@ -1677,7 +1676,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Ланац �ертификата дао за %s није и�праван."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4744,11 +4745,20 @@ msgstr "Додатак за �абер протокол"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Захтева SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Захтевај овлашћење"
 
-msgid "Force old (port 5223) SSL"
-msgstr "�аметни �тари (порт 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Подаци о кори�нику %s недо�тупни"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Понављање везе"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Дозволи не�кривене лозинке на нешифрованим токовима"
@@ -6024,7 +6034,7 @@ msgid "The two PINs you entered do not match."
 msgstr "�ове лозинке �е не поклапају."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Унети SecurID кључ је неи�праван."
 
 msgid ""
@@ -6131,10 +6141,6 @@ msgid "Connecting..."
 msgstr "У�по�тављање везе"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Унети SecurID кључ је неи�праван."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Унети SecurID кључ је неи�праван."
 
@@ -7025,6 +7031,15 @@ msgstr "�дре�а �ервера"
 msgid "Server port"
 msgstr "Порт �ервера"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Дај ми овлашћење како бих могао да те додам у �пи�ак другара."
+
+msgid "No reason given."
+msgstr "Разлог није наведен."
+
+msgid "Authorization Denied Message:"
+msgstr "Разлог одбијања овлашћења:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Добијен је неочекиван одговор HTTP �ервера."
@@ -7058,6 +7073,25 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+"(Јавила �е грешка у пријему ове поруке. Другар �а ким �те разговарали "
+"вероватно кори�ти другачије кодирање од очекиваног. Уколико знате које "
+"кодирање он кори�ти, можете га унети у напредним опцијама вашег �ИМ/ICQ "
+"налога.)"
+
+#, 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 има неку грешку у програму.)"
+
 msgid "Could not join chat room"
 msgstr "�е могу да �е повежем на причаоницу"
 
@@ -7290,95 +7324,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Датотека %s је %s, што је веће од мак�ималне величине од %s."
 
-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 ""
-"(Јавила �е грешка у пријему ове поруке. Другар �а ким �те разговарали "
-"вероватно кори�ти другачије кодирање од очекиваног. Уколико знате које "
-"кодирање он кори�ти, можете га унети у напредним опцијама вашег �ИМ/ICQ "
-"налога.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "Сличица другара"
-
-msgid "Voice"
-msgstr "Гла�"
-
-msgid "AIM Direct IM"
-msgstr "�епо�редна �ИМ порука"
-
-msgid "Get File"
-msgstr "Прибави датотеку"
-
-msgid "Games"
-msgstr "Игре"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Додаци"
-
-msgid "Send Buddy List"
-msgstr "Пошаљи �пи�ак другара"
-
-msgid "ICQ Direct Connect"
-msgstr "�епо�редна ICQ веза"
-
-msgid "AP User"
-msgstr "�П кори�ник"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "�ихили�та"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ преу�меравање �ервера"
-
-msgid "Old ICQ UTF8"
-msgstr "Стари ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Трилијан енкрипција"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Врхкука"
-
-msgid "Security Enabled"
-msgstr "Безбедно�т укључена"
-
-msgid "Video Chat"
-msgstr "Видео ћа�кање"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Жива �лика"
-
-msgid "Camera"
-msgstr "Камера"
-
-msgid "Screen Sharing"
-msgstr "Дељење екрана"
-
 msgid "Free For Chat"
 msgstr "До�тупан за ћа�кање"
 
@@ -7414,16 +7359,6 @@ msgstr "Мрежа"
 msgid "At lunch"
 msgstr "Ручам"
 
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-msgid "IP Address"
-msgstr "ИП адре�а"
-
-msgid "Warning Level"
-msgstr "_�ивои упозорења"
-
-msgid "Buddy Comment"
-msgstr "Примедба за другара:"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7525,15 +7460,6 @@ msgstr "Лозинка по�лата"
 msgid "Unable to initialize connection"
 msgstr "�е могу да у�по�тавим везу."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Дај ми овлашћење како бих могао да те додам у �пи�ак другара."
-
-msgid "No reason given."
-msgstr "Разлог није наведен."
-
-msgid "Authorization Denied Message:"
-msgstr "Разлог одбијања овлашћења:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7654,59 +7580,13 @@ msgstr[1] "ПропуÑ�тили Ñ�те %hu поруке од %s из непозÐ
 msgstr[2] "Пропу�тили �те %hu порука од %s из непознатих разлога."
 msgstr[3] "Пропу�тили �те %hu поруку од %s из непознатих разлога."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Подаци о кори�нику %s недо�тупни:"
-
-msgid "Online Since"
-msgstr "�а вези од"
-
-msgid "Member Since"
-msgstr "Члан од"
-
-msgid "Capabilities"
-msgstr "Могућно�ти"
-
 msgid "Your AIM connection may be lost."
 msgstr "Можда �ИМ веза прекинута."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[�ије могуће приказати поруку јер �адржи знаке који �е не могу приказати.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Веза �а причаоницом %s је прекинута."
 
-msgid "Mobile Phone"
-msgstr "Мобилни телефон"
-
-msgid "Personal Web Page"
-msgstr "Лична веб �траница"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Додатни подаци"
-
-msgid "Zip Code"
-msgstr "Поштан�ки број"
-
-msgid "Work Information"
-msgstr "Подаци о по�лу"
-
-msgid "Division"
-msgstr "Одељење"
-
-msgid "Position"
-msgstr "Позиција"
-
-msgid "Web Page"
-msgstr "Веб �траница"
-
 msgid "Pop-Up Message"
 msgstr "И�качућа порука"
 
@@ -8001,7 +7881,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Промена адре�е у:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>не чекате на овлашћење</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8040,6 +7921,14 @@ msgstr "ПодеÑ�и проÑ�леђивање брзих порука (прекÐ
 msgid "Set Privacy Options..."
 msgstr "Уне�и опције приватно�ти..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Прикажи �пи�ак _другара"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Спи�ак позваних"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Потврдите налог"
@@ -8056,9 +7945,6 @@ msgstr "Прикажи другаре за које �е чека овлашће
 msgid "Search for Buddy by Email Address..."
 msgstr "Пронађи другара према адре�и е-поште..."
 
-msgid "Search for Buddy by Information"
-msgstr "Пронађи другара према подацима"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Кори�ник није пријављен"
@@ -8168,6 +8054,166 @@ msgstr "Ред је пун"
 msgid "Not while on AOL"
 msgstr "�е док је на �ОЛ-у"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Сличица другара"
+
+msgid "Voice"
+msgstr "Гла�"
+
+msgid "AIM Direct IM"
+msgstr "�епо�редна �ИМ порука"
+
+msgid "Get File"
+msgstr "Прибави датотеку"
+
+msgid "Games"
+msgstr "Игре"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Додаци"
+
+msgid "Send Buddy List"
+msgstr "Пошаљи �пи�ак другара"
+
+msgid "ICQ Direct Connect"
+msgstr "�епо�редна ICQ веза"
+
+msgid "AP User"
+msgstr "�П кори�ник"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "�ихили�та"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ преу�меравање �ервера"
+
+msgid "Old ICQ UTF8"
+msgstr "Стари ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Трилијан енкрипција"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Врхкука"
+
+msgid "Security Enabled"
+msgstr "Безбедно�т укључена"
+
+msgid "Video Chat"
+msgstr "Видео ћа�кање"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Жива �лика"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "Screen Sharing"
+msgstr "Дељење екрана"
+
+# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
+msgid "IP Address"
+msgstr "ИП адре�а"
+
+msgid "Warning Level"
+msgstr "_�ивои упозорења"
+
+msgid "Buddy Comment"
+msgstr "Примедба за другара:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Подаци о кори�нику %s недо�тупни:"
+
+msgid "Mobile Phone"
+msgstr "Мобилни телефон"
+
+msgid "Personal Web Page"
+msgstr "Лична веб �траница"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Додатни подаци"
+
+msgid "Zip Code"
+msgstr "Поштан�ки број"
+
+msgid "Work Information"
+msgstr "Подаци о по�лу"
+
+msgid "Division"
+msgstr "Одељење"
+
+msgid "Position"
+msgstr "Позиција"
+
+msgid "Web Page"
+msgstr "Веб �траница"
+
+msgid "Online Since"
+msgstr "�а вези од"
+
+msgid "Member Since"
+msgstr "Члан од"
+
+msgid "Capabilities"
+msgstr "Могућно�ти"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Прави �е повезан"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Прави �е повезан"
+
+msgid "Appear Offline"
+msgstr "Као неповезан"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Као неповезан"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Избацио Ва� је %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Можете поновити захтев за овлашћење од ових другара де�ним кликом на њих и "
+"избором „Понови захтев за овлашћење“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Видљив"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Спи�ак позваних"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолија"
 
@@ -8353,8 +8399,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u захтева проверу"
 
 msgid "Add buddy question"
@@ -10571,18 +10617,12 @@ msgstr "Изашао �ам на кратко"
 msgid "Not on server list"
 msgstr "�ије на �пи�ку на �ерверу"
 
-msgid "Appear Online"
-msgstr "Прави �е повезан"
-
 msgid "Appear Permanently Offline"
 msgstr "Прави �е потпуно неповезан"
 
 msgid "Presence"
 msgstr "При�у�тво"
 
-msgid "Appear Offline"
-msgstr "Као неповезан"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�е прави �е потпуно неповезан"
 
@@ -11143,27 +11183,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Удаљени домаћин за прекинуо везу."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Време везе је и�текло."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Веза је одбијена."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "�дре�а је већ у употеби."
 
@@ -11312,6 +11347,10 @@ msgstr ""
 "Можете �е увек вратити у овај прозор, како би додали, уредили или уклонили "
 "налоге из менија <b>�алози->Уреди налоге</b> у прозору �а �пи�ком другара."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s жели да дода %s у �вој �пи�ак другара%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Боја позадине"
@@ -11586,6 +11625,8 @@ msgstr "�адимак (необавезно)"
 msgid "Edit User Mood"
 msgstr "Уреди кори�ничко ра�положење"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Другари"
@@ -12355,9 +12396,6 @@ msgstr "подршка"
 msgid "webmaster"
 msgstr "веб уредник"
 
-msgid "Senior Contributor/QA"
-msgstr "Старији доприно�иоци/QA"
-
 msgid "win32 port"
 msgstr "Windows издање"
 
@@ -12383,6 +12421,9 @@ msgstr "први аутор"
 msgid "lead developer"
 msgstr "главни програмер"
 
+msgid "Senior Contributor/QA"
+msgstr "Старији доприно�иоци/QA"
+
 msgid "Afrikaans"
 msgstr "афрички"
 
@@ -13760,6 +13801,10 @@ msgid "_TURN server:"
 msgstr "С_ТУ� Сервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Порт:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Кори�ничко име:"
 
@@ -13782,6 +13827,11 @@ msgstr "Мозила"
 msgid "Konqueror"
 msgstr "Конкверор"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Подразумевано на �итему"
 
@@ -13800,6 +13850,14 @@ msgstr "Жар-птица"
 msgid "Epiphany"
 msgstr "Спознаја"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ручна по�тавка"
 
@@ -14345,7 +14403,8 @@ msgstr "нико"
 msgid "Small"
 msgstr "Мало"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Мање издање подразумеваних �мешака"
 
 msgid "Response Probability:"
@@ -15412,6 +15471,10 @@ msgstr "Уређај"
 msgid "Voice/Video Settings"
 msgstr "Измени по�тавке"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Измени по�тавке"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15541,7 +15604,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Овај додатак је кори�тан за уклањање грешака �абер �ервера или програма"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15672,6 +15735,25 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Захтева SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "�аметни �тари (порт 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Унети SecurID кључ је неи�праван."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[�ије могуће приказати поруку јер �адржи знаке који �е не могу приказати.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Пронађи другара према подацима"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Ланац �ертификата дао за %s није и�праван."
@@ -16249,9 +16331,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Веза прекинута (пишем)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Понављање везе"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Грешка при читању из утичнице: %s"
 
@@ -16453,7 +16532,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "�е могу да отворим %s за упи�!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "�еу�пешан прено� датотеке; друга �трана је вероватно отказала."
 
 #~ msgid "Could not connect for transfer."
@@ -16541,9 +16620,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "�еу�пешно �лање брзе поруке"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Подаци о кори�нику %s недо�тупни"
-
 #~ msgid "Error password"
 #~ msgstr "Погрешна лозинка"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 074b5798e5..e4ca75c600 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -527,7 +527,6 @@ msgstr "Potvrda brisanja sertifikata"
 msgid "Certificate Manager"
 msgstr "Upravnik sertifikatima"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ime domaćina"
 
@@ -792,7 +791,7 @@ msgstr "Zaustavi"
 msgid "Waiting for transfer to begin"
 msgstr "Čekam da prenos po�ne"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkaži"
 
 msgid "Failed"
@@ -1679,7 +1678,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Lanac sertifikata dao za %s nije ispravan."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4751,11 +4752,20 @@ msgstr "Dodatak za Džaber protokol"
 msgid "Domain"
 msgstr "Domen"
 
-msgid "Require SSL/TLS"
-msgstr "Zahteva SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Zahtevaj ovlašćenje"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Nametni stari (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Podaci o korisniku %s nedostupni"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Ponavljanje veze"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dozvoli neskrivene lozinke na nešifrovanim tokovima"
@@ -6032,7 +6042,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Nove lozinke se ne poklapaju."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Uneti SecurID klju� je neispravan."
 
 msgid ""
@@ -6139,10 +6149,6 @@ msgid "Connecting..."
 msgstr "Uspostavljanje veze"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Uneti SecurID klju� je neispravan."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Uneti SecurID klju� je neispravan."
 
@@ -7034,6 +7040,15 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Daj mi ovlašćenje kako bih mogao da te dodam u spisak drugara."
+
+msgid "No reason given."
+msgstr "Razlog nije naveden."
+
+msgid "Authorization Denied Message:"
+msgstr "Razlog odbijanja ovlašćenja:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Dobijen je neo�ekivan odgovor HTTP servera."
@@ -7067,6 +7082,25 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Greška u zahtevu tokena za prijavu"
 
+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 ""
+"(Javila se greška u prijemu ove poruke. Drugar sa kim ste razgovarali "
+"verovatno koristi druga�ije kodiranje od o�ekivanog. Ukoliko znate koje "
+"kodiranje on koristi, možete ga uneti u naprednim opcijama vašeg AIM/ICQ "
+"naloga.)"
+
+#, 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 ""
+"(Došlo je do greške pri prijemu ove poruke. Ili Vi i %s koristite razli�ito "
+"kodiranje karaktera, ili %s ima neku grešku u programu.)"
+
 msgid "Could not join chat room"
 msgstr "Ne mogu da se povežem na pri�aonicu"
 
@@ -7299,95 +7333,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datoteka %s je %s, što je veće od maksimalne veli�ine od %s."
 
-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 ""
-"(Javila se greška u prijemu ove poruke. Drugar sa kim ste razgovarali "
-"verovatno koristi druga�ije kodiranje od o�ekivanog. Ukoliko znate koje "
-"kodiranje on koristi, možete ga uneti u naprednim opcijama vašeg AIM/ICQ "
-"naloga.)"
-
-#, 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 ""
-"(Došlo je do greške pri prijemu ove poruke. Ili Vi i %s koristite razli�ito "
-"kodiranje karaktera, ili %s ima neku grešku u programu.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Sli�ica drugara"
-
-msgid "Voice"
-msgstr "Glas"
-
-msgid "AIM Direct IM"
-msgstr "Neposredna AIM poruka"
-
-msgid "Get File"
-msgstr "Pribavi datoteku"
-
-msgid "Games"
-msgstr "Igre"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Dodaci"
-
-msgid "Send Buddy List"
-msgstr "Pošalji spisak drugara"
-
-msgid "ICQ Direct Connect"
-msgstr "Neposredna ICQ veza"
-
-msgid "AP User"
-msgstr "AP korisnik"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ preusmeravanje servera"
-
-msgid "Old ICQ UTF8"
-msgstr "Stari ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trilijan enkripcija"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Vrhkuka"
-
-msgid "Security Enabled"
-msgstr "Bezbednost uklju�ena"
-
-msgid "Video Chat"
-msgstr "Video ćaskanje"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Živa slika"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Deljenje ekrana"
-
 msgid "Free For Chat"
 msgstr "Dostupan za ćaskanje"
 
@@ -7423,16 +7368,6 @@ msgstr "Mreža"
 msgid "At lunch"
 msgstr "Ru�am"
 
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-msgid "IP Address"
-msgstr "IP adresa"
-
-msgid "Warning Level"
-msgstr "_Nivoi upozorenja"
-
-msgid "Buddy Comment"
-msgstr "Primedba za drugara:"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7534,15 +7469,6 @@ msgstr "Lozinka poslata"
 msgid "Unable to initialize connection"
 msgstr "Ne mogu da uspostavim vezu."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Daj mi ovlašćenje kako bih mogao da te dodam u spisak drugara."
-
-msgid "No reason given."
-msgstr "Razlog nije naveden."
-
-msgid "Authorization Denied Message:"
-msgstr "Razlog odbijanja ovlašćenja:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7667,59 +7593,13 @@ msgstr[1] "Propustili ste %hu poruke od %s iz nepoznatih razloga."
 msgstr[2] "Propustili ste %hu poruka od %s iz nepoznatih razloga."
 msgstr[3] "Propustili ste %hu poruku od %s iz nepoznatih razloga."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Podaci o korisniku %s nedostupni:"
-
-msgid "Online Since"
-msgstr "Na vezi od"
-
-msgid "Member Since"
-msgstr "ÄŒlan od"
-
-msgid "Capabilities"
-msgstr "Mogućnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Možda AIM veza prekinuta."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nije moguće prikazati poruku jer sadrži znake koji se ne mogu prikazati.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Veza sa pri�aonicom %s je prekinuta."
 
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-msgid "Personal Web Page"
-msgstr "Li�na veb stranica"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatni podaci"
-
-msgid "Zip Code"
-msgstr "Poštanski broj"
-
-msgid "Work Information"
-msgstr "Podaci o poslu"
-
-msgid "Division"
-msgstr "Odeljenje"
-
-msgid "Position"
-msgstr "Pozicija"
-
-msgid "Web Page"
-msgstr "Veb stranica"
-
 msgid "Pop-Up Message"
 msgstr "Iska�uća poruka"
 
@@ -8014,7 +7894,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Promena adrese u:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne �ekate na ovlašćenje</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8053,6 +7934,14 @@ msgstr "Podesi prosleđivanje brzih poruka (preko veba)"
 msgid "Set Privacy Options..."
 msgstr "Unesi opcije privatnosti..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Prikaži spisak _drugara"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Spisak pozvanih"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdite nalog"
@@ -8069,9 +7958,6 @@ msgstr "Prikaži drugare za koje se �eka ovlašćenje"
 msgid "Search for Buddy by Email Address..."
 msgstr "Pronađi drugara prema adresi e-pošte..."
 
-msgid "Search for Buddy by Information"
-msgstr "Pronađi drugara prema podacima"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Korisnik nije prijavljen"
@@ -8181,6 +8067,166 @@ msgstr "Red je pun"
 msgid "Not while on AOL"
 msgstr "Ne dok je na AOL-u"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Sli�ica drugara"
+
+msgid "Voice"
+msgstr "Glas"
+
+msgid "AIM Direct IM"
+msgstr "Neposredna AIM poruka"
+
+msgid "Get File"
+msgstr "Pribavi datoteku"
+
+msgid "Games"
+msgstr "Igre"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Dodaci"
+
+msgid "Send Buddy List"
+msgstr "Pošalji spisak drugara"
+
+msgid "ICQ Direct Connect"
+msgstr "Neposredna ICQ veza"
+
+msgid "AP User"
+msgstr "AP korisnik"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ preusmeravanje servera"
+
+msgid "Old ICQ UTF8"
+msgstr "Stari ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trilijan enkripcija"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Vrhkuka"
+
+msgid "Security Enabled"
+msgstr "Bezbednost uklju�ena"
+
+msgid "Video Chat"
+msgstr "Video ćaskanje"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Živa slika"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Deljenje ekrana"
+
+# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "_Nivoi upozorenja"
+
+msgid "Buddy Comment"
+msgstr "Primedba za drugara:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Podaci o korisniku %s nedostupni:"
+
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+msgid "Personal Web Page"
+msgstr "Li�na veb stranica"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatni podaci"
+
+msgid "Zip Code"
+msgstr "Poštanski broj"
+
+msgid "Work Information"
+msgstr "Podaci o poslu"
+
+msgid "Division"
+msgstr "Odeljenje"
+
+msgid "Position"
+msgstr "Pozicija"
+
+msgid "Web Page"
+msgstr "Veb stranica"
+
+msgid "Online Since"
+msgstr "Na vezi od"
+
+msgid "Member Since"
+msgstr "ÄŒlan od"
+
+msgid "Capabilities"
+msgstr "Mogućnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Pravi se povezan"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Pravi se povezan"
+
+msgid "Appear Offline"
+msgstr "Kao nepovezan"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Kao nepovezan"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Izbacio Vas je %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Možete ponoviti zahtev za ovlašćenje od ovih drugara desnim klikom na njih i "
+"izborom „Ponovi zahtev za ovlašćenje“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Vidljiv"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Spisak pozvanih"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodolija"
 
@@ -8366,8 +8412,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u zahteva proveru"
 
 msgid "Add buddy question"
@@ -10586,18 +10632,12 @@ msgstr "Izašao sam na kratko"
 msgid "Not on server list"
 msgstr "Nije na spisku na serveru"
 
-msgid "Appear Online"
-msgstr "Pravi se povezan"
-
 msgid "Appear Permanently Offline"
 msgstr "Pravi se potpuno nepovezan"
 
 msgid "Presence"
 msgstr "Prisustvo"
 
-msgid "Appear Offline"
-msgstr "Kao nepovezan"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pravi se potpuno nepovezan"
 
@@ -11159,27 +11199,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Udaljeni domaćin za prekinuo vezu."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Vreme veze je isteklo."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Veza je odbijena."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresa je već u upotebi."
 
@@ -11328,6 +11363,10 @@ msgstr ""
 "Možete se uvek vratiti u ovaj prozor, kako bi dodali, uredili ili uklonili "
 "naloge iz menija <b>Nalozi->Uredi naloge</b> u prozoru sa spiskom drugara."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s želi da doda %s u svoj spisak drugara%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Boja pozadine"
@@ -11602,6 +11641,8 @@ msgstr "Nadimak (neobavezno)"
 msgid "Edit User Mood"
 msgstr "Uredi korisni�ko raspoloženje"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Drugari"
@@ -12371,9 +12412,6 @@ msgstr "podrška"
 msgid "webmaster"
 msgstr "veb urednik"
 
-msgid "Senior Contributor/QA"
-msgstr "Stariji doprinosioci/QA"
-
 msgid "win32 port"
 msgstr "Windows izdanje"
 
@@ -12399,6 +12437,9 @@ msgstr "prvi autor"
 msgid "lead developer"
 msgstr "glavni programer"
 
+msgid "Senior Contributor/QA"
+msgstr "Stariji doprinosioci/QA"
+
 msgid "Afrikaans"
 msgstr "afri�ki"
 
@@ -13776,6 +13817,10 @@ msgid "_TURN server:"
 msgstr "S_TUN Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Korisni�ko ime:"
 
@@ -13798,6 +13843,11 @@ msgstr "Mozila"
 msgid "Konqueror"
 msgstr "Konkveror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Podrazumevano na sitemu"
 
@@ -13816,6 +13866,14 @@ msgstr "Žar-ptica"
 msgid "Epiphany"
 msgstr "Spoznaja"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ru�na postavka"
 
@@ -14361,7 +14419,8 @@ msgstr "niko"
 msgid "Small"
 msgstr "Malo"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Manje izdanje podrazumevanih smešaka"
 
 msgid "Response Probability:"
@@ -15429,6 +15488,10 @@ msgstr "Uređaj"
 msgid "Voice/Video Settings"
 msgstr "Izmeni postavke"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Izmeni postavke"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15559,7 +15622,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Ovaj dodatak je koristan za uklanjanje grešaka Džaber servera ili programa"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15690,6 +15753,25 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemate ovlašćenja za deinstalaciju ove aplikacije."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Zahteva SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Nametni stari (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Uneti SecurID klju� je neispravan."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Nije moguće prikazati poruku jer sadrži znake koji se ne mogu prikazati.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Pronađi drugara prema podacima"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Lanac sertifikata dao za %s nije ispravan."
@@ -16267,9 +16349,6 @@ msgstr "Nemate ovlašćenja za deinstalaciju ove aplikacije."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Veza prekinuta (pišem)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Ponavljanje veze"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Greška pri �itanju iz uti�nice: %s"
 
@@ -16471,7 +16550,7 @@ msgstr "Nemate ovlašćenja za deinstalaciju ove aplikacije."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Ne mogu da otvorim %s za upis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
 
 #~ msgid "Could not connect for transfer."
@@ -16559,9 +16638,6 @@ msgstr "Nemate ovlašćenja za deinstalaciju ove aplikacije."
 #~ msgid "Failed to send IM."
 #~ msgstr "Neuspešno slanje brze poruke"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Podaci o korisniku %s nedostupni"
-
 #~ msgid "Error password"
 #~ msgstr "Pogrešna lozinka"
 
diff --git a/po/stats.pl b/po/stats.pl
index f845e189df..8037bafbb3 100755
--- a/po/stats.pl
+++ b/po/stats.pl
@@ -27,9 +27,11 @@ use Locale::Language;
 
 $lang{'ca@valencia'} = "Catalan (Valencian)";
 $lang{'be@latin'} = "Belarusian (Latin)";
+$lang{bn_IN} = "Bengali-India";
 $lang{en_AU} = "English (Australian)";
 $lang{en_CA} = "English (Canadian)";
 $lang{en_GB} = "English (British)";
+$lang{mai} = "Maithili";
 $lang{ms_MY} = "Malay";
 $lang{my_MM} = "Burmese (Myanmar)";
 $lang{pt_BR} = "Portuguese (Brazilian)";
diff --git a/po/sv.po b/po/sv.po
index 0d9ed8399a..10aaa93c99 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-06-20 19:50+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
@@ -525,7 +525,6 @@ msgstr "Godkänn borttagning av certifikat"
 msgid "Certificate Manager"
 msgstr "Certifikatshanterare"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Värdnamn"
 
@@ -797,7 +796,7 @@ msgstr "Stoppa"
 msgid "Waiting for transfer to begin"
 msgstr "Väntar på att överföringen ska inledas"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbruten"
 
 msgid "Failed"
@@ -1687,7 +1686,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Certifikatet är för gammalt och bör inte anses giltigt."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4718,11 +4720,20 @@ msgstr "Insticksmodul för XMPP-Protokollet"
 msgid "Domain"
 msgstr "Domän"
 
-msgid "Require SSL/TLS"
-msgstr "Kräver SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Kräver auktorisering"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Tvinga fram användning av gammal (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Användarinformation om %s är inte tillgänglig"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Anslutningen nollställd"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillåt klartextautentisering över okrypterad ström"
@@ -5934,7 +5945,8 @@ msgstr "Ogiltigt PIN. Det får enbart bestå av nummer [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "De två PIN du angav matchar inte."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Namnet är ogiltigt."
 
 msgid ""
@@ -6027,10 +6039,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Namnet är ogiltigt."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Det PIN du uppgav har ogiltig längd [7-10]."
 
@@ -6883,6 +6891,15 @@ msgstr "Serveradress"
 msgid "Server port"
 msgstr "Serverport"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Snälla godkänn mig så jag kan lägga till dig till min kompislista."
+
+msgid "No reason given."
+msgstr "Ingen motivering angiven."
+
+msgid "Authorization Denied Message:"
+msgstr "Meddelande om auktorisering nekad:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Mottog oväntat svar från %s; %s"
@@ -6918,6 +6935,25 @@ msgstr "AOL tillåter inte ditt skärmnamn att autentisera här"
 msgid "Error requesting %s"
 msgstr "Fel vid efterfrågan av %s"
 
+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 ""
+"(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du "
+"pratar med använder antagligen en annan teckenkod än den förväntade. Om du "
+"vet vilken teckenkod han använder kan du specificera den bland de avancerade "
+"inställningarna för ditt AIM/ICQ-konto.)"
+
+#, 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 ""
+"(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du "
+"och %s olika teckenkodningar valda eller så har %s en buggig klient.)"
+
 msgid "Could not join chat room"
 msgstr "Kunde inte ansluta till chatrummet"
 
@@ -7132,95 +7168,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Filen %s är %s vilket är större än den maximala storleken på %s."
 
-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 ""
-"(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du "
-"pratar med använder antagligen en annan teckenkod än den förväntade. Om du "
-"vet vilken teckenkod han använder kan du specificera den bland de avancerade "
-"inställningarna för ditt AIM/ICQ-konto.)"
-
-#, 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 ""
-"(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du "
-"och %s olika teckenkodningar valda eller så har %s en buggig klient.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Kompisikon"
-
-msgid "Voice"
-msgstr "Röst"
-
-msgid "AIM Direct IM"
-msgstr "AIM-direktmeddelande"
-
-msgid "Get File"
-msgstr "Hämta fil"
-
-msgid "Games"
-msgstr "Spel"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Lägg till"
-
-msgid "Send Buddy List"
-msgstr "Skicka kompislista"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ-direktanslutning"
-
-msgid "AP User"
-msgstr "AP-användare"
-
-msgid "ICQ RTF"
-msgstr "ICQ-RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ-serverrelay"
-
-msgid "Old ICQ UTF8"
-msgstr "Gamla ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillansk kryptering"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Säkerhet aktiverad"
-
-msgid "Video Chat"
-msgstr "Videochatt"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live-video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Skärmdelning"
-
 msgid "Free For Chat"
 msgstr "Tillgänglig för chatt"
 
@@ -7251,15 +7198,6 @@ msgstr "PÃ¥ jobbet"
 msgid "At lunch"
 msgstr "PÃ¥ lunch"
 
-msgid "IP Address"
-msgstr "IP-adress"
-
-msgid "Warning Level"
-msgstr "Varningsnivåer"
-
-msgid "Buddy Comment"
-msgstr "Kompiskommentar"
-
 # Osäker!!!
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7359,15 +7297,6 @@ msgstr "Lösenord skickat"
 msgid "Unable to initialize connection"
 msgstr "Kan inte skapa anslutning"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Snälla godkänn mig så jag kan lägga till dig till min kompislista."
-
-msgid "No reason given."
-msgstr "Ingen motivering angiven."
-
-msgid "Authorization Denied Message:"
-msgstr "Meddelande om auktorisering nekad:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7485,60 +7414,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du missade %hu meddelande från %s av okända orsaker."
 msgstr[1] "Du missade %hu meddelanden från %s av okända orsaker."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Användarinformation är inte tillgänglig: %s"
-
-msgid "Online Since"
-msgstr "Ansluten sedan"
-
-msgid "Member Since"
-msgstr "Medlem sedan"
-
-msgid "Capabilities"
-msgstr "Stödjer"
-
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kan inte visa meddelande från denna användare eftersom det innehöll "
-"felaktiga tecken.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilnummer"
-
-msgid "Personal Web Page"
-msgstr "Personlig webbsida"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Extra information"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Information om arbete"
-
-msgid "Division"
-msgstr "Avdelning"
-
-msgid "Position"
-msgstr "Befattning"
-
-msgid "Web Page"
-msgstr "Webbsida"
-
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
@@ -7822,7 +7704,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ändra adress till:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>du väntar inte på auktorisering</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7861,6 +7744,14 @@ msgstr "Konfigurera vidarebefordring av snabbmeddelanden (web)"
 msgid "Set Privacy Options..."
 msgstr "Ange sekretessinställningar..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Visa kompis_listan"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Gästlista"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bekräfta konto"
@@ -7877,9 +7768,6 @@ msgstr "Visa kompisar som väntar på auktorisering"
 msgid "Search for Buddy by Email Address..."
 msgstr "Sök efter kompis på e-postadress..."
 
-msgid "Search for Buddy by Information"
-msgstr "Sök efter kompis via information"
-
 msgid "Use clientLogin"
 msgstr "Använd klientLogin"
 
@@ -7988,6 +7876,165 @@ msgstr "Kö full"
 msgid "Not while on AOL"
 msgstr "Inte på AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Kompisikon"
+
+msgid "Voice"
+msgstr "Röst"
+
+msgid "AIM Direct IM"
+msgstr "AIM-direktmeddelande"
+
+msgid "Get File"
+msgstr "Hämta fil"
+
+msgid "Games"
+msgstr "Spel"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Lägg till"
+
+msgid "Send Buddy List"
+msgstr "Skicka kompislista"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ-direktanslutning"
+
+msgid "AP User"
+msgstr "AP-användare"
+
+msgid "ICQ RTF"
+msgstr "ICQ-RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-serverrelay"
+
+msgid "Old ICQ UTF8"
+msgstr "Gamla ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillansk kryptering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Säkerhet aktiverad"
+
+msgid "Video Chat"
+msgstr "Videochatt"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live-video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skärmdelning"
+
+msgid "IP Address"
+msgstr "IP-adress"
+
+msgid "Warning Level"
+msgstr "Varningsnivåer"
+
+msgid "Buddy Comment"
+msgstr "Kompiskommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Användarinformation är inte tillgänglig: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilnummer"
+
+msgid "Personal Web Page"
+msgstr "Personlig webbsida"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Extra information"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Information om arbete"
+
+msgid "Division"
+msgstr "Avdelning"
+
+msgid "Position"
+msgstr "Befattning"
+
+msgid "Web Page"
+msgstr "Webbsida"
+
+msgid "Online Since"
+msgstr "Ansluten sedan"
+
+msgid "Member Since"
+msgstr "Medlem sedan"
+
+msgid "Capabilities"
+msgstr "Stödjer"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Verka vara ansluten"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Verka vara ansluten"
+
+msgid "Appear Offline"
+msgstr "Verka vara frånkopplad"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Verka vara frånkopplad"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du har sparkats ut från denna MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan begära auktorisering igen från dessa kompisar genom att högerklicka "
+"på dem och välja \"Begär auktorisering igen.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synlig"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Gästlista"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vattumanen"
 
@@ -8166,8 +8213,8 @@ msgstr "Din förfrågan accepterades."
 msgid "Your request was rejected."
 msgstr "Din förfrågan avvisades."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u kräver verifikation"
 
 msgid "Add buddy question"
@@ -10373,18 +10420,12 @@ msgstr "GÃ¥tt ut"
 msgid "Not on server list"
 msgstr "Finns inte i listan på servern"
 
-msgid "Appear Online"
-msgstr "Verka vara ansluten"
-
 msgid "Appear Permanently Offline"
 msgstr "Verka vara permanent frånkopplad"
 
 msgid "Presence"
 msgstr "Närvaro"
 
-msgid "Appear Offline"
-msgstr "Verka vara frånkopplad"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Verka inte vara permanent frånkopplad"
 
@@ -10925,28 +10966,23 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Anslutningen avbröts av annan programvara på din dator."
 
 # Osäker (And weeei!)
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Motparten har stängt anslutningen."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Anslutningen överskred tidsgränsen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Anslutningen nekades."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adressen används redan"
 
@@ -11095,6 +11131,10 @@ msgstr ""
 "Du kan komma tillbaka till detta fönster för att lägga till, ändra eller ta "
 "bort konton från <b>Konton->Hantera konton</b> i kompislistans fönster"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s vill lägga till %s i sin kompislista%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Bakgrundsfärg"
@@ -11350,6 +11390,8 @@ msgstr "Meddelande (valfritt)"
 msgid "Edit User Mood"
 msgstr "Redigera användarhumör"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kompisar"
@@ -12104,9 +12146,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "webbansvarig"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/Kvalitetsgranskning"
-
 msgid "win32 port"
 msgstr "win32-portering"
 
@@ -12138,6 +12177,9 @@ msgstr "ursprunglig upphovsman"
 msgid "lead developer"
 msgstr "utvecklingsledare"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/Kvalitetsgranskning"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -13487,6 +13529,10 @@ msgstr "Återsändningsserver (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-server:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
 msgid "Use_rname:"
 msgstr "_Användarnamn:"
 
@@ -13508,6 +13554,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Skrivbordets förval"
 
@@ -13526,6 +13577,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manuell"
 
@@ -14058,7 +14117,8 @@ msgstr "ingen"
 msgid "Small"
 msgstr "Liten"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre versioner av de förvalda smiliesarna."
 
 msgid "Response Probability:"
@@ -15089,6 +15149,10 @@ msgstr "_Enhet"
 msgid "Voice/Video Settings"
 msgstr "Röst/videoinställningar"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Röst/videoinställningar"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15217,7 +15281,7 @@ msgstr "Skicka och ta emot råa XMPP strofer."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15351,6 +15415,25 @@ msgstr "Besök Pidgin hemsida"
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har inte rättigheter att avinstallera den här applikationen."
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Kräver SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Tvinga fram användning av gammal (port 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Namnet är ogiltigt."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Kan inte visa meddelande från denna användare eftersom det innehöll "
+#~ "felaktiga tecken.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Sök efter kompis via information"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Certifikatet är inte giltigt än."
 
@@ -15928,9 +16011,6 @@ msgstr "Du har inte rättigheter att avinstallera den här applikationen."
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Anslutningen stängd (skrivande)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Anslutningen nollställd"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Fel vid läsning av från uttag %s"
 
@@ -16135,7 +16215,7 @@ msgstr "Du har inte rättigheter att avinstallera den här applikationen."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kunde inte öppna %s för läsning!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
 
@@ -16380,9 +16460,6 @@ msgstr "Du har inte rättigheter att avinstallera den här applikationen."
 #~ msgid "QQ Server Notice"
 #~ msgstr "Serverport"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Användarinformation om %s är inte tillgänglig"
-
 #, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "Fjärrdatorn kopplade ifrån"
diff --git a/po/sw.po b/po/sw.po
index f0cea0874d..55b8f58eb8 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-04-16 22:24+0300\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
@@ -524,7 +524,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr "Meneja Ithibati"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -784,7 +783,7 @@ msgstr "&Simama"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Imeghairishwa"
 
 msgid "Failed"
@@ -1687,7 +1686,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4696,12 +4697,20 @@ msgstr ""
 msgid "Domain"
 msgstr "Kikoa:"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Haipatikani"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Muunganisho ulikataliwa"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -5941,7 +5950,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Nywila"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
 msgid ""
@@ -6041,10 +6050,6 @@ msgid "Connecting..."
 msgstr "Inaunganisha…"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Nambari mstari iliyoingizwa ni batili."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
@@ -6905,6 +6910,15 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
@@ -6936,6 +6950,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Hitilafu katika kuhifadhi %S"
 
+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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -7166,96 +7193,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-#, fuzzy
-msgid "Get File"
-msgstr "Mafaili ya Matini"
-
-#, fuzzy
-msgid "Games"
-msgstr "Jina"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-#, fuzzy
-msgid "Add-Ins"
-msgstr "Nyongeza"
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-#, fuzzy
-msgid "Security Enabled"
-msgstr "Levo ya Usalama"
-
-#, fuzzy
-msgid "Video Chat"
-msgstr "Podikasti Video"
-
-msgid "iChat AV"
-msgstr ""
-
-#, fuzzy
-msgid "Live Video"
-msgstr "Hifadhi video"
-
-#, fuzzy
-msgid "Camera"
-msgstr "Cameroon"
-
-msgid "Screen Sharing"
-msgstr ""
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7289,16 +7226,6 @@ msgstr "Mtandao"
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr "Anwani-IP"
-
-#, fuzzy
-msgid "Warning Level"
-msgstr "Jumbe za tahadhari"
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Imeshindwa kuipata seva wakala"
@@ -7389,15 +7316,6 @@ msgstr "Nywila"
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7492,61 +7410,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr ""
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-#, fuzzy
-msgid "Additional Information"
-msgstr "Inachunguza taarifa"
-
-msgid "Zip Code"
-msgstr ""
-
-#, fuzzy
-msgid "Work Information"
-msgstr "Taarifa Zaidi"
-
-msgid "Division"
-msgstr ""
-
-#, fuzzy
-msgid "Position"
-msgstr "Nafasi:"
-
-msgid "Web Page"
-msgstr ""
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7792,7 +7662,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7831,6 +7701,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 #, fuzzy
 msgid "Confirm Account"
@@ -7848,9 +7724,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7956,6 +7829,173 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+#, fuzzy
+msgid "Get File"
+msgstr "Mafaili ya Matini"
+
+#, fuzzy
+msgid "Games"
+msgstr "Jina"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+#, fuzzy
+msgid "Add-Ins"
+msgstr "Nyongeza"
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+#, fuzzy
+msgid "Security Enabled"
+msgstr "Levo ya Usalama"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "Podikasti Video"
+
+msgid "iChat AV"
+msgstr ""
+
+#, fuzzy
+msgid "Live Video"
+msgstr "Hifadhi video"
+
+#, fuzzy
+msgid "Camera"
+msgstr "Cameroon"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Anwani-IP"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "Jumbe za tahadhari"
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "Inachunguza taarifa"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Nafasi:"
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Baki Mkondoni"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Baki Mkondoni"
+
+msgid "Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Baki Mkondoni"
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Lemaza"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8158,7 +8198,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -10330,10 +10370,6 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-#, fuzzy
-msgid "Appear Online"
-msgstr "Baki Mkondoni"
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
@@ -10341,9 +10377,6 @@ msgstr ""
 msgid "Presence"
 msgstr "Mapendekezo"
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10881,27 +10914,25 @@ msgid " (%s)"
 msgstr "(%S)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Mwenzi SSL imefunga uunganisho huu"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Muunganiko umepita muda"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Muunganisho ulikataliwa"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -11054,6 +11085,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11324,6 +11359,8 @@ msgstr "&Barua pepe (Uchaguzi):"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -12092,9 +12129,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -12120,6 +12154,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Kiafriakansi"
 
@@ -13456,6 +13493,10 @@ msgid "_TURN server:"
 msgstr "Seva"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Lango:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Jina la mtumiaji"
 
@@ -13479,6 +13520,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Rejesha Misingi"
@@ -13499,6 +13545,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -14057,7 +14111,7 @@ msgstr "Bila"
 msgid "Small"
 msgstr "Kisomali"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15091,6 +15145,10 @@ msgstr "Huduma"
 msgid "Voice/Video Settings"
 msgstr "Vipimo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Vipimo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15214,7 +15272,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15342,6 +15400,10 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Nambari mstari iliyoingizwa ni batili."
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Nambari mstari iliyoingizwa ni batili."
 
@@ -15500,10 +15562,6 @@ msgstr ""
 #~ msgstr "Unganisho"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Muunganisho ulikataliwa"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Hitilafu ya upakiaji lahamtindo: %S"
 
diff --git a/po/ta.po b/po/ta.po
index 4acc978dfa..d3a39cb3fb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,13 +6,14 @@
 #
 # Viveka Nathan K <vivekanathan@gmail.com>, 2006.
 # drtvasudevan <agnihot3@gmail.com>, 2006, 2009, 2010.
+# I Felix <ifelix@redhat.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
-"PO-Revision-Date: 2010-01-05 14:58+0530\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-05 16:08+0530\n"
+"Last-Translator: I Felix <ifelix25@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -388,7 +389,7 @@ msgid "Please enter the username or alias of the person you would like to IM."
 msgstr "நீங�கள� IMஆக விர�ம�ப�ம� ஒர� நபரின� பயனர�பெயர� அல�லத� ப�னைப�பெயரை உள�ளிட�."
 
 msgid "Channel"
-msgstr "சே"
+msgstr "சேனல�"
 
 msgid "Join a Chat"
 msgstr "ஒர� அரட�டையில� இணை"
@@ -526,7 +527,6 @@ msgstr "சானிறிதழà¯� அழிதà¯�தலை உறà¯�திசà
 msgid "Certificate Manager"
 msgstr "சான�றிதழ� மேலாளர�"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ப�ரவலன� பெயர�"
 
@@ -645,11 +645,11 @@ msgstr "நீங�கள� இணைக�கப�படவில�லை."
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "List of %d users:\n"
-msgstr[1] "List of %d users:\n"
+msgstr[0] "%d பயனர� பட�டியல�:\n"
+msgstr[1] "%d பயனர�களின� பட�டியல�:\n"
 
 msgid "Supported debug options are: plugins version"
 msgstr "த�ணைப�ரிய�ம� பிழைதிர�த�த விர�ப�பங�களாவன: செர�கிகள� பதிப�ப�"
@@ -728,11 +728,11 @@ msgid ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
-"msgநிறம� &lt;வக�ப�ப�&gt; &lt;ம�ன�னணி&gt; &lt;பின�னணி&gt;: கலந�த�ரையாடல� சாளரத�தில�  "
-"வேற�பட�ட வக�ப�ப�களின� செய�திகள�க�க� நிறத�தை அமை.<br>    &lt;வக�ப�ப�&gt;: பெற�, "
-"அன�ப�ப�,ம�க�கியமான, செயல�, நேரஅஞ�சல�<br>    &lt;ம�ன�னணி/பின�னணி&gt;: கர�ப�ப�, "
-"சிவப�ப�, பச�சை, நீலம�, வெள�ளை, சாம�பல�, கர�சாம�பல�, மஜென�தா, சையன�, "
-"ம�ன�னிர�ப�ப�<br><br>EXAMPLE:<br>    msgநிறம� சையன� ம�ன�னிர�ப�பை அன�ப�ப�கிறத�"
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: கலந�த�ரையாடல� "
+"சாளரத�தில�  வேற�பட�ட வக�ப�ப�களின� செய�திகள�க�க� நிறத�தை அமை.<br>    &lt;class&gt;: "
+"பெற�, அன�ப�ப�,ம�க�கியமான, செயல�, நேரஅஞ�சல�<br>    &lt;foreground/background&gt;: "
+"கர�ப�ப�, சிவப�ப�, பச�சை, நீலம�, வெள�ளை, சாம�பல�, கர�சாம�பல�, மஜென�தா, சையன�, "
+"ம�ன�னிர�ப�ப�<br><br>EXAMPLE:<br>    msgcolor சையன� ம�ன�னிர�ப�பை அன�ப�ப�கிறத�"
 
 msgid "Unable to open file."
 msgstr "கோப�பை திறக�க இயலவில�லை."
@@ -753,15 +753,15 @@ msgstr "வடிப�பி:"
 msgid "Pause"
 msgstr "தற�காலிகமாக நிற�த�த�"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "File Transfers - %d%% of %d files"
-msgstr[1] "File Transfers - %d%% of %d files"
+msgstr[0] "கோப�ப� இடமாற�றங�கள�  - %d%% இல� %d கோப�ப�"
+msgstr[1] "கோப�ப� இடமாற�றங�கள�  - %d%% இல� %d கோப�ப�கள�"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "கோப�ப� மாற�றல�கள�"
+msgstr "கோப�ப� இடமாற�றங�கள�"
 
 msgid "Progress"
 msgstr "ம�ன�னேற�றம�"
@@ -795,7 +795,8 @@ msgstr "நிற�த�த�"
 msgid "Waiting for transfer to begin"
 msgstr "பரிமாற�றம� ஆரம�பமாவதற�காக காத�திர�க�கிறத�"
 
-msgid "Canceled"
+#, fuzzy
+msgid "Cancelled"
 msgstr "தவிர�க�கப�பட�டத�"
 
 msgid "Failed"
@@ -924,11 +925,11 @@ msgstr "அன�ப�ப�பவர�"
 msgid "Subject"
 msgstr "பொர�ள�"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s (%s) has %d new messages."
-msgstr[1] "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) ஆனத� %d ப�திய செய�தியை கொண�ட�ள�ளத�."
+msgstr[1] "%s (%s) ஆனத� %d ப�திய செய�திகளை கொண�ட�ள�ளத�."
 
 msgid "New Mail"
 msgstr "ப�திய அஞ�சல�"
@@ -1684,7 +1685,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "இந�த சான�றிதழ� ம�டிவடைந�தத� மற�ற�ம� இதை மதிப�ப�டையதாக �ற�ற�க� கொள�ள ம�டியவில�லை."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2313,7 +2317,7 @@ msgid "_Save"
 msgstr "சேமி (_S)"
 
 msgid "_Cancel"
-msgstr "_ந நீக�க�"
+msgstr "ரத�த� (_C)"
 
 msgid "Ask"
 msgstr "கேள�"
@@ -2438,7 +2442,7 @@ msgid "Set Account Idle Time"
 msgstr "கணக�கின� செயலற�ற காலத�தை அமை"
 
 msgid "_Set"
-msgstr "_அமை"
+msgstr "அமை (_S)"
 
 msgid "None of your accounts are idle."
 msgstr "உங�களத� எந�த கணக�க�ம� ஓய�வ� நேரத�தில� இல�லை."
@@ -2447,7 +2451,7 @@ msgid "Unset Account Idle Time"
 msgstr "கணக�கின� ஒய�வ� நேர அமைப�பை நீக�க�"
 
 msgid "_Unset"
-msgstr "அமைப�பை _ன நீக�க�"
+msgstr "அமைப�பை நீக�க� (_U)"
 
 msgid "Set Idle Time for All Accounts"
 msgstr "அனைத�த� கணக�க�கள�க�க�ம� ஓய�வ� நேரம� அமை"
@@ -2861,7 +2865,7 @@ msgstr "GNUTLS மூலமà¯� எஸà¯�எஸà¯�எலà¯� ஆதரவை à®…à®
 #. *< priority
 #. *< id
 msgid "NSS"
-msgstr "என�எஸ�எஸ�"
+msgstr "NSS"
 
 #. *< name
 #. *< version
@@ -2877,7 +2881,7 @@ msgstr "மோஸில�லா என�எஸ�எஸ� மூலம� எ
 #. *< priority
 #. *< id
 msgid "SSL"
-msgstr "எஸ�எஸ�எல�"
+msgstr "SSL"
 
 #. *< name
 #. *< version
@@ -2910,13 +2914,13 @@ msgid "Notify When"
 msgstr "அப�பொழ�த� தெரிவி"
 
 msgid "Buddy Goes _Away"
-msgstr "நண�பர� _வ வெளியே செல�கிறார�"
+msgstr "நண�பர� வெளியே செல�கிறார� (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "நண�பர� _ஓய�வாக இர�க�கப�போகிறார�"
+msgstr "நண�பர� ஓய�வாக இர�க�கப�போகிறார� (_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "நண�பர� _ந ந�ழைய/வெளியேற"
+msgstr "நண�பர� ந�ழைய/வெளியேற (_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -3237,7 +3241,7 @@ msgid "Add to chat"
 msgstr "அரட�டையில� சேர�க�க"
 
 msgid "Chat _name:"
-msgstr "_ப அரட�டை பெயர�:"
+msgstr "அரட�டை பெயர� (_n):"
 
 #, c-format
 msgid "Unable to resolve hostname '%s': %s"
@@ -3320,7 +3324,7 @@ msgid "Error displaying MOTD"
 msgstr "எம�ஓடிடி (MOTD) காண�பிப�பதில� பிழை"
 
 msgid "No MOTD available"
-msgstr "எம�ஓடிடி (MOTD) கிடைக�கவில�லை"
+msgstr "MOTD கிடைக�கவில�லை"
 
 msgid "There is no MOTD associated with this connection."
 msgstr "இந�த இணைப�ப�டன� எம�ஓடிடி (MOTD) இல�லை"
@@ -3344,10 +3348,10 @@ msgid "View MOTD"
 msgstr "எம�ஓடிடி (MOTD) � காண"
 
 msgid "_Channel:"
-msgstr "_வாய�க�கால�:"
+msgstr "சேனல� (_C):"
 
 msgid "_Password:"
-msgstr "_கடவ�ச�சொல�:"
+msgstr "கடவ�ச�சொல� (_P):"
 
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ப�னை மற�ற�ம� சேவையகம� வெற�றிடத�தை  கொண�டிர�க�கவில�லை"
@@ -3664,21 +3668,21 @@ msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"நிலை &lt;+|-&gt;&lt;A-Za-z&gt; &lt;ப�னைப�பெயர�|வாய�க�கால�&gt;:  வாய�க�கால� அல�லத� "
-"பயனாளர� நிலையை அமை அல�லத� நீக�க�."
+"நிலை  &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  வாய�க�கால� அல�லத� பயனாளர� "
+"நிலையை அமை அல�லத� நீக�க�."
 
 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;:  பயனாளர�க�க� தனிப�பட�ட தகவல� அன�ப�ப� "
-"(வாய�க�கால�க�க� எதிராக)."
+"msg &lt;nick&gt; &lt;message&gt;: பயனாளர�க�க� தனிப�பட�ட தகவல� அன�ப�ப� (வாய�க�கால�க�க� "
+"எதிராக)."
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "பெயர�கள� [வாய�க�கால�]:  வாய�க�காலில� தற�போத�ள�ள பயனாளர�களை பட�டியலிட�."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;ப�திய ப�னைப�பெயர�&gt;:  உங�களத� ப�னைப�பெயரை மாற�ற�க."
+msgstr "nick &lt;new nickname&gt;:  உங�களத� ப�னைப�பெயரை மாற�ற�க."
 
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  nickserv க�க� கட�டளையை அன�ப�ப�"
@@ -3920,7 +3924,7 @@ msgid "Given Name"
 msgstr "கொட�க�கப�பட�ட பெயர�"
 
 msgid "URL"
-msgstr "ய�ஆர�எல� "
+msgstr "URL"
 
 msgid "Street Address"
 msgstr "தெர� ம�கவரி"
@@ -4108,13 +4112,13 @@ msgid "Search Directory"
 msgstr "அடைவை தேட�"
 
 msgid "_Room:"
-msgstr "அறை:"
+msgstr "அறை (_R):"
 
 msgid "_Server:"
-msgstr "_ச சேவையகம�:"
+msgstr "சேவையகம� (_S):"
 
 msgid "_Handle:"
-msgstr "_க க�ற�ம�பெயர�:"
+msgstr "கையாள�தல� (_H):"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4702,11 +4706,20 @@ msgstr "XMPP நெறிம�றை சொர�கி"
 msgid "Domain"
 msgstr "டொமைன�"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS தேவைப�பட�கிறத�"
+#, fuzzy
+msgid "Require encryption"
+msgstr "உரிமையாக�கல� தேவை"
 
-msgid "Force old (port 5223) SSL"
-msgstr "பழைய (தளம� 5223) எஸ�எஸ�எல� � வன� ப�க�த�த�"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "டிஎல�எஸ� இர�ந�தால� பயன�பட�த�த�"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "இணைப�ப� மீண�ட�ம� அமைக�கப� பட�டத�"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "க�றியாக�கம� செய�யாத வாய�க�கால�களில� வெற�ற� உரை அன�மதியை செயல� பட�த�த�."
@@ -4758,9 +4771,8 @@ msgstr "XMPP செய�தி பிழை"
 msgid "(Code %s)"
 msgstr " (க�றியீட� %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "தகவல� அன�ப�ப இயலவில�லை: தகவல� மிக நீளமாக உள�ளத�."
+msgstr "ஒர� தனிபயன� ஸ�மைலி செய�தியில� அன�ப�ப மிக பெரியதாக உள�ளத�."
 
 msgid "XMPP stream header missing"
 msgstr ""
@@ -4796,7 +4808,7 @@ msgid "_Configure Room"
 msgstr "_ற அறையை வரையற�"
 
 msgid "_Accept Defaults"
-msgstr "_ம ம�ன�னிர�ப�பை �ற�ற�க�கொள�"
+msgstr "ம�ன�னிர�ப�பை �ற�ற�க�கொள� (_A)"
 
 msgid "No reason"
 msgstr "காரணம� இல�லை"
@@ -4844,31 +4856,26 @@ msgstr "%s க�க� கோப�பை அன�ப�ப ம�டியவ
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "நீங�கள� ஒர� கோப�பை அன�ப�ப விர�ம�பிய %sக�க� மற�தீர�வை தேர�ந�தெட�"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "அராபிக�"
+msgstr ""
 
-#, fuzzy
 msgid "Amazed"
-msgstr "அவமானப� பட�ம�"
+msgstr ""
 
-#, fuzzy
 msgid "Amorous"
-msgstr "ப�கழ�பெற�ற"
+msgstr ""
 
 msgid "Angry"
 msgstr "கோபம�"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "தட�க�கப�பட�டத�"
+msgstr ""
 
 msgid "Anxious"
 msgstr "பதட�டத�தில�"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "நீங�கள� அன�ப�ப"
+msgstr ""
 
 msgid "Ashamed"
 msgstr "அவமானப� பட�ம�"
@@ -4876,29 +4883,24 @@ msgstr "அவமானப� பட�ம�"
 msgid "Bored"
 msgstr "போரடிக�க�த�"
 
-#, fuzzy
 msgid "Brave"
-msgstr "சேமிக�கவ�ம�"
+msgstr ""
 
-#, fuzzy
 msgid "Calm"
-msgstr "ஆள�ம� தளம�"
+msgstr ""
 
-#, fuzzy
 msgid "Cautious"
-msgstr "அரட�டைகள�"
+msgstr ""
 
-#, fuzzy
 msgid "Cold"
-msgstr "தடிமனான"
+msgstr ""
 
 #, fuzzy
 msgid "Confident"
 msgstr "ம�ரண�பாட�"
 
-#, fuzzy
 msgid "Confused"
-msgstr "தொடர�"
+msgstr ""
 
 #, fuzzy
 msgid "Contemplative"
@@ -4906,11 +4908,10 @@ msgstr "தொடர�ப�"
 
 #, fuzzy
 msgid "Contented"
-msgstr "இணைக�கப�பட�டத�"
+msgstr "தொடர�"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "நிற�வனம�"
+msgstr ""
 
 msgid "Crazy"
 msgstr ""
@@ -4927,24 +4928,22 @@ msgstr "ப�கழ�பெற�ற"
 msgid "Dejected"
 msgstr "மற�க�கப�பட�டத�"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "அழிக�கப�பட�டத�"
+msgstr ""
 
 #, fuzzy
 msgid "Disappointed"
-msgstr "இணைப�ப� த�ண�டிக�கப�பட�டத�."
+msgstr "செயல�நீக�க�"
 
 msgid "Disgusted"
 msgstr ""
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "செயல�நீக�க�"
+msgstr ""
 
 #, fuzzy
 msgid "Distracted"
-msgstr "பிரிக�கப� பட�ட"
+msgstr "இணைப�ப� த�ண�டிக�கப�பட�டத�."
 
 msgid "Embarrassed"
 msgstr ""
@@ -4960,9 +4959,8 @@ msgstr "பரபரப�பான"
 msgid "Flirtatious"
 msgstr "ப�கழ�பெற�ற"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "ம�தற� பெயர�"
+msgstr ""
 
 msgid "Grateful"
 msgstr ""
@@ -4974,9 +4972,8 @@ msgstr "திர�ம�ப எட�க�கிறத�..."
 msgid "Grumpy"
 msgstr "�ற�மாறான"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "நகரம�"
+msgstr ""
 
 msgid "Happy"
 msgstr "மகிழ�ச�சி"
@@ -4997,31 +4994,27 @@ msgstr ""
 msgid "Hungry"
 msgstr "கோபம�"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "நகைச�ச�வை"
+msgstr ""
 
 msgid "Impressed"
 msgstr ""
 
-#, fuzzy
 msgid "In awe"
-msgstr "காதலில�"
+msgstr ""
 
 msgid "In love"
-msgstr "� லவ� �எம�"
+msgstr "காதலில�"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "இந�தோனேஷியன�"
+msgstr ""
 
 #, fuzzy
 msgid "Interested"
 msgstr "பொழ�த�போக�க� மற�ற�ம� விர�ப�பங�கள�"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "அழைக�கப�பட�டத�"
+msgstr ""
 
 msgid "Invincible"
 msgstr "தோற�கடிக�க ம�டியாத"
@@ -5029,20 +5022,17 @@ msgstr "தோற�கடிக�க ம�டியாத"
 msgid "Jealous"
 msgstr "பொறாமை பிடித�த"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "க�ரங�க�"
+msgstr ""
 
-#, fuzzy
 msgid "Lost"
-msgstr "மிகமிக சத�தமான"
+msgstr ""
 
 msgid "Lucky"
 msgstr ""
 
-#, fuzzy
 msgid "Mean"
-msgstr "ஜெர�மன�"
+msgstr ""
 
 #, fuzzy
 msgid "Moody"
@@ -5051,13 +5041,11 @@ msgstr "மன நிலை"
 msgid "Nervous"
 msgstr ""
 
-#, fuzzy
 msgid "Neutral"
-msgstr "விவரம�"
+msgstr ""
 
-#, fuzzy
 msgid "Offended"
-msgstr "இணைப�ப� விலகி"
+msgstr ""
 
 msgid "Outraged"
 msgstr ""
@@ -5066,32 +5054,27 @@ msgstr ""
 msgid "Playful"
 msgstr "இயக�க�"
 
-#, fuzzy
 msgid "Proud"
-msgstr "சத�தமான"
+msgstr ""
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "இயற� பெயர�"
+msgstr ""
 
-#, fuzzy
 msgid "Relieved"
-msgstr "பெறப�பட�டத�"
+msgstr ""
 
 #, fuzzy
 msgid "Remorseful"
 msgstr "நீக�க�க"
 
-#, fuzzy
 msgid "Restless"
-msgstr "பதிவ�"
+msgstr ""
 
 msgid "Sad"
 msgstr "சோகம�"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "க�ஜராத�தி"
+msgstr ""
 
 msgid "Satisfied"
 msgstr ""
@@ -5121,9 +5104,8 @@ msgstr ""
 msgid "Stressed"
 msgstr "வேகம�:"
 
-#, fuzzy
 msgid "Strong"
-msgstr "பாட�ட�"
+msgstr ""
 
 msgid "Surprised"
 msgstr ""
@@ -5134,21 +5116,18 @@ msgstr ""
 msgid "Thirsty"
 msgstr ""
 
-#, fuzzy
 msgid "Tired"
-msgstr "ஃபயர�"
+msgstr ""
 
 #, fuzzy
 msgid "Undefined"
 msgstr "அடிக�கோடிட�ட"
 
-#, fuzzy
 msgid "Weak"
-msgstr "களைப�படைதல�"
+msgstr ""
 
-#, fuzzy
 msgid "Worried"
-msgstr "போரடிக�க�த�"
+msgstr ""
 
 msgid "Set User Nickname"
 msgstr "பயனர� ப�னைப�பெயரை அமை"
@@ -5486,7 +5465,7 @@ msgid "Working"
 msgstr "பணிப�ரிகிறத�"
 
 msgid "Has you"
-msgstr "Has you"
+msgstr "நீங�கள�"
 
 msgid "Home Phone Number"
 msgstr "வீட�ட� தொலைபேசி எண�"
@@ -5567,7 +5546,7 @@ msgstr "தயவà¯� செயà¯�தà¯� எனகà¯�கà¯� அனà¯�மதி à®
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 msgid "_OK"
-msgstr "_OK"
+msgstr "சரி (_O)"
 
 msgid "Error retrieving profile"
 msgstr "க�ற�ந�தொக�ப�பை பெற�வதில� பிழை"
@@ -5951,7 +5930,8 @@ msgstr "PIN தவறானதà¯�. அதà¯� ஒனà¯�பதà¯� இலகà¯�கà
 msgid "The two PINs you entered do not match."
 msgstr "நீங�கள� உள�ளிட�ட இரண�ட� PINகள� பொர�ந�தவில�லை."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "நீங�கள� உள�ளிட�ட பெயர� தவறானத�."
 
 msgid ""
@@ -6041,10 +6021,6 @@ msgstr "MXit சேவையகதà¯�தà¯�டனà¯� இணைகà¯�க à®®à¯�à®
 msgid "Connecting..."
 msgstr "இணைக�கிறத�..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "நீங�கள� உள�ளிட�ட பெயர� தவறானத�."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "நீங�கள� உள�ளிட�ட PIN ஒர� தவறான நீளமாக�ம� [7-10]."
 
@@ -6156,7 +6132,7 @@ msgstr "கெட�ட அன�மதிச�சீட�ட�"
 
 #, fuzzy
 msgid "_Room Name:"
-msgstr "அறை:"
+msgstr "அறை (_R):"
 
 #. Display system message in chat window
 #, fuzzy
@@ -6345,7 +6321,7 @@ msgstr "எனத� இடம�"
 msgid "IM Friends"
 msgstr "IM நண�பர�கள�"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%d buddy was added or updated from the server (including buddies already on "
 "the server-side list)"
@@ -6353,11 +6329,11 @@ msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
+"%d நண�பர� சேவையகத�திலிர�ந�த� சேர�க�கப�பட�ட� ப�த�ப�பிக�கப�பட�டனர� (சேவையக பக�க பட�டியலிர�ந�த� "
+"�ற�கனவே இர�ந�த நண�பர�கள� உட�பட)"
 msgstr[1] ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
+"%d நண�பர�கள� சேவையகத�திலிர�ந�த� சேர�க�கப�பட�ட� ப�த�ப�பிக�கப�பட�டனர� (சேவையக பக�க "
+"பட�டியலிர�ந�த� �ற�கனவே இர�ந�த நண�பர�கள� உட�பட)"
 
 msgid "Add contacts from server"
 msgstr "சேவையகத�திலிர�ந�த� தொடர�ப�களை சேர�"
@@ -6823,7 +6799,7 @@ msgstr "பயனர� �டி:"
 #. }
 #.
 msgid "Full name"
-msgstr "Full name (ம�ழ�ப�பெயர�)"
+msgstr "ம�ழ�ப�பெயர�"
 
 #, c-format
 msgid "GroupWise Conference %d"
@@ -6891,9 +6867,18 @@ msgstr "சேவையகம� ம�கவரி"
 msgid "Server port"
 msgstr "சேவையகம� தளம�"
 
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "உங�களை என� நண�பர�கள� பட�டியலில� சேர�க�க எனக�க� அன�மதி தார�ங�கள�."
+
+msgid "No reason given."
+msgstr "காரணம� கொட�க�கப�படவில�லை."
+
+msgid "Authorization Denied Message:"
+msgstr "அன�மதி மற�த�தல� தகவல�:"
+
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "%s லிர�ந�த� எதிர�பாராத பதில� பெறப�பட�டத�"
+msgstr "%sஇலிர�ந�த� எதிர�பாராத பதில� கிடைத�தத�: %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6916,6 +6901,8 @@ msgid ""
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
 "client does not currently support CAPTCHAs."
 msgstr ""
+"உள�ந�ழைய ஒர� CAPTCHA� நிரப�ப கோரப�பட�கிறத�, ஆனால� இந�த கிளையன� தற�போத� "
+"CAPTCHAகள�க�க� த�ணைப�ரியவில�லை."
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ஆனத� உங�கள� திரையில� பெயரை இங�கே அங�கீகரிக�க அன�மதிக�கவில�லை"
@@ -6924,6 +6911,24 @@ msgstr "AOL ஆனதà¯� உஙà¯�களà¯� திரையிலà¯� பெயà®
 msgid "Error requesting %s"
 msgstr "பிழையை கோர�ம� %s: %s"
 
+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 கணக�கை நீங�கள� க�றிப�பிடலாம�.)"
+
+#, 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 ஒர� பிழையான க�ளையன�ட� பெற�ற�ள�ளத�.)"
+
 msgid "Could not join chat room"
 msgstr "அரட�டை அறையில� சேர�க�க ம�டியவில�லை"
 
@@ -6998,9 +7003,8 @@ msgstr "டைபà¯� செயà¯�வதை நிறà¯�தà¯�தà¯�கிறதà
 msgid "Questioning"
 msgstr "உரையாடல� கேள�வி "
 
-#, fuzzy
 msgid "Eating"
-msgstr "அழைப�ப�"
+msgstr ""
 
 #, fuzzy
 msgid "Watching a movie"
@@ -7019,9 +7023,8 @@ msgstr ""
 msgid "Watching TV"
 msgstr ""
 
-#, fuzzy
 msgid "Having fun"
-msgstr "த�ணிடித�தல�"
+msgstr ""
 
 #, fuzzy
 msgid "Sleeping"
@@ -7038,9 +7041,8 @@ msgstr "IM நண�பர�கள�"
 msgid "On the phone"
 msgstr "தொலைபேசியில�"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "மீண�ட�ம� மீண�ட�ம� நிகழ�ம�"
+msgstr ""
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
@@ -7065,11 +7067,11 @@ msgstr ""
 
 #, fuzzy
 msgid "Smoking"
-msgstr "பாட�ட�"
+msgstr "பணிப�ரிகிறத�"
 
 #, fuzzy
 msgid "Writing"
-msgstr "பணிப�ரிகிறத�"
+msgstr "எழ�த�தல� பிழை"
 
 #. Drinking [Alcohol]
 #, fuzzy
@@ -7079,9 +7081,8 @@ msgstr "பணிப�ரிகிறத�"
 msgid "Listening to music"
 msgstr "இசையை கவனிக�கிறத�"
 
-#, fuzzy
 msgid "Studying"
-msgstr "அன�ப�ப�கிறத�"
+msgstr ""
 
 #, fuzzy
 msgid "In the restroom"
@@ -7154,94 +7155,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s கோப�பானத� %s, அதிகபட�ச அளவான %s� விட அதிகமாக உள�ளத�."
 
-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 கணக�கை நீங�கள� க�றிப�பிடலாம�.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "நண�பர� க�ற�ம�படம�"
-
-msgid "Voice"
-msgstr "க�ரல�"
-
-msgid "AIM Direct IM"
-msgstr "�எம� நேரடி �எம�"
-
-msgid "Get File"
-msgstr "கோப�பை கொண�ட� வர�க"
-
-msgid "Games"
-msgstr "விளையாட�ட�கள�"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Add-Ins (சேர�ப�ப�கள�)"
-
-msgid "Send Buddy List"
-msgstr "நண�பர� பட�டியலை அன�ப�ப�"
-
-msgid "ICQ Direct Connect"
-msgstr "�சீக�யூ நேர� இணைப�ப�"
-
-msgid "AP User"
-msgstr "�பி பயனாளர� "
-
-msgid "ICQ RTF"
-msgstr "�சீக�யூ வடிவமைத�த உரை"
-
-msgid "Nihilist"
-msgstr "ப�ரட�சியாளர�"
-
-msgid "ICQ Server Relay"
-msgstr "�சிக�யூ சேவையக ஒளிபரப�ப�"
-
-msgid "Old ICQ UTF8"
-msgstr "பழைய �சீக�யூ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ட�ரில�லியன� ரகசியமாக�கல�"
-
-msgid "ICQ UTF8"
-msgstr "�சீக�யூ ய�டிஎப�8"
-
-msgid "Hiptop"
-msgstr "ஹிப�டாப�"
-
-msgid "Security Enabled"
-msgstr "பாத�காப�ப� செயலாக�கப�பட�டத�"
-
-msgid "Video Chat"
-msgstr "வீடியோ அரட�டை"
-
-msgid "iChat AV"
-msgstr "�சாட� �வி"
-
-msgid "Live Video"
-msgstr "நிகழ� ஒளித�தோற�றம�"
-
-msgid "Camera"
-msgstr "காமிரா"
-
-msgid "Screen Sharing"
-msgstr "திரையை பகிர�கிறத�"
-
 msgid "Free For Chat"
 msgstr "அரட�டைக�க�த� தயார�"
 
@@ -7257,17 +7170,15 @@ msgstr "வலை உணர�வ�ள�ள"
 msgid "Invisible"
 msgstr "காணம�டியாத"
 
-#, fuzzy
 msgid "Evil"
-msgstr "மின�னஞ�சல�"
+msgstr ""
 
 #, fuzzy
 msgid "Depression"
 msgstr "வேலை"
 
-#, fuzzy
 msgid "At home"
-msgstr "என�னைப� பற�றி"
+msgstr ""
 
 #, fuzzy
 msgid "At work"
@@ -7277,15 +7188,6 @@ msgstr "வலையமைப�ப�"
 msgid "At lunch"
 msgstr "உணவிற�காக வெளியே"
 
-msgid "IP Address"
-msgstr "�பி ம�கவரிகள�"
-
-msgid "Warning Level"
-msgstr "எச�சரிக�கை நிலை"
-
-msgid "Buddy Comment"
-msgstr "நண�பர� விமரிசனம�"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "அங�கீகரிக�கப�பட�ட சேவையகத�தை இணைக�க ம�டியவில�லை: %s"
@@ -7382,15 +7284,6 @@ msgstr "கடவà¯�சà¯�சொலà¯� அனà¯�பà¯�பபà¯�படà¯�டதà¯
 msgid "Unable to initialize connection"
 msgstr "இணைப�பை த�வக�க ம�டியவில�லை"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "உங�களை என� நண�பர�கள� பட�டியலில� சேர�க�க எனக�க� அன�மதி தார�ங�கள�."
-
-msgid "No reason given."
-msgstr "காரணம� கொட�க�கப�படவில�லை."
-
-msgid "Authorization Denied Message:"
-msgstr "அன�மதி மற�த�தல� தகவல�:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7455,7 +7348,7 @@ msgid "_Add"
 msgstr "_ச சேர�க�கவ�ம�"
 
 msgid "_Decline"
-msgstr "_ந நிராகரி"
+msgstr "நிராகரி (_D)"
 
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
@@ -7477,93 +7370,50 @@ msgid_plural ""
 msgstr[0] "மிக வேகமாக இர�ந�ததால� நீங�கள� %hu செய�தியை  %s லிர�ந�த� இழந�தீர�கள�"
 msgstr[1] "மிக வேகமாக இர�ந�ததால� நீங�கள� %hu செய�திபளை  %s லிர�ந�த� இழந�தீர�கள�"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"You missed %hu messages from %s because his/her warning level is too high."
+"நீங�கள� விட�ப�பட�ட %hu செய�தியை %sஇலிர�ந�த� பெற�றீர�கள� �னெனில� அவர�கள�க�க� எச�சரிக�கை நிலை "
+"மிக அதிகம�."
 msgstr[1] ""
-"You missed %hu messages from %s because his/her warning level is too high."
+"நீங�கள� விட�ப�பட�ட %hu செய�திகளை %sஇலிர�ந�த� பெற�றீர�கள� �னெனில� அவர�கள�க�க� எச�சரிக�கை நிலை "
+"மிக அதிகம�."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
-"You missed %hu messages from %s because your warning level is too high."
+"நீங�கள� %hu செய�திகளை %s இலிர�ந�த� விட�ட�விட�டீர�கள� �னெனில� உங�கள� எச�சரிக�கை நிலை மிக "
+"அதிகம�."
 msgstr[1] ""
-"You missed %hu messages from %s because your warning level is too high."
+"நீங�கள� %hu செய�தியை %s இலிர�ந�த� விட�ட�விட�டீர�கள� �னெனில� உங�கள� எச�சரிக�கை நிலை மிக "
+"அதிகம�."
 
 #, 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] "தெரியாத காரணங�களால� நீங�கள� %hu செய�திகளை %s லிர�ந�த� இழந�தீர�கள�"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "பயனர� பற�றிய விவரங�கள� கிடைக�கவில�லை: %s"
-
-msgid "Online Since"
-msgstr "இன�ன�ம� இணைப�ப�டன�"
-
-msgid "Member Since"
-msgstr "இதிலிர�ந�த� அங�கத�தினர�."
-
-msgid "Capabilities"
-msgstr "செயல�திறன�"
+msgstr[0] "தெரியாத காரணத�தால� நீங�கள� %hu செய�தியை %s இலிர�ந�த� விட�ட�விட�டீர�கள�."
+msgstr[1] "தெரியாத காரணத�தால� நீங�கள� %hu செய�திகளை %s இலிர�ந�த� விட�ட�விட�டீர�கள�."
 
 msgid "Your AIM connection may be lost."
 msgstr "உங�கள� ��எம� இணைப�ப� அற�பட�டத� போல உள�ளத�."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[செல�ல�படியற�ற எண� எழ�த�த�க� க�றியீட�கள� உள�ளதால� இந�த பயனரிடமிர�ந�த�  செய�தி காட�ட "
-"இயலவில�லை.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "நீங�கள� இந�த அரட�டை அறையிலிர�ந�த� இணப�ப� நீக�கப�பட�டீர�கள� %s."
 
-msgid "Mobile Phone"
-msgstr "அலைபேசி"
-
-msgid "Personal Web Page"
-msgstr "சொந�த வலைப� பக�கம�"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "கூட�தல� செய�தி"
-
-msgid "Zip Code"
-msgstr "அஞ�சல� க�றியீட�"
-
-msgid "Work Information"
-msgstr "வேலை பற�றிய தகவல�"
-
-msgid "Division"
-msgstr "பிரிவ�"
-
-msgid "Position"
-msgstr "இடம�"
-
-msgid "Web Page"
-msgstr "வலைப� பக�கம�"
-
 msgid "Pop-Up Message"
 msgstr "த�ள�ள� தகவல�"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "The following usernames are associated with %s"
-msgstr[1] "The following usernames are associated with %s"
+msgstr[0] "பின�வர�ம� பயனர� பெயர� %sஉடன� தொடர�ப�டையவர�"
+msgstr[1] "பின�வர�ம� பயனர� பெயர�கள� %sஉடன� தொடர�ப�டையவர�கள�"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7650,7 +7500,7 @@ msgstr ""
 "கேட�டிர�க�கலாம�. உங�கள�  விவரக�க�றிப�ப� இன�ன�ம� அமைக�கப� படாமல� உள�ளத�. நீங�கள� ம�ழ�த�ம� "
 "இணக�கப� பட� ம�ன� அதை அமைக�க ம�யற�சிக�கவ�ம�."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7658,16 +7508,14 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+"அதிகபட�ச  விவரக�க�றிப�ப� நீளமான %d பைட�டை தாண�டியத�.  இத� உங�கள�க�க� வெட�டப�பட�டத�."
 msgstr[1] ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+"அதிகபட�ச  விவரக�க�றிப�ப� நீளமான %d பைட�களை தாண�டியத�.  இத� உங�கள�க�க� வெட�டப�பட�டத�."
 
 msgid "Profile too long."
 msgstr "மிக நீண�ட விவரக�க�றிப�ப� "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7675,11 +7523,9 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+"அதிகபட�ச வெளியேற�ம� செய�தி நீளம� %d பைட�டை தாண�டியத�. இத� உங�கள�க�க� வெட�டப�பட�டத�. "
 msgstr[1] ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+"அதிகபட�ச வெளியேற�ம� செய�தி நீளம� %d பைட�களை தாண�டியத�. இத� உங�கள�க�க� வெட�டப�பட�டத�. "
 
 msgid "Away message too long."
 msgstr "வெளிச�செல� தகவல� மிக நீளமாக உள�ளத�."
@@ -7756,7 +7602,7 @@ msgid "Authorization Denied"
 msgstr "அன�மதி மற�க�கப� பட�டத�"
 
 msgid "_Exchange:"
-msgstr "_பரிமாற�றம�:"
+msgstr "பரிமாற�றம� (_E):"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
@@ -7765,9 +7611,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iடியூன�கள� மியூசிக� சேகரிப�ப� இணைப�ப�"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "பின�ச�"
+msgstr ""
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7831,7 +7676,8 @@ msgstr "பயனரà¯�பெயரà¯� வடிவமைபà¯�பாலà¯� சà
 msgid "Change Address To:"
 msgstr "மாற�றவேண�டிய ம�கவரி:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>நீங�கள� அன�மதிக�க� காத�திர�க�கவில�லை</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7870,6 +7716,14 @@ msgstr "IM ம�ன�னேற�வதை கட�டமை (இணயம�
 msgid "Set Privacy Options..."
 msgstr "�சீக�யூ அந�தரங�க விர�ப�பங�கள�"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "நண�பர� பட�டியலை காட�ட� (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "விர�ந�தினர� பட�டியல�"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "கணக�கை உற�திப�பட�த�த�"
@@ -7886,9 +7740,6 @@ msgstr "உறà¯�தியாகà¯�கலà¯�கà¯�கà¯� காதà¯�திரà¯
 msgid "Search for Buddy by Email Address..."
 msgstr "நண�பர�க�கான மின�னஞ�சல� ம�கவரியின� படி தேடவ�ம�..."
 
-msgid "Search for Buddy by Information"
-msgstr "தோழரை தகவல� மூலம� தேட�க"
-
 msgid "Use clientLogin"
 msgstr "பயனர� உட�ப�க�வை பயன�பட�த�த�"
 
@@ -7947,7 +7798,7 @@ msgid "Obsolete SNAC"
 msgstr "காலாவதியான எஸ�என��சி"
 
 msgid "Not supported by host"
-msgstr "ப�ரவலனால� ஆதரிக�கப� படவில�லை"
+msgstr "ப�ரவலனால� ஆதரிக�கப�படவில�லை"
 
 msgid "Not supported by client"
 msgstr "பயனரால� ஆதரிக�கப� படவில�லை"
@@ -7997,6 +7848,167 @@ msgstr "கியூ வரிசை நிறைந�தத�"
 msgid "Not while on AOL"
 msgstr "�ஓஎல� இல� உள�ள போத� இல�லை"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "நண�பர� க�ற�ம�படம�"
+
+msgid "Voice"
+msgstr "க�ரல�"
+
+msgid "AIM Direct IM"
+msgstr "�எம� நேரடி �எம�"
+
+msgid "Get File"
+msgstr "கோப�பை கொண�ட� வர�க"
+
+#, fuzzy
+msgid "Games"
+msgstr "விளையாட�ட�கள�"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins (சேர�ப�ப�கள�)"
+
+msgid "Send Buddy List"
+msgstr "நண�பர� பட�டியலை அன�ப�ப�"
+
+msgid "ICQ Direct Connect"
+msgstr "�சீக�யூ நேர� இணைப�ப�"
+
+msgid "AP User"
+msgstr "�பி பயனாளர� "
+
+msgid "ICQ RTF"
+msgstr "�சீக�யூ வடிவமைத�த உரை"
+
+msgid "Nihilist"
+msgstr "ப�ரட�சியாளர�"
+
+msgid "ICQ Server Relay"
+msgstr "�சிக�யூ சேவையக ஒளிபரப�ப�"
+
+msgid "Old ICQ UTF8"
+msgstr "பழைய �சீக�யூ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ட�ரில�லியன� ரகசியமாக�கல�"
+
+msgid "ICQ UTF8"
+msgstr "�சீக�யூ ய�டிஎப�8"
+
+msgid "Hiptop"
+msgstr "ஹிப�டாப�"
+
+msgid "Security Enabled"
+msgstr "பாத�காப�ப� செயலாக�கப�பட�டத�"
+
+msgid "Video Chat"
+msgstr "வீடியோ அரட�டை"
+
+msgid "iChat AV"
+msgstr "�சாட� �வி"
+
+msgid "Live Video"
+msgstr "நிகழ� ஒளித�தோற�றம�"
+
+msgid "Camera"
+msgstr "காமிரா"
+
+msgid "Screen Sharing"
+msgstr "திரையை பகிர�கிறத�"
+
+msgid "IP Address"
+msgstr "�பி ம�கவரிகள�"
+
+msgid "Warning Level"
+msgstr "எச�சரிக�கை நிலை"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "நண�பர� க�றிப�ப�:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "பயனர� பற�றிய விவரங�கள� கிடைக�கவில�லை: %s"
+
+msgid "Mobile Phone"
+msgstr "அலைபேசி"
+
+msgid "Personal Web Page"
+msgstr "சொந�த வலைப� பக�கம�"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "கூட�தல� செய�தி"
+
+msgid "Zip Code"
+msgstr "அஞ�சல� க�றியீட�"
+
+msgid "Work Information"
+msgstr "வேலை பற�றிய தகவல�"
+
+msgid "Division"
+msgstr "பிரிவ�"
+
+msgid "Position"
+msgstr "இடம�"
+
+msgid "Web Page"
+msgstr "வலைப� பக�கம�"
+
+msgid "Online Since"
+msgstr "இன�ன�ம� இணைப�ப�டன�"
+
+msgid "Member Since"
+msgstr "இதிலிர�ந�த� அங�கத�தினர�."
+
+msgid "Capabilities"
+msgstr "செயல�திறன�"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "தொடர�ப�ள�ள நிலையில� காட�சியளி"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "தொடர�ப�ள�ள நிலையில� காட�சியளி"
+
+msgid "Appear Offline"
+msgstr "இணைப�பில�லாத நிலையில� இர�க�கிறத�"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "இணைப�பில�லாத நிலையில� இர�க�கிறத�"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "நீங�கள� உதைக�கப�பட�டீர�கள�: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"நீங�கள� இந�த நண�பர�களிடமிர�ந�த� அன�மதியை மீண�ட�ம� கோரலாம�. அதற�க� வலத� சொட�க�கி  \"அன�மதி "
+"மீண�ட�ம� கோர�க.\" � தேர�வ� செய�யவ�ம�."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "காணக�கூடிய"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "விர�ந�தினர� பட�டியல�"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "மீனம�"
 
@@ -8175,8 +8187,8 @@ msgstr "உங�கள� கோரிக�கை �ற�ற�க� கொ
 msgid "Your request was rejected."
 msgstr "உங�கள� கோரிக�கை மற�க�கப�பட�டத�."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u கோரிக�கைகள� சரிபார�த�தல�"
 
 msgid "Add buddy question"
@@ -8282,7 +8294,7 @@ msgstr "நிர�வாகம�"
 #. XXX: Should this be "Topic"?
 #, fuzzy
 msgid "Room Title"
-msgstr "அறை பட�டியல�"
+msgstr "வேலையின� தலைப�ப�"
 
 msgid "Notice"
 msgstr "அறிக�கை"
@@ -8517,7 +8529,7 @@ msgid "Update all QQ Quns"
 msgstr "அனைத�த� QQ Quns மேம�பட�த�த�"
 
 msgid "About OpenQ"
-msgstr "திறந�த Q� பற�றி"
+msgstr "OpenQ� பற�றி"
 
 msgid "Modify Buddy Memo"
 msgstr "நண�பர� மெமோவை மாற�றியமை"
@@ -8941,7 +8953,7 @@ msgstr "கà¯�à®´à¯�வை சேரà¯�கà¯�க இயலவிலà¯�லை: à®
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "  '%s' என பெயரிட�ட க�ழ� உங�கள� பட�டியலில� �ற�கெனவே உள�ளத�."
+msgstr "'%s' என பெயரிட�ட க�ழ� உங�கள� பட�டியலில� �ற�கெனவே உள�ளத�."
 
 msgid "Unable to add group"
 msgstr "க�ழ�வை சேர�க�க இயலவில�லை"
@@ -9148,7 +9160,7 @@ msgstr ""
 "செய�ய இறக�க�மதி � அழ�த�தவ�ம�."
 
 msgid "_Import..."
-msgstr "_இறக�க�மதி..."
+msgstr "இறக�க�மதி (_I)..."
 
 msgid "Select correct user"
 msgstr "சரியான பயனரை தேர�வ� செய�"
@@ -9219,7 +9231,7 @@ msgid "Draw On Whiteboard"
 msgstr "வெண�பலகையில� வரை"
 
 msgid "_Passphrase:"
-msgstr "_அன�மதி வாக�கியம�:"
+msgstr "அன�மதி வாக�கியம� (_P):"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -9491,10 +9503,10 @@ msgid "Public Key Babbleprint"
 msgstr "பொத� சொல�லாக�க விசை"
 
 msgid "_More..."
-msgstr "_ம மேல�ம�..."
+msgstr "மேல�ம� (_M)..."
 
 msgid "Detach From Server"
-msgstr "சேவயகத�திலிர�ந�த� பிரிக�க"
+msgstr "சேவையகத�திலிர�ந�த� பிரிக�க"
 
 msgid "Cannot detach"
 msgstr "பிரிக�க இயலாத�"
@@ -9624,7 +9636,7 @@ msgid "Verify Public Key"
 msgstr "பொத� சாவியை பரிசோதிக�க"
 
 msgid "_View..."
-msgstr "_காட�சி..."
+msgstr "காட�சி (_V)..."
 
 msgid "Unsupported public key type"
 msgstr "ஆதரவில�லா பொத�விசை வகை"
@@ -9682,10 +9694,10 @@ msgstr ""
 "உங�களத� விர�ப�பப�பட�ட தொடர�ப� ம�றைகள�"
 
 msgid "SMS"
-msgstr "எஸ�எம�எஸ�"
+msgstr "SMS"
 
 msgid "MMS"
-msgstr "எம�எம�எஸ�"
+msgstr "MMS"
 
 msgid "Video conferencing"
 msgstr "வீடியோ கூட�டம�"
@@ -9931,7 +9943,7 @@ msgid "Cipher"
 msgstr "மறையீட�"
 
 msgid "HMAC"
-msgstr "ஹெச�எம��சி "
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
 msgstr "சரியான ம�ன�னோக�க� இரகசியத�தை பயன�பட�த�த�"
@@ -10027,7 +10039,7 @@ msgid "Computer"
 msgstr "கணினி"
 
 msgid "PDA"
-msgstr "பிடி�"
+msgstr "PDA"
 
 msgid "Terminal"
 msgstr "ம�னையம�"
@@ -10372,18 +10384,12 @@ msgstr "வெளியே சென�ற�விட�டார�"
 msgid "Not on server list"
 msgstr "சேவையகம� பட�டியலில� இல�லை"
 
-msgid "Appear Online"
-msgstr "தொடர�ப�ள�ள நிலையில� காட�சியளி"
-
 msgid "Appear Permanently Offline"
 msgstr "எப�பொழ�த�ம� இணைப�பற�ற நிலையில� காட�சியளி"
 
 msgid "Presence"
 msgstr "தற�போதைய"
 
-msgid "Appear Offline"
-msgstr "இணைப�பில�லாத நிலையில� இர�க�கிறத�"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "எப�பொழ�த�மே இணைப�பற�ற நிலையில� காட�சியளிக�கவேண�டாம�"
 
@@ -10586,13 +10592,13 @@ msgid "Anyone"
 msgstr "யாராவத�"
 
 msgid "_Class:"
-msgstr "_வக�ப�ப�:"
+msgstr "வக�ப�ப� (_C):"
 
 msgid "_Instance:"
-msgstr "_ந நிகழ�வ�:"
+msgstr "நிகழ�வ� (_I):"
 
 msgid "_Recipient:"
-msgstr "_ப பெற�னர�:"
+msgstr "பெற�னர� (_R):"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
@@ -10734,7 +10740,7 @@ msgstr "இல�லை (_N)"
 #. * buttons.
 #.
 msgid "_Accept"
-msgstr "_�ற�ற�க� கொள�க"
+msgstr "�ற�ற�க� கொள� (_A) "
 
 #. *
 #. * The default message to use when the user becomes auto-away.
@@ -10799,9 +10805,8 @@ msgstr "தொந�தரவ� செய�ய வேண�டாம�"
 msgid "Extended away"
 msgstr "அப�பால� நீட�டப�பட�டத�"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "பெற�கிறத�"
+msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10924,27 +10929,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "உங�கள� கணினியில� மற�ற மென�பொர�ளின� படி இணைப�ப� இடைமறிக�கப�பட�டத�."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "தொலை ப�ரவல மூடப�பட�ட இணைப�ப�."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "இணைப�ப� காலம� ம�டிந�தத�."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "இணைப�ப� மற�க�கப�பட�டத�"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "ம�கவரி �ற�கனவே பயனில� உள�ளத�."
 
@@ -10980,10 +10980,10 @@ msgid "Pro_tocol:"
 msgstr "நெறிம�றை (_t):"
 
 msgid "_Username:"
-msgstr "_பயனாளர�:"
+msgstr "பயனாளர� (_U):"
 
 msgid "Remember pass_word"
-msgstr "கடவ�ச�சொல�லை நினைவ� கொள�  (_w)"
+msgstr "கடவ�ச�சொல�லை நினைவ� கொள� (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
@@ -11012,7 +11012,7 @@ msgid "No Proxy"
 msgstr "பதிலாள� இல�லை"
 
 msgid "HTTP"
-msgstr "ஹெச�டிடிபி"
+msgstr "HTTP"
 
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
@@ -11036,16 +11036,16 @@ msgid "you can see the butterflies mating"
 msgstr "பட�ட�ப�பூச�சிகள� உறவாட�வதை உங�களால� பார�க�க இயல�ம�"
 
 msgid "Proxy _type:"
-msgstr "பதிலாள� _வகை:"
+msgstr "பதிலாள� வகை (_t):"
 
 msgid "_Host:"
-msgstr "_ர ப�ரவலர�:"
+msgstr "ப�ரவலர� (_H):"
 
 msgid "_Port:"
-msgstr "_தளம�:"
+msgstr "த�றை (_P):"
 
 msgid "Pa_ssword:"
-msgstr "_கடவ�ச�சொல�:"
+msgstr "கடவ�ச�சொல� (_s):"
 
 msgid "Unable to save new account"
 msgstr "ப�திய கணக�கை சேமிக�க ம�டியவில�லை"
@@ -11057,13 +11057,13 @@ msgid "Add Account"
 msgstr "கணக�கை சேர�"
 
 msgid "_Basic"
-msgstr "_அடிப�படை"
+msgstr "அடிப�படை (_B)"
 
 msgid "Create _this new account on the server"
 msgstr "சேவையகத�தில� இந�த ப�திய கணக�கை உர�வாக�க�  (_t)"
 
 msgid "P_roxy"
-msgstr "ப�ராக�ஸி(_r)"
+msgstr "ப�ராக�ஸி (_r)"
 
 msgid "Enabled"
 msgstr "செயலாக�கப�பட�டத�"
@@ -11093,6 +11093,10 @@ msgstr ""
 "நண�பர�பட�டியல� சாளரத�தில� நீங�கள� மீண�ட�ம� வந�த� சாளரத�தில� சேர�க�க, திர�த�த, அல�லத�  "
 "<b>கணக�க�கள�->மேலாண�மை கணக�க�கள�</b>இதிலிர�ந�த� கணக�க�களை நீக�கலாம�"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ஆனத�  %s � அவன� அல�லத� அவள� நண�பர� பட�டியல� %s%s இல� சேர�க�கிறத�"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "பின�னணி நிறம�"
@@ -11209,14 +11213,14 @@ msgstr "அரட�டையின� போத� உங�கள� ப�ன
 msgid "The text information for a buddy's status"
 msgstr "ஒர� நண�பரின� நிலைக�கான உரை தகவல�"
 
-#, fuzzy, c-format
+#, 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� பெற�றிர�க�கலாம�. நீங�கள� அவற�றை அமிழ�த�த விர�ம�ப�கிறீர�களா?"
+"நீங�கள� %d தொடர�ப� பெயர�டைய %s� கொண�ட�ள�ளீர�கள�. நீங�கள� அவற�றை இணைக�க விர�ம�ப�கிறீர�களா?"
 msgstr[1] ""
-"நீங�கள� %d தொடர�ப� பெயர�டைய %s� பெற�றிர�க�கலாம�. நீங�கள� அவற�றை அமிழ�த�த விர�ம�ப�கிறீர�களா?"
+"நீங�கள� %d தொடர�ப�கள� பெயர�டைய %s� கொண�ட�ள�ளீர�கள�. நீங�கள� அவற�றை இணைக�க விர�ம�ப�கிறீர�களா?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -11243,7 +11247,7 @@ msgid "Room _List"
 msgstr "அறை பட�டியல� (_L)"
 
 msgid "_Block"
-msgstr "_தட�க�கவ�ம�"
+msgstr "தட�க�கவ�ம� (_B)"
 
 msgid "Un_block"
 msgstr "தடையை நீக�க� (_b)"
@@ -11252,7 +11256,7 @@ msgid "Move to"
 msgstr "இதற�க� நகர�த�த�"
 
 msgid "Get _Info"
-msgstr "_தகவல� பெற�"
+msgstr "தகவல� பெற� (_I)"
 
 msgid "I_M"
 msgstr "I_M"
@@ -11273,7 +11277,7 @@ msgid "Add Buddy _Pounce..."
 msgstr "நண�பர� பவ�ன�ஸை சேர� (_P)..."
 
 msgid "View _Log"
-msgstr "_பதிவை காண�"
+msgstr "பதிவை காண� (_L)"
 
 msgid "Hide When Offline"
 msgstr "ஆஃப�லைனில� இர�க�க�ம� போத� மறை"
@@ -11282,7 +11286,7 @@ msgid "Show When Offline"
 msgstr "ஆஃப�லைனில� இர�க�க�ம� போத� காட�ட�"
 
 msgid "_Alias..."
-msgstr "_ப ப�னைப�பெயர�..."
+msgstr "ப�னைப�பெயர� (_A)..."
 
 msgid "_Remove"
 msgstr "நீக�க� (_R)"
@@ -11300,14 +11304,14 @@ msgid "Add C_hat..."
 msgstr "அரட�டையை சேர� (_h)..."
 
 msgid "_Delete Group"
-msgstr "க�ழ�வை _நீக�க�"
+msgstr "க�ழ�வை அழி (_D)"
 
 msgid "_Rename"
-msgstr "_ம பெயர�மாற�ற�"
+msgstr "மற�பெயரிட� (_R)"
 
 #. join button
 msgid "_Join"
-msgstr "_இணை"
+msgstr "சேர� (_J)"
 
 msgid "Auto-Join"
 msgstr "ச�ய-இணைப�ப�"
@@ -11319,10 +11323,10 @@ msgid "_Edit Settings..."
 msgstr "அமைவ�களை திர�த�த� (_E)..."
 
 msgid "_Collapse"
-msgstr "_ச ச�ர�க�க�"
+msgstr "க�ற�க�க� (_C)"
 
 msgid "_Expand"
-msgstr "_வ விரிவ�"
+msgstr "விரிவ� (_E)"
 
 msgid "/Tools/Mute Sounds"
 msgstr "/கர�விகள�/ஒலியை ஊமையாக�க�"
@@ -11348,21 +11352,23 @@ msgstr "மாறாக (விர�ம�பினால�)"
 msgid "Edit User Mood"
 msgstr "பயனர� மனநிலையை திர�த�த�"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/_நண�பர�கள�"
+msgstr "/நண�பர�கள� (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/நண�பர�கள�/ப�திய உடனடி _தகவல�..."
+msgstr "/நண�பர�கள�/ப�திய உடனடி தகவல� (_M)..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/நண�பர�கள�/_அரட�டையில� இணை..."
+msgstr "/நண�பர�கள�/அரட�டையில� இணை (_C)..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/நண�பர�கள�/பயனாளர� _தகவலை பெற�..."
+msgstr "/நண�பர�கள�/பயனாளர� தகவலை பெற� (_I)..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/நண�பர�கள�/பயனாளர� _பதிவை காண�..."
+msgstr "/நண�பர�கள�/பயனாளர� பதிவை காண� (_L)..."
 
 msgid "/Buddies/Sh_ow"
 msgstr "/நண�பர�களை/காட�ட� (_o)"
@@ -11383,33 +11389,33 @@ msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/நண�பர�களை/காட�ட�/நெறிம�றை சின�னங�கள� (_P)"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/நண�பர�கள�/நண�பர�களை _அட�க�க�"
+msgstr "/நண�பர�கள�/நண�பர�களை அட�க�க� (_S)"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/நண�பர�கள�/தோழரை _ச சேர�..."
+msgstr "/நண�பர�கள�/தோழரை சேர� (_A)..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/நண�பர�கள�/_அரட�டையை சேர�..."
+msgstr "/நண�பர�கள�/அரட�டையை சேர� (_h)..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/நண�பர�கள�/_க க�ழ�வை சேர�..."
+msgstr "/நண�பர�கள�/க�ழ�வை சேர� (_G)..."
 
 msgid "/Buddies/_Quit"
-msgstr "/நண�பர�கள�/_வ வெளியேற�க"
+msgstr "/நண�பர�கள�/வெளியேற�க (_Q)"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_கணக�க�கள�"
+msgstr "/கணக�க�கள� (_A)"
 
 msgid "/Accounts/Manage Accounts"
 msgstr "/கணக�க�கள�/கணக�க�களின� மேலாண�மை"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/_கர�விகள�"
+msgstr "/கர�விகள� (_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/கர�விகள�/நண�பர� _நிமித�தச� செயல�கள�"
+msgstr "/கர�விகள�/நண�பர� நிமித�தச� செயல�கள� (_P)"
 
 msgid "/Tools/_Certificates"
 msgstr "/கர�விகள�/சான�றிதழ�கள� (_C)"
@@ -11418,43 +11424,43 @@ msgid "/Tools/Custom Smile_ys"
 msgstr "/கர�விகள�/தனிபயன� ஸ�மைல�ஸ� (_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/கர�விகள�/_ச சொர�க�பொர�ள�கள�"
+msgstr "/கர�விகள�/சொர�க�பொர�ள�கள� (_g)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/கர�விகள�/_ம ம�ன�ன�ரிமைகள�"
+msgstr "/கர�விகள�/ம�ன�ன�ரிமைகள� (_e)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/கர�விகள�/_தனிமை"
+msgstr "/கர�விகள�/தனிமை (_i)"
 
 #, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/கர�விகள�/அமைப�ப� _ல லாக� பதிவ�"
+msgstr "/கர�விகள�/அமைப�ப� பதிவ� (_L)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/கர�விகள�/_க கோப�ப� பரிமாற�றங�கள�"
+msgstr "/கர�விகள�/கோப�ப� பரிமாற�றங�கள� (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/கர�விகள�/_அறை பட�டியல�"
+msgstr "/கர�விகள�/அறை பட�டியல� (_o)"
 
 msgid "/Tools/System _Log"
-msgstr "/கர�விகள�/அமைப�ப� _ல லாக� பதிவ�"
+msgstr "/கர�விகள�/அமைப�ப� பதிவ� (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/கர�விகள�/_ஒலிகளை ஊமையாக�க�"
+msgstr "/கர�விகள�/ஒலிகளை நிற�த�த� (_S)"
 
 #. Help
 msgid "/_Help"
-msgstr "/_உதவி"
+msgstr "/உதவி (_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/உதவி/வலை இணைப�பில� _உதவி"
+msgstr "/உதவி/வலை இணைப�பில� உதவி (_H)"
 
 #, fuzzy
 msgid "/Help/_Build Information"
 msgstr "நண�பர� பற�றிய தகவல�"
 
 msgid "/Help/_Debug Window"
-msgstr "/உதவி/_வ வழ� அறிதல� சாளரம�"
+msgstr "/உதவி/வழ� அறிதல� சாளரம� (_D)"
 
 #, fuzzy
 msgid "/Help/De_veloper Information"
@@ -11465,7 +11471,7 @@ msgid "/Help/_Translator Information"
 msgstr "அந�தரங�க தகவல�"
 
 msgid "/Help/_About"
-msgstr "/உதவி/_பற�றி"
+msgstr "/உதவி/பற�றி (_A)"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11582,14 +11588,14 @@ msgstr "SSL FAQs"
 msgid "Welcome back!"
 msgstr "மீண�ட�ம� வர�க!"
 
-#, fuzzy, c-format
+#, 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 accounts were disabled because you signed on from another location:"
+"%d கணக�க� செயல�நீக�கப�பட�டத� �னெனில� நீங�கள� வேற� இடத�திலிர�ந�த� உள�ந�ழைந�த�ள�ளீர�கள�:"
 msgstr[1] ""
-"%d accounts were disabled because you signed on from another location:"
+"%d கணக�க�கள� செயல�நீக�கப�பட�டன �னெனில� நீங�கள� வேற� இடத�திலிர�ந�த� உள�ந�ழைந�த�ள�ளீர�கள�:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>பயனர�பெயர�:</b>"
@@ -11598,7 +11604,7 @@ msgid "<b>Password:</b>"
 msgstr "<b>கடவ�ச�சொல�:</b>"
 
 msgid "_Login"
-msgstr "உட�ப�க� (_L)"
+msgstr "உள�ந�ழை (_L)"
 
 msgid "/Accounts"
 msgstr "/கணக�க�கள�"
@@ -11614,10 +11620,10 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>%sக�க� வர�க!</span>\n"
 "\n"
-"உங�கள�க�க� செயல�பட�த�தக�கூடிய கணக�க� இல�லை. உங�கள� IM கணக�க�களை <b>Accounts</b> window "
-"at <b>Accounts->Manage Accounts</b>இல� செயல�பட�த�த�கிறத�. உங�கள� கணக�க�களை "
-"செயல�பட�த�த த�வங�கிவிட�டால�, உங�களால� உள� ந�ழைய ம�டிய�ம�, உங�கள� நிலைகளை அமைக�கலாம�, "
-"மற�ற�ம� உங�கள� நண�பர�கள�டன� பேசலாம�."
+"உங�கள�க�க� செயல�பட�த�தக�கூடிய கணக�க� இல�லை. உங�கள� IM கணக�க�களை <b>கணக�க�கள�</b> "
+"சாளரத�தில� <b>கணக�க�கள�->கணக�க�களை மேலாண�மை செய�</b> என�பதில� செயல�பட�த�த�கிறத�. உங�கள� "
+"கணக�க�களை செயல�பட�த�த த�வங�கிவிட�டால�, உங�களால� உள� ந�ழைய ம�டிய�ம�, உங�கள� நிலைகளை "
+"அமைக�கலாம�, மற�ற�ம� உங�கள� நண�பர�கள�டன� பேசலாம�."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -11668,7 +11674,7 @@ msgid "A_lias:"
 msgstr "ப�னைப�பெயர� (_l):"
 
 msgid "_Group:"
-msgstr "_க க�ழ�:"
+msgstr "க�ழ� (_G):"
 
 msgid "Auto_join when account connects."
 msgstr "கணக�க� இணைக�க�ம� போத� தானாக இணை (_j)."
@@ -11689,7 +11695,7 @@ msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/கணக�க�கள�/"
 
 msgid "_Edit Account"
-msgstr "கணக�கை _த திர�த�த�க"
+msgstr "கணக�கை திர�த�த� (_E)"
 
 #, fuzzy
 msgid "Set _Mood..."
@@ -11699,7 +11705,7 @@ msgid "No actions available"
 msgstr "எந�த செயல�பாட�ம� இல�லை"
 
 msgid "_Disable"
-msgstr "செயல� _ந நீக�க�"
+msgstr "செயல�நீக�க� (_D)"
 
 msgid "/Tools"
 msgstr "/கர�விகள�"
@@ -11728,10 +11734,10 @@ msgid "Invite Buddy Into Chat Room"
 msgstr "தோழரை அரட�டை அறைக�க� அழை"
 
 msgid "_Buddy:"
-msgstr "_நண�பர�:"
+msgstr "நண�பர� (_B):"
 
 msgid "_Message:"
-msgstr "_தகவல�:"
+msgstr "செய�தி (_M):"
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
@@ -11778,25 +11784,25 @@ msgstr "அனைத�தைய�ம� காட�ட�"
 
 #. Conversation menu
 msgid "/_Conversation"
-msgstr "/_உரையாடல�"
+msgstr "/உரையாடல� (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/உரையாடல�/ப�திய உடனடி _தகவல�..."
+msgstr "/உரையாடல�/ப�திய உடனடி செய�தி (_M)..."
 
 msgid "/Conversation/Join a _Chat..."
 msgstr "/உரையாடல�/ஒர� அரட�டையை இணை ( _C)..."
 
 msgid "/Conversation/_Find..."
-msgstr "/உரையாடல�/_த தேட�க..."
+msgstr "/உரையாடல�/தேட�க (_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/உரையாடல�/_பதிவை காண�"
+msgstr "/உரையாடல�/பதிவை காண� (_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/உரையாடல�/_இப�படிச�சேமி..."
+msgstr "/உரையாடல�/இப�படிச�சேமி (_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/உரையாடல�/_ட பின� உர�ட�டலை த�டை"
+msgstr "/உரையாடல�/பின� உர�ட�டலை த�டை (_r)"
 
 msgid "/Conversation/M_edia"
 msgstr "/உரையாடல�/ஊடகம� (_e)"
@@ -11811,63 +11817,63 @@ msgid "/Conversation/Media/Audio\\/Video _Call"
 msgstr "/உரையாடல�/ஊடகம�/ஆடியோ\\/வீடியோ அழைப�ப� (_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/உரையாடல�/கோப�பை _அன�ப�ப�..."
+msgstr "/உரையாடல�/கோப�பை அன�ப�ப� (_n)..."
 
 #, fuzzy
 msgid "/Conversation/Get _Attention"
 msgstr "/உரையாடல�/தகவல� பெற�"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/உரையாடல�/நண�பர� _நிமித�தச� செயலை சேர�"
+msgstr "/உரையாடல�/நண�பர� நிமித�தச� செயலை சேர� (_P)..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/உரையாடல�/தகவல� _ப பெற�"
+msgstr "/உரையாடல�/தகவல� பெற� (_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/உரையாடல�/_அழை"
+msgstr "/உரையாடல�/அழை (_v)..."
 
 msgid "/Conversation/M_ore"
 msgstr "/உரையாடல�/மேல�ம� (_o)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/உரையாடல�/_ன ப�னைப�பெயர�..."
+msgstr "/உரையாடல�/ப�னைப�பெயர� (_i)..."
 
 msgid "/Conversation/_Block..."
-msgstr "/உரையாடல�/_� தட�க�கவ�ம�..."
+msgstr "/உரையாடல�/தட� (_B)..."
 
 msgid "/Conversation/_Unblock..."
 msgstr "/உரையாடல�/தட�க�கப�பட�டாத (_U)..."
 
 msgid "/Conversation/_Add..."
-msgstr "/உரையாடல�/_ச சேர�..."
+msgstr "/உரையாடல�/சேர� (_A)..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/உரையாடல�/_ந நீக�க�..."
+msgstr "/உரையாடல�/நீக�க� (_R)..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/உரையாடல�/_ண இணைப�பை ந�ழை..."
+msgstr "/உரையாடல�/இணைப�பை ந�ழை (_k)..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/உரையாடல�/_ல படத�தை ந�ழை..."
+msgstr "/உரையாடல�/படத�தை ந�ழை (_e)..."
 
 msgid "/Conversation/_Close"
-msgstr "/உரையாடல�/_ம மூட�"
+msgstr "/உரையாடல�/மூட� (_C)"
 
 #. Options
 msgid "/_Options"
-msgstr "/_வ விர�ப�பங�கள�"
+msgstr "/விர�ப�பங�கள� (_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/விர�ப�பங�கள�/_பதிவை இயல�மைபட�த�த�"
+msgstr "/விர�ப�பங�கள�/பதிவை இயல�மைபட�த�த� (_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/விர�ப�பங�கள�/_ஒலியை இயல�மைபட�த�த�"
+msgstr "/விர�ப�பங�கள�/ஒலியை இயல�மைபட�த�த� (_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/விர�ப�பங�கள�/சீரமைப�ப� _கர�விகளை காட�ட�"
+msgstr "/விர�ப�பங�கள�/சீரமைப�ப� கர�விகளை காட�ட� (_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/விர�ப�பங�கள�/_காலச�ச�வட�களை காட�ட�"
+msgstr "/விர�ப�பங�கள�/காலச�ச�வட�களை காட�ட� (_m)"
 
 msgid "/Conversation/More"
 msgstr "/உரையாடல�/மேல�ம�"
@@ -11960,7 +11966,7 @@ msgid "S_end To"
 msgstr "இதற�க� அன�ப�ப� (_e)"
 
 msgid "_Send"
-msgstr "_அன�ப�ப�"
+msgstr "அன�ப�ப� (_S)"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
@@ -12035,7 +12041,7 @@ msgid "Find"
 msgstr "தேட�க"
 
 msgid "_Search for:"
-msgstr "இதற�காக _த தேட�க:"
+msgstr "இதற�காக தேட�க (_S):"
 
 msgid "Save Debug Log"
 msgstr "பிழையறி பதிவை சேமி"
@@ -12101,9 +12107,6 @@ msgstr "ஆதரவ�"
 msgid "webmaster"
 msgstr "வலைமேலாளர�"
 
-msgid "Senior Contributor/QA"
-msgstr "மூத�தவர� கொடையாளி/QA"
-
 msgid "win32 port"
 msgstr "விண�32 தளம�"
 
@@ -12129,6 +12132,9 @@ msgstr "இயற� உரிமையாளர�"
 msgid "lead developer"
 msgstr "ம�ன�னணி உர�வாக�க�பவர�"
 
+msgid "Senior Contributor/QA"
+msgstr "மூத�தவர� கொடையாளி/QA"
+
 msgid "Afrikaans"
 msgstr "ஆப�ரிக�கன�ஸ�"
 
@@ -12137,7 +12143,7 @@ msgstr "அராபிக�"
 
 #, fuzzy
 msgid "Assamese"
-msgstr "அவமானப� பட�ம�"
+msgstr "விளையாட�ட�கள�"
 
 msgid "Belarusian Latin"
 msgstr "பெலார�சியன� லத�தீன�"
@@ -12273,9 +12279,8 @@ msgstr "மலாய�"
 msgid "Mongolian"
 msgstr "மங�கோலியன�"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "க�ஜராத�தி"
+msgstr "மராத�தி"
 
 msgid "Malay"
 msgstr "மலாய�"
@@ -12295,9 +12300,8 @@ msgstr "நார�வேஜியன� நேனோர�ஸ�க�"
 msgid "Occitan"
 msgstr "ஆக�டிசியன�"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "ஒபேரா"
+msgstr "ஒரியா"
 
 msgid "Punjabi"
 msgstr "பஞ�சாபி"
@@ -12462,13 +12466,13 @@ msgstr "à®®à¯�நà¯�தைய மொழிபெயரà¯�பà¯�பாளரà¯�à®
 
 #, fuzzy, c-format
 msgid "%s Translator Information"
-msgstr "மேல�ம� தகவல�"
+msgstr "பயனரின� தகவல�"
 
 msgid "_Name"
-msgstr "_ப பெயர�"
+msgstr "பெயர� (_N)"
 
 msgid "_Account"
-msgstr "_கணக�க�"
+msgstr "கணக�க� (_A)"
 
 msgid "Get User Info"
 msgstr "பயனாளர� தகவலை பெற�"
@@ -12520,7 +12524,7 @@ msgid "Remove Contact"
 msgstr "தொடர�பை நீக�க�க..."
 
 msgid "_Remove Contact"
-msgstr "தொடர�பை _ந நீக�க�க"
+msgstr "தொடர�பை நீக�க� (_R)"
 
 #, c-format
 msgid ""
@@ -12548,7 +12552,7 @@ msgid "Remove Group"
 msgstr "க�ழ�வை நீக�க�க"
 
 msgid "_Remove Group"
-msgstr "க�ழ�வை _ந நீக�க�க"
+msgstr "க�ழ�வை நீக�க� (_R)"
 
 #, c-format
 msgid ""
@@ -12559,7 +12563,7 @@ msgid "Remove Buddy"
 msgstr "தோழரை நீக�க�க"
 
 msgid "_Remove Buddy"
-msgstr "தோழரை _ந நீக�க�க"
+msgstr "தோழரை நீக�க� (_R)"
 
 #, c-format
 msgid ""
@@ -12571,7 +12575,7 @@ msgid "Remove Chat"
 msgstr "அரட�டையை நீக�க�க"
 
 msgid "_Remove Chat"
-msgstr "அரட�டையை _ந நீக�க�க"
+msgstr "அரட�டையை நீக�க� (_R)"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "அதிக படிக�காத செய�திகள�க�க� வலத� சொட�க�கவ�ம�... \n"
@@ -12658,17 +12662,17 @@ msgid "Close this window when all transfers _finish"
 msgstr "அனைத�த� மாற�றங�கள�ம� ம�டிந�த பின� இந�த சாளரத�தை மூட�"
 
 msgid "C_lear finished transfers"
-msgstr "ம�டிந�த�விட�ட பரிமாற�றங�களை _ச ச�த�தம� செய�"
+msgstr "ம�டிந�த�விட�ட பரிமாற�றங�களை ச�த�தம� செய� (_l)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "கோப�ப� பரிமாற�ற _வ விவரங�கள�"
+msgstr "கோப�ப� பரிமாற�ற விவரங�கள� (_d)"
 
 msgid "Paste as Plain _Text"
-msgstr "வெற�ற� _உரையாக ஒட�ட� "
+msgstr "வெற�ற� உரையாக ஒட�ட� (_T)"
 
 msgid "_Reset formatting"
-msgstr "வடிவமைப�பை _ம மீட�டமை"
+msgstr "வடிவமைப�பை மீட�டமை (_R)"
 
 msgid "Disable _smileys in selected text"
 msgstr "தேர�ந�தெட�க�கப�பட�ட உரையில�ள�ள ஸ�மைலிகளை செயல�நீக�க� (_s)"
@@ -12767,7 +12771,7 @@ msgid "Save Image"
 msgstr "படத�தை சேமி"
 
 msgid "_Save Image..."
-msgstr "படத�தை _ச சேமி..."
+msgstr "படத�தை சேமி (_S)..."
 
 msgid "_Add Custom Smiley..."
 msgstr "தனிபயனை ஸ�மைலியை சேர� (_A)..."
@@ -12782,10 +12786,10 @@ msgid "Select Background Color"
 msgstr "பின�னணி நிறத�தை தேர�வ�செய�"
 
 msgid "_URL"
-msgstr "_ய ய�ஆர�எல� "
+msgstr "_URL"
 
 msgid "_Description"
-msgstr "_வ விவர உரை"
+msgstr "விவர உரை (_D)"
 
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
@@ -12801,7 +12805,7 @@ msgid "Insert Link"
 msgstr "இணைப�பை ந�ழைக�கவ�ம�"
 
 msgid "_Insert"
-msgstr "_ந ந�ழைக�க"
+msgstr "ந�ழை (_I)"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12835,7 +12839,7 @@ msgid "Group Items"
 msgstr "க�ழ� உர�ப�படிகள�"
 
 msgid "Ungroup Items"
-msgstr "க�ழ�வில�லைத உர�ப�படிகள�"
+msgstr "க�ழ�வில�லாத உர�ப�படிகள�"
 
 msgid "Bold"
 msgstr "தடிமனான"
@@ -12899,7 +12903,7 @@ msgstr "<span size='smaller'>க�ற�கிய (_S)</span>"
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
 msgid "_Font face"
-msgstr "_Font face"
+msgstr "எழ�த�த�ர� (_F)"
 
 msgid "Foreground _color"
 msgstr "ம�ன�னணி நிறம� (_c)"
@@ -13071,7 +13075,7 @@ msgid "Incoming Call"
 msgstr "உள�வர�ம� அழைப�ப�"
 
 msgid "_Pause"
-msgstr "தற�காலிகமாக _ந நிற�த�த�"
+msgstr "இடைநிற�த�த� (_P)"
 
 #, c-format
 msgid "%s has %d new message."
@@ -13079,11 +13083,11 @@ msgid_plural "%s has %d new messages."
 msgstr[0] "%s க�க� %d ப�திய செய�தி வந�த�ள�ளத� "
 msgstr[1] "%s க�க� %d ப�திய செய�திகள� வந�த�ள�ளன"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>%d new emails.</b>"
-msgstr[1] "<b>%d new emails.</b>"
+msgstr[0] "<b>%d ப�திய மின�னஞ�சல�.</b>"
+msgstr[1] "<b>%d ப�திய மின�னஞ�சல�கள�.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -13158,7 +13162,7 @@ msgid "<b>Filename:</b>"
 msgstr "<b>பயனர�பெயர�:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "_ச சொர�க� பொர�ளை வடிவமை"
+msgstr "சொர�க� பொர�ளை வடிவமை (_u)"
 
 msgid "<b>Plugin Details</b>"
 msgstr "<b>சொர�க�பொர�ள� விவரம�</b>"
@@ -13174,70 +13178,70 @@ msgid "Pounce on Whom"
 msgstr "யார� மீத� நிமித�தச� செயலாக�க வேண�ட�ம�"
 
 msgid "_Account:"
-msgstr "_கணக�க�:"
+msgstr "கணக�க� (_A):"
 
 msgid "_Buddy name:"
-msgstr "_நண�பர� பெயர�:"
+msgstr "நண�பர� பெயர� (_B):"
 
 msgid "Si_gns on"
-msgstr "_ந�ழைகிறார�"
+msgstr "ந�ழைகிறார� (_g)"
 
 msgid "Signs o_ff"
-msgstr "_வ வெளியேற�றம�"
+msgstr "வெளியேற�றினார� (_f)"
 
 msgid "Goes a_way"
-msgstr "வெளியே _ச செல�கிறார�"
+msgstr "வெளியே செல�கிறேன� (_w)"
 
 msgid "Ret_urns from away"
-msgstr "வெளியிலிர�ந�த� _த திர�ம�ப�கிறார�"
+msgstr "வெளியிலிர�ந�த� வந�த�விட�டேன� (_u)"
 
 msgid "Becomes _idle"
-msgstr "_ஓய�வாக இர�க�கிறார�"
+msgstr "ஓய�வாக இர�க�கிறார� (_i)"
 
 msgid "Is no longer i_dle"
-msgstr "_இனிய�ம� ஓய�வாக இல�லை"
+msgstr "இனிய�ம� ஓய�வாக இல�லை (_d)"
 
 msgid "Starts _typing"
-msgstr "_தட�டச�சிட ஆரம�பிக�கிறார�"
+msgstr "தட�டச�சிட ஆரம�பிக�கிறார� (_t)"
 
 msgid "P_auses while typing"
 msgstr "தட�டச�சை இடைநிற�த�த�ம� போத� (_a)"
 
 msgid "Stops t_yping"
-msgstr "தட�டச�சிட�வதை _ந நிற�த�த�கிறார�"
+msgstr "தட�டச�சிட�வதை நிற�த�த�கிறார� (_y)"
 
 msgid "Sends a _message"
-msgstr "ஒர� _ச செய�தியை அன�ப�ப�க"
+msgstr "ஒர� செய�தியை அன�ப�ப�கிறத� (_m)"
 
 msgid "Ope_n an IM window"
-msgstr "�எம� சாளரத�தை _த திற"
+msgstr "ஒர� �எம� சாளரத�தை திற (_n)"
 
 msgid "_Pop up a notification"
-msgstr "ஒர� அறிவிப�பை _த�ள�ள விட�"
+msgstr "ஒர� அறிவிப�பை த�ள�ள விட� (_P)"
 
 msgid "Send a _message"
-msgstr "_தகவல� அன�ப�ப�"
+msgstr "ஒர� செய�தியை அன�ப�ப� (_m)"
 
 msgid "E_xecute a command"
-msgstr "_கட�டளையை இயக�க�"
+msgstr "கட�டளையை இயக�க� (_x)"
 
 msgid "P_lay a sound"
-msgstr "_ஒலியை இயக�க�"
+msgstr "ஒலியை இயக�க� (_l)"
 
 msgid "Brows_e..."
-msgstr "_உலாவ�..."
+msgstr "உலாவ� (_e)..."
 
 msgid "Br_owse..."
-msgstr "_உலாவ�..."
+msgstr "உலாவ� (_o)..."
 
 msgid "Pre_view"
-msgstr "_ம�ன�னோட�டம�"
+msgstr "ம�ன�னோட�டம� (_v)"
 
 msgid "P_ounce only when my status is not Available"
 msgstr "எனத� நிலை கிடைக�கப� பெறாத போத� மட�ட�ம� விழிப�பூட�ட� (_o)"
 
 msgid "_Recurring"
-msgstr "_மீண�ட�ம� மீண�ட�ம� நிகழ�ம�"
+msgstr "மீண�ட�ம� மீண�ட�ம� நிகழ�ம� (_R)"
 
 msgid "Pounce Target"
 msgstr "நிமித�தச� செயலாக�க�தலின� இலக�க�"
@@ -13359,10 +13363,10 @@ msgid "Show IMs and chats in _tabbed windows"
 msgstr "�எம� மற�ற�ம� அரட�டைகளை _க கீற�ற� சாளரங�களில� காட�ட�"
 
 msgid "Show close b_utton on tabs"
-msgstr "_ம மூட� பொத�தான�களை கீற�றில� காட�ட�க"
+msgstr "மூட� பொத�தான�களை கீற�றில� காட�ட�க (_u)"
 
 msgid "_Placement:"
-msgstr "_இடம�:"
+msgstr "இடம� (_P):"
 
 msgid "Top"
 msgstr "மேலே"
@@ -13383,10 +13387,10 @@ msgid "Right Vertical"
 msgstr "வலத� செங�க�த�த�"
 
 msgid "N_ew conversations:"
-msgstr "_ப ப�திய உரையாடல�கள�:"
+msgstr "ப�திய உரையாடல�கள� (_e):"
 
 msgid "Show _formatting on incoming messages"
-msgstr "_ற உள�வர�ம� தகவல�களில� ம�றைப�பட�த�த�மையை காட�ட�"
+msgstr "உள�வர�ம� தகவல�களில� ம�றைப�பட�த�த�மையை காட�ட� (_f)"
 
 msgid "Close IMs immediately when the tab is closed"
 msgstr "தத�தல� மூடப�பட�டவ�டன� உடனடியாக IMs� மூடவ�ம�"
@@ -13395,13 +13399,13 @@ msgid "Show _detailed information"
 msgstr "விவரமான தகவலைக� காட�ட� (_d)"
 
 msgid "Enable buddy ic_on animation"
-msgstr "நண�பர� _க க�ற�ம�பட அசைவ�களை இயல�மைப� பட�த�த�"
+msgstr "நண�பர� க�ற�ம�பட அசைவ�களை இயல�மைப� பட�த�த� (_o)"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "நீங�கள� _தட�டச�ச� செய�கிறீர�கள� என�பதை நண�பர�கள�க�க� அறிவிக�கிறத�"
+msgstr "நீங�கள� தட�டச�ச� செய�கிறீர�கள� என�பதை நண�பர�கள�க�க� அறிவிக�கிறத� (_N)"
 
 msgid "Highlight _misspelled words"
-msgstr "த_வறாக உள�ளிட�டதை தனிப�பட�த�தி காட�ட�"
+msgstr "தவறாக உள�ளிட�டதை தனிப�பட�த�தி காட�ட� (_m)"
 
 msgid "Use smooth-scrolling"
 msgstr "மென�மையான உர�ட�ட�தலை செயல�பட�த�த�"
@@ -13451,7 +13455,7 @@ msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">எட�த�த�க�காட�ட�: stunserver.org</span>"
 
 msgid "Public _IP:"
-msgstr "பொத� _�பி:"
+msgstr "பொத� _IP:"
 
 msgid "Ports"
 msgstr "தளங�கள�"
@@ -13475,6 +13479,10 @@ msgstr "இடமாற�ற� சேவையகம� (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN சேவையகம�:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "த�றை (_P):"
+
 msgid "Use_rname:"
 msgstr "பயனர� பெயர�(_r):"
 
@@ -13482,20 +13490,25 @@ msgid "Pass_word:"
 msgstr "கடவ�ச�சொல� (_w):"
 
 msgid "Seamonkey"
-msgstr "கடல�க�ரங�க�"
+msgstr "Seamonkey"
 
 msgid "Opera"
-msgstr "ஒபேரா"
+msgstr "Opera"
 
 msgid "Netscape"
-msgstr "நெட�ஸ�கேப�"
+msgstr "Netscape"
 
 msgid "Mozilla"
-msgstr "மோஸில�லா"
+msgstr "Mozilla"
 
 msgid "Konqueror"
-msgstr "கான�கொரர�"
+msgstr "Konqueror"
+
+msgid "Google Chrome"
+msgstr ""
 
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "பணிமேடை ம�ன�னிர�ப�ப�"
 
@@ -13506,13 +13519,21 @@ msgid "Galeon"
 msgstr "கேலியன�"
 
 msgid "Firefox"
-msgstr "பயர�பாக�ஸ�"
+msgstr "Firefox"
 
 msgid "Firebird"
-msgstr "பயர�பேர�ட�"
+msgstr "Firebird"
 
 msgid "Epiphany"
-msgstr "எபிபனி"
+msgstr "Epiphany"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
 
 msgid "Manual"
 msgstr "கைம�றை"
@@ -13530,10 +13551,10 @@ msgid "Configure _Browser"
 msgstr "உலாவியை கட�டமை (_B)"
 
 msgid "_Browser:"
-msgstr "_உலாவி:"
+msgstr "உலாவி (_B):"
 
 msgid "_Open link in:"
-msgstr "_த தொடர�பை இதில� திற:"
+msgstr "தொடர�பை இதில� திற (_O):"
 
 msgid "Browser default"
 msgstr "உலாவி ம�ன�னிர�ப�ப�"
@@ -13549,7 +13570,7 @@ msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_க கைம�றை:\n"
+"கைம�றை (_M):\n"
 "(%s ய�ஆர�எல� க�காக)"
 
 msgid "Proxy Server"
@@ -13582,16 +13603,16 @@ msgid "User_name:"
 msgstr "பயனர� பெயர� (_n):"
 
 msgid "Log _format:"
-msgstr "பதிவ� _ம ம�றை:"
+msgstr "பதிவ� ம�றை (_f):"
 
 msgid "Log all _instant messages"
-msgstr "அனைத�த� _உடனடி தகவல�களைய�ம� பதிவ� செய�"
+msgstr "அனைத�த� உடனடி தகவல�களைய�ம� பதிவ� செய� (_i)"
 
 msgid "Log all c_hats"
-msgstr "அனைத�த� _அரட�டைகளைய�ம� பதிவ� செய�"
+msgstr "அனைத�த� அரட�டைகளைய�ம� பதிவ� செய� (_h)"
 
 msgid "Log all _status changes to system log"
-msgstr "அனைத�த� _ந நிலை மாற�றங�களைய�ம� கணினி பதிவேட�டில� பதிவ� செய�"
+msgstr "அனைத�த� நிலை மாற�றங�களைய�ம� கணினி பதிவேட�டில� பதிவ� செய� (_s)"
 
 msgid "Sound Selection"
 msgstr "ஒலித� தேர�வ�"
@@ -13621,7 +13642,7 @@ msgid "Loudest"
 msgstr "மிகமிக சத�தமான"
 
 msgid "_Method:"
-msgstr "_ம ம�றை:"
+msgstr "ம�றை (_M):"
 
 msgid "Console beep"
 msgstr "கன�ஸோல� பீப�"
@@ -13641,7 +13662,7 @@ msgid "M_ute sounds"
 msgstr "ஒலிகளை நிற�த�த� (_u)"
 
 msgid "Sounds when conversation has _focus"
-msgstr "உரையாடல� _க க�விக�கப�பட�ம�போத� ஒலியிட�கிறத�"
+msgstr "உரையாடல� க�விக�கப�பட�ம�போத� ஒலியிட�கிறத� (_f)"
 
 msgid "_Enable sounds:"
 msgstr "ஒரிகளை செயல�பட�த�த� (_E)"
@@ -13659,7 +13680,7 @@ msgid "_Reset"
 msgstr "மற�அமை (_R)"
 
 msgid "_Report idle time:"
-msgstr "_ஓ ஓய�வாக இர�க�க�ம� காலத�தை தெரிவி"
+msgstr "ஓய�வாக இர�க�க�ம� காலத�தை தெரிவி (_R)"
 
 msgid "Based on keyboard or mouse use"
 msgstr "இயக�க� விசைப�பலகை அல�லத� ச�ட�டி உபயோகத�தை ஒட�டி"
@@ -13671,7 +13692,7 @@ msgid "Change to this status when _idle:"
 msgstr "ஓய�வாக இர�க�க�ம� போத� நிலையை மாற�ற� (_i):"
 
 msgid "_Auto-reply:"
-msgstr "_தானியங�கி-பதில�:"
+msgstr "தானியங�கி-பதில� (_A):"
 
 msgid "When both away and idle"
 msgstr "இர�வர�ம� வெளியே மற�ற�ம� ஓய�வாக இர�க�க�ம�பொழ�த�"
@@ -13681,10 +13702,10 @@ msgid "Status at Startup"
 msgstr "த�வக�கத�தில� நிலை"
 
 msgid "Use status from last _exit at startup"
-msgstr "_கடைசி வெளியேற�றத�தின� நிலையை தொடக�கத�தில� பயன�பட�த�த�க"
+msgstr "கடைசி வெளியேற�றத�தின� நிலையை தொடக�கத�தில� பயன�பட�த�த�க (_e)"
 
 msgid "Status to a_pply at startup:"
-msgstr "த�வக�கத�தில� _இர�க�க வேண�டிய நிலை:"
+msgstr "த�வக�கத�தில� இர�க�க வேண�டிய நிலை (_p):"
 
 msgid "Interface"
 msgstr "இடைம�கம� "
@@ -13736,7 +13757,7 @@ msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "நீங�கள� தொடர�ப� கொள�ள விர�ம�பக�கூடிய பயனாளர� பெயரை உள�ளிடவ�ம�."
 
 msgid "_Permit"
-msgstr "_அன�மதி"
+msgstr "அன�மதி (_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
@@ -13750,7 +13771,7 @@ msgid "Block User"
 msgstr "பயனாளரை தட�க�கவ�ம�"
 
 msgid "Type a user to block."
-msgstr "தட�க�கவ�ம�க�க வேண�டிய பயனாளரை தட�டச�ச� செய�க."
+msgstr "தட�க�க வேண�டிய பயனாளரை தட�டச�ச� செய�க."
 
 msgid "Please enter the name of the user you wish to block."
 msgstr "நீங�கள� தட�க�கவ�ம�க�க விர�ம�ப�ம� பயனாளர� பெயரை உள�ளிவ�ம�."
@@ -13783,18 +13804,18 @@ msgstr "அடைவை தேர�ந�தெட�க�கவ�ம�..."
 
 #. list button
 msgid "_Get List"
-msgstr "_பட�டியலை பெற�க"
+msgstr "பட�டியலை பெற�க (_G)"
 
 #. add button
 msgid "_Add Chat"
-msgstr "_அரட�டையை சேர�க�கவ�ம�"
+msgstr "அரட�டையை சேர�க�கவ�ம� (_A)"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "தேர�ந�தெட�க�கப�பட�ட� சேமிக�கப�பட�ட நிலைகளை நீங�கள� உற�தியாக அழிக�க விர�ம�ப�கிறீர�களா?"
 
 #. Use button
 msgid "_Use"
-msgstr "_உபயோகி"
+msgstr "உபயோகி (_U)"
 
 msgid "Title already in use.  You must choose a unique title."
 msgstr "தலைப�ப� �ற�கனவே உபயோகத�தில� உள�ளத�. நீங�கள� தனிப�பட�ட தலைப�பை தேர�வ� செய�ய வேண�ட�ம�."
@@ -13803,18 +13824,18 @@ msgid "Different"
 msgstr "வேற�பாட�"
 
 msgid "_Title:"
-msgstr "_தலைப�ப�:"
+msgstr "தலைப�ப� (_T):"
 
 msgid "_Status:"
-msgstr "_ந நிலை:"
+msgstr "நிலை (_S):"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "_வ சில கணக�க�கள�க�க� வேற�பாடான நிலைகளை பயன�பட�த�த�"
+msgstr "சில கணக�க�கள�க�க� வேற�பாடான நிலைகளை பயன�பட�த�த� (_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "_ச சேமித�த� உபயோகிக�கவ�ம�"
+msgstr "சேமித�த� உபயோகிக�கவ�ம� (_v)"
 
 #, c-format
 msgid "Status for %s"
@@ -13976,10 +13997,10 @@ msgid "_Open Link"
 msgstr "இணைப�பை திற(_O)"
 
 msgid "_Copy Link Location"
-msgstr "தொடர�ப� பக�தியை _நகல� செய�"
+msgstr "தொடர�ப� பக�தியை நகல� செய� (_C)"
 
 msgid "_Copy Email Address"
-msgstr "மின�னஞ�சல� ம�கவரியை _நகலெட�"
+msgstr "மின�னஞ�சல� ம�கவரியை நகலெட� (_C)"
 
 msgid "_Open File"
 msgstr "கோப�பை திற (_O)"
@@ -13996,9 +14017,8 @@ msgstr "ஒலியை இயக�க� (_P)"
 msgid "_Save File"
 msgstr "கோப�பை சேமி (_S)"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "உற�தியாக %s யை அழிக�கலாமா?"
+msgstr "த�டைக�க வேண�ட�மா?"
 
 msgid "Select color"
 msgstr "நிறம� தேர�வ� செய�க"
@@ -14009,16 +14029,16 @@ msgid "Pidgin"
 msgstr "பிட�ஜின�"
 
 msgid "_Alias"
-msgstr "_ப ப�னைப�பெயர�"
+msgstr "ப�னைப�பெயர� (_A)"
 
 msgid "Close _tabs"
-msgstr "_க கீற�ற�களை மூடவ�ம�"
+msgstr "கீற�ற�களை மூடவ�ம� (_t)"
 
 msgid "_Get Info"
-msgstr "_தகவல� பெற�க"
+msgstr "தகவல� பெற�க (_G)"
 
 msgid "_Invite"
-msgstr "_அழை"
+msgstr "அழை (_I)"
 
 msgid "_Modify..."
 msgstr "மாற�றியமை (_M)..."
@@ -14027,7 +14047,7 @@ msgid "_Add..."
 msgstr "சேர� (_A)..."
 
 msgid "_Open Mail"
-msgstr "_அஞ�சலை திற"
+msgstr "அஞ�சலை திற (_O)"
 
 msgid "_Edit"
 msgstr "திர�த�த� (_E)"
@@ -14047,7 +14067,8 @@ msgstr "ஒன�ற�மில�லாத"
 msgid "Small"
 msgstr "சிறிய"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ம�ன�னிர�ப�ப� ஸ�மைலிகள�க�கான சிறிய பதிவ�கள�"
 
 msgid "Response Probability:"
@@ -14294,7 +14315,7 @@ msgstr "சொட�க�கியின� வலத� விசை"
 
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "_ச சித�திர அசைவ�கள� காட�சி"
+msgstr "சித�திர அசைவ�கள� காட�சி (_V)"
 
 #. *< type
 #. *< ui_requirement
@@ -14355,11 +14376,11 @@ msgstr ""
 
 #. Add the expander
 msgid "User _details"
-msgstr "பயனாளர� _தகவல�"
+msgstr "பயனர� விவரங�கள� (_d)"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "_சக நண�பரை சேர�க�க"
+msgstr "சக நண�பரை சேர�க�க (_A)"
 
 msgid "Unable to send email"
 msgstr "மின�னஞ�சல� அன�ப�ப இயலவில�லை"
@@ -14490,10 +14511,10 @@ msgid "Draw Markerline in "
 msgstr "மார�க�கர�வரியில� வரை"
 
 msgid "_IM windows"
-msgstr "_�எம� சாளரங�கள�"
+msgstr "_IM சாளரங�கள�"
 
 msgid "C_hat windows"
-msgstr "_அரட�டை சாளரங�கள�"
+msgstr "அரட�டை சாளரங�கள� (_h)"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -14523,7 +14544,7 @@ msgid "Score Editor Path"
 msgstr "இசைக�க�றி திர�த�தி பாதை"
 
 msgid "_Apply"
-msgstr "_�ற�ற�"
+msgstr "செயல�பட�த�த� (_A)"
 
 #. *< type
 #. *< ui_requirement
@@ -14552,18 +14573,18 @@ msgid "\t_Only when someone says your username"
 msgstr "\tஉங�கள� பயனர�பெயரை யாராவத� சொல�ல�ம� போத� மட�ட�ம� (_O)"
 
 msgid "_Focused windows"
-msgstr "_ம ம�ன�ன�ற�ற சாளரங�கள�"
+msgstr "ம�ன�ன�ற�ற சாளரங�கள� (_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "அறிவிப�ப� ம�றைகள�"
 
 msgid "Prepend _string into window title:"
-msgstr "சாளரத� தலைப�பிற�க� ம�ன� _வார�த�தையை சேர�க�க"
+msgstr "சாளரத� தலைப�பிற�க� ம�ன� வார�த�தையை சேர�க�க (_s)"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "சாளரத�தலைப�ப�டன� ப�திய தகவல�களின� _எண�ணிக�கையை சேர�க�க"
+msgstr "சாளரத�தலைப�ப�டன� ப�திய தகவல�களின� எண�ணிக�கையை சேர�க�க (_o)"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
@@ -14571,14 +14592,14 @@ msgstr "_X உடைமையில� ப�திய தகவலின� எ
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "சாளர மேலாளரின� \"அ_வசர\" க�றிப�பை அமை"
+msgstr "சாளர மேலாளரின� \"அவசர\" க�றிப�பை அமை (_U)"
 
 msgid "_Flash window"
 msgstr "ஃப�ளாஷ� சாளரம� (_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "உரையாடல� சாளரத�தை _உயர�த�த�"
+msgstr "உரையாடல� சாளரத�தை உயர�த�த� (_a)"
 
 #. Present conversation method button
 msgid "_Present conversation window"
@@ -14590,23 +14611,23 @@ msgstr "அறிவிப�ப� நீக�கல�"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "உரையாடல� சாளரம� _ம ம�ன�ன�ற�ற போத� நீக�க�க"
+msgstr "உரையாடல� சாளரம� ம�ன�ன�ற�ற போத� நீக�க�க (_g)"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "உரையாடல� சாளரத�தில� _ச சொட�க�க�ம�பொழ�த� நீக�கவ�ம�."
+msgstr "உரையாடல� சாளரத�தில� சொட�க�க�ம�பொழ�த� நீக�கவ�ம� (_r)"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "உரையாடல� சாளரத�தில� தட�_டச�ச� செய�ய�ம�பொழ�த� நீக�கவ�ம�"
+msgstr "உரையாடல� சாளரத�தில� தட�டச�ச� செய�ய�ம�பொழ�த� நீக�கவ�ம� (_t)"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "_தகவல� அன�ப�பியபிறக� நீக�கவ�ம�"
+msgstr "தகவல� அன�ப�பியபிறக� நீக�கவ�ம� (_m)"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "உரையாடல� _க கீற�ற�க�க� மாற�ம� பொழ�த� நீக�கவ�ம�"
+msgstr "உரையாடல� கீற�ற�க�க� மாற�ம� பொழ�த� நீக�கவ�ம� (_b)"
 
 #. *< type
 #. *< ui_requirement
@@ -14827,17 +14848,17 @@ msgid "Add a new text replacement"
 msgstr "ப�திய மாற�ற� வார�த�தையை சேர�"
 
 msgid "You _type:"
-msgstr "நீங�கள� _தட�டச�ச� செய�ய:"
+msgstr "நீங�கள� தட�டச�ச� செய�ய (_t):"
 
 msgid "You _send:"
-msgstr "நீங�கள� _அன�ப�ப:"
+msgstr "நீங�கள� அன�ப�ப (_s):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_சரியான நிலை பொர�த�தம� (தானியங�கி நிலை மேலாண�மைக�க� க�றி நீக�க�க)"
+msgstr "சரியான நிலை பொர�த�தம� (தானியங�கி நிலை மேலாண�மைக�க� க�றி நீக�க�க) (_E)"
 
 msgid "Only replace _whole words"
-msgstr "_ம ம�ழ� வார�த�தையை மட�ட�ம� மாற�ற"
+msgstr "ம�ழ� வார�த�தையை மட�ட�ம� மாற�ற (_w)"
 
 msgid "General Text Replacement Options"
 msgstr "பொத� உரை மாற�றம� தேர�வ�கள�"
@@ -14990,7 +15011,7 @@ msgstr "24-மணி நேர வடிவ செயல�திறம� (_F)"
 
 #, fuzzy
 msgid "Use system default"
-msgstr "பணிமேடை ம�ன�னிர�ப�ப�"
+msgstr "உலாவி ம�ன�னிர�ப�ப�"
 
 #, fuzzy
 msgid "12 hour time format"
@@ -15004,7 +15025,7 @@ msgid "Show dates in..."
 msgstr "தேதிகளை இப�படிக� காட�ட�க..."
 
 msgid "Co_nversations:"
-msgstr "_உரையாடல�கள�:"
+msgstr "உரையாடல�கள� (_n):"
 
 msgid "For delayed messages"
 msgstr "தாமதமான செய�திகள�க�க�"
@@ -15013,7 +15034,7 @@ msgid "For delayed messages and in chats"
 msgstr "தாமதமான செய�திகள�க�க�ம� மற�ற�ம� அரட�டைக�க�ம�"
 
 msgid "_Message Logs:"
-msgstr "_ச செய�தி லாக� பதிவ�:"
+msgstr "செய�தி பதிவ�கள� (_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -15074,6 +15095,10 @@ msgstr "சாதனம� (_e)"
 msgid "Voice/Video Settings"
 msgstr "வாய�ஸ�/வீடியோ அமைவ�கள�"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "வாய�ஸ�/வீடியோ அமைவ�கள�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15091,10 +15116,10 @@ msgid "IM Conversation Windows"
 msgstr "�எம� உரையாடல� சாளரங�கள�"
 
 msgid "_IM window transparency"
-msgstr "_�எம� சாளர ஊட�ர�வல�"
+msgstr "_IM சாளர ஊட�ர�வல�"
 
 msgid "_Show slider bar in IM window"
-msgstr "_க �எம� சாளரத�தில� நகர�த�தல� பட�டியை காட�ட�"
+msgstr "�எம� சாளரத�தில� நகர�த�தல� பட�டியை காட�ட� (_S)"
 
 msgid "Remove IM window transparency on focus"
 msgstr "க�விக�க�ம�பொழ�த� �எம� சாளர ஊட�ர�வல� தன�மையை நீக�க�"
@@ -15107,7 +15132,7 @@ msgid "Buddy List Window"
 msgstr "நண�பர� பட�டியல� சாளரம�"
 
 msgid "_Buddy List window transparency"
-msgstr "_நண�பர� பட�டியல� சாளர ஊட�ர�வல� தன�மை"
+msgstr "நண�பர� பட�டியல� சாளர ஊட�ர�வல� தன�மை (_B)"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr "க�விக�க�ம�பொழ�த� நண�பர� பட�டியல� சாளர ஊட�ர�வல� தன�மையை நீக�க�"
@@ -15151,7 +15176,7 @@ msgid "Allow multiple instances"
 msgstr "பல எட�த�த�க�காட�ட�களை அன�மதி"
 
 msgid "_Dockable Buddy List"
-msgstr "_நிலை நிற�த�தக� கூடிய நண�பர� பட�டியல�"
+msgstr "நிலை நிற�த�தக� கூடிய நண�பர� பட�டியல� (_D)"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
@@ -15203,7 +15228,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "பிழைதிர�த�தி XMPP சேவையகங�கள� அல�லத� வாடிக�கையாளர�க�காக இந�த செர�கி பயன�பட�கிறத�."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15337,29 +15362,20 @@ msgstr ""
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "சான�றிதழ� இத�வரை செல�லாதத�."
 
-#~ msgid "The nick name you entered is invalid."
-#~ msgstr "நீங�கள� உள�ளிட�ட ப�னைப�பெயர� தவறானத�."
-
-#~ msgid "MXit Login Name"
-#~ msgstr "MXit உட�ப�க� பெயர� "
-
-#~ msgid "Nick Name"
-#~ msgstr "ப�னைப� பெயர�"
-
-#~ msgid "Your Mobile Number..."
-#~ msgstr "உங�களத� மொபைல� எண�..."
+#~ msgid "Error creating conference."
+#~ msgstr "உரையாடலை உர�வாக�க�வதில� பிழை."
 
-#~ msgid "Rate to host"
-#~ msgstr "ப�ரவலர�க�க� விகிதம�"
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "த�றைக�க� சாக�கெட�டை பிணைக�க ம�டியவில�லை: %s"
 
-#~ msgid "Rate to client"
-#~ msgstr "பயனர�க�க� விகிதம�"
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "சாக�கெட�டில� கவனிக�க ம�டியவில�லை: %s"
 
-#~ msgid "/Media/_Hangup"
-#~ msgstr "/ஊடகம�/தொங�க�தல� (_H)"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS தேவைப�பட�கிறத�"
 
-#~ msgid "Unknown reason."
-#~ msgstr "தெரியாத காரணம�."
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "பழைய (தளம� 5223) எஸ�எஸ�எல� � வன� ப�க�த�த�"
 
 #~ msgid "Artist"
 #~ msgstr "ஆர�டிஸ�ட�"
@@ -15367,45 +15383,6 @@ msgstr ""
 #~ msgid "Album"
 #~ msgstr "ஆல�பம�"
 
-#~ msgid "Current Mood"
-#~ msgstr "தற�போதைய மனநிலை"
-
-#~ msgid "New Mood"
-#~ msgstr "ப�திய மனநிலை"
-
-#~ msgid "Change your Mood"
-#~ msgstr "உங�களத� மனநிலையை மாற�ற�"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "இப�போத� எவ�வாற� உணர�கிறீர�கள�?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "மனநிலையை மாற�ற�..."
-
-#~ msgid "Pager server"
-#~ msgstr "பேஜர� சேவையகம�"
-
-#~ msgid "Yahoo Chat server"
-#~ msgstr "Yahoo அரட�டை சேவையகம�"
-
-#~ msgid "Yahoo Chat port"
-#~ msgstr "Yahoo அரட�டை த�றை"
-
-#~ msgid "Orientation"
-#~ msgstr "திசை அமைப�ப�"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "கணினி தட�டின� திசை அமைப�ப�"
-
-#~ msgid "Error creating conference."
-#~ msgstr "உரையாடலை உர�வாக�க�வதில� பிழை."
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "த�றைக�க� சாக�கெட�டை பிணைக�க ம�டியவில�லை: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "சாக�கெட�டில� கவனிக�க ம�டியவில�லை: %s"
-
 #~ msgid "%s just sent you a Nudge!"
 #~ msgstr "%s உங�கள�க�க� ஒர� சீண�டல� அன�ப�பிய�ள�ளார�!"
 
@@ -15460,6 +15437,67 @@ msgstr ""
 #~ msgid "%s has removed you from his or her buddy list."
 #~ msgstr "%s அவரத� நண�பர� பட�டியலில� இர�ந�த� உங�களை நீக�கிய�ள�ளார�."
 
+#~ msgid "Current Mood"
+#~ msgstr "தற�போதைய மனநிலை"
+
+#~ msgid "New Mood"
+#~ msgstr "ப�திய மனநிலை"
+
+#~ msgid "Change your Mood"
+#~ msgstr "உங�களத� மனநிலையை மாற�ற�"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "இப�போத� எவ�வாற� உணர�கிறீர�கள�?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "மனநிலையை மாற�ற�..."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "நீங�கள� உள�ளிட�ட ப�னைப�பெயர� தவறானத�."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit உட�ப�க� பெயர� "
+
+#~ msgid "Nick Name"
+#~ msgstr "ப�னைப� பெயர�"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "உங�களத� மொபைல� எண�..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ப�ரவலர�க�க� விகிதம�"
+
+#~ msgid "Rate to client"
+#~ msgstr "பயனர�க�க� விகிதம�"
+
+#~ msgid "Unknown reason."
+#~ msgstr "தெரியாத காரணம�."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[செல�ல�படியற�ற எண� எழ�த�த�க� க�றியீட�கள� உள�ளதால� இந�த பயனரிடமிர�ந�த�  செய�தி காட�ட "
+#~ "இயலவில�லை.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "தோழரை தகவல� மூலம� தேட�க"
+
+#~ msgid "Pager server"
+#~ msgstr "பேஜர� சேவையகம�"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo அரட�டை சேவையகம�"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo அரட�டை த�றை"
+
+#~ msgid "Orientation"
+#~ msgstr "திசை அமைப�ப�"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "கணினி தட�டின� திசை அமைப�ப�"
+
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 #~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
@@ -15497,6 +15535,9 @@ msgstr ""
 #~ "\n"
 #~ "%s"
 
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ஊடகம�/தொங�க�தல� (_H)"
+
 #~ msgid "Failed to open file '%s': %s"
 #~ msgstr "கோப�ப� '%s'� திறக�க ம�டியவில�லை: %s"
 
@@ -15864,9 +15905,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "இணைப�ப� த�ண�டிக�கப�பட�டத�,(எழ�தப�பட�கிறத�)"
 
-#~ msgid "Connection reset"
-#~ msgstr "இணைப�ப� மீண�ட�ம� அமைக�கப� பட�டத�"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "கொள� க�ழி (சாக�கெட�) இலிர�ந�த� வாசிப�பதில� பிழை : %s"
 
@@ -16777,9 +16815,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "ஜாப�பர� நெறிம�றை சொர�க�பொர�ள�"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "டிஎல�எஸ� இர�ந�தால� பயன�பட�த�த�"
-
 #~ msgid "_Authorize"
 #~ msgstr "_அன�மதியளி"
 
diff --git a/po/te.po b/po/te.po
index 289290c29e..0c54f8cb73 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-03-25 15:56+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
@@ -524,7 +524,6 @@ msgstr "ధృవీకరణపతà±�à°°à°®à±� తొలగింపà±�à°¨à±� à
 msgid "Certificate Manager"
 msgstr "ధృవీకరణపత�రమ� నిర�వాహిక"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "హోస�ట�నామమ�"
 
@@ -787,7 +786,7 @@ msgstr "ఆప�మ�"
 msgid "Waiting for transfer to begin"
 msgstr "ప�రారంభించడానికి బదిలీ కోసం నిరీక�షణ "
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "రద�ద�చేయి"
 
 msgid "Failed"
@@ -1666,7 +1665,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "ధృవీకరణపత�రమ� కాలమ�మించినది మరియ� చెల�ల�నదిగా పరిగణించబడకూడద�."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4630,11 +4632,20 @@ msgstr "XMPP ప�రొటోకాల� ప�లగిన�"
 msgid "Domain"
 msgstr "డొమైన�"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS అవసరమ�"
+#, fuzzy
+msgid "Require encryption"
+msgstr "సాధికారిత అవసరం "
 
-msgid "Force old (port 5223) SSL"
-msgstr "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "వినియోగదార�ని జాడ లభించడంలేద�: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "కనెక�షన� సమయం మ�గిసింది"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ఎన� క�రిప�ట�కాని స�ట�రీమ�స� పై సాదా పాఠ�య ప�రమాణీకరణన� అన�మతించండి"
@@ -5806,7 +5817,8 @@ msgstr "PIN చెలà±�లనిది. ఇది అంకెలనà±� మాà
 msgid "The two PINs you entered do not match."
 msgstr "మీర� ప�రవేశపెట�టిన రెండ� PINల� సరిపోల�టలేద�."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "మీర� ప�రవేశపెట�టిన పేర� చెల�లనిది."
 
 msgid ""
@@ -5894,10 +5906,6 @@ msgstr "MXit సేవికకà±� à°…à°¨à±�సంధానమà±� కాలేà°
 msgid "Connecting..."
 msgstr "అన�సంధానించబడ�త�న�నది ..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "మీర� ప�రవేశపెట�టిన పేర� చెల�లనిది."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "మీర� ప�రవేశపెట�టిన PIN చెల�లని పొడవ� [7-10] కలిగివ�ంది."
 
@@ -6736,6 +6744,15 @@ msgstr "సెర�వర� అడ�రస� "
 msgid "Server port"
 msgstr "సెర�వర� పోర�ట� "
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "నాక� అధికారమివ�వండి, తద�వారా మీ పేర�న� నా మిత�ర�ల జాబితాలో చేర�చ�క�ంటాన�. "
+
+msgid "No reason given."
+msgstr "కారణం ఇవ�వలేద�. "
+
+msgid "Authorization Denied Message:"
+msgstr "ఆథరైజేషన� నిరాకరణ సందేశం:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "%s న�ండి అన�కోని స�పందన స�వీకరించబడినది: %s"
@@ -6771,6 +6788,24 @@ msgstr "మీ స�క�రీన�‌పేర�న� ఇక�కడ ద
 msgid "Error requesting %s"
 msgstr "%sన� అభ�యర�ధించ�టలో దోషమ�: %s"
 
+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 ఖాతాలోని అడ�వాన�స�డ� "
+"ఖతాల� అవకాశాల�లో దానిని పేర�కొనవచ�చ�.)"
+
+#, 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 బగ�గీ క�లయింట� కలిగివ�ండవచ�చ�.)"
+
 msgid "Could not join chat room"
 msgstr "చాట� రూమ�‌నక� చేరలేక పోతోంది"
 
@@ -6984,94 +7019,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s ఫైల� %s, %s క� మించిన పరిమాణంలో ఉంది."
 
-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 ఖాతాలోని అడ�వాన�స�డ� "
-"ఖతాల� అవకాశాల�లో దానిని పేర�కొనవచ�చ�.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "మిత�ర�ని ప�రతిమ"
-
-msgid "Voice"
-msgstr "ధ�వని "
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "పైల�న� తీస�కొని రమ�మ� "
-
-msgid "Games"
-msgstr "ఆటల�"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "చేరినవి"
-
-msgid "Send Buddy List"
-msgstr "మిత�ర�ల జాబితాన� పంప�మ�"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ డైరెక�ట� అన�సంధానం "
-
-msgid "AP User"
-msgstr "AP వినియోగదార�డ� "
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "శూన�యవాది"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ సర�వర� రిలే "
-
-msgid "Old ICQ UTF8"
-msgstr "ప�రాచీన ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "హిప�‌టాప� "
-
-msgid "Security Enabled"
-msgstr "స�రక�ష సమర�థత"
-
-msgid "Video Chat"
-msgstr "వీడియో చాట�"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "ప�రత�యక�ష వీడియో "
-
-msgid "Camera"
-msgstr "ఛాయాగ�రహణం తీసే పరికరం"
-
-msgid "Screen Sharing"
-msgstr "స�క�రీన� భాగస�వామ�యం"
-
 msgid "Free For Chat"
 msgstr "చాట� చేయడానికి ఖాళీగా వ�న�నార�"
 
@@ -7102,15 +7049,6 @@ msgstr ""
 msgid "At lunch"
 msgstr ""
 
-msgid "IP Address"
-msgstr "IP చిర�నామా"
-
-msgid "Warning Level"
-msgstr "వార�నింగ� లెవల�"
-
-msgid "Buddy Comment"
-msgstr "మిత�ర�ని వ�యాఖ�య "
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ధృవీకరణ సేవికక� అన�సంధానమ� కాలేకపోయింది: %s"
@@ -7204,15 +7142,6 @@ msgstr "పాస�‌వర�డ� పంపబడింది"
 msgid "Unable to initialize connection"
 msgstr "కనెక�షన� న� ప�రారంభించలేకపోత�న�నాం"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "నాక� అధికారమివ�వండి, తద�వారా మీ పేర�న� నా మిత�ర�ల జాబితాలో చేర�చ�క�ంటాన�. "
-
-msgid "No reason given."
-msgstr "కారణం ఇవ�వలేద�. "
-
-msgid "Authorization Denied Message:"
-msgstr "ఆథరైజేషన� నిరాకరణ సందేశం:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7321,58 +7250,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ఒక తెలియని కారణం చేత మీర� %hu సందేశాన�ని %s న�ండి కోల�పోయినార�."
 msgstr[1] "ఒక తెలియని కారణం చేత మీర� %hu సందేశాన�ని %s న�ండి కోల�పోయినార�."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "వినియోగదార�ని జాడ లభించడంలేద�: %s"
-
-msgid "Online Since"
-msgstr "న�ండి ఆన�‌లైన�. "
-
-msgid "Member Since"
-msgstr "న�ండి సభ�య�డ�."
-
-msgid "Capabilities"
-msgstr "సామర�ధ�యమ�ల�"
-
 msgid "Your AIM connection may be lost."
 msgstr "మీర� AIM కనెక�షన� కోల�పోవచ�చ�."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[ఈ వినియోగదార�ని సందేశంలో విల�వలేని అక�షరాల�న�నంద�వల�ల ప�రదర�శించ�ట  సాధ�యపడద�]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "చాట� రూమ� %s న�ండి మీర� అనన�సంధానించబడినార�"
 
-msgid "Mobile Phone"
-msgstr "కరదూరవాణి"
-
-msgid "Personal Web Page"
-msgstr "వ�యక�తిగత వెబ� పేజీ "
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "అదనప� సమాచారమ�"
-
-msgid "Zip Code"
-msgstr "జిప� కోడ� "
-
-msgid "Work Information"
-msgstr "పని సమాచారం "
-
-msgid "Division"
-msgstr "విభాగమ�"
-
-msgid "Position"
-msgstr "స�థానమ�"
-
-msgid "Web Page"
-msgstr "మహాతలం ప�ట"
-
 msgid "Pop-Up Message"
 msgstr "పాప�-అప� సందేశం "
 
@@ -7635,7 +7519,8 @@ msgstr "వినియోగదారిపేరà±� ఫారà±�మేటిà°
 msgid "Change Address To:"
 msgstr "అడ�రస�న� మార�చండి:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>మీర� ఆథరైజేషన�‌ కోసం ఎద�ర�చూడ�డంలేద�</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7674,6 +7559,14 @@ msgstr "IM ఫారà±�వారà±�à°¡à°¿à°‚à°—à±�‌నà±� ఆకృతీకà°
 msgid "Set Privacy Options..."
 msgstr "గోపనీయ అవకాశాలన� సెట� చేయండి..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "మిత�ర�ల జాబితా చూపించ� (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "జాబితాన� ఆహ�వానించండి. "
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ఖాతా‌న� నిర�ధారించండి. "
@@ -7690,9 +7583,6 @@ msgstr "ఆథరైజేషనà±�‌ కోసం à°Žà°¦à±�à°°à±�చూసà±�à
 msgid "Search for Buddy by Email Address..."
 msgstr "ఇ-మెయిల� అడ�రస� ద�వారా మిత�రాన�వేషణ ..."
 
-msgid "Search for Buddy by Information"
-msgstr "సమాచారం ద�వారా మిత�రాన�వేషణ "
-
 msgid "Use clientLogin"
 msgstr "క�లైంట�‌లాగిన� వ�పయోగించ�మ�"
 
@@ -7800,6 +7690,165 @@ msgstr "పూర�తి క�యూ."
 msgid "Not while on AOL"
 msgstr "AOL ఉన�నప�ప�డ� కాద� "
 
+#. Label
+msgid "Buddy Icon"
+msgstr "మిత�ర�ని ప�రతిమ"
+
+msgid "Voice"
+msgstr "ధ�వని "
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "పైల�న� తీస�కొని రమ�మ� "
+
+msgid "Games"
+msgstr "ఆటల�"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "చేరినవి"
+
+msgid "Send Buddy List"
+msgstr "మిత�ర�ల జాబితాన� పంప�మ�"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ డైరెక�ట� అన�సంధానం "
+
+msgid "AP User"
+msgstr "AP వినియోగదార�డ� "
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "శూన�యవాది"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ సర�వర� రిలే "
+
+msgid "Old ICQ UTF8"
+msgstr "ప�రాచీన ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "హిప�‌టాప� "
+
+msgid "Security Enabled"
+msgstr "స�రక�ష సమర�థత"
+
+msgid "Video Chat"
+msgstr "వీడియో చాట�"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ప�రత�యక�ష వీడియో "
+
+msgid "Camera"
+msgstr "ఛాయాగ�రహణం తీసే పరికరం"
+
+msgid "Screen Sharing"
+msgstr "స�క�రీన� భాగస�వామ�యం"
+
+msgid "IP Address"
+msgstr "IP చిర�నామా"
+
+msgid "Warning Level"
+msgstr "వార�నింగ� లెవల�"
+
+msgid "Buddy Comment"
+msgstr "మిత�ర�ని వ�యాఖ�య "
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "వినియోగదార�ని జాడ లభించడంలేద�: %s"
+
+msgid "Mobile Phone"
+msgstr "కరదూరవాణి"
+
+msgid "Personal Web Page"
+msgstr "వ�యక�తిగత వెబ� పేజీ "
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "అదనప� సమాచారమ�"
+
+msgid "Zip Code"
+msgstr "జిప� కోడ� "
+
+msgid "Work Information"
+msgstr "పని సమాచారం "
+
+msgid "Division"
+msgstr "విభాగమ�"
+
+msgid "Position"
+msgstr "స�థానమ�"
+
+msgid "Web Page"
+msgstr "మహాతలం ప�ట"
+
+msgid "Online Since"
+msgstr "న�ండి ఆన�‌లైన�. "
+
+msgid "Member Since"
+msgstr "న�ండి సభ�య�డ�."
+
+msgid "Capabilities"
+msgstr "సామర�ధ�యమ�ల�"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ఆన� లైన� లో ఉన�నట�ట� చూపండి "
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ఆన� లైన� లో ఉన�నట�ట� చూపండి "
+
+msgid "Appear Offline"
+msgstr "ఆఫ�‌లైన� లో ఉన�నట�ట� చూపండి"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ఆఫ�‌లైన� లో ఉన�నట�ట� చూపండి"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "మీర� గెంటివేయబడ�డార�: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ఈ క�రింది మిత�ర�లన�ండి ఆథరైజేషన� కొసం మీర� మరల మనవి చేయవచ�చ�న�. వారిపేర�పై రైట�‌క�లిక� చేసి \"ఆథరైజేషన� "
+"కోసం మరోసారి మనవి.\" ని యెంపిక� చేయండి. "
+
+#, fuzzy
+msgid "Visible List"
+msgstr "దర�శనీయ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "జాబితాన� ఆహ�వానించండి. "
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "క�ంభం"
 
@@ -7978,8 +8027,8 @@ msgstr "మీ అభ�యర�ధన ఆమోదించబడింది.
 msgid "Your request was rejected."
 msgstr "మీ అభ�యర�ధన తిరస�కరించబడింది."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%uక� నిర�ధారణ అవసరమ�"
 
 msgid "Add buddy question"
@@ -10149,18 +10198,12 @@ msgstr "బయటక� వెళ�లార�"
 msgid "Not on server list"
 msgstr "సర�వర� జాబితాలో లేర�"
 
-msgid "Appear Online"
-msgstr "ఆన� లైన� లో ఉన�నట�ట� చూపండి "
-
 msgid "Appear Permanently Offline"
 msgstr "శాశ�వతంగా ఆఫ� లైన� గా కనిపించ�"
 
 msgid "Presence"
 msgstr "హాజర�"
 
-msgid "Appear Offline"
-msgstr "ఆఫ�‌లైన� లో ఉన�నట�ట� చూపండి"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "శాశ�వతంగా ఆఫ� లైన� గా కనిపించవద�ద�"
 
@@ -10695,27 +10738,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "అన�సంధానమ� మీ కంప�యూటర�‌పైని యితర సాఫ�ట�వేర� ద�వారా ఆటంకపరచబడింది."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "రిమోట� హోస�ట� అన�సంధానమ� మూసివేసినది."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "అన�సంధానమ� సమయం మించినది."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "అన�సంధానమ� తిరస�కరించబడింది."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "చిర�నామా యిప�పటికే వ�పయోగంలో వ�ంది."
 
@@ -10862,6 +10900,10 @@ msgstr ""
 "ఖాతాలన� జతచేయ�టక�, సరికూర�చ�టక�, లేదా తీసివేయ�టక� మీర� ఈ విండోనక� మిత�ర�ని జాబితా విండోనందలి "
 "<b>ఖాతాల�->ఖాతాల నిర�వహించ�</b> ద�వారా రావచ�చ�న�."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "తన మిత�ర�ని లేదా స�నేహిత�రాలి జాబితా%s %s లో %s న�  చేర�చాలని %s%s%s%s  కోర�త�న�నార� "
+
 #. Buddy List
 msgid "Background Color"
 msgstr "పూర�వరంగ వర�ణం"
@@ -11112,6 +11154,8 @@ msgstr ""
 msgid "Edit User Mood"
 msgstr "వినియోగదార�ని మూడ�‌న� సరికూర�చ�మ�"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/మిత�ర�ల� (_B)"
@@ -11853,9 +11897,6 @@ msgstr "మద�దత�� "
 msgid "webmaster"
 msgstr "వెబ� మాస�టర�"
 
-msgid "Senior Contributor/QA"
-msgstr "అన�భవయ�క�త సహాయక�డ�/QA"
-
 msgid "win32 port"
 msgstr "విన�32 పోర�ట� "
 
@@ -11881,6 +11922,9 @@ msgstr "ఒరిజినల� ఆథర� "
 msgid "lead developer"
 msgstr "మ�ఖ�య డెవలపర� "
 
+msgid "Senior Contributor/QA"
+msgstr "అన�భవయ�క�త సహాయక�డ�/QA"
+
 msgid "Afrikaans"
 msgstr "ఆఫ�రికాన�స�"
 
@@ -13193,6 +13237,10 @@ msgstr "రిలే సర�వర� (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN సర�వర�:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "పోర�ట� (_P):"
+
 msgid "Use_rname:"
 msgstr "వినియోగదార�నిపేర� (_r):"
 
@@ -13214,6 +13262,11 @@ msgstr "మొజిల�లా"
 msgid "Konqueror"
 msgstr "కాంకెరర�"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "డెస�క�టాప� అప�రమేయం"
 
@@ -13232,6 +13285,14 @@ msgstr "ఫైర�‌బర�డ�"
 msgid "Epiphany"
 msgstr "ఎపిఫేని"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "మాన�య�వల�"
 
@@ -13759,7 +13820,8 @@ msgstr "�దీకాద�"
 msgid "Small"
 msgstr "చిన�న"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "అప�రమేయ స�మైలీల యొక�క చిన�న వర�షన�ల�"
 
 msgid "Response Probability:"
@@ -14770,6 +14832,10 @@ msgstr "పరికరమ� (_e)"
 msgid "Voice/Video Settings"
 msgstr "స�వర/విడియో అమరికల�"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "స�వర/విడియో అమరికల�"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14894,7 +14960,7 @@ msgstr "కొతà±�à°¤ raw XMPP à°¸à±�టాంజాలనà±� పంపింà
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15024,6 +15090,23 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS అవసరమ�"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old (port 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "మీర� ప�రవేశపెట�టిన పేర� చెల�లనిది."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[ఈ వినియోగదార�ని సందేశంలో విల�వలేని అక�షరాల�న�నంద�వల�ల ప�రదర�శించ�ట  సాధ�యపడద�]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "సమాచారం ద�వారా మిత�రాన�వేషణ "
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "ధృవీకరణపత�రమ� యింకా చెల�ల�నది కాలేద�."
 
diff --git a/po/th.po b/po/th.po
index 94e2da1d8c..20821d2f83 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2006-04-04 15:35+0700\n"
 "Last-Translator: Isriya Paireepairit <markpeak@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -546,7 +546,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -804,7 +803,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr "�ำลังรอ�ารรับส่ง�ฟ้ม"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ย�เลิ�"
 
 msgid "Failed"
@@ -1743,7 +1742,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4688,12 +4689,19 @@ msgstr "ปลั๊�อิน Jabber"
 msgid "Domain"
 msgstr "เรีย�คำสั่ง"
 
+msgid "Require encryption"
+msgstr ""
+
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "บังคับใช้ TLS"
+msgid "Use encryption if available"
+msgstr "ใช้ TLS เมื่อเป็นไปได้"
 
-msgid "Force old (port 5223) SSL"
-msgstr "บังคับ SSL �บบเ�่า (พอร์ต 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "เ�ิดข้อผิดพลาดใน�ารเชื่อมต่อ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "อนุ�าตให้ล็อ�อินผ่าน�ารเชื่อมต่อที่ไม่เข้ารหัส"
@@ -5921,7 +5929,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr "รหัสผ่านใหม่ไม่ตรง�ัน"
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -6021,9 +6029,6 @@ msgstr "ไม่สามารถติดต่อไปยังโฮสต
 msgid "Connecting..."
 msgstr "�ำลังเชื่อมต่อ"
 
-msgid "The Display Name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
@@ -6888,6 +6893,15 @@ msgstr "ที่อยู่เซิร์ฟเวอร์"
 msgid "Server port"
 msgstr "พอร์ตเซิร์ฟเวอร์"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "มีข้อความใหม่ %d ข้อความจา� %s\n"
@@ -6919,6 +6933,19 @@ msgstr ""
 msgid "Error requesting %s"
 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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
@@ -7154,90 +7181,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "ไอคอนใน�ารสนทนา"
-
-msgid "Voice"
-msgstr ""
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr ""
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr ""
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "ชื่อผู้ใช้"
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7273,15 +7216,6 @@ msgstr "เครือข่าย"
 msgid "At lunch"
 msgstr "พั��ลางวัน"
 
-msgid "IP Address"
-msgstr "หมายเลขไอพี"
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
@@ -7370,15 +7304,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr ""
-
-msgid "Authorization Denied Message:"
-msgstr ""
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7470,58 +7395,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr ""
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr ""
-
-msgid "Zip Code"
-msgstr ""
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr ""
-
-msgid "Position"
-msgstr ""
-
-msgid "Web Page"
-msgstr ""
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7764,7 +7644,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7804,6 +7684,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "�สดงราย�ารคู่สนทนา"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ไม่�สดงตัว"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7820,9 +7708,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7925,6 +7810,162 @@ msgstr ""
 msgid "Not while on AOL"
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr "ไอคอนใน�ารสนทนา"
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "ชื่อผู้ใช้"
+
+msgid "IP Address"
+msgstr "หมายเลขไอพี"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr ""
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ไม่�สดงตัว"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ไม่�สดงตัว"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8135,7 +8176,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -10302,18 +10343,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10849,27 +10884,25 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "�ารเชื่อมต่อ�ับเซิร์ฟเวอร์ถู�ตัด"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "เชื่อมต่อล้มเหลว"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "เ�ิดข้อผิดพลาดใน�ารเชื่อมต่อ"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -11014,6 +11047,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "ผู้ใช้ %s ต้อง�ารเพิ่ม %s ในราย�ารคู่สนทนา"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11291,6 +11328,8 @@ msgstr "�าร�จ้งเตือนข้อความ"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_คู่สนทนา"
@@ -12086,9 +12125,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -12114,6 +12150,9 @@ msgstr ""
 msgid "lead developer"
 msgstr "นั�พัฒนาหลั�"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -13489,6 +13528,10 @@ msgid "_TURN server:"
 msgstr "เซิร์ฟเวอร์ ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "พอร์ต UDP"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_ชื่อผู้ใช้:"
 
@@ -13511,6 +13554,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "ค่าปริยายของ GNOME"
@@ -13530,6 +13578,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "�ำหนดเอง"
 
@@ -14087,7 +14143,7 @@ msgstr "โทรศัพท์"
 msgid "Small"
 msgstr "อีเมล"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15126,6 +15182,10 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr "ใช้ค่าของระบบ"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ใช้ค่าของระบบ"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15249,7 +15309,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15378,6 +15438,13 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "บังคับใช้ TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "บังคับ SSL �บบเ�่า (พอร์ต 5223)"
+
+#, fuzzy
 #~ msgid "Nick Name"
 #~ msgstr "ชื่อเล่น"
 
@@ -15589,10 +15656,6 @@ msgstr ""
 #~ msgstr "เซิร์ฟเวอร์"
 
 #, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "เ�ิดข้อผิดพลาดใน�ารเชื่อมต่อ"
-
-#, fuzzy
 #~ msgid "Could not resolve hostname"
 #~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
@@ -15891,9 +15954,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "พอร์ต TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "พอร์ต UDP"
-
 #~ msgid "Blink tray icon for unread..."
 #~ msgstr "�สดงไอคอน�ระพริบเมื่อมีข้อความ..."
 
@@ -15998,9 +16058,6 @@ msgstr ""
 #~ msgid "Change Jabber Password"
 #~ msgstr "เปลี่ยนรหัสผ่าน Jabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "ใช้ TLS เมื่อเป็นไปได้"
-
 #~ msgid "_Deny"
 #~ msgstr "ไ_ม่อนุ�าต"
 
diff --git a/po/tr.po b/po/tr.po
index bab99e178b..78e9352016 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-11-09 00:33+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -546,7 +546,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr "Sertifika Yöneticisi"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Barındırıcı adı"
 
@@ -805,7 +804,7 @@ msgstr "Dur"
 msgid "Waiting for transfer to begin"
 msgstr "Aktarımın başlaması bekleniyor"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ä°ptal Edildi"
 
 msgid "Failed"
@@ -1703,7 +1702,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4739,11 +4740,20 @@ msgstr "XMPP Protokol Eklentisi"
 msgid "Domain"
 msgstr "Alan Adı"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Ä°zin gereksin"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s adlı kullanıcının bilgisi mevcut değil"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Eski (port 5223) SSL kullan"
+#, fuzzy
+msgid "Connection security"
+msgstr "Bağlantı kesildi"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Şifrelenmemiş sistemlerden gelen düzyazılara (plain text) izin ver."
@@ -6004,7 +6014,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Yeni şifreler çelişiyor."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Girilen SecurID anahtarı geçersiz."
 
 msgid ""
@@ -6107,10 +6117,6 @@ msgid "Connecting..."
 msgstr "Bağlanılıyor"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Girilen SecurID anahtarı geçersiz."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Girilen SecurID anahtarı geçersiz."
 
@@ -6984,6 +6990,15 @@ msgstr "Sunucu adresi"
 msgid "Server port"
 msgstr "Sunucu portu"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
+
+msgid "No reason given."
+msgstr "Sebep yazılmamış."
+
+msgid "Authorization Denied Message:"
+msgstr "Ä°zin Reddetme Ä°letisi:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
@@ -7018,6 +7033,19 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "%s çözümleme hatası"
 
+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 ""
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Bağlanılamadı"
@@ -7252,90 +7280,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "%s dosyasının boyutu %s, bu boyut en yüksek boyut olan %s boyutunundan büyük."
 
-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 ""
-
-#, 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 ""
-
-#. Label
-msgid "Buddy Icon"
-msgstr "KiÅŸi Simgesi"
-
-msgid "Voice"
-msgstr "Ses"
-
-msgid "AIM Direct IM"
-msgstr "AIM DoÄŸrudan IM"
-
-msgid "Get File"
-msgstr "Dosyayı Al"
-
-msgid "Games"
-msgstr "Oyunlar"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Eklentiler"
-
-msgid "Send Buddy List"
-msgstr "Kişi Listesi Gönder"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Doğrudan Bağlantı"
-
-msgid "AP User"
-msgstr "AP Kullanıcısı"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Eski ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian Åžifrelemesi"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Güvenlik Aktif"
-
-msgid "Video Chat"
-msgstr "Görüntülü Sohbet"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Canlı Görüntü"
-
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Kayıtlı İsim"
-
 msgid "Free For Chat"
 msgstr "Sohbet için Hazır"
 
@@ -7371,15 +7315,6 @@ msgstr "AÄŸ"
 msgid "At lunch"
 msgstr "Yemekte"
 
-msgid "IP Address"
-msgstr "IP Adresi"
-
-msgid "Warning Level"
-msgstr "Uyarı Seviyesi"
-
-msgid "Buddy Comment"
-msgstr "Kişi Hakkında Yorum"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7484,15 +7419,6 @@ msgstr "Parola gönderildi"
 msgid "Unable to initialize connection"
 msgstr "Bağlantı başlatılamadı"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
-
-msgid "No reason given."
-msgstr "Sebep yazılmamış."
-
-msgid "Authorization Denied Message:"
-msgstr "Ä°zin Reddetme Ä°letisi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7596,60 +7522,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 "%hu mesajı %s gönderinden bilinmeyen bir sebepten dolayı kaçırdınız."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "%s kullanıcı bilgisi mevcut değil."
-
-msgid "Online Since"
-msgstr "Bağlı olduğu süre:"
-
-msgid "Member Since"
-msgstr "Üye olduğu süre:"
-
-msgid "Capabilities"
-msgstr "Yetenekler"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM bağlantınız kaybolmuş olabilir."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
-"gösterilemiyor.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s sohbet odasından bağlantınız koptu."
 
-msgid "Mobile Phone"
-msgstr "Cep Telefonu"
-
-msgid "Personal Web Page"
-msgstr "Kişisel Web Sayfası"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Ek Bilgi"
-
-msgid "Zip Code"
-msgstr "Posta Kodu"
-
-msgid "Work Information"
-msgstr "Ä°ÅŸ Bilgileri"
-
-msgid "Division"
-msgstr "Bölüm"
-
-msgid "Position"
-msgstr "Pozisyon"
-
-msgid "Web Page"
-msgstr "Web Sayfası"
-
 msgid "Pop-Up Message"
 msgstr "Açılır Pencere Mesajı"
 
@@ -7914,7 +7793,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Adresi Şöyle Değiştir:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>izin için beklemiyorsunuz</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7956,6 +7836,14 @@ msgstr "IM Yönlendirmeyi yapılandır (URL)"
 msgid "Set Privacy Options..."
 msgstr "Gizlilik Seçeneklerini Ayarla..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Kişi Listesini Görüntüle"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Davetli Listesi"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Hesabı Doğrula"
@@ -7972,9 +7860,6 @@ msgstr "İzin Bekleyen Kişileri Göster"
 msgid "Search for Buddy by Email Address..."
 msgstr "E-Posta Adresine Göre Kişi Ara..."
 
-msgid "Search for Buddy by Information"
-msgstr "Kişi Bilgilerine Göre Kişi Ara"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Kullanıcı oturum açmamış"
@@ -8085,6 +7970,166 @@ msgstr "Liste dolu"
 msgid "Not while on AOL"
 msgstr "AOL'de deÄŸil"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "KiÅŸi Simgesi"
+
+msgid "Voice"
+msgstr "Ses"
+
+msgid "AIM Direct IM"
+msgstr "AIM DoÄŸrudan IM"
+
+msgid "Get File"
+msgstr "Dosyayı Al"
+
+msgid "Games"
+msgstr "Oyunlar"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Eklentiler"
+
+msgid "Send Buddy List"
+msgstr "Kişi Listesi Gönder"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Doğrudan Bağlantı"
+
+msgid "AP User"
+msgstr "AP Kullanıcısı"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Eski ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Åžifrelemesi"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Güvenlik Aktif"
+
+msgid "Video Chat"
+msgstr "Görüntülü Sohbet"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Canlı Görüntü"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Kayıtlı İsim"
+
+msgid "IP Address"
+msgstr "IP Adresi"
+
+msgid "Warning Level"
+msgstr "Uyarı Seviyesi"
+
+msgid "Buddy Comment"
+msgstr "Kişi Hakkında Yorum"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "%s kullanıcı bilgisi mevcut değil."
+
+msgid "Mobile Phone"
+msgstr "Cep Telefonu"
+
+msgid "Personal Web Page"
+msgstr "Kişisel Web Sayfası"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Ek Bilgi"
+
+msgid "Zip Code"
+msgstr "Posta Kodu"
+
+msgid "Work Information"
+msgstr "Ä°ÅŸ Bilgileri"
+
+msgid "Division"
+msgstr "Bölüm"
+
+msgid "Position"
+msgstr "Pozisyon"
+
+msgid "Web Page"
+msgstr "Web Sayfası"
+
+msgid "Online Since"
+msgstr "Bağlı olduğu süre:"
+
+msgid "Member Since"
+msgstr "Üye olduğu süre:"
+
+msgid "Capabilities"
+msgstr "Yetenekler"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Çevrimiçi"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Çevrimiçi"
+
+msgid "Appear Offline"
+msgstr "Çevrimdışı Görün"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Çevrimdışı Görün"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s tarafından atıldınız: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Kullanıcıya sağ tıklayıp \"Yeniden İzin İste\" ye tıklayarak yeniden bu "
+"kullanıcıdan izin isteyebilirsiniz."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Görünmez"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Davetli Listesi"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Kova"
 
@@ -8285,7 +8330,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Ä°zin gereksin"
 
 #, fuzzy
@@ -10513,18 +10558,12 @@ msgstr "_Dışarı Çıktı"
 msgid "Not on server list"
 msgstr "Sunucu listesinde deÄŸil"
 
-msgid "Appear Online"
-msgstr "Çevrimiçi"
-
 msgid "Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görün"
 
 msgid "Presence"
 msgstr "Bulunma"
 
-msgid "Appear Offline"
-msgstr "Çevrimdışı Görün"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görünme"
 
@@ -11061,27 +11100,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Uzaktaki kullanıcı bağlantıyı kapattı."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Bağlantı zamanaşımına uğradı"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Bağlantı kesildi"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Bu sohbet adı zaten kullanımda"
 
@@ -11232,6 +11270,10 @@ msgstr ""
 "Bu pencereye daha sonra ulaÅŸmak isterseniz KiÅŸi Listesi Penceresindeki "
 "<b>Hesaplar->Ekle/Düzenle</b> yolunu takip etmelisiniz."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor %s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Arkaplan Rengi"
@@ -11509,6 +11551,8 @@ msgstr "Görünen İsim"
 msgid "Edit User Mood"
 msgstr ""
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_KiÅŸiler"
@@ -12283,9 +12327,6 @@ msgstr "destek"
 msgid "webmaster"
 msgstr "geliştirici & site yöneticisi"
 
-msgid "Senior Contributor/QA"
-msgstr "Kıdemli Katılımcı/QA"
-
 msgid "win32 port"
 msgstr "win32 portu"
 
@@ -12311,6 +12352,9 @@ msgstr "asıl yazar"
 msgid "lead developer"
 msgstr "lider geliÅŸtirici"
 
+msgid "Senior Contributor/QA"
+msgstr "Kıdemli Katılımcı/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaanca (Hollanda Lehçesi)"
 
@@ -13694,6 +13738,10 @@ msgid "_TURN server:"
 msgstr "ST_UN sunucusu:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Kullanıcı adı:"
 
@@ -13716,6 +13764,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Varsayılanları _Kabul Et"
@@ -13735,6 +13788,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "El ile ayarla"
 
@@ -14302,7 +14363,7 @@ msgstr "hiçbiri"
 msgid "Small"
 msgstr "E-Posta"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15376,6 +15437,10 @@ msgstr "Aygıt"
 msgid "Voice/Video Settings"
 msgstr "Ayarları Düzenle"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Ayarları Düzenle"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15505,7 +15570,7 @@ msgstr ""
 "Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için "
 "kullanışlıdır."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15636,6 +15701,23 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Eski (port 5223) SSL kullan"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Girilen SecurID anahtarı geçersiz."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
+#~ "gösterilemiyor.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Kişi Bilgilerine Göre Kişi Ara"
+
 #, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Seçilen dosya geçerli bir eklenti değil."
@@ -16123,9 +16205,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Bağlantı kapandı (yazılıyor)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Bağlantı kesildi"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Soket okuma hatası: %s"
 
@@ -16367,7 +16446,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s yazma için açılamıyor!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
 
@@ -16390,9 +16469,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC Protokol Eklentisi"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s adlı kullanıcının bilgisi mevcut değil"
-
 #~ msgid "%s Options"
 #~ msgstr "%s Seçenekleri"
 
diff --git a/po/uk.po b/po/uk.po
index 97266b38b8..fd2eabe999 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-09 21:57-0700\n"
-"PO-Revision-Date: 2010-08-09 00:28+0300\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 21:42+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -191,7 +191,7 @@ msgid ""
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Во�таннє в мережі: %s ago"
+"Во�таннє в мережі: %s тому"
 
 msgid "Default"
 msgstr "Типовий"
@@ -531,7 +531,6 @@ msgstr "Підтвердити видаленн� �ертифікату"
 msgid "Certificate Manager"
 msgstr "Менеджер �ертифікатів"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "�азва вузла"
 
@@ -809,7 +808,7 @@ msgstr "Зупинити"
 msgid "Waiting for transfer to begin"
 msgstr "Очікуванн� початку передачі"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ска�овано"
 
 msgid "Failed"
@@ -1397,7 +1396,7 @@ msgid "Use"
 msgstr "Викори�тати"
 
 msgid "Invalid title"
-msgstr "�евірний заголовок"
+msgstr "�еправильний заголовок"
 
 msgid "Please enter a non-empty title for the status."
 msgstr "Будь ла�ка, введіть непорожню назву дл� �тану."
@@ -1700,8 +1699,12 @@ msgstr ""
 "Сертифікат ще не дій�ний. Перевірте, чи дата та ча� вашого комп'ютера "
 "правильні."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Термін дії �ертифікату закінчив�� і його не �лід вважати дій�ним."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Термін дії �ертифікату закінчив�� і він вважаєть�� недій�ним. Перевірте, чи "
+"дата та ча� вашого комп'ютера правильні."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -3560,14 +3563,14 @@ msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) в�тановлено %s"
 
 msgid "Invalid nickname"
-msgstr "�евірне прізви�ько"
+msgstr "�еправильне прізви�ько"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Вибране вами прізви�ько було відхилене �ервером.  Можливо воно мі�тить "
-"невірні �имволи."
+"неправильні �имволи."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
@@ -4126,7 +4129,7 @@ msgid "Search"
 msgstr "Шукати"
 
 msgid "Invalid Directory"
-msgstr "�евірна тека"
+msgstr "�еправильна тека"
 
 msgid "Enter a User Directory"
 msgstr "Введіть каталог кори�тувача"
@@ -4219,14 +4222,14 @@ msgid "Ping timed out"
 msgstr "Вийшов ча� очікуванн� луни (ping)"
 
 msgid "Invalid XMPP ID"
-msgstr "�евірний XMPP ID"
+msgstr "�еправильний XMPP ID"
 
 msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 "�еправильний XMPP ID. Має бути в�тановлена ча�тина з іменем кори�тувача."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "�евірний XMPP ID. Має бути вказаний домен."
+msgstr "�еправильний XMPP ID. Має бути вказаний домен."
 
 msgid "Malformed BOSH URL"
 msgstr "Підробна BOSH URL"
@@ -4734,11 +4737,17 @@ msgstr "Додаток протоколу XMPP"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Потребує SSL/TLS"
+msgid "Require encryption"
+msgstr "Вимагати шифруванн�"
+
+msgid "Use encryption if available"
+msgstr "Викори�товувати шифруванн�, коли це можливо"
+
+msgid "Use old-style SSL"
+msgstr "Викори�товувати SSL �тарого типу"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Приму�ово �тарий (порт 5223) SSL"
+msgid "Connection security"
+msgstr "Безпека з'єднанн�"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Дозволити автентифікацію звичайним тек�том через нешифровані потоки"
@@ -4864,7 +4873,7 @@ msgstr "�е вдаєть�� відправити файл"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "�е вдало�� наді�лати файл до %s, невірний JID"
+msgstr "�е вдало�� наді�лати файл до %s, неправильний JID"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -6366,7 +6375,7 @@ msgid "MySpaceIM Error"
 msgstr "Помилка MySpaceIM"
 
 msgid "Invalid input condition"
-msgstr "�евірні вхідні умови"
+msgstr "�еправильні вхідні умови"
 
 msgid "Failed to add buddy"
 msgstr "�е вдаєть�� додати контакт"
@@ -6887,6 +6896,16 @@ msgstr "�дре�а �ервера"
 msgid "Server port"
 msgstr "Порт �ервера"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr "Причина не вказана."
+
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr "Повідомленн� відмови у авторизації:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Отримана неочікувана відповідь від %s: %s"
@@ -6922,6 +6941,19 @@ msgstr "AOL не дозволÑ�Ñ” автентифікуватиÑ�ÑŒ тут з Ð
 msgid "Error requesting %s"
 msgstr "Помилка запиту %s"
 
+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 ""
+
+#, 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 ""
+
 msgid "Could not join chat room"
 msgstr "�е вдало�� приєднати�� до кімнати балачки"
 
@@ -7140,95 +7172,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Файл %s має довжину %s, що більше ніж найбільший розмір %s."
 
-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.)"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "Значок кори�тувача"
-
-msgid "Voice"
-msgstr "Голо�"
-
-msgid "AIM Direct IM"
-msgstr "Пр�ме з'єднанн� AIM"
-
-msgid "Get File"
-msgstr "Отриманн� файлу"
-
-msgid "Games"
-msgstr "Ігри"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Доповненн�"
-
-msgid "Send Buddy List"
-msgstr "�аді�лати перелік контактів"
-
-msgid "ICQ Direct Connect"
-msgstr "Пр�ме з'єднанн� ICQ"
-
-msgid "AP User"
-msgstr "Кори�тувач AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "�ігілі�т"
-
-msgid "ICQ Server Relay"
-msgstr "Транзитний �ервер ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Старий ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Кодуванн� Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Безпека увімкнена"
-
-msgid "Video Chat"
-msgstr "Відеобалачка"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Живе відео"
-
-msgid "Camera"
-msgstr "Камера"
-
-msgid "Screen Sharing"
-msgstr "Спільний екран"
-
 msgid "Free For Chat"
 msgstr "Готовий до балачки"
 
@@ -7259,15 +7202,6 @@ msgstr "�а роботі"
 msgid "At lunch"
 msgstr "Обідаю"
 
-msgid "IP Address"
-msgstr "IP �дре�а"
-
-msgid "Warning Level"
-msgstr "Рівень попередженн�"
-
-msgid "Buddy Comment"
-msgstr "Коментар кори�тувача"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "�е вдаєть�� з'єднати�ь з �ервером автентифікації: %s"
@@ -7363,17 +7297,6 @@ msgstr "Пароль відправлено"
 msgid "Unable to initialize connection"
 msgstr "�е вдаєть�� розпочати з'єднанн�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Будь ла�ка, авторизуйте мене, щоб � міг додати ва� до �вого переліку "
-"контактів."
-
-msgid "No reason given."
-msgstr "Причина не вказана."
-
-msgid "Authorization Denied Message:"
-msgstr "Повідомленн� відмови у авторизації:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7511,60 +7434,13 @@ msgstr[0] "Ви не отримали %hu повідомленн� від %s, з
 msgstr[1] "Ви не отримали %hu повідомленн� від %s, з невідомої причини."
 msgstr[2] "Ви не отримали %hu повідомлень від %s, з невідомої причини."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Відомо�ті про кори�тувача недо�тупні: %s"
-
-msgid "Online Since"
-msgstr "У мережі з"
-
-msgid "Member Since"
-msgstr "Член з"
-
-msgid "Capabilities"
-msgstr "Можливо�ті"
-
 msgid "Your AIM connection may be lost."
 msgstr "Ваше з'єднанн� AIM можливо буде розірване."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[�е вдаєть�� відобразити повідомленн� від цього кори�тувача, тому що воно "
-"мі�тить недопу�тимі �имволи.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ва� було від'єднано від кімнати балачки %s."
 
-msgid "Mobile Phone"
-msgstr "Мобільний телефон"
-
-msgid "Personal Web Page"
-msgstr "О�оби�та �торінка тенет"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Додаткові відомо�ті"
-
-msgid "Zip Code"
-msgstr "Поштовий індек�"
-
-msgid "Work Information"
-msgstr "Відомо�ті про роботу"
-
-msgid "Division"
-msgstr "Відділ"
-
-msgid "Position"
-msgstr "По�ада"
-
-msgid "Web Page"
-msgstr "Сторінка тенет"
-
 msgid "Pop-Up Message"
 msgstr "Спливаюче повідомленн�"
 
@@ -7843,8 +7719,8 @@ msgstr "Форматуванн� імені кори�тувача може зм
 msgid "Change Address To:"
 msgstr "Змінити адре�у на:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>ви не очікуєте на авторизацію</i>"
+msgid "you are not waiting for authorization"
+msgstr "ви не очікуєте на авторизацію"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Чи очікуєте авторизацію від на�тупних кори�тувачів"
@@ -7882,6 +7758,14 @@ msgstr "Ð�алаштувати перенаправленнÑ� миттєвих Ð
 msgid "Set Privacy Options..."
 msgstr "В�тановити опції приватно�ті..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Показати _перелік контактів"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Перелік запрошень"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Підтвердити обліковий запи�"
@@ -7898,9 +7782,6 @@ msgstr "Показати контакти, що очікують авторизÐ
 msgid "Search for Buddy by Email Address..."
 msgstr "Шукати кори�тувача за адре�ою ел.пошти..."
 
-msgid "Search for Buddy by Information"
-msgstr "Шукати кори�тувача за відомо�т�ми"
-
 msgid "Use clientLogin"
 msgstr "Викори�товувати clientLogin"
 
@@ -8009,6 +7890,185 @@ msgstr "Черга переповнена"
 msgid "Not while on AOL"
 msgstr "�е тоді, коли у AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Значок кори�тувача"
+
+msgid "Voice"
+msgstr "Голо�"
+
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "Пр�ме миттєве повідомленн�"
+
+#, fuzzy
+msgid "Get File"
+msgstr "�ад�иланн� файлу"
+
+#, fuzzy
+msgid "Games"
+msgstr "��ам�ька"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Перелік контактів"
+
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "Дозволити пр�мі з'єднанн�"
+
+#, fuzzy
+msgid "AP User"
+msgstr "Кори�тувач"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+#, fuzzy
+msgid "ICQ Server Relay"
+msgstr "Сервер каже:"
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+#, fuzzy
+msgid "Security Enabled"
+msgstr "Код безпеки"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "_Відеовиклик"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "Балачка"
+
+#, fuzzy
+msgid "Live Video"
+msgstr " Відео"
+
+#, fuzzy
+msgid "Camera"
+msgstr "Відеокамера"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP �дре�а"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "За�тереженн�"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Коментар кори�тувача:"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Викори�товувати шифруванн�, коли це можливо"
+
+msgid "Mobile Phone"
+msgstr "Мобільний телефон"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "О�оби�тий мобільний"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "�еобов'�зкові відомо�ті:"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "Більше відомо�тей"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Опи�"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Домашн� �торінка"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "У мережі з"
+
+msgid "Member Since"
+msgstr "Член з"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "З'�вив�� в мережі"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "З'�вив�� в мережі"
+
+msgid "Appear Offline"
+msgstr "З'�вив�� поза мережею"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "З'�вив�� поза мережею"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ва� викинули з цього MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Ви можете повторно запитати авторизацію від цих кори�тувачів, клацнувши на "
+"них правою кнопкою миші та вибравши \"Повторний запит авторизації\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Видимий"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Перелік запрошень"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолій"
 
@@ -8188,8 +8248,8 @@ msgid "Your request was rejected."
 msgstr "Ваш запит відхилений."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u потребує перевірки"
+msgid "%u requires verification: %s"
+msgstr "%u потребує перевірки: %s"
 
 msgid "Add buddy question"
 msgstr "Додати питанн� кори�тувача"
@@ -8201,7 +8261,7 @@ msgid "Send"
 msgstr "�аді�лати"
 
 msgid "Invalid answer."
-msgstr "�евірна відповідь."
+msgstr "�еправильна відповідь."
 
 msgid "Authorization denied message:"
 msgstr "Повідомленн� відмови у авторизації:"
@@ -8229,7 +8289,7 @@ msgid "Add buddy"
 msgstr "Додати кори�тувача"
 
 msgid "Invalid QQ Number"
-msgstr "�евірний номер QQ"
+msgstr "�еправильний номер QQ"
 
 msgid "Failed sending authorize"
 msgstr "Помилка над�иланн� запиту на авторизацію"
@@ -8423,7 +8483,7 @@ msgid "Ver"
 msgstr "Вер�і�"
 
 msgid "Invalid name"
-msgstr "�евірне ім'�"
+msgstr "�еправильне ім'�"
 
 msgid "Select icon..."
 msgstr "Вибрати значок..."
@@ -8864,8 +8924,8 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"�і вузол, ні адре�а IP не були налаштовані дл� облікового запи�у Meanwhile %"
-"s. Будь ла�ка, введіть �кій�ь, щоб налаштувати вхід."
+"�і вузол, ні адре�а IP не були налаштовані дл� облікового запи�у Meanwhile "
+"%s. Будь ла�ка, введіть �кій�ь, щоб налаштувати вхід."
 
 msgid "Meanwhile Connection Setup"
 msgstr "В�тановленн� з'єднанн� Meanwhile"
@@ -9516,10 +9576,10 @@ msgid "_More..."
 msgstr "_Більше..."
 
 msgid "Detach From Server"
-msgstr "Розірвати з'єднанн� з �ервером"
+msgstr "Від'єднати�� від �ервера"
 
 msgid "Cannot detach"
-msgstr "�е вдаєть�� розірвати з'єднанн�"
+msgstr "�е вдаєть�� від'єднати��"
 
 msgid "Cannot set topic"
 msgstr "�е вдаєть�� в�тановити тему"
@@ -9696,7 +9756,7 @@ msgstr "Ваш поточний на�трій"
 
 #, c-format
 msgid "Normal"
-msgstr "�ормально"
+msgstr "Звичайний"
 
 msgid ""
 "\n"
@@ -10172,10 +10232,10 @@ msgid "Proxy"
 msgstr "Прок�і"
 
 msgid "Auth User"
-msgstr "�втентифікаці� кори�тувача"
+msgstr "Кори�тувач"
 
 msgid "Auth Domain"
-msgstr "автоматично"
+msgstr "Домен"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;кімната&gt;:  приєднати�� до кімнати балачки мережі Yahoo"
@@ -10258,8 +10318,8 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (повторно) заборонив вам додати �ебе у ваш перелік з на�тупної причини: %"
-"s."
+"%s (повторно) заборонив вам додати �ебе у ваш перелік з на�тупної причини: "
+"%s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -10405,18 +10465,12 @@ msgstr "Вийшов"
 msgid "Not on server list"
 msgstr "�е у переліку �ервера"
 
-msgid "Appear Online"
-msgstr "З'�вив�� в мережі"
-
 msgid "Appear Permanently Offline"
 msgstr "З'�вл�єть�� по�тійно поза мережею"
 
 msgid "Presence"
 msgstr "При�утні�ть"
 
-msgid "Appear Offline"
-msgstr " не у мережі"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�е з'�вл�єть�� по�тійно поза мережею"
 
@@ -10582,7 +10636,7 @@ msgid "Fetching the room list failed."
 msgstr "�е вдаєть�� завантажити перелік кімнат."
 
 msgid "Voices"
-msgstr "Голо�"
+msgstr "Голо�и"
 
 msgid "Webcams"
 msgstr "Веб-камери"
@@ -10973,27 +11027,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "З'єданнн� розірвано іншою програмою на вашому комп'ютері."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Віддалений вузол закрив з'єднанн�."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Сплинув ча� очікуванн� з'єднанн�."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "З'єднанн� відхилене."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "�дре�а вже викори�товуєть��."
 
@@ -11144,6 +11193,10 @@ msgstr ""
 "облікові запи�и з <b>Обл. запи�и->Керуванн� обліковими запи�ами</b> у вікні "
 "переліку контактів"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s хоче додати ва� (%s) до �вого переліку контактів%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Колір тла"
@@ -11400,6 +11453,8 @@ msgstr "Повідомленн� (не обов'�зково)"
 msgid "Edit User Mood"
 msgstr "Редагувати на�трій кори�тувача"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Контакти"
@@ -12150,9 +12205,6 @@ msgstr "підтримка"
 msgid "webmaster"
 msgstr "Розробник �торінки тенет"
 
-msgid "Senior Contributor/QA"
-msgstr "Головний �при�льник та �пеціалі�т з �ко�ті"
-
 msgid "win32 port"
 msgstr "порт win32"
 
@@ -12178,6 +12230,9 @@ msgstr "початковий автор"
 msgid "lead developer"
 msgstr "головний розробник"
 
+msgid "Senior Contributor/QA"
+msgstr "Головний �при�льник та �пеціалі�т з �ко�ті"
+
 msgid "Afrikaans"
 msgstr "�фрікан�"
 
@@ -12430,12 +12485,12 @@ msgid ""
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s - це клієнт обміну миттєвими повідомленн�ми, �кий о�нований на libpurple, "
-"що здатна з'єднувати�ь з багатьма по�лугами миттєвих повідомлень одноча�но. %"
-"s напи�аний на C, за�то�овуючи GTK+. %s виданий та може змінювати�� і "
+"що здатна з'єднувати�ь з багатьма по�лугами миттєвих повідомлень одноча�но. "
+"%s напи�аний на C, за�то�овуючи GTK+. %s виданий та може змінювати�� і "
 "розпов�юджувати�� у відповідно�ті з ліцензією GPL вер�ії 2 (або новіша).  "
 "Копі� GPL по�тачаєть�� з %s.  �втор�ьке право на %s належить його "
 "розробникам, перелік �ких теж по�тачаєть�� з %s. Будь-�кі гарантії на %s не "
@@ -12978,15 +13033,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Ви дій�но хочете назавжди видалити журнал розмов у %s, що розпочали�� о %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Чи дій�но хочете назавжди видалити �и�темний журнал, що розпочатий о %s?"
 
@@ -13518,6 +13573,9 @@ msgstr "Транзитний �ервер (TURN)"
 msgid "_TURN server:"
 msgstr "Сервер _TURN:"
 
+msgid "_UDP Port:"
+msgstr "Порт _UDP:"
+
 msgid "Use_rname:"
 msgstr "_Ім'� кори�тувача:"
 
@@ -13539,6 +13597,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Типовий �тільниці"
 
@@ -13557,6 +13620,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Інший"
 
@@ -13641,11 +13712,11 @@ msgstr "Вибір звуку"
 
 #, c-format
 msgid "Quietest"
-msgstr "�айтихше"
+msgstr "�айтихіше"
 
 #, c-format
 msgid "Quieter"
-msgstr "Тихше"
+msgstr "Тихіше"
 
 #, c-format
 msgid "Quiet"
@@ -14087,8 +14158,8 @@ msgstr "немає"
 msgid "Small"
 msgstr "Маленький"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Менша вер�і� типових у�мішок"
+msgid "Smaller versions of the default smileys"
+msgstr "Менші вер�ії типових у�мішок"
 
 msgid "Response Probability:"
 msgstr "Можливі�ть відповіді:"
@@ -15117,6 +15188,9 @@ msgstr "_При�трій"
 msgid "Voice/Video Settings"
 msgstr "�алаштуванн� голо�у та відео"
 
+msgid "Voice and Video Settings"
+msgstr "�алаштуванн� голо�у та відео"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15245,7 +15319,7 @@ msgstr "�аді�лати та отримати �ирі р�дки XMPP."
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Додаток кори�ний дл� зневадженн� �ерверів або клієнтів XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15269,7 +15343,7 @@ msgstr "О�новні файли Pidgin та dll"
 
 #. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr "Створити запи� у меню \"Пу�к\" дл� Pidgin"
+msgstr "Створити запи� у меню 'Пу�к' дл� Pidgin"
 
 #. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
@@ -15306,8 +15380,8 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 "Помилка в�тановленн� перевірки правопи�у ($R3).$\\rЯкщо �проби будуть "
 "марними, дивіть�� довідку по ручному в�тановленню на http://developer.pidgin."
@@ -15387,3 +15461,21 @@ msgstr "Відвідати �торінку тенет Pidgin"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Ви не маєте права на видаленн� цієї програми."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Термін дії �ертифікату закінчив�� і його не �лід вважати дій�ним."
+
+#~ msgid "_UDP:"
+#~ msgstr "_UDP:"
+
+#~ msgid "_TCP:"
+#~ msgstr "_TCP:"
+
+#~ msgid "_TLS:"
+#~ msgstr "_TLS:"
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Потребує SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Приму�ово �тарий (порт 5223) SSL"
diff --git a/po/ur.po b/po/ur.po
index 3b1630b7fa..018e67eeba 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Urdu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-11-14 14:00+0530\n"
 "Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
 "Language-Team: C-DAC,Gist,Urdu Team / BharateeyaOO.o <info.gist@cdac.in / "
@@ -545,7 +545,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "میزبان كا نام"
 
@@ -815,7 +814,7 @@ msgstr "سیٹ اپ "
 msgid "Waiting for transfer to begin"
 msgstr "ٹرانس�ر �ونے کے لئے انتظار کرر�ا �ے"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr " منسوخ کیا گیا"
 
 msgid "Failed"
@@ -1756,7 +1755,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4854,11 +4855,19 @@ msgid "Domain"
 msgstr "رومینیائی"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "مطلوب�  TLS"
+msgid "Require encryption"
+msgstr "مطلوب� اتھورائزیشن "
 
-msgid "Force old (port 5223) SSL"
-msgstr "�ورس پرانا (پورٹ 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%sغیر دستیاب کے لئے صار� معلومات"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "رابط� دوبار� سیٹ كیا گیا"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ان اینکریپٹیڈ پر ساد� متن authکی اجازت دیں"
@@ -6151,7 +6160,7 @@ msgid "The two PINs you entered do not match."
 msgstr "نیا خ�ی� ل�ظ میل ن�یں کھاتا۔"
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر �ے۔"
 
 msgid ""
@@ -6258,10 +6267,6 @@ msgid "Connecting..."
 msgstr "کنیکٹ کرر�ا �ے"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر �ے۔"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر �ے۔"
 
@@ -7160,6 +7165,15 @@ msgstr "سرور ایڈریس"
 msgid "Server port"
 msgstr "سرور پورٹ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "برا� کرم مجھے اتھورائز کریں تاک� میں آپ کو بڈی لسٹ میں شامل کر سکوں۔"
+
+msgid "No reason given."
+msgstr "کوئی وج� ن�یں دی گئی۔"
+
+msgid "Authorization Denied Message:"
+msgstr "اتھورائزیشن انکار کیا گيا پیام:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا �ے۔"
@@ -7194,6 +7208,23 @@ msgstr ""
 msgid "Error requesting %s"
 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اكاؤنٹ كےلیے ایڈوانسڈاكاؤنٹ آپشن میں مختص كرسكتے�یں۔)"
+
+#, 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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "كنیكٹ ن�یں �وسكا"
@@ -7432,95 +7463,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "�ائل%s%s�ے، جو %s كی سب سے زیاد� سائز سے بڑی �ے۔"
 
-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اكاؤنٹ كےلیے ایڈوانسڈاكاؤنٹ آپشن میں مختص كرسكتے�یں۔)"
-
-#, 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 ""
-
-# msgstr "(پیام موصول �ونے میں خامی تھی۔  جس بڈی سے آپ بات کرر�ے تھے ب�ت حد تک قیاس �ے ک� کلائنٹ بگی تھا۔)"
-#. Label
-msgid "Buddy Icon"
-msgstr "بڈی آئیکن"
-
-msgid "Voice"
-msgstr "آواز"
-
-msgid "AIM Direct IM"
-msgstr "AIM برا� راست IM"
-
-msgid "Get File"
-msgstr "�ائل لو"
-
-msgid "Games"
-msgstr "کھیل"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "ایڈ - انس"
-
-msgid "Send Buddy List"
-msgstr "بڈی ��رست بھیجو"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ برا� راست کنیکٹ"
-
-msgid "AP User"
-msgstr "APصار�"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQسرور ری لے"
-
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "ٹری لیئن اینکریپشن"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "�پ ٹاپ"
-
-msgid "Security Enabled"
-msgstr "ح�اظتی قابل کی گئی"
-
-msgid "Video Chat"
-msgstr "وڈیو گ�تگو"
-
-msgid "iChat AV"
-msgstr " iگ�تگو AV"
-
-msgid "Live Video"
-msgstr "جاری ویڈیو"
-
-msgid "Camera"
-msgstr "کیمر�"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "اسکرین کا نام"
-
 msgid "Free For Chat"
 msgstr "گ�تگو کے لئے �ری"
 
@@ -7556,15 +7498,6 @@ msgstr "نیٹ ورک"
 msgid "At lunch"
 msgstr "كھانے كے لیے با�ر"
 
-msgid "IP Address"
-msgstr "IP ایڈریس"
-
-msgid "Warning Level"
-msgstr "آگ�ی سطح"
-
-msgid "Buddy Comment"
-msgstr "بڈی رائے"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7670,15 +7603,6 @@ msgstr "خ�ی� ل�ظ بھیجا"
 msgid "Unable to initialize connection"
 msgstr " كنیكشن كی شروعات نا ممكن"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "برا� کرم مجھے اتھورائز کریں تاک� میں آپ کو بڈی لسٹ میں شامل کر سکوں۔"
-
-msgid "No reason given."
-msgstr "کوئی وج� ن�یں دی گئی۔"
-
-msgid "Authorization Denied Message:"
-msgstr "اتھورائزیشن انکار کیا گيا پیام:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7789,60 +7713,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] " آپ نے نا معلوم وج� کےلئے %2$sسے%1$hu پیام مس کردیا ۔"
 msgstr[1] " آپ نے نا معلوم وج� کےلئے %2$sسے%1$hu پیامات مس کردیئے ۔"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "صار� معلومات دستیاب  ن�یں: %s"
-
-msgid "Online Since"
-msgstr "آن لائن جب تک "
-
-msgid "Member Since"
-msgstr "ممبر جب تک"
-
-msgid "Capabilities"
-msgstr "صلاحیتیں"
-
 msgid "Your AIM connection may be lost."
 msgstr "آپ کا AIM کنیکشن کھو گیا۔"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[اس صار� سے پیام ڈسپلے کرنے میں ناقابل کیونک�  ی� غیر معتبر ال�اظ سے وابست� "
-"Û�Û’Û”]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "آپ کمر� گ�تگو%sسے منقطع کئے جا چکے �یں۔"
 
-msgid "Mobile Phone"
-msgstr "موبائل �ون"
-
-msgid "Personal Web Page"
-msgstr "ذاتی ویب پیج"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "اضا�ی معلومات"
-
-msgid "Zip Code"
-msgstr "Zip Ú©ÙˆÚˆ"
-
-msgid "Work Information"
-msgstr "کام کی معلومات"
-
-msgid "Division"
-msgstr "تقسیم"
-
-msgid "Position"
-msgstr "حالت"
-
-msgid "Web Page"
-msgstr "  ویب پیج"
-
 msgid "Pop-Up Message"
 msgstr "پاپ - اپ پیام"
 
@@ -8128,7 +8005,8 @@ msgstr "اسکرین نام �ارمیٹینگ  تبدیل کر سکتا �ے ص
 msgid "Change Address To:"
 msgstr "کو ایڈریس تبدیل کرو:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>آپ اتھورائزیشن کے لئۓ انتظار ن�یں کرر�ے �یں</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8171,6 +8049,14 @@ msgstr "وضع IMآگے بڑھ ر�ا �ے (URL)"
 msgid "Set Privacy Options..."
 msgstr "پرائوسی آپشن سیٹ كریں۔۔۔"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "بڈّی ��رست دکھاؤ"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "��رست مدعو کرو"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "اکاؤنٹ کی تصدیق کریں"
@@ -8187,9 +8073,6 @@ msgstr "بڈیز انتظار اتھورائزیشن دکھاؤ"
 msgid "Search for Buddy by Email Address..."
 msgstr "دوست كے لیے Emailایڈریس سے تلاش كریں۔۔۔"
 
-msgid "Search for Buddy by Information"
-msgstr "معلومات کے ذریعے بڈی کے لئے تلاش کریں"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "صار� لاگڈ ان ن�یں"
@@ -8300,6 +8183,167 @@ msgstr "قطار �ل"
 msgid "Not while on AOL"
 msgstr "AOLکے دوران ن�یں"
 
+# msgstr "(پیام موصول �ونے میں خامی تھی۔  جس بڈی سے آپ بات کرر�ے تھے ب�ت حد تک قیاس �ے ک� کلائنٹ بگی تھا۔)"
+#. Label
+msgid "Buddy Icon"
+msgstr "بڈی آئیکن"
+
+msgid "Voice"
+msgstr "آواز"
+
+msgid "AIM Direct IM"
+msgstr "AIM برا� راست IM"
+
+msgid "Get File"
+msgstr "�ائل لو"
+
+msgid "Games"
+msgstr "کھیل"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "ایڈ - انس"
+
+msgid "Send Buddy List"
+msgstr "بڈی ��رست بھیجو"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ برا� راست کنیکٹ"
+
+msgid "AP User"
+msgstr "APصار�"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQسرور ری لے"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ٹری لیئن اینکریپشن"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "�پ ٹاپ"
+
+msgid "Security Enabled"
+msgstr "ح�اظتی قابل کی گئی"
+
+msgid "Video Chat"
+msgstr "وڈیو گ�تگو"
+
+msgid "iChat AV"
+msgstr " iگ�تگو AV"
+
+msgid "Live Video"
+msgstr "جاری ویڈیو"
+
+msgid "Camera"
+msgstr "کیمر�"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "اسکرین کا نام"
+
+msgid "IP Address"
+msgstr "IP ایڈریس"
+
+msgid "Warning Level"
+msgstr "آگ�ی سطح"
+
+msgid "Buddy Comment"
+msgstr "بڈی رائے"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "صار� معلومات دستیاب  ن�یں: %s"
+
+msgid "Mobile Phone"
+msgstr "موبائل �ون"
+
+msgid "Personal Web Page"
+msgstr "ذاتی ویب پیج"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "اضا�ی معلومات"
+
+msgid "Zip Code"
+msgstr "Zip Ú©ÙˆÚˆ"
+
+msgid "Work Information"
+msgstr "کام کی معلومات"
+
+msgid "Division"
+msgstr "تقسیم"
+
+msgid "Position"
+msgstr "حالت"
+
+msgid "Web Page"
+msgstr "  ویب پیج"
+
+msgid "Online Since"
+msgstr "آن لائن جب تک "
+
+msgid "Member Since"
+msgstr "ممبر جب تک"
+
+msgid "Capabilities"
+msgstr "صلاحیتیں"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "آن لائن ظا�ر کرو"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "آن لائن ظا�ر کرو"
+
+msgid "Appear Offline"
+msgstr "اپیئر آ� لائن"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "اپیئر آ� لائن"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "آپ  کو%s: (%s)کے ذریعے ٹھوکر ماری گئی۔"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"آپ ان بڈیز سے اتھورائزیشن کو دوبار� - درخواست کر سکتے �یں ان رائٹ- کلیک "
+"کرکےاور منتخب کرکے/\"دوبار�- درخواست اتھورائزیشن۔/\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "اوجھل"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "��رست مدعو کرو"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "برج دلو"
 
@@ -8501,7 +8545,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "مطلوب� اتھورائزیشن "
 
 #, fuzzy
@@ -10788,18 +10832,12 @@ msgstr "با�ر نکل گیا"
 msgid "Not on server list"
 msgstr "سرور ��رست پر ن�یں"
 
-msgid "Appear Online"
-msgstr "آن لائن ظا�ر کرو"
-
 msgid "Appear Permanently Offline"
 msgstr "اپیئر مستقل آ� لائن"
 
 msgid "Presence"
 msgstr "حاضری"
 
-msgid "Appear Offline"
-msgstr "اپیئر آ� لائن"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "مستقل آ�سلائن اپیئر مت کرو"
 
@@ -11356,27 +11394,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "ریموٹ صار� نے كنیكشن بندكردیا۔"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "كنیكشن ٹائم ختم!"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "رابط� دوبار� سیٹ كیا گیا"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "ی� گ�تگو نام پ�لے سے استعمال میں"
 
@@ -11524,6 +11561,12 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s ملانا چا�تے �یں اس �ولڈر كو %s ملانے كے لیے اس كے یا اس كی بڈی "
+"��رست كو %s%s"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11815,6 +11858,8 @@ msgstr "عر�یت رابط�"
 msgid "Edit User Mood"
 msgstr "صار� موڈس"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -12613,9 +12658,6 @@ msgstr "تعاون"
 msgid "webmaster"
 msgstr "تکمیل کار  اور ویب ماسٹر"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "ون32پورٹ"
 
@@ -12641,6 +12683,9 @@ msgstr "اصل مصن�"
 msgid "lead developer"
 msgstr "لیڈ تکمیل کار"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14048,6 +14093,10 @@ msgid "_TURN server:"
 msgstr "ST_UNسرور:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_ پورٹ:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_ صار� کا نام:"
 
@@ -14070,6 +14119,11 @@ msgstr "موزیلا"
 msgid "Konqueror"
 msgstr "�اتح"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "ـڈی�الٹس قبول كریں"
@@ -14089,6 +14143,14 @@ msgstr "آتشی پرند�"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "مینیوول"
 
@@ -14705,7 +14767,7 @@ msgstr "(ÙƒÚ†Ú¾ Ù†Û�ÙŠÚº )"
 msgid "Small"
 msgstr "ای- میل"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -15797,6 +15859,10 @@ msgstr "ڈیوائس"
 msgid "Voice/Video Settings"
 msgstr "سیٹینگس مرتب كیجیے۔"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "سیٹینگس مرتب كیجیے۔"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15926,7 +15992,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16058,6 +16124,27 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "مطلوب�  TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "�ورس پرانا (پورٹ 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر �ے۔"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[اس صار� سے پیام ڈسپلے کرنے میں ناقابل کیونک�  ی� غیر معتبر ال�اظ سے "
+#~ "وابست� �ے۔]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "معلومات کے ذریعے بڈی کے لئے تلاش کریں"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "مخصوص کیا گيا اسکرین نام معتبرن�یں �ے۔"
 
@@ -16570,9 +16657,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "رابط� بند�وا(لكھ ر�ا �ے)"
 
-#~ msgid "Connection reset"
-#~ msgstr "رابط� دوبار� سیٹ كیا گیا"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "ساكیٹ سےخامی پڑھ ر�ا�ے:%s"
 
@@ -16800,7 +16884,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "لکھنے کے لئے %s کھول ن�یں سکا!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "�ائل ٹرانس�ر ناکام �وا؛یا ممکن �ے دوسری حانب منسوخ �وا �ے۔"
 
 #~ msgid "Could not connect for transfer."
@@ -16825,9 +16909,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOCپروٹو کول پلگ ان"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%sغیر دستیاب کے لئے صار� معلومات"
-
 #~ msgid "%s Options"
 #~ msgstr "%sآپشنس"
 
diff --git a/po/vi.po b/po/vi.po
index 1ec3774c9b..113b2772d2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2010-03-12 17:32+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -529,7 +529,6 @@ msgstr "Xác nhận xoá chứng nhận"
 msgid "Certificate Manager"
 msgstr "Bộ Quản lý Chứng nhận"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Tên máy"
 
@@ -805,7 +804,7 @@ msgstr "Dừng"
 msgid "Waiting for transfer to begin"
 msgstr "�ợi bắt đầu truy�n"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Bị thôi"
 
 msgid "Failed"
@@ -1695,7 +1694,10 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 "Chứng nhận này đã hết hạn sử dụng thì không nên được thấy là vẫn hợp lệ."
 
@@ -4754,11 +4756,20 @@ msgstr "Phần bổ sung giao thức XMPP"
 msgid "Domain"
 msgstr "Mi�n"
 
-msgid "Require SSL/TLS"
-msgstr "Cần thiết SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Cần thiết sự cho phép"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Buộc dùng SSL cũ (cổng 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Không có sẵn thông tin v� ngư�i dùng %s:"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Quá hạn tạo kết nối"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Cho phép xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
@@ -5940,7 +5951,8 @@ msgstr "Mã PIN này không phải đúng. Nó chỉ nên chứa chữ số [0-9
 msgid "The two PINs you entered do not match."
 msgstr "Bạn đã gõ hai mã PIN không trùng."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Bạn đã gõ một tên không đúng."
 
 msgid ""
@@ -6033,10 +6045,6 @@ msgstr ""
 msgid "Connecting..."
 msgstr "�ang kết nối..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Bạn đã gõ một tên không đúng."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Bạn đã gõ một mã PIN có chi�u dài không đúng [7-10]."
 
@@ -6887,6 +6895,15 @@ msgstr "�ịa chỉ máy phục vụ"
 msgid "Server port"
 msgstr "Cổng máy phục vụ"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Xin hãy cho phép tôi để tôi có thể thêm bạn vào danh sách bạn bè."
+
+msgid "No reason given."
+msgstr "Không nêu lý do."
+
+msgid "Authorization Denied Message:"
+msgstr "Thông điệp từ chối cho phép:"
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Nhận được đáp ứng bất thư�ng từ %s: %s"
@@ -6922,6 +6939,24 @@ msgstr "AOL không cho phép tên màn hình xác thực ở đây"
 msgid "Error requesting %s"
 msgstr "Gặp lỗi khi yêu cầu %s: %s"
 
+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 ""
+"(Gặp lỗi khi nhận tin này. Bạn chát với h� bạn đang nói chuyện rất có thể sử "
+"dụng bảng mã khác với đi�u mong đợi. Biết bảng mã đó thì bạn ghi rõ nó trong "
+"các tùy ch�n tài khoản cấp cao cho tài khoản AIM/ICQ của bạn.)"
+
+#, 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ó lỗi khi nhận tin này. Hoặc bạn và %s đã ch�n các bảng mã khác nhau, hoặc "
+"%s chạy trình khách bị lỗi.)"
+
 msgid "Could not join chat room"
 msgstr "Không thể tham gia phòng trò chuyện"
 
@@ -7138,97 +7173,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Tập tin %s là %s mà lớn hơn kích cỡ tối đa %s."
 
-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 ""
-"(Gặp lỗi khi nhận tin này. Bạn chát với h� bạn đang nói chuyện rất có thể sử "
-"dụng bảng mã khác với đi�u mong đợi. Biết bảng mã đó thì bạn ghi rõ nó trong "
-"các tùy ch�n tài khoản cấp cao cho tài khoản AIM/ICQ của bạn.)"
-
-#, 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ó lỗi khi nhận tin này. Hoặc bạn và %s đã ch�n các bảng mã khác nhau, hoặc "
-"%s chạy trình khách bị lỗi.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Biểu tượng bạn chát"
-
-msgid "Voice"
-msgstr "Nói"
-
-msgid "AIM Direct IM"
-msgstr "Nhắn tin nhanh trực tiếp AIM"
-
-msgid "Get File"
-msgstr "Lấy tập tin"
-
-msgid "Games"
-msgstr "Trò chơi"
-
-# Tên
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Phần bổ trợ"
-
-msgid "Send Buddy List"
-msgstr "Gửi danh sách bạn bè"
-
-msgid "ICQ Direct Connect"
-msgstr "Kết nối trực tiếp ICQ"
-
-msgid "AP User"
-msgstr "Ngư�i dùng AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-# Name or function? Tên hay hàm?
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Chuyển tiếp máy phục vụ ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "UTF-8 ICQ cũ"
-
-msgid "Trillian Encryption"
-msgstr "Mật mã Trillian"
-
-msgid "ICQ UTF8"
-msgstr "UTF-8 ICQ"
-
-# Tên thiết bị.
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Bật bảo mật"
-
-msgid "Video Chat"
-msgstr "Trò chuyện ảnh động"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Ảnh động trực tiếp"
-
-msgid "Camera"
-msgstr "Máy ảnh"
-
-msgid "Screen Sharing"
-msgstr "Chia sẻ màn hình"
-
 msgid "Free For Chat"
 msgstr "Rảnh rỗi để Chát"
 
@@ -7259,15 +7203,6 @@ msgstr "Ở chỗ làm"
 msgid "At lunch"
 msgstr "Ä‚n trÆ°a"
 
-msgid "IP Address"
-msgstr "�ịa chỉ IP"
-
-msgid "Warning Level"
-msgstr "Mức cảnh báo"
-
-msgid "Buddy Comment"
-msgstr "Chú thích bạn chát"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Không thể kết nối tới máy phục vụ xác thực: %s"
@@ -7362,15 +7297,6 @@ msgstr "�ã gửi mật khẩu"
 msgid "Unable to initialize connection"
 msgstr "Không thể khởi tạo kết nối"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Xin hãy cho phép tôi để tôi có thể thêm bạn vào danh sách bạn bè."
-
-msgid "No reason given."
-msgstr "Không nêu lý do."
-
-msgid "Authorization Denied Message:"
-msgstr "Thông điệp từ chối cho phép:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7476,60 +7402,13 @@ 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] "Bạn không nhận được %hu tin nhẳn từ %s do lỗi chưa xác định."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Không có sẵn thông tin v� ngư�i dùng %s:"
-
-msgid "Online Since"
-msgstr "�ã kết nối từ"
-
-msgid "Member Since"
-msgstr "Là thành viên từ"
-
-msgid "Capabilities"
-msgstr "Khả năng"
-
 msgid "Your AIM connection may be lost."
 msgstr "Bạn có thể đã bị ngắt kết nối với AIM"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Không thể hiển thị tin nhẳn từ ngư�i dùng này vì nó chứa ký tự hợp lệ hợp "
-"lệ.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Bạn đã bị ngắt kết nối với phòng Chat %s."
 
-msgid "Mobile Phone"
-msgstr "�iện thoại đi động"
-
-msgid "Personal Web Page"
-msgstr "Trang web cá nhân"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Thông tin thêm"
-
-msgid "Zip Code"
-msgstr "Mã bưu điện"
-
-msgid "Work Information"
-msgstr "Thông tin v� công việc"
-
-msgid "Division"
-msgstr "Bộ phận"
-
-msgid "Position"
-msgstr "Chức vụ"
-
-msgid "Web Page"
-msgstr "Trang Web"
-
 msgid "Pop-Up Message"
 msgstr "Thông điệp tự mở"
 
@@ -7792,7 +7671,8 @@ msgstr "�ịnh dạng cho tên ngư�i dùng chỉ đổi chữ viết hoa và
 msgid "Change Address To:"
 msgstr "�ổi địa chỉ thành:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>bạn không đang ch� sự cho phép</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7831,6 +7711,14 @@ msgstr "Cấu hình chuyển tiếp Nhắn Tin (Web)"
 msgid "Set Privacy Options..."
 msgstr "�ặt tùy ch�n riêng tư..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Hiện danh sách _bạn bè"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Danh sách m�i"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Xác nhận tài khoản"
@@ -7847,9 +7735,6 @@ msgstr "Hiển thị các bạn chát ch� sự cho phép"
 msgid "Search for Buddy by Email Address..."
 msgstr "Tìm kiếm bạn chát theo địa chỉ thư..."
 
-msgid "Search for Buddy by Information"
-msgstr "Tìm kiếm bạn chát theo thông tin"
-
 msgid "Use clientLogin"
 msgstr "Dùng clientLogin"
 
@@ -7959,6 +7844,168 @@ msgstr "Hàng đợi đã đầy"
 msgid "Not while on AOL"
 msgstr "Không phải khi trên AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Biểu tượng bạn chát"
+
+msgid "Voice"
+msgstr "Nói"
+
+msgid "AIM Direct IM"
+msgstr "Nhắn tin nhanh trực tiếp AIM"
+
+msgid "Get File"
+msgstr "Lấy tập tin"
+
+msgid "Games"
+msgstr "Trò chơi"
+
+# Tên
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Phần bổ trợ"
+
+msgid "Send Buddy List"
+msgstr "Gửi danh sách bạn bè"
+
+msgid "ICQ Direct Connect"
+msgstr "Kết nối trực tiếp ICQ"
+
+msgid "AP User"
+msgstr "Ngư�i dùng AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# Name or function? Tên hay hàm?
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Chuyển tiếp máy phục vụ ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "UTF-8 ICQ cũ"
+
+msgid "Trillian Encryption"
+msgstr "Mật mã Trillian"
+
+msgid "ICQ UTF8"
+msgstr "UTF-8 ICQ"
+
+# Tên thiết bị.
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Bật bảo mật"
+
+msgid "Video Chat"
+msgstr "Trò chuyện ảnh động"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Ảnh động trực tiếp"
+
+msgid "Camera"
+msgstr "Máy ảnh"
+
+msgid "Screen Sharing"
+msgstr "Chia sẻ màn hình"
+
+msgid "IP Address"
+msgstr "�ịa chỉ IP"
+
+msgid "Warning Level"
+msgstr "Mức cảnh báo"
+
+msgid "Buddy Comment"
+msgstr "Chú thích bạn chát"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Không có sẵn thông tin v� ngư�i dùng %s:"
+
+msgid "Mobile Phone"
+msgstr "�iện thoại đi động"
+
+msgid "Personal Web Page"
+msgstr "Trang web cá nhân"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Thông tin thêm"
+
+msgid "Zip Code"
+msgstr "Mã bưu điện"
+
+msgid "Work Information"
+msgstr "Thông tin v� công việc"
+
+msgid "Division"
+msgstr "Bộ phận"
+
+msgid "Position"
+msgstr "Chức vụ"
+
+msgid "Web Page"
+msgstr "Trang Web"
+
+msgid "Online Since"
+msgstr "�ã kết nối từ"
+
+msgid "Member Since"
+msgstr "Là thành viên từ"
+
+msgid "Capabilities"
+msgstr "Khả năng"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Hình như trực tuyến"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Hình như trực tuyến"
+
+msgid "Appear Offline"
+msgstr "Hình như ngoại tuyến"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Hình như ngoại tuyến"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Bạn bị đá: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Bạn có thể gửi lại yêu cầu sự cho phép của những bạn chát này bằng cách nhấn "
+"chuột phải vào tên ngư�i đó và ch�n « Yêu cầu lại sự cho phép »."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Hiện rõ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Danh sách m�i"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Bảo Bình"
 
@@ -8137,8 +8184,8 @@ msgstr "Yêu cầu của bạn đã được chấp nhận."
 msgid "Your request was rejected."
 msgstr "Yêu cầu của bạn bị từ chối."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u cần thiết sự thẩm tra"
 
 msgid "Add buddy question"
@@ -10365,18 +10412,12 @@ msgstr "�i ra ngoài"
 msgid "Not on server list"
 msgstr "Không có trong danh sách máy phục vụ"
 
-msgid "Appear Online"
-msgstr "Hình như trực tuyến"
-
 msgid "Appear Permanently Offline"
 msgstr "Hình như ngoại tuyến b�n bỉ"
 
 msgid "Presence"
 msgstr "Có mặt"
 
-msgid "Appear Offline"
-msgstr "Hình như ngoại tuyến"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Không hình như ngoại tuyến bên bỉ"
 
@@ -10914,27 +10955,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Kết nối bị ngắt bởi phần m�m khác trên máy tính này."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Máy ở xa đã đóng kết nối."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Quá hạn tạo kết nối"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Kết nối bị từ chối."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "�ịa chỉ vẫn còn được dùng."
 
@@ -11083,6 +11119,10 @@ msgstr ""
 "Bạn vẫn có thể trở v� cửa sổ này để thêm, chỉnh sửa hay gỡ b� tài khoản, sử "
 "dụng mục <b>Tài khoản > Quản lý Tài khoản</b> trong cửa sổ Danh sách Bạn chát"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s muốn thêm %s vào danh sách bạn bè của h�%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Màu n�n"
@@ -11336,6 +11376,8 @@ msgstr "Thông điệp (tùy ch�n)"
 msgid "Edit User Mood"
 msgstr "Sửa tâm trạng ngư�i dùng"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Bạn chát"
@@ -12079,9 +12121,6 @@ msgstr "hỗ trợ"
 msgid "webmaster"
 msgstr "chủ Web"
 
-msgid "Senior Contributor/QA"
-msgstr "Ngư�i đóng góp cấp cao/ tin chắc chất lượng"
-
 msgid "win32 port"
 msgstr "bản cho win32"
 
@@ -12107,6 +12146,9 @@ msgstr "tác giả đầu tiên"
 msgid "lead developer"
 msgstr "nhà phát triển lãnh đạo"
 
+msgid "Senior Contributor/QA"
+msgstr "Ngư�i đóng góp cấp cao/ tin chắc chất lượng"
+
 msgid "Afrikaans"
 msgstr "Tiếng Hoà Nam Phi"
 
@@ -13449,6 +13491,10 @@ msgstr "Máy phục vụ tiếp lại (TURN)"
 msgid "_TURN server:"
 msgstr "Máy phục vụ _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Cổng:"
+
 msgid "Use_rname:"
 msgstr "Tên ngư�i _dùng:"
 
@@ -13475,6 +13521,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Mặc định môi trư�ng"
 
@@ -13497,6 +13548,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Bằng tay"
 
@@ -14027,7 +14086,8 @@ msgstr "không có"
 msgid "Small"
 msgstr "Nh�"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Phiên bản nh� của các hình cư�i mặc định"
 
 msgid "Response Probability:"
@@ -15058,6 +15118,10 @@ msgstr "Thiết _bị"
 msgid "Voice/Video Settings"
 msgstr "Thiết lập Thoại/Phim"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Thiết lập Thoại/Phim"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15189,7 +15253,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Phần bổ sung này có ích để gỡ lỗi máy phục vụ hay trình khách kiểu XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15319,6 +15383,25 @@ msgstr ""
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Cần thiết SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Buộc dùng SSL cũ (cổng 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Bạn đã gõ một tên không đúng."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Không thể hiển thị tin nhẳn từ ngư�i dùng này vì nó chứa ký tự hợp lệ "
+#~ "hợp lệ.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Tìm kiếm bạn chát theo thông tin"
+
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Chứng nhận này chưa hợp lệ."
 
diff --git a/po/xh.po b/po/xh.po
index a8f37e884a..99c5b89d40 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2005-03-23 12:21+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -561,7 +561,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "iFani:"
@@ -843,7 +842,7 @@ msgstr "I-Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Ulindele ukuba ukudlulisa kuqalise"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "IRhoxisiwe"
 
 msgid "Failed"
@@ -1805,7 +1804,9 @@ msgid ""
 "are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4972,12 +4973,20 @@ msgstr "Imithetho yokuSebenza kuNgeniso lweMSN"
 msgid "Domain"
 msgstr "IsiRomania"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Isicelo soGunyaziso"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Sebenzisa iTLS ukuba iyafumaneka"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "UkuNyanzela iSSL eNdala"
+msgid "Connection security"
+msgstr "Unxibelelwano luvaliwe"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Vumela umbhalo ocacileyo ngaphezu kwemijelo entsonkothileyo"
@@ -6325,7 +6334,7 @@ msgid "The two PINs you entered do not match."
 msgstr "Ii-password ezintsha azingqamani."
 
 #, fuzzy
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
 msgid ""
@@ -6433,10 +6442,6 @@ msgid "Connecting..."
 msgstr "Ukunxulumana"
 
 #, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "Ulungiselelo olutsha alusebenzi."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
@@ -7355,6 +7360,15 @@ msgstr "Idilesi yeseva"
 msgid "Server port"
 msgstr "Isiqhagamshelisi seseva"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Nceda undigunyazise ukuze ndikongeze kuluhlu lwam lobuhlobo."
+
+msgid "No reason given."
+msgstr "Akukho sizathu sinikiweyo."
+
+msgid "Authorization Denied Message:"
+msgstr "Umyalezo wokuLandula uGunyaziso:"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Impendulo engasebenziyo evela kwiseva."
@@ -7389,6 +7403,21 @@ msgstr ""
 msgid "Error requesting %s"
 msgstr "Impazamo yokudala unxibelelwano"
 
+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 ""
+
+#, 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 ""
+"(Kubekho impazamo ukufumana lo myalelzo.  Umhlobo othetha naye mhlawumbe "
+"unomboneleli wenkonzo onesiphene.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Akukwazeki ukunxulumana"
@@ -7631,92 +7660,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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 ""
-"(Kubekho impazamo ukufumana lo myalelzo.  Umhlobo othetha naye mhlawumbe "
-"unomboneleli wenkonzo onesiphene.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "UmFanekiso ongumQondiso womHlobo"
-
-msgid "Voice"
-msgstr "Ilizwi"
-
-msgid "AIM Direct IM"
-msgstr "I-AIM iLawula i-IM"
-
-msgid "Get File"
-msgstr "Fumana iFayili"
-
-msgid "Games"
-msgstr "Imidlalo"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Izongezo"
-
-msgid "Send Buddy List"
-msgstr "Thumela uLuhlu Lobuhlobo"
-
-msgid "ICQ Direct Connect"
-msgstr "Ukunxulumana Ngqo ne-ICQ"
-
-msgid "AP User"
-msgstr "Umsebenzisi we-AP"
-
-msgid "ICQ RTF"
-msgstr "I-ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Umtshabalalisi"
-
-msgid "ICQ Server Relay"
-msgstr "Ukuthumela kweSeva kwi-ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "I-ICQ UTF8 endala"
-
-msgid "Trillian Encryption"
-msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
-
-msgid "ICQ UTF8"
-msgstr "I-ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "I-Hiptop"
-
-msgid "Security Enabled"
-msgstr "Ukhuseleko luvunyelwe ukusebenza"
-
-msgid "Video Chat"
-msgstr "InCoko ngeVidiyo"
-
-msgid "iChat AV"
-msgstr "iNcoko nge-AV"
-
-msgid "Live Video"
-msgstr "IVidiyo eSebenzayo"
-
-msgid "Camera"
-msgstr "Ikhamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "iGama leSkrini"
-
 msgid "Free For Chat"
 msgstr "Ukukhululeka Ukuba ungaNcokola"
 
@@ -7752,15 +7695,6 @@ msgstr "uThungelwano"
 msgid "At lunch"
 msgstr "Akakho Uye Kutya"
 
-msgid "IP Address"
-msgstr "Idilesi ye-IP"
-
-msgid "Warning Level"
-msgstr "Umgangatho wesiLumkiso"
-
-msgid "Buddy Comment"
-msgstr "Izimvo zomHlobo"
-
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe."
@@ -7869,15 +7803,6 @@ msgstr "Ukuthunyelwa kwepassword"
 msgid "Unable to initialize connection"
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Nceda undigunyazise ukuze ndikongeze kuluhlu lwam lobuhlobo."
-
-msgid "No reason given."
-msgstr "Akukho sizathu sinikiweyo."
-
-msgid "Authorization Denied Message:"
-msgstr "Umyalezo wokuLandula uGunyaziso:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7992,60 +7917,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Uphose umyalezo %hu ovela ku %s ngenxa yesizathu esingaziwayo."
 msgstr[1] "Uphose imiyalezo %hu evela ku %s ngenxa yesizathu esingaziwayo."
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "Ulwazi lomsebenzisi alufumaneki kwi: %s"
-
-msgid "Online Since"
-msgstr "Kunxibelelwano ukusuka"
-
-msgid "Member Since"
-msgstr "Lilungu ukusukela"
-
-msgid "Capabilities"
-msgstr "Izakhono"
-
 msgid "Your AIM connection may be lost."
 msgstr "Kunokwenzeka unxibelelwano lwakho no-AIM lulahlekile."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Akukwazeki ukubonisa umyalezo ovela kulo msebenzisi ngenxa yokuba uqulethe "
-"iimpawu ezingasebenziyo.]"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Uqhawuliwe kunxibelelwano negumbi lencoko %s."
 
-msgid "Mobile Phone"
-msgstr "Ifowuni ohamba nayo"
-
-msgid "Personal Web Page"
-msgstr "Iphepha leWebhu ye-intanethi lakho buqu"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Ulwazi olongezelelweyo"
-
-msgid "Zip Code"
-msgstr "Ikhowudi yeNdawo"
-
-msgid "Work Information"
-msgstr "Iinkcukacha ngoMsebenzi"
-
-msgid "Division"
-msgstr "Icandelo"
-
-msgid "Position"
-msgstr "Isikhundla"
-
-msgid "Web Page"
-msgstr "IPhepha leWebhu ye-intanethi"
-
 msgid "Pop-Up Message"
 msgstr "Umyalezo omFutshane oqhashumbayo"
 
@@ -8340,7 +8218,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Tshintsha iDilesi ukuya ku:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>awulindanga ukugunyaziswa</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8384,6 +8263,14 @@ msgstr "Misela iIM iThumela (URL)"
 msgid "Set Privacy Options..."
 msgstr "Bonisa ezongeziweyo ezinokukhethwa"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "uLuhlu lwabaHlobo"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Uluhlu lokuMema"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Qinisekisa i-Akhawunti"
@@ -8403,9 +8290,6 @@ msgstr "Bonisa Abahlobo abaLindele uGunyaziso"
 msgid "Search for Buddy by Email Address..."
 msgstr "Zingela umHlobo nge-Imeyile..."
 
-msgid "Search for Buddy by Information"
-msgstr "Zingela umHlobo ngoLwazi"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Umsebenzisi akangenanga"
@@ -8513,6 +8397,167 @@ msgstr "Ukrozo luzele"
 msgid "Not while on AOL"
 msgstr "Hayi xeshikweni inxulumene ne-AOL"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "UmFanekiso ongumQondiso womHlobo"
+
+msgid "Voice"
+msgstr "Ilizwi"
+
+msgid "AIM Direct IM"
+msgstr "I-AIM iLawula i-IM"
+
+msgid "Get File"
+msgstr "Fumana iFayili"
+
+msgid "Games"
+msgstr "Imidlalo"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Izongezo"
+
+msgid "Send Buddy List"
+msgstr "Thumela uLuhlu Lobuhlobo"
+
+msgid "ICQ Direct Connect"
+msgstr "Ukunxulumana Ngqo ne-ICQ"
+
+msgid "AP User"
+msgstr "Umsebenzisi we-AP"
+
+msgid "ICQ RTF"
+msgstr "I-ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Umtshabalalisi"
+
+msgid "ICQ Server Relay"
+msgstr "Ukuthumela kweSeva kwi-ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "I-ICQ UTF8 endala"
+
+msgid "Trillian Encryption"
+msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
+
+msgid "ICQ UTF8"
+msgstr "I-ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "I-Hiptop"
+
+msgid "Security Enabled"
+msgstr "Ukhuseleko luvunyelwe ukusebenza"
+
+msgid "Video Chat"
+msgstr "InCoko ngeVidiyo"
+
+msgid "iChat AV"
+msgstr "iNcoko nge-AV"
+
+msgid "Live Video"
+msgstr "IVidiyo eSebenzayo"
+
+msgid "Camera"
+msgstr "Ikhamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "iGama leSkrini"
+
+msgid "IP Address"
+msgstr "Idilesi ye-IP"
+
+msgid "Warning Level"
+msgstr "Umgangatho wesiLumkiso"
+
+msgid "Buddy Comment"
+msgstr "Izimvo zomHlobo"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Ulwazi lomsebenzisi alufumaneki kwi: %s"
+
+msgid "Mobile Phone"
+msgstr "Ifowuni ohamba nayo"
+
+msgid "Personal Web Page"
+msgstr "Iphepha leWebhu ye-intanethi lakho buqu"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Ulwazi olongezelelweyo"
+
+msgid "Zip Code"
+msgstr "Ikhowudi yeNdawo"
+
+msgid "Work Information"
+msgstr "Iinkcukacha ngoMsebenzi"
+
+msgid "Division"
+msgstr "Icandelo"
+
+msgid "Position"
+msgstr "Isikhundla"
+
+msgid "Web Page"
+msgstr "IPhepha leWebhu ye-intanethi"
+
+msgid "Online Since"
+msgstr "Kunxibelelwano ukusuka"
+
+msgid "Member Since"
+msgstr "Lilungu ukusukela"
+
+msgid "Capabilities"
+msgstr "Izakhono"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+msgid "Appear Offline"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Ungacela ugunyaziso kwakhona kwaba bahlobo ngokucofa ngasekunene kubo "
+"nokukhetha \"Isicelo soGunyaziso Kwakhona.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Engabonakaliyo"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Uluhlu lokuMema"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8732,7 +8777,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Isicelo soGunyaziso"
 
 #, fuzzy
@@ -11116,10 +11161,6 @@ msgid "Not on server list"
 msgstr "Ayikho kuluhlu lweseva"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Ukubonakala kungekho nxibelelwano"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Ukubonakala kungekho nxibelelwano"
 
@@ -11127,9 +11168,6 @@ msgstr "Ukubonakala kungekho nxibelelwano"
 msgid "Presence"
 msgstr "Ezikhethwayo"
 
-msgid "Appear Offline"
-msgstr "Ukubonakala kungekho nxibelelwano"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Ukubonakala kungekho nxibelelwano"
@@ -11702,27 +11740,26 @@ msgid " (%s)"
 msgstr "Abasebenzisi be %s: %s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Umsebenzisi okude akasekho kuthungelwano"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Ukuphela kweXesha lokuNxulumana"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Unxibelelwano luvaliwe"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Loo fayili sele ikhona"
 
@@ -11874,6 +11911,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -12164,6 +12205,8 @@ msgstr "IsaZiso ngomYalezo"
 msgid "Edit User Mood"
 msgstr "Izimo zomSebenzisi"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Abahlobo"
@@ -13004,9 +13047,6 @@ msgstr "inkxaso"
 msgid "webmaster"
 msgstr "umphuhlisi nomyili wesiza se-inthanethi"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "isiqhagamsheli win32"
 
@@ -13034,6 +13074,9 @@ msgstr "umbhali wentsusa"
 msgid "lead developer"
 msgstr "umphuhlisi ophambili"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -14494,6 +14537,10 @@ msgid "_TURN server:"
 msgstr "_Iseva:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "I_siqhagamsheli:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Igama lomsebenzisi:"
 
@@ -14516,6 +14563,11 @@ msgstr "I-Mozilla"
 msgid "Konqueror"
 msgstr "I-Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Yamkela eziMiselweyo"
@@ -14536,6 +14588,14 @@ msgstr "I-Firebird"
 msgid "Epiphany"
 msgstr "I-Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Uxwebhu lokusebenzisa"
 
@@ -15125,7 +15185,7 @@ msgstr "Nabani na"
 msgid "Small"
 msgstr "I-imeyile"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -16249,6 +16309,10 @@ msgstr "isiXhobo"
 msgid "Voice/Video Settings"
 msgstr "Sebenzisa imiMiselo yokusiNgqongileyo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Sebenzisa imiMiselo yokusiNgqongileyo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -16383,7 +16447,7 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -16516,6 +16580,24 @@ msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "UkuNyanzela iSSL eNdala"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Ulungiselelo olutsha alusebenzi."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Akukwazeki ukubonisa umyalezo ovela kulo msebenzisi ngenxa yokuba "
+#~ "uqulethe iimpawu ezingasebenziyo.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Zingela umHlobo ngoLwazi"
+
+#, fuzzy
 #~ msgid "The certificate is not valid yet."
 #~ msgstr "Ulungiselelo olutsha alusebenzi."
 
@@ -16962,10 +17044,6 @@ msgstr ""
 #~ msgstr "Unxibelelwano luvaliwe"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Unxibelelwano luvaliwe"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Impazamo xeshikweni kufundwa kwi-sokhethi."
 
@@ -17192,7 +17270,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe."
 
@@ -17981,9 +18059,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "ImiThetho yokuSebenza yokuNgenisa iJabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Sebenzisa iTLS ukuba iyafumaneka"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a2c96a4c7d..2dd30398f0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Pidgin 软件包的简体中文翻译。
-# Copyright (C) 2009, 2010 pidgin team.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 02:13-0400\n"
-"PO-Revision-Date: 2010-07-19 19:31+0800\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 16:18+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -519,7 +519,6 @@ msgstr "确认删除�书"
 msgid "Certificate Manager"
 msgstr "�书管�器"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "主机�"
 
@@ -777,7 +776,7 @@ msgstr "�止"
 msgid "Waiting for transfer to begin"
 msgstr "正在等待传�开始"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已�消"
 
 msgid "Failed"
@@ -1647,8 +1646,10 @@ msgid ""
 "are accurate."
 msgstr "�书无效，请检查您计算机的日期和时间。"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "此�书已过期，故�被认为有效。"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "�书已过期，故被视作无效，请检查您计算机的日期和时间。"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1870,7 +1871,7 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "解�器进程在应答请求�退出"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
 msgstr "转� %s 为微代�时出错：%d"
 
@@ -4151,7 +4152,7 @@ msgid "Re-initializing Stream"
 msgstr "�新�始化�"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "�务器�支��蔽"
 
 msgid "Not Authorized"
 msgstr "未认�"
@@ -4444,7 +4445,7 @@ msgstr ""
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr ""
+msgstr "�幕震动"
 
 #, c-format
 msgid "%s has buzzed you!"
@@ -4556,11 +4557,17 @@ msgstr "XMPP �议�件"
 msgid "Domain"
 msgstr "域"
 
-msgid "Require SSL/TLS"
-msgstr "需� SSL/TLS"
+msgid "Require encryption"
+msgstr "需�加密"
+
+msgid "Use encryption if available"
+msgstr "�能时使用加密"
+
+msgid "Use old-style SSL"
+msgstr "使用�� SSL"
 
-msgid "Force old (port 5223) SSL"
-msgstr "强制旧 SSL(5223 端�)"
+msgid "Connection security"
+msgstr "连接安全性"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�许在�加密�上的纯文本验�"
@@ -5269,7 +5276,7 @@ msgid "Send a mobile message."
 msgstr "��移动消�。"
 
 msgid "Page"
-msgstr ""
+msgstr "页�"
 
 msgid "Playing a game"
 msgstr "正在玩游�"
@@ -5326,7 +5333,7 @@ msgid "Allow/Disallow Mobile Pages..."
 msgstr "�许/�止移动寻呼..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "查看被�蔽文本..."
 
 msgid "Open Hotmail Inbox"
 msgstr "打开 Hotmail 收件箱"
@@ -5719,8 +5726,8 @@ msgstr "PIN 无效，它应当�包�数字 [0-9]。"
 msgid "The two PINs you entered do not match."
 msgstr "两次输入的 PIN �相�。"
 
-msgid "The name you entered is invalid."
-msgstr "您输入的姓�密钥无效。"
+msgid "The Display Name you entered is invalid."
+msgstr "您输入的姓�无效。"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5740,9 +5747,8 @@ msgstr "个人资料"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "尚未检索到您的个人资料信�，请���试。"
 
-#, fuzzy
 msgid "Your UID"
-msgstr "您的 MXitID"
+msgstr "您的 UID"
 
 #. pin
 #. pin (required)
@@ -5810,16 +5816,12 @@ msgstr "无法连接到 MXit �务器。请检查您的�务器设置。"
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "您输入的姓�密钥无效。"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "您输入的 PIN 长度无效 [7-10]。"
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5897,9 +5899,8 @@ msgstr "拒�消�"
 msgid "Hidden Number"
 msgstr "����"
 
-#, fuzzy
 msgid "Your MXit ID..."
-msgstr "您的 MXitID"
+msgstr "您的 MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5923,13 +5924,11 @@ msgid "_Room Name:"
 msgstr "�天室�称(_R)："
 
 #. Display system message in chat window
-#, fuzzy
 msgid "You have invited"
-msgstr "�邮件了�"
+msgstr "您已邀请"
 
-#, fuzzy
 msgid "Last Online"
-msgstr "在线"
+msgstr "最�在线"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6633,6 +6632,15 @@ msgstr "�务器地�"
 msgid "Server port"
 msgstr "�务器端�"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "请��我将您加入好�。"
+
+msgid "No reason given."
+msgstr "没有给出�由。"
+
+msgid "Authorization Denied Message:"
+msgstr "认�拒�消�："
+
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "从 %s 收到了�外的�应：%s"
@@ -6666,6 +6674,21 @@ msgstr "AOL ��许通过此站点认�您的�幕�称。"
 msgid "Error requesting %s"
 msgstr "请求 %s 时出错"
 
+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 ""
+
+#, 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 的客户端有程�错"
+"误。)"
+
 msgid "Could not join chat room"
 msgstr "无法进入�天室"
 
@@ -6693,19 +6716,19 @@ msgid "Cannot send SMS to unknown country"
 msgstr "无法�未知国家��短信�"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "机器人��无法�始化�天"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "机器人��无法与此用户�天"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "机器人��达到了�天�制"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "机器人��达到了�日�天�制"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgstr "机器人��达到了�月�天�制"
 
 msgid "Unable to receive offline messages"
 msgstr "无法接收离线消�"
@@ -6877,91 +6900,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 ""
-
-#, 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
-msgid "Buddy Icon"
-msgstr "用户头�"
-
-msgid "Voice"
-msgstr "语音"
-
-msgid "AIM Direct IM"
-msgstr "AIM 二人世界"
-
-msgid "Get File"
-msgstr "获�文件"
-
-msgid "Games"
-msgstr "游�"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "�件"
-
-msgid "Send Buddy List"
-msgstr "��好�列表"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ 直接连接"
-
-msgid "AP User"
-msgstr "AP 用户"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ �务器转�"
-
-msgid "Old ICQ UTF8"
-msgstr "旧的 ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian 加密"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "安全已�用"
-
-msgid "Video Chat"
-msgstr "�视�天"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "实时视频"
-
-msgid "Camera"
-msgstr "相机"
-
-msgid "Screen Sharing"
-msgstr "�幕共享"
-
 msgid "Free For Chat"
 msgstr "无事闲�"
 
@@ -6992,15 +6930,6 @@ msgstr "在上�"
 msgid "At lunch"
 msgstr "���"
 
-msgid "IP Address"
-msgstr "IP 地�"
-
-msgid "Warning Level"
-msgstr "警告级别"
-
-msgid "Buddy Comment"
-msgstr "好�注释"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
@@ -7095,15 +7024,6 @@ msgstr "密�已�出"
 msgid "Unable to initialize connection"
 msgstr "无法�始化连接"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "请��我将您加入好�。"
-
-msgid "No reason given."
-msgstr "没有给出�由。"
-
-msgid "Authorization Denied Message:"
-msgstr "认�拒�消�："
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7205,58 +7125,13 @@ 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] ""
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "用户信���用：%s"
-
-msgid "Online Since"
-msgstr "上线时间"
-
-msgid "Member Since"
-msgstr "注册时间"
-
-msgid "Capabilities"
-msgstr "容�"
-
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接�能已丢失。"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[无法显示�自此用户的信�，原因是其中包�了无效的字符。"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已�断开与�天室 %s 的连接。"
 
-msgid "Mobile Phone"
-msgstr "移动电�"
-
-msgid "Personal Web Page"
-msgstr "个人主页"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "�外信�"
-
-msgid "Zip Code"
-msgstr "邮政编�"
-
-msgid "Work Information"
-msgstr "工作信�"
-
-msgid "Division"
-msgstr "部门"
-
-msgid "Position"
-msgstr "�务"
-
-msgid "Web Page"
-msgstr "网页"
-
 msgid "Pop-Up Message"
 msgstr "弹出消�"
 
@@ -7439,7 +7314,7 @@ msgid "iTunes Music Store Link"
 msgstr "iTunes 音�商店链接"
 
 msgid "Lunch"
-msgstr ""
+msgstr "��"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7501,8 +7376,8 @@ msgstr "用户�格�化�更改大写和空格。"
 msgid "Change Address To:"
 msgstr "将地�更改为："
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>您并�在等候认�</i>"
+msgid "you are not waiting for authorization"
+msgstr "您并�在等候认�"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好�的认�"
@@ -7540,6 +7415,14 @@ msgstr "�置�天转�(web)"
 msgid "Set Privacy Options..."
 msgstr "设置��选项..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "显示好�列表(_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "邀请列表"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "确认��"
@@ -7556,9 +7439,6 @@ msgstr "显示正在等候认�的好�"
 msgid "Search for Buddy by Email Address..."
 msgstr "按电�邮件�索好�..."
 
-msgid "Search for Buddy by Information"
-msgstr "按信��索好�"
-
 msgid "Use clientLogin"
 msgstr "使用客户端登录"
 
@@ -7666,6 +7546,165 @@ msgstr "队列满"
 msgid "Not while on AOL"
 msgstr "��于 AOL 上"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "用户头�"
+
+msgid "Voice"
+msgstr "语音"
+
+msgid "AIM Direct IM"
+msgstr "AIM 二人世界"
+
+msgid "Get File"
+msgstr "获�文件"
+
+msgid "Games"
+msgstr "游�"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "�件"
+
+msgid "Send Buddy List"
+msgstr "��好�列表"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ 直接连接"
+
+msgid "AP User"
+msgstr "AP 用户"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ �务器转�"
+
+msgid "Old ICQ UTF8"
+msgstr "旧的 ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 加密"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "安全已�用"
+
+msgid "Video Chat"
+msgstr "�视�天"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "实时视频"
+
+msgid "Camera"
+msgstr "相机"
+
+msgid "Screen Sharing"
+msgstr "�幕共享"
+
+msgid "IP Address"
+msgstr "IP 地�"
+
+msgid "Warning Level"
+msgstr "警告级别"
+
+msgid "Buddy Comment"
+msgstr "好�注释"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "用户信���用：%s"
+
+msgid "Mobile Phone"
+msgstr "移动电�"
+
+msgid "Personal Web Page"
+msgstr "个人主页"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "�外信�"
+
+msgid "Zip Code"
+msgstr "邮政编�"
+
+msgid "Work Information"
+msgstr "工作信�"
+
+msgid "Division"
+msgstr "部门"
+
+msgid "Position"
+msgstr "�务"
+
+msgid "Web Page"
+msgstr "网页"
+
+msgid "Online Since"
+msgstr "上线时间"
+
+msgid "Member Since"
+msgstr "注册时间"
+
+msgid "Capabilities"
+msgstr "容�"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "显示为在线"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "显示为在线"
+
+msgid "Appear Offline"
+msgstr "显示为离线"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "显示为离线"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "您已被踢出此 MultiMX。"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"如果您想��这些好��新请求认�，�需用鼠标�键�击这些好�，然��击“�新请"
+"求认��。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "��"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "邀请列表"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水瓶座"
 
@@ -7845,8 +7884,8 @@ msgid "Your request was rejected."
 msgstr "您的请求被拒�。"
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u 请求验�"
+msgid "%u requires verification: %s"
+msgstr "%u 请求验�：%s"
 
 msgid "Add buddy question"
 msgstr "添加好�问题"
@@ -9953,9 +9992,8 @@ msgstr ""
 msgid "Unable to establish a connection with %s: %s"
 msgstr "无法与 %s 建立连接：%s"
 
-#, fuzzy
 msgid "Unable to connect: The server returned an empty response."
-msgstr "无法连接到 MXit �务器。请检查您的�务器设置。"
+msgstr "无法连接：�务器返回空回应。"
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
@@ -9980,18 +10018,12 @@ msgstr "郊游"
 msgid "Not on server list"
 msgstr "�在�务器列表中"
 
-msgid "Appear Online"
-msgstr "显示为在线"
-
 msgid "Appear Permanently Offline"
 msgstr "显示为临时离线"
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr "显示为离线"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "�显示永久离线"
 
@@ -10513,27 +10545,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "连接被您计算机上的其他软件中断。"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "远程主机关闭了连接。"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "连接超时。"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "连接被拒�。"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "此地�已被使用。"
 
@@ -10677,6 +10704,10 @@ msgstr ""
 "如果您想�回到此窗�以便添加�编辑或删除��，�以从好�列表中窗�中选择<b>�"
 "�->管���</b>"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s 想�将您(%s)添加为好�%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "背景颜色"
@@ -10925,6 +10956,8 @@ msgstr "消�(�选)"
 msgid "Edit User Mood"
 msgstr "编辑用户心情"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/好�(_B)"
@@ -11660,9 +11693,6 @@ msgstr "支�"
 msgid "webmaster"
 msgstr "网络管�员"
 
-msgid "Senior Contributor/QA"
-msgstr "其他贡献者/质���"
-
 msgid "win32 port"
 msgstr "Win32 移�"
 
@@ -11688,6 +11718,9 @@ msgstr "原作者"
 msgid "lead developer"
 msgstr "开�领导者"
 
+msgid "Senior Contributor/QA"
+msgstr "其他贡献者/质���"
+
 msgid "Afrikaans"
 msgstr "���兰语"
 
@@ -12559,24 +12592,22 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "退出，因为�一个 libpurple 客户端已�行。\n"
 
-#, fuzzy
 msgid "_Media"
-msgstr "/媒体(_M)"
+msgstr "媒体(_M)"
 
-#, fuzzy
 msgid "_Hangup"
-msgstr "挂断"
+msgstr "挂断(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr "%s 希望于您进行音频/视频�天。"
+msgstr "%s 希望与您进行音频/视频�天。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr "%s 希望于您进行视频�天。"
+msgstr "%s 希望与您进行视频�天。"
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "�电"
 
 msgid "_Pause"
 msgstr "暂�(_P)"
@@ -12975,6 +13006,9 @@ msgstr "中继�务器(TURN)"
 msgid "_TURN server:"
 msgstr "_TURN �务器："
 
+msgid "_UDP Port:"
+msgstr "_UDP 端�："
+
 msgid "Use_rname:"
 msgstr "用户�(_R)："
 
@@ -12996,6 +13030,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "桌�默认值"
 
@@ -13014,6 +13053,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "手工设置"
 
@@ -13537,7 +13584,7 @@ msgstr "æ— "
 msgid "Small"
 msgstr "å°�"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "默认表情的�图�版本"
 
 msgid "Response Probability:"
@@ -14535,6 +14582,9 @@ msgstr "设备(_E)"
 msgid "Voice/Video Settings"
 msgstr "音视频设置"
 
+msgid "Voice and Video Settings"
+msgstr "音视频设置"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14659,7 +14709,7 @@ msgstr "��和接�原始 XMPP 节。"
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "此�件用于调试 XMPP �务器或客户端。"
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -14782,6 +14832,26 @@ msgstr "�览 Pidgin 网页"
 msgid "You do not have permission to uninstall this application."
 msgstr "您没有���载此程�。"
 
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "此�书已过期，故�被认为有效。"
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "需� SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "强制旧 SSL(5223 端�)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "您输入的姓�密钥无效。"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[无法显示�自此用户的信�，原因是其中包�了无效的字符。"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "按信��索好�"
+
 #~ msgid "The nick name you entered is invalid."
 #~ msgstr "您输入的昵称无效。"
 
@@ -15282,9 +15352,6 @@ msgstr "您没有���载此程�。"
 #~ msgid "Connection closed (writing)"
 #~ msgstr "连接已关闭(写入)"
 
-#~ msgid "Connection reset"
-#~ msgstr "连接�置"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "从套接字读�时出错：%s"
 
@@ -15530,7 +15597,7 @@ msgstr "您没有���载此程�。"
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "无法打开 %s 写入�"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "文件传�失败；�能其中一端�消了传�。"
 
 #~ msgid "Could not connect for transfer."
@@ -15552,9 +15619,6 @@ msgstr "您没有���载此程�。"
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC �议�件"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s 的用户信���用"
-
 #~ msgid "%s Options"
 #~ msgstr "%s 选项"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 68318630f1..170f2a5879 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,4 +1,4 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.25 2010/05/10 05:50:52 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.26 2010/08/09 21:40:12 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
@@ -8,7 +8,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.637 2010/05/28 19:17:20 acli Exp $
+# $InternalId: zh_TW.po,v 1.650 2010/10/17 14:56:33 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,10 +60,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.1\n"
+"Project-Id-Version: Pidgin 2.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
-"PO-Revision-Date: 2010-05-29 02:50+0800\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-17 10:55-0400\n"
 "Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_HK\n"
@@ -117,9 +117,8 @@ msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
-#, fuzzy
 msgid "Account was not modified"
-msgstr "帳號未被新增"
+msgstr "帳號未被更改"
 
 # FIXME 譯文有待改進 - 20061028
 msgid "Account was not added"
@@ -130,11 +129,11 @@ msgstr "帳號��留空。"
 
 msgid ""
 "The account's protocol cannot be changed while it is connected to the server."
-msgstr ""
+msgstr "這個帳號還連線到伺�器時，無法更改所使用的通訊�定。"
 
 msgid ""
 "The account's username cannot be changed while it is connected to the server."
-msgstr ""
+msgstr "這個帳號還連線到伺�器時，無法更改所使用的使用者�稱。"
 
 msgid "New mail notifications"
 msgstr "新郵件通知"
@@ -599,7 +598,6 @@ msgstr "確定刪除證書"
 msgid "Certificate Manager"
 msgstr "證書管�"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "主機�稱"
 
@@ -868,7 +866,7 @@ msgstr "中止"
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已�消"
 
 msgid "Failed"
@@ -1782,10 +1780,12 @@ msgstr "無法信賴這張證書，因為目�沒有�信賴的證書�以驗
 msgid ""
 "The certificate is not valid yet.  Check that your computer's date and time "
 "are accurate."
-msgstr ""
+msgstr "這個證書尚未生效，請確�你電腦上的日期�時間是正確的。"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "這張證書已逾期，應視作無效。"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "這張證書已逾期，應視作無效，請確�你電腦上的日期�時間是正確的。"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -3946,15 +3946,14 @@ msgstr "伺�器�來了無效的驗證挑戰"
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "伺�器�為驗證程�已經完畢，但用戶端���"
 
-#, fuzzy
 msgid "Server may require plaintext authentication over an unencrypted stream"
-msgstr "伺�器需�經由未經加密的串�進行明文�證"
+msgstr "伺�器�能需�經由未經加密的串�進行明文�證"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s may require plaintext authentication over an unencrypted connection.  "
 "Allow this and continue authentication?"
-msgstr "%s 需�經由未經加密的串�進行明文�證。�許並繼續進行�證？"
+msgstr "%s �能需�經由未經加密的串�進行明文�證。�許並繼續進行�證？"
 
 msgid "SASL authentication failed"
 msgstr "SASL �證失敗"
@@ -4920,11 +4919,20 @@ msgstr "XMPP �定模組"
 msgid "Domain"
 msgstr "域�"
 
-msgid "Require SSL/TLS"
-msgstr "需� SSL/TLS"
+#  NOTE Connection security �項，指強制性使用 TLS, 如伺�器�支� TLS �視作連線失敗
+msgid "Require encryption"
+msgstr "使用加密"
+
+#  NOTE Connection security �項，指在伺�器支�的情�下使用 TLS, 如伺�器�支� TLS 則以�加密的方�繼續進行連線
+msgid "Use encryption if available"
+msgstr "當伺�器支�時，使用加密功能"
 
-msgid "Force old (port 5223) SSL"
-msgstr "強迫使用舊� SSL (port 5223)"
+#  NOTE Connection security �項，指以舊� SSL 方�進行加密
+msgid "Use old-style SSL"
+msgstr "以舊�的 SSL 方�加密"
+
+msgid "Connection security"
+msgstr "連線安全"
 
 #  NOTE 譯文更動 by Ambrose
 msgid "Allow plaintext auth over unencrypted streams"
@@ -6238,8 +6246,8 @@ msgstr "你所輸入的密碼無效，密碼必須由數字（0 至 9）組æˆ�ã€
 msgid "The two PINs you entered do not match."
 msgstr "兩個密碼並�相符。"
 
-msgid "The name you entered is invalid."
-msgstr "你所輸入的�稱無效。"
+msgid "The Display Name you entered is invalid."
+msgstr "你所輸入的網�無效。"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -6257,8 +6265,9 @@ msgstr "個人資料"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀�你的個人資料，請�後�試。"
 
+# NOTE mxitid, �「MXit ID�，在其他地方譯「MXit 帳號�或「MXit ID�
 msgid "Your UID"
-msgstr ""
+msgstr "使用者 ID"
 
 #. pin
 #. pin (required)
@@ -6328,16 +6337,12 @@ msgstr "無法連線至 MXit 伺�器，請檢查伺�器設定。"
 msgid "Connecting..."
 msgstr "連線中..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "你所輸入的�稱無效。"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "你所輸入的密碼�短或�長（長度應為 7 至 10 個數字）。"
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6365,13 +6370,11 @@ msgstr "你的工作階段已逾時，請�後�試。"
 msgid "Invalid country selected. Please try again."
 msgstr "指定的國家是無效的，請�試。"
 
-#, fuzzy
 msgid "The MXit ID you entered is not registered. Please register first."
-msgstr "帳號未有註冊，請先註冊。"
+msgstr "你所輸入的MXit帳號尚未註冊，請先註冊。"
 
-#, fuzzy
 msgid "The MXit ID you entered is already registered. Please choose another."
-msgstr "帳號已註冊，請�擇�一個帳號。"
+msgstr "你所輸入的MXit帳號已被註冊，請�擇�一個帳號。"
 
 msgid "Internal error. Please try again later."
 msgstr "內部錯誤，請�後�試"
@@ -6416,9 +6419,8 @@ msgstr "拒絕訊�"
 msgid "Hidden Number"
 msgstr "隱�電話號碼"
 
-#, fuzzy
 msgid "Your MXit ID..."
-msgstr "Yahoo 帳號"
+msgstr "ä½ çš„MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6432,30 +6434,22 @@ msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫�彈出視窗"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "你已被踢出：(%s)"
+msgstr "你已經從MultiMX中被踢出。"
 
-#  FIXME「ticket�暫無譯文，也許�譯「通行證�或「許�證�？
-#  NOTE MSN 錯誤代號 928
-#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
-#, fuzzy
 msgid "was kicked"
-msgstr "無效的 ticket"
+msgstr "被踢出"
 
-#, fuzzy
 msgid "_Room Name:"
-msgstr "�天室(_R)："
+msgstr "�天室�稱(_R)："
 
-# XXX �覆查
+# NOTE 很差的原文，其實整�上下文後是「You have invited: %s�（%s 是被邀請者）
 #. Display system message in chat window
-#, fuzzy
 msgid "You have invited"
-msgstr "你收到郵件�"
+msgstr "你邀請了"
 
-#, fuzzy
 msgid "Last Online"
-msgstr "上線"
+msgstr "最近上線"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -7200,6 +7194,15 @@ msgstr "伺�器��"
 msgid "Server port"
 msgstr "伺�器通訊埠"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "請通�我的�證�求，好讓我�以將您加入我的好�清單中。"
+
+msgid "No reason given."
+msgstr "沒有給予原因。"
+
+msgid "Authorization Denied Message:"
+msgstr "拒絕�證訊�："
+
 # NOTE �見 http://pidgin.im/pipermail/translators/2009-July/000394.html
 #, c-format
 msgid "Received unexpected response from %s: %s"
@@ -7237,6 +7240,24 @@ msgstr "AOL ��許你的帳號在這�登入"
 msgid "Error requesting %s"
 msgstr "�求讀� %s 途中發生了錯誤"
 
+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 帳號的「進階設定�中的「編碼�"
+"欄�指定。）"
+
+#, 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 在使"
+"用有�題的用戶端程�。）"
+
 msgid "Could not join chat room"
 msgstr "無法加入�天室"
 
@@ -7457,109 +7478,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s�大�為 %s，超�了 %s 這個上�。"
 
-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 帳號的「進階設定�中的「編碼�"
-"欄�指定。）"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "好�圖示"
-
-msgid "Voice"
-msgstr "�音"
-
-# NOTE 將「直接消��改譯為「�時訊��
-msgid "AIM Direct IM"
-msgstr "AIM ��時訊�"
-
-msgid "Get File"
-msgstr "接收檔案"
-
-msgid "Games"
-msgstr "�戲"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "模組"
-
-msgid "Send Buddy List"
-msgstr "�出好�清單"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ �直接連線"
-
-# NOTE 據其他PO檔的譯文看，「AP�應該�是「應用程��
-msgid "AP User"
-msgstr "AP 使用者"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-# 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?
-# NOTE (18:17:29) KingAnt: Right...
-# NOTE (18:17:36) wing: what does that mean though?
-# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ 伺�器轉�"
-
-msgid "Old ICQ UTF8"
-msgstr "舊� ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian �加密"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-# NOTE 這似乎是一種掌上電腦的牌�
-msgid "Hiptop"
-msgstr "Hiptop"
-
-# FIXME flagged "有�安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-msgid "Security Enabled"
-msgstr "有�安功能"
-
-# XXX æš«è­¯
-msgid "Video Chat"
-msgstr "視��天"
-
-# XXX æš«è­¯
-msgid "iChat AV"
-msgstr "iChat 視��天"
-
-msgid "Live Video"
-msgstr "動態視�"
-
-#  NOTE AIM_CAPS_CAMERA，�是什麼呢(^^;)
-msgid "Camera"
-msgstr "照相機"
-
-# XXX 20080810 畫�分享 (Apple) / 螢幕共享 / 螢幕分享
-msgid "Screen Sharing"
-msgstr "螢幕共享"
-
 msgid "Free For Chat"
 msgstr "我有空�天"
 
@@ -7593,15 +7511,6 @@ msgstr "工作中"
 msgid "At lunch"
 msgstr "外出用�"
 
-msgid "IP Address"
-msgstr "IP ��"
-
-msgid "Warning Level"
-msgstr "警告等級"
-
-msgid "Buddy Comment"
-msgstr "好�備註"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "無法連線至�證伺�器：%s"
@@ -7698,15 +7607,6 @@ msgstr "�功�出密碼"
 msgid "Unable to initialize connection"
 msgstr "無法�始化連�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "請通�我的�證�求，好讓我�以將你加入我的好�清單中。"
-
-msgid "No reason given."
-msgstr "沒有給予原因。"
-
-msgid "Authorization Denied Message:"
-msgstr "拒絕�證訊�："
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7815,59 +7715,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "你�失了 %hu 個由 %s �來的訊�，原因�明。"
 msgstr[1] "你�失了 %hu 個由 %s �來的訊�，原因�明。"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "無法�得個人資料：%s"
-
-msgid "Online Since"
-msgstr "上線自"
-
-# XXX 改譯「註冊日期�會�比較通順？
-msgid "Member Since"
-msgstr "�為�員的時間"
-
-msgid "Capabilities"
-msgstr "兼容性"
-
 msgid "Your AIM connection may be lost."
 msgstr "你的 AIM �能斷線了。"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "（無法顯示來自這個使用者的訊�，因為它包�了無效字符。）"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "你已經由�天室 %s �止連線。"
 
-msgid "Mobile Phone"
-msgstr "�動電話"
-
-msgid "Personal Web Page"
-msgstr "個人網�"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "其他資訊"
-
-msgid "Zip Code"
-msgstr "郵�編號"
-
-msgid "Work Information"
-msgstr "工作資訊"
-
-msgid "Division"
-msgstr "部門"
-
-msgid "Position"
-msgstr "��"
-
-msgid "Web Page"
-msgstr "網�"
-
 # XXX 這是什麼 (情形下出�的)？ (好�是以�譯「訊��的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊�"
@@ -8132,8 +7986,8 @@ msgstr "帳號格�化�能改變大寫以�空白。"
 msgid "Change Address To:"
 msgstr "更改地�為："
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>你並沒有在等待驗證</i>"
+msgid "you are not waiting for authorization"
+msgstr "你並沒有在等待驗證"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "你目�正在等待下列好�的�證"
@@ -8173,6 +8027,14 @@ msgstr "設定�時訊�的轉� (��網�)"
 msgid "Set Privacy Options..."
 msgstr "設定�隱�項..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "公開"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "邀請清單"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "確�帳號"
@@ -8189,9 +8051,6 @@ msgstr "顯示等待�證的好�"
 msgid "Search for Buddy by Email Address..."
 msgstr "使用電�郵件地��尋好�..."
 
-msgid "Search for Buddy by Information"
-msgstr "根據資訊尋找好�"
-
 msgid "Use clientLogin"
 msgstr "使用 clientLogin"
 
@@ -8233,87 +8092,262 @@ msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
 msgid "Server rate limit exceeded"
-msgstr ""
+msgstr "超出了伺�器端的速率上�"
 
 msgid "Client rate limit exceeded"
-msgstr ""
+msgstr "超出了用戶端的速率上�"
 
-#  NOTE Jabber 錯誤 <service-unavailable/>，表示伺�器收到一個�義�明的指令
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#, fuzzy
+# NOTE SNAC 錯誤代碼5，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 應係指給定了一個已定義的�務 (Service, Family)，但因�種原因，伺�器暫時無法�供該�務
 msgid "Service unavailable"
-msgstr "��供該項�務"
+msgstr "�務�存在"
 
-#, fuzzy
 msgid "Service not defined"
-msgstr "找�到該會議"
+msgstr "�務未定義"
 
+# XXX 譯文有待改進 - acli 20100809
 msgid "Obsolete SNAC"
-msgstr ""
+msgstr "已作廢的舊� SNAC"
 
-#  XXX 這個太奇怪了 (^^;)
-#, fuzzy
 msgid "Not supported by host"
-msgstr "�支�"
+msgstr "伺�器�支�"
 
-#  XXX 這個太奇怪了 (^^;)
-#, fuzzy
 msgid "Not supported by client"
-msgstr "�支�"
+msgstr "用戶端�支�"
 
-#, fuzzy
 msgid "Refused by client"
-msgstr "到用戶端速率"
+msgstr "被用戶端拒絕"
 
+# XXX 譯文有待改進 - acli 20100809
 msgid "Reply too big"
-msgstr ""
+msgstr "回應太大"
 
-#, fuzzy
 msgid "Responses lost"
-msgstr "「回答�或然率："
+msgstr "�失回應"
 
-#, fuzzy
 msgid "Request denied"
-msgstr "請求中"
+msgstr "請求被拒"
 
+# NOTE SNAC 錯誤代碼14 (0x0e)，見 http://iserverd.khstu.ru/oscar/errorlist.html，指 SNAC 負載內出�了格�上的錯誤
+# XXX 譯文有待改進 - acli 20100809
 msgid "Busted SNAC payload"
-msgstr ""
+msgstr "畸型的 SNAC 負載"
 
 msgid "Insufficient rights"
-msgstr ""
+msgstr "權��夠"
 
+# NOTE SNAC 錯誤代碼16 (0x10)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# XXX 譯文有待改進 - acli 20100809
 msgid "In local permit/deny"
-msgstr ""
+msgstr "在本地端的�許�拒絕清單內"
 
+# NOTE SNAC 錯誤代碼17 (0x11)，見 http://iserverd.khstu.ru/oscar/errorlist.html，�見其他涉�「warning level�的譯文
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "（發�者）警告等級�高"
 
+# NOTE SNAC 錯誤代碼18 (0x12)，見 http://iserverd.khstu.ru/oscar/errorlist.html，�見其他涉�「warning level�的譯文
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "（接收者）警告等級�高"
 
-#  NOTE「暫時無法使用�應該比「暫時�存在�通順
-#  NOTE 譯文更動 by Ambrose
-#, fuzzy
 msgid "User temporarily unavailable"
-msgstr "暫時無法使用�務"
+msgstr "使用者暫時�在線上"
 
-#, fuzzy
 msgid "No match"
-msgstr "沒有相符�的"
+msgstr "沒有相符的記錄"
 
-#, fuzzy
+# NOTE SNAC 錯誤代碼21 (0x15)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE OSCAR �定至少有三種「List�，譯�「好�清單��能��
 msgid "List overflow"
-msgstr "好�清單已滿"
+msgstr "清單已滿"
 
-#, fuzzy
 msgid "Request ambiguous"
-msgstr "請求中"
+msgstr "�明確的請求"
 
 msgid "Queue full"
-msgstr ""
+msgstr "佇列已滿"
 
+# NOTE SNAC 錯誤代碼24 (0x18)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE �能是指在 AOL ��求了一種 ICQ 的�務
+# XXX 譯文有待改進 - acli 20100809
 msgid "Not while on AOL"
+msgstr "���於 AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "好�圖示"
+
+msgid "Voice"
+msgstr "�音"
+
+# NOTE 將「直接消��改譯為「�時訊��
+msgid "AIM Direct IM"
+msgstr "AIM ��時訊�"
+
+msgid "Get File"
+msgstr "接收檔案"
+
+msgid "Games"
+msgstr "�戲"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "模組"
+
+msgid "Send Buddy List"
+msgstr "�出好�清單"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ �直接連線"
+
+# NOTE 據其他PO檔的譯文看，「AP�應該�是「應用程��
+msgid "AP User"
+msgstr "AP 使用者"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# 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?
+# NOTE (18:17:29) KingAnt: Right...
+# NOTE (18:17:36) wing: what does that mean though?
+# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 伺�器轉�"
+
+msgid "Old ICQ UTF8"
+msgstr "舊� ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian �加密"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+# NOTE 這似乎是一種掌上電腦的牌�
+msgid "Hiptop"
+msgstr "Hiptop"
+
+# FIXME flagged "有�安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
+msgid "Security Enabled"
+msgstr "有�安功能"
+
+# XXX æš«è­¯
+msgid "Video Chat"
+msgstr "視��天"
+
+# XXX æš«è­¯
+msgid "iChat AV"
+msgstr "iChat 視��天"
+
+msgid "Live Video"
+msgstr "動態視訊"
+
+#  NOTE AIM_CAPS_CAMERA，�是什麼呢(^^;)
+msgid "Camera"
+msgstr "照相機"
+
+# XXX 20080810 畫�分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+msgid "IP Address"
+msgstr "IP ��"
+
+msgid "Warning Level"
+msgstr "警告等級"
+
+msgid "Buddy Comment"
+msgstr "好�備註"
+
+#  NOTE Connection security �項，指在伺�器支�的情�下使用 TLS, 如伺�器�支� TLS 則以�加密的方�繼續進行連線
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "當伺�器支�時，使用加密功能"
+
+msgid "Mobile Phone"
+msgstr "�動電話"
+
+msgid "Personal Web Page"
+msgstr "個人網�"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "其他資訊"
+
+msgid "Zip Code"
+msgstr "郵��號"
+
+msgid "Work Information"
+msgstr "工作資訊"
+
+msgid "Division"
+msgstr "部門"
+
+msgid "Position"
+msgstr "��"
+
+msgid "Web Page"
+msgstr "網�"
+
+msgid "Online Since"
+msgstr "上線自"
+
+# XXX 改譯「註冊日期�會�比較通順？
+msgid "Member Since"
+msgstr "�為�員的時間"
+
+msgid "Capabilities"
+msgstr "相容性"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "報稱上線"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "報稱上線"
+
+# NOTE 下次登入時�報稱離線，所以加「暫時�字眼
+msgid "Appear Offline"
+msgstr "暫時報稱離線"
+
+# NOTE 下次登入時�報稱離線，所以加「暫時�字眼
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "暫時報稱離線"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "你已經從MultiMX中被踢出。"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"你�以�新�求這些好�的�證，��在好�清單中以滑鼠��點擊他們，然後�擇"
+"「�求�新�證�。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "公開"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "邀請清單"
+
+msgid "These buddies will always see you as offline"
 msgstr ""
 
 msgid "Aquarius"
@@ -8503,8 +8537,8 @@ msgid "Your request was rejected."
 msgstr "請求已被拒絶。"
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u �求�證"
+msgid "%u requires verification: %s"
+msgstr "%u �求�證：%s"
 
 # XXX æš«è­¯ - acli 20090803
 msgid "Add buddy question"
@@ -8747,7 +8781,6 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
 msgstr " 使用�動通訊器�"
 
@@ -10583,9 +10616,8 @@ msgstr "�天室�域 (Locale)"
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與�天室邀請"
 
-#, fuzzy
 msgid "Use account proxy for HTTP and HTTPS connections"
-msgstr "使用 SSL 連線時，使用帳號的代�伺�器"
+msgstr "使用 HTTP 和 HTTPS 連線時，使用帳號的代�伺�器"
 
 msgid "Chat room list URL"
 msgstr "�天室清單所在網�"
@@ -10765,9 +10797,6 @@ msgstr "走出去了"
 msgid "Not on server list"
 msgstr "�在伺�器上的清單中"
 
-msgid "Appear Online"
-msgstr "報稱上線"
-
 # NOTE Yahoo 官方譯「永�顯示離線�，說白一點其實�是（���人）「長期隠身�
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
@@ -10775,10 +10804,6 @@ msgstr "長期報稱離線"
 msgid "Presence"
 msgstr "�狀"
 
-# NOTE 下次登入時�報稱離線，所以加「暫時�字眼
-msgid "Appear Offline"
-msgstr "暫時報稱離線"
-
 #  NOTE 這是清單內的一個指令
 msgid "Don't Appear Permanently Offline"
 msgstr "�止長期報稱離線"
@@ -11357,28 +11382,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "連線被電腦上的其他軟件中斷。"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "�端主機關閉了連線。"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "連線已逾時"
 
 # XXX - 20061027
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "��已在使用中"
 
@@ -11533,6 +11553,12 @@ msgstr ""
 "你如果希望新增�修改或刪除帳號，����好�清單上的「帳號->管�帳號�指令，"
 "��返回這個畫�。"
 
+#  NOTE: 最頭的 %s%s%s%s 是�方帳號，或帳號括弧別�（第二�四個 %s 是括弧）
+#  NOTE: 最尾的 %s%s 是空白或「: 訊��，基本上�以��會（也�能怎樣�會）
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "使用者 %s%s%s%s 想�將你（%s）加入他（她）的好�清單%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "背景�色"
@@ -11792,6 +11818,8 @@ msgstr "訊�（�用）"
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/好�(_B)"
@@ -12567,9 +12595,6 @@ msgstr "支�"
 msgid "webmaster"
 msgstr "網站管�員"
 
-msgid "Senior Contributor/QA"
-msgstr "資深貢�者兼�管"
-
 msgid "win32 port"
 msgstr "Windows 版本移�"
 
@@ -12595,6 +12620,9 @@ msgstr "原作者"
 msgid "lead developer"
 msgstr "主�開發者"
 
+msgid "Senior Contributor/QA"
+msgstr "資深貢�者兼�管"
+
 #  NOTE �見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "阿�利堪文"
@@ -13568,14 +13596,12 @@ msgid "Exiting because another libpurple client is already running.\n"
 msgstr "因為已有其他 libpurple 用戶端正在執行，本程��在��。\n"
 
 # XXX 媒體? - acli 20090730
-#, fuzzy
 msgid "_Media"
-msgstr "/媒體(_M)"
+msgstr "媒體(_M)"
 
 # NOTE 這是按鈕上的標籤
-#, fuzzy
 msgid "_Hangup"
-msgstr "掛斷"
+msgstr "掛斷(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14001,6 +14027,9 @@ msgstr "中繼伺�器 (TURN)"
 msgid "_TURN server:"
 msgstr "TURN 伺�器(_U)："
 
+msgid "_UDP Port:"
+msgstr "UDP 通訊埠(_U)："
+
 msgid "Use_rname:"
 msgstr "帳號(_R)："
 
@@ -14022,6 +14051,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "桌��設值"
 
@@ -14040,6 +14074,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "使用者自定"
 
@@ -14578,7 +14620,7 @@ msgstr "ç„¡"
 msgid "Small"
 msgstr "縮�版�設表情"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "縮�版的�設表情圖示"
 
 msgid "Response Probability:"
@@ -14595,9 +14637,11 @@ msgstr "好�作出回覆的時間上�："
 msgid "minutes"
 msgstr "分�"
 
+#  NOTE �閱 gtk/plugins/cap/README
+#  FIXME 但這�能是暫譯，譯文絕�有待改進
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "在線時間差異上�："
 
 #  NOTE �閱 gtk/plugins/cap/README
 #  FIXME 但這�能是暫譯，譯文絕�有待改進
@@ -15649,6 +15693,9 @@ msgstr "�置(_E)"
 msgid "Voice/Video Settings"
 msgstr "語音�視�設定"
 
+msgid "Voice and Video Settings"
+msgstr "語音�視�設定"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15777,7 +15824,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺�器或客戶端進行除錯。"
 
 # XXX �覆查譯文 - acli 20100527
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15922,43 +15969,31 @@ msgstr "�覽 Pidgin 官方網站"
 msgid "You do not have permission to uninstall this application."
 msgstr "你沒有權�移除程�。"
 
-#~ msgid "The certificate is not valid yet."
-#~ msgstr "這張證書尚未生效。"
-
-#~ msgid "The nick name you entered is invalid."
-#~ msgstr "你所輸入的網�無效。"
-
-#~ msgid "MXit Login Name"
-#~ msgstr "MXit 帳號"
-
-# NOTE「Display Name�和「Nick Name�都是指�一個欄�，就是 profile->nickname
-#~ msgid "Nick Name"
-#~ msgstr "網�"
-
-#~ msgid "Your Mobile Number..."
-#~ msgstr "�動電話號碼..."
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "這張憑證已逾期，應視作無效。"
 
-#~ msgid "Rate to host"
-#~ msgstr "到伺�器速率"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "需� SSL/TLS"
 
-#~ msgid "Rate to client"
-#~ msgstr "到用戶端速率"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "強迫使用舊� SSL (port 5223)"
 
-# XXX æš«è­¯ - acli 20090730
-#~ msgid "/Media/_Hangup"
-#~ msgstr "/媒體/掛斷(_H)"
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "（無法顯示來自這個使用者的訊�，因為它包�了無效字元。）"
 
-#~ msgid "Current Mood"
-#~ msgstr "目�的心情"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "�照資訊尋找好�"
 
-#~ msgid "New Mood"
-#~ msgstr "新心情"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "您所輸入的�稱無效。"
 
-#~ msgid "Change your Mood"
-#~ msgstr "修改心情"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張憑證尚未生效。"
 
-#~ msgid "How do you feel right now?"
-#~ msgstr "您�在覺得怎樣？"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您所輸入的暱稱無效。"
 
-#~ msgid "Change Mood..."
-#~ msgstr "修改心情..."
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e7686db070..c9d9031de9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.634 2010/05/27 21:29:19 acli Exp $
+# $InternalId: zh_TW.po,v 1.650 2010/10/17 14:56:33 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,13 +58,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.1\n"
+"Project-Id-Version: Pidgin 2.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 01:18-0400\n"
-"PO-Revision-Date: 2010-05-29 02:50+0800\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-17 10:55-0400\n"
 "Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -115,9 +115,8 @@ msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
-#, fuzzy
 msgid "Account was not modified"
-msgstr "帳號未被新增"
+msgstr "帳號未被變更"
 
 # FIXME 譯文有待改進 - 20061028
 msgid "Account was not added"
@@ -128,11 +127,11 @@ msgstr "帳號��留空。"
 
 msgid ""
 "The account's protocol cannot be changed while it is connected to the server."
-msgstr ""
+msgstr "這個帳號還連線到伺�器時，無法變更所使用的通訊�定。"
 
 msgid ""
 "The account's username cannot be changed while it is connected to the server."
-msgstr ""
+msgstr "這個帳號還連線到伺�器時，無法變更所使用的使用者�稱。"
 
 msgid "New mail notifications"
 msgstr "新郵件通知"
@@ -597,7 +596,6 @@ msgstr "確定刪除憑證"
 msgid "Certificate Manager"
 msgstr "憑證管�"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "主機�稱"
 
@@ -866,7 +864,7 @@ msgstr "中止"
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已�消"
 
 msgid "Failed"
@@ -1780,10 +1778,12 @@ msgstr "無法信賴這張憑證，因為目�沒有�信賴的憑證�以驗
 msgid ""
 "The certificate is not valid yet.  Check that your computer's date and time "
 "are accurate."
-msgstr ""
+msgstr "這個憑證尚未生效，請確�您電腦上的日期�時間是正確的。"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "這張憑證已逾期，應視作無效。"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "這張憑證已逾期，應視作無效，請確�您電腦上的日期�時間是正確的。"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -3944,15 +3944,14 @@ msgstr "伺�器�來了無效的驗證挑戰"
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "伺�器�為驗證程�已經完畢，但用戶端���"
 
-#, fuzzy
 msgid "Server may require plaintext authentication over an unencrypted stream"
-msgstr "伺�器需�經由未經加密的串�進行明文�證"
+msgstr "伺�器�能需�經由未經加密的串�進行明文�證"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s may require plaintext authentication over an unencrypted connection.  "
 "Allow this and continue authentication?"
-msgstr "%s 需�經由未經加密的串�進行明文�證。�許並繼續進行�證？"
+msgstr "%s �能需�經由未經加密的串�進行明文�證。�許並繼續進行�證？"
 
 msgid "SASL authentication failed"
 msgstr "SASL �證失敗"
@@ -4918,11 +4917,20 @@ msgstr "XMPP �定模組"
 msgid "Domain"
 msgstr "域�"
 
-msgid "Require SSL/TLS"
-msgstr "需� SSL/TLS"
+#  NOTE Connection security �項，指強制性使用 TLS, 如伺�器�支� TLS �視作連線失敗
+msgid "Require encryption"
+msgstr "使用加密"
+
+#  NOTE Connection security �項，指在伺�器支�的情�下使用 TLS, 如伺�器�支� TLS 則以�加密的方�繼續進行連線
+msgid "Use encryption if available"
+msgstr "當伺�器支�時，使用加密功能"
 
-msgid "Force old (port 5223) SSL"
-msgstr "強迫使用舊� SSL (port 5223)"
+#  NOTE Connection security �項，指以舊� SSL 方�進行加密
+msgid "Use old-style SSL"
+msgstr "以舊�的 SSL 方�加密"
+
+msgid "Connection security"
+msgstr "連線安全"
 
 #  NOTE 譯文更動 by Ambrose
 msgid "Allow plaintext auth over unencrypted streams"
@@ -6236,8 +6244,8 @@ msgstr "您所輸入的密碼無效，密碼必須由數字（0 至 9）組æˆ�ã€
 msgid "The two PINs you entered do not match."
 msgstr "兩個密碼並�相符。"
 
-msgid "The name you entered is invalid."
-msgstr "您所輸入的�稱無效。"
+msgid "The Display Name you entered is invalid."
+msgstr "您所輸入的暱稱無效。"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -6255,8 +6263,9 @@ msgstr "個人資料"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀�您的個人資料，請�後�試。"
 
+# NOTE mxitid, �「MXit ID�，在其他地方譯「MXit 帳號�或「MXit ID�
 msgid "Your UID"
-msgstr ""
+msgstr "使用者 ID"
 
 #. pin
 #. pin (required)
@@ -6326,16 +6335,12 @@ msgstr "無法連線至 MXit 伺�器，請檢查伺�器設定。"
 msgid "Connecting..."
 msgstr "連線中..."
 
-#, fuzzy
-msgid "The Display Name you entered is invalid."
-msgstr "您所輸入的�稱無效。"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "您所輸入的密碼�短或�長（長度應為 7 至 10 個數字）。"
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6363,13 +6368,11 @@ msgstr "您的工作階段已逾時，請�後�試。"
 msgid "Invalid country selected. Please try again."
 msgstr "指定的國家是無效的，請�試。"
 
-#, fuzzy
 msgid "The MXit ID you entered is not registered. Please register first."
-msgstr "帳號未有註冊，請先註冊。"
+msgstr "你所輸入的MXit帳號尚未註冊，請先註冊。"
 
-#, fuzzy
 msgid "The MXit ID you entered is already registered. Please choose another."
-msgstr "帳號已註冊，請�擇�一個帳號。"
+msgstr "您所輸入的MXit帳號已被註冊，請�擇�一個帳號。"
 
 msgid "Internal error. Please try again later."
 msgstr "內部錯誤，請�後�試"
@@ -6414,9 +6417,8 @@ msgstr "拒絕訊�"
 msgid "Hidden Number"
 msgstr "隱�電話號碼"
 
-#, fuzzy
 msgid "Your MXit ID..."
-msgstr "Yahoo 帳號"
+msgstr "您的MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6430,30 +6432,22 @@ msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫�彈出視窗"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "您已被踢出：(%s)"
+msgstr "您已經從MultiMX中被踢出。"
 
-#  FIXME「ticket�暫無譯文，也許�譯「通行證�或「許�證�？
-#  NOTE MSN 錯誤代號 928
-#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
-#, fuzzy
 msgid "was kicked"
-msgstr "無效的 ticket"
+msgstr "被踢出"
 
-#, fuzzy
 msgid "_Room Name:"
-msgstr "�天室(_R)："
+msgstr "�天室�稱(_R)："
 
-# XXX �覆查
+# NOTE 很差的原文，其實整�上下文後是「You have invited: %s�（%s 是被邀請者）
 #. Display system message in chat window
-#, fuzzy
 msgid "You have invited"
-msgstr "您收到郵件�"
+msgstr "您邀請了"
 
-#, fuzzy
 msgid "Last Online"
-msgstr "上線"
+msgstr "最後上線"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -7198,6 +7192,15 @@ msgstr "伺�器��"
 msgid "Server port"
 msgstr "伺�器通訊埠"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "請通�我的�證�求，好讓我�以將您加入我的好�清單中。"
+
+msgid "No reason given."
+msgstr "沒有給予原因。"
+
+msgid "Authorization Denied Message:"
+msgstr "拒絕�證訊�："
+
 # NOTE �見 http://pidgin.im/pipermail/translators/2009-July/000394.html
 #, c-format
 msgid "Received unexpected response from %s: %s"
@@ -7235,6 +7238,24 @@ msgstr "AOL ��許您的帳號在這�登入"
 msgid "Error requesting %s"
 msgstr "�求讀� %s 途中發生了錯誤"
 
+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 帳號的「進階設定�中的「編碼�"
+"欄�指定。）"
+
+#, 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 在使"
+"用有�題的用戶端程�。）"
+
 msgid "Could not join chat room"
 msgstr "無法加入�天室"
 
@@ -7455,109 +7476,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s�大�為 %s，超�了 %s 這個上�。"
 
-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 帳號的「進階設定�中的「編碼�"
-"欄�指定。）"
-
-#, 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
-msgid "Buddy Icon"
-msgstr "好�圖示"
-
-msgid "Voice"
-msgstr "�音"
-
-# NOTE 將「直接消��改譯為「�時訊��
-msgid "AIM Direct IM"
-msgstr "AIM ��時訊�"
-
-msgid "Get File"
-msgstr "接收檔案"
-
-msgid "Games"
-msgstr "�戲"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "模組"
-
-msgid "Send Buddy List"
-msgstr "�出好�清單"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ �直接連線"
-
-# NOTE 據其他PO檔的譯文看，「AP�應該�是「應用程��
-msgid "AP User"
-msgstr "AP 使用者"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-# 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?
-# NOTE (18:17:29) KingAnt: Right...
-# NOTE (18:17:36) wing: what does that mean though?
-# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ 伺�器轉�"
-
-msgid "Old ICQ UTF8"
-msgstr "舊� ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian �加密"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-# NOTE 這似乎是一種掌上電腦的牌�
-msgid "Hiptop"
-msgstr "Hiptop"
-
-# FIXME flagged "有�安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-msgid "Security Enabled"
-msgstr "有�安功能"
-
-# XXX æš«è­¯
-msgid "Video Chat"
-msgstr "視��天"
-
-# XXX æš«è­¯
-msgid "iChat AV"
-msgstr "iChat 視��天"
-
-msgid "Live Video"
-msgstr "動態視訊"
-
-#  NOTE AIM_CAPS_CAMERA，�是什麼呢(^^;)
-msgid "Camera"
-msgstr "照相機"
-
-# XXX 20080810 畫�分享 (Apple) / 螢幕共享 / 螢幕分享
-msgid "Screen Sharing"
-msgstr "螢幕共享"
-
 msgid "Free For Chat"
 msgstr "我有空�天"
 
@@ -7591,15 +7509,6 @@ msgstr "工作中"
 msgid "At lunch"
 msgstr "外出用�"
 
-msgid "IP Address"
-msgstr "IP ��"
-
-msgid "Warning Level"
-msgstr "警告等級"
-
-msgid "Buddy Comment"
-msgstr "好�備註"
-
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "無法連線至�證伺�器：%s"
@@ -7696,15 +7605,6 @@ msgstr "�功�出密碼"
 msgid "Unable to initialize connection"
 msgstr "無法�始化連�"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "請通�我的�證�求，好讓我�以將您加入我的好�清單中。"
-
-msgid "No reason given."
-msgstr "沒有給予原因。"
-
-msgid "Authorization Denied Message:"
-msgstr "拒絕�證訊�："
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7813,59 +7713,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您�失了 %hu 個由 %s �來的訊�，原因�明。"
 msgstr[1] "您�失了 %hu 個由 %s �來的訊�，原因�明。"
 
-#, c-format
-msgid "User information not available: %s"
-msgstr "無法�得個人資訊：%s"
-
-msgid "Online Since"
-msgstr "上線自"
-
-# XXX 改譯「註冊日期�會�比較通順？
-msgid "Member Since"
-msgstr "�為�員的時間"
-
-msgid "Capabilities"
-msgstr "相容性"
-
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM �能斷線了。"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "（無法顯示來自這個使用者的訊�，因為它包�了無效字元。）"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由�天室 %s �止連線。"
 
-msgid "Mobile Phone"
-msgstr "行動電話"
-
-msgid "Personal Web Page"
-msgstr "個人網�"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "其他資訊"
-
-msgid "Zip Code"
-msgstr "郵��號"
-
-msgid "Work Information"
-msgstr "工作資訊"
-
-msgid "Division"
-msgstr "部門"
-
-msgid "Position"
-msgstr "��"
-
-msgid "Web Page"
-msgstr "網�"
-
 # XXX 這是什麼 (情形下出�的)？ (好�是以�譯「訊��的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊�"
@@ -8130,8 +7984,8 @@ msgstr "帳號格�化�能改變大寫以�空白。"
 msgid "Change Address To:"
 msgstr "變更地�為："
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>您並沒有在等待驗證</i>"
+msgid "you are not waiting for authorization"
+msgstr "您並沒有在等待驗證"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目�正在等待下列好�的�證"
@@ -8171,6 +8025,14 @@ msgstr "設定�時訊�的轉� (��網�)"
 msgid "Set Privacy Options..."
 msgstr "設定隱��項..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "公開"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "邀請清單"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "確�帳號"
@@ -8187,9 +8049,6 @@ msgstr "顯示等待�證的好�"
 msgid "Search for Buddy by Email Address..."
 msgstr "使用電�郵件地��尋好�..."
 
-msgid "Search for Buddy by Information"
-msgstr "�照資訊尋找好�"
-
 msgid "Use clientLogin"
 msgstr "使用 clientLogin"
 
@@ -8231,87 +8090,262 @@ msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
 msgid "Server rate limit exceeded"
-msgstr ""
+msgstr "超出了伺�器端的速率上�"
 
 msgid "Client rate limit exceeded"
-msgstr ""
+msgstr "超出了用戶端的速率上�"
 
-#  NOTE Jabber 錯誤 <service-unavailable/>，表示伺�器收到一個�義�明的指令
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#, fuzzy
+# NOTE SNAC 錯誤代碼5，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 應係指給定了一個已定義的�務 (Service, Family)，但因�種原因，伺�器暫時無法�供該�務
 msgid "Service unavailable"
-msgstr "��供該項�務"
+msgstr "�務�存在"
 
-#, fuzzy
 msgid "Service not defined"
-msgstr "找�到該會議"
+msgstr "�務未定義"
 
+# XXX 譯文有待改進 - acli 20100809
 msgid "Obsolete SNAC"
-msgstr ""
+msgstr "已作廢的舊� SNAC"
 
-#  XXX 這個太奇怪了 (^^;)
-#, fuzzy
 msgid "Not supported by host"
-msgstr "�支�"
+msgstr "伺�器�支�"
 
-#  XXX 這個太奇怪了 (^^;)
-#, fuzzy
 msgid "Not supported by client"
-msgstr "�支�"
+msgstr "用戶端�支�"
 
-#, fuzzy
 msgid "Refused by client"
-msgstr "到用戶端速率"
+msgstr "被用戶端拒絕"
 
+# XXX 譯文有待改進 - acli 20100809
 msgid "Reply too big"
-msgstr ""
+msgstr "回應太大"
 
-#, fuzzy
 msgid "Responses lost"
-msgstr "「回答�或然率："
+msgstr "�失回應"
 
-#, fuzzy
 msgid "Request denied"
-msgstr "請求中"
+msgstr "請求被拒"
 
+# NOTE SNAC 錯誤代碼14 (0x0e)，見 http://iserverd.khstu.ru/oscar/errorlist.html，指 SNAC 負載內出�了格�上的錯誤
+# XXX 譯文有待改進 - acli 20100809
 msgid "Busted SNAC payload"
-msgstr ""
+msgstr "畸型的 SNAC 負載"
 
 msgid "Insufficient rights"
-msgstr ""
+msgstr "權��夠"
 
+# NOTE SNAC 錯誤代碼16 (0x10)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# XXX 譯文有待改進 - acli 20100809
 msgid "In local permit/deny"
-msgstr ""
+msgstr "在本地端的�許�拒絕清單內"
 
+# NOTE SNAC 錯誤代碼17 (0x11)，見 http://iserverd.khstu.ru/oscar/errorlist.html，�見其他涉�「warning level�的譯文
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "（發�者）警告等級�高"
 
+# NOTE SNAC 錯誤代碼18 (0x12)，見 http://iserverd.khstu.ru/oscar/errorlist.html，�見其他涉�「warning level�的譯文
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "（接收者）警告等級�高"
 
-#  NOTE「暫時無法使用�應該比「暫時�存在�通順
-#  NOTE 譯文更動 by Ambrose
-#, fuzzy
 msgid "User temporarily unavailable"
-msgstr "暫時無法使用�務"
+msgstr "使用者暫時�在線上"
 
-#, fuzzy
 msgid "No match"
-msgstr "沒有相符�的"
+msgstr "沒有相符的記錄"
 
-#, fuzzy
+# NOTE SNAC 錯誤代碼21 (0x15)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE OSCAR �定至少有三種「List�，譯�「好�清單��能��
 msgid "List overflow"
-msgstr "好�清單已滿"
+msgstr "清單已滿"
 
-#, fuzzy
 msgid "Request ambiguous"
-msgstr "請求中"
+msgstr "�明確的請求"
 
 msgid "Queue full"
-msgstr ""
+msgstr "佇列已滿"
 
+# NOTE SNAC 錯誤代碼24 (0x18)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE �能是指在 AOL ��求了一種 ICQ 的�務
+# XXX 譯文有待改進 - acli 20100809
 msgid "Not while on AOL"
+msgstr "���於 AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "好�圖示"
+
+msgid "Voice"
+msgstr "�音"
+
+# NOTE 將「直接消��改譯為「�時訊��
+msgid "AIM Direct IM"
+msgstr "AIM ��時訊�"
+
+msgid "Get File"
+msgstr "接收檔案"
+
+msgid "Games"
+msgstr "�戲"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "模組"
+
+msgid "Send Buddy List"
+msgstr "�出好�清單"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ �直接連線"
+
+# NOTE 據其他PO檔的譯文看，「AP�應該�是「應用程��
+msgid "AP User"
+msgstr "AP 使用者"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# 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?
+# NOTE (18:17:29) KingAnt: Right...
+# NOTE (18:17:36) wing: what does that mean though?
+# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 伺�器轉�"
+
+msgid "Old ICQ UTF8"
+msgstr "舊� ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian �加密"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+# NOTE 這似乎是一種掌上電腦的牌�
+msgid "Hiptop"
+msgstr "Hiptop"
+
+# FIXME flagged "有�安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
+msgid "Security Enabled"
+msgstr "有�安功能"
+
+# XXX æš«è­¯
+msgid "Video Chat"
+msgstr "視��天"
+
+# XXX æš«è­¯
+msgid "iChat AV"
+msgstr "iChat 視��天"
+
+msgid "Live Video"
+msgstr "動態視訊"
+
+#  NOTE AIM_CAPS_CAMERA，�是什麼呢(^^;)
+msgid "Camera"
+msgstr "照相機"
+
+# XXX 20080810 畫�分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+msgid "IP Address"
+msgstr "IP ��"
+
+msgid "Warning Level"
+msgstr "警告等級"
+
+msgid "Buddy Comment"
+msgstr "好�備註"
+
+#  NOTE Connection security �項，指在伺�器支�的情�下使用 TLS, 如伺�器�支� TLS 則以�加密的方�繼續進行連線
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "當伺�器支�時，使用加密功能"
+
+msgid "Mobile Phone"
+msgstr "行動電話"
+
+msgid "Personal Web Page"
+msgstr "個人網�"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "其他資訊"
+
+msgid "Zip Code"
+msgstr "郵��號"
+
+msgid "Work Information"
+msgstr "工作資訊"
+
+msgid "Division"
+msgstr "部門"
+
+msgid "Position"
+msgstr "��"
+
+msgid "Web Page"
+msgstr "網�"
+
+msgid "Online Since"
+msgstr "上線自"
+
+# XXX 改譯「註冊日期�會�比較通順？
+msgid "Member Since"
+msgstr "�為�員的時間"
+
+msgid "Capabilities"
+msgstr "相容性"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "報稱上線"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "報稱上線"
+
+# NOTE 下次登入時�報稱離線，所以加「暫時�字眼
+msgid "Appear Offline"
+msgstr "暫時報稱離線"
+
+# NOTE 下次登入時�報稱離線，所以加「暫時�字眼
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "暫時報稱離線"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "您已經從MultiMX中被踢出。"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"您�以�新�求這些好�的�證，��在好�清單中以滑鼠��點擊他們，然後�擇"
+"「�求�新�證�。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "公開"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "邀請清單"
+
+msgid "These buddies will always see you as offline"
 msgstr ""
 
 msgid "Aquarius"
@@ -8501,8 +8535,8 @@ msgid "Your request was rejected."
 msgstr "請求已被拒絶。"
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u �求�證"
+msgid "%u requires verification: %s"
+msgstr "%u �求�證：%s"
 
 # XXX æš«è­¯ - acli 20090803
 msgid "Add buddy question"
@@ -8745,7 +8779,6 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
 msgstr " 使用行動�置"
 
@@ -10577,9 +10610,8 @@ msgstr "�天室�域 (Locale)"
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與�天室邀請"
 
-#, fuzzy
 msgid "Use account proxy for HTTP and HTTPS connections"
-msgstr "使用 SSL 連線時，使用帳號的代�伺�器"
+msgstr "使用 HTTP 和 HTTPS 連線時，使用帳號的代�伺�器"
 
 msgid "Chat room list URL"
 msgstr "�天室清單所在網�"
@@ -10759,9 +10791,6 @@ msgstr "走出去了"
 msgid "Not on server list"
 msgstr "�在伺�器上的清單中"
 
-msgid "Appear Online"
-msgstr "報稱上線"
-
 # NOTE Yahoo 官方譯「永�顯示離線�，說白一點其實�是（���人）「長期隠身�
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
@@ -10769,10 +10798,6 @@ msgstr "長期報稱離線"
 msgid "Presence"
 msgstr "�狀"
 
-# NOTE 下次登入時�報稱離線，所以加「暫時�字眼
-msgid "Appear Offline"
-msgstr "暫時報稱離線"
-
 #  NOTE 這是清單內的一個指令
 msgid "Don't Appear Permanently Offline"
 msgstr "�止長期報稱離線"
@@ -11351,28 +11376,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "連線被電腦上的其他軟體中斷。"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "�端主機關閉了連線。"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "連線已逾時"
 
 # XXX - 20061027
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "��已在使用中"
 
@@ -11527,6 +11547,12 @@ msgstr ""
 "您如果希望新增�修改或刪除帳號，����好�清單上的「帳號->管�帳號�指令，"
 "��返回這個畫�。"
 
+#  NOTE: 最頭的 %s%s%s%s 是�方帳號，或帳號括弧別�（第二�四個 %s 是括弧）
+#  NOTE: 最尾的 %s%s 是空白或「: 訊��，基本上�以��會（也�能怎樣�會）
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "使用者 %s%s%s%s 想�將您（%s）加入他（她）的好�清單%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "背景�色"
@@ -11786,6 +11812,8 @@ msgstr "訊�（�用）"
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/好�(_B)"
@@ -12561,9 +12589,6 @@ msgstr "支�"
 msgid "webmaster"
 msgstr "網站管�員"
 
-msgid "Senior Contributor/QA"
-msgstr "資深貢�者兼�管"
-
 msgid "win32 port"
 msgstr "Windows 版本移�"
 
@@ -12589,6 +12614,9 @@ msgstr "原作者"
 msgid "lead developer"
 msgstr "主�開發者"
 
+msgid "Senior Contributor/QA"
+msgstr "資深貢�者兼�管"
+
 #  NOTE �見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "���蘭文"
@@ -13562,14 +13590,12 @@ msgid "Exiting because another libpurple client is already running.\n"
 msgstr "因為已有其他 libpurple 用戶端正在執行，本程��在��。\n"
 
 # XXX 媒體? - acli 20090730
-#, fuzzy
 msgid "_Media"
-msgstr "/媒體(_M)"
+msgstr "媒體(_M)"
 
 # NOTE 這是按鈕上的標籤
-#, fuzzy
 msgid "_Hangup"
-msgstr "掛斷"
+msgstr "掛斷(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13995,6 +14021,9 @@ msgstr "中繼伺�器 (TURN)"
 msgid "_TURN server:"
 msgstr "TURN 伺�器(_U)："
 
+msgid "_UDP Port:"
+msgstr "UDP 通訊埠(_U)："
+
 msgid "Use_rname:"
 msgstr "帳號(_R)："
 
@@ -14016,6 +14045,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "桌��設值"
 
@@ -14034,6 +14068,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "使用者自定"
 
@@ -14572,7 +14614,7 @@ msgstr "ç„¡"
 msgid "Small"
 msgstr "縮�版�設表情"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "縮�版的�設表情圖示"
 
 msgid "Response Probability:"
@@ -14589,9 +14631,11 @@ msgstr "好�作出回覆的時間上�："
 msgid "minutes"
 msgstr "分�"
 
+#  NOTE �閱 gtk/plugins/cap/README
+#  FIXME 但這�能是暫譯，譯文絕�有待改進
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "在線時間差異上�："
 
 #  NOTE �閱 gtk/plugins/cap/README
 #  FIXME 但這�能是暫譯，譯文絕�有待改進
@@ -15643,6 +15687,9 @@ msgstr "�置(_E)"
 msgid "Voice/Video Settings"
 msgstr "語音�視訊設定"
 
+msgid "Voice and Video Settings"
+msgstr "語音�視訊設定"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15771,7 +15818,7 @@ msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺�器或客戶端進行除錯。"
 
 # XXX �覆查譯文 - acli 20100527
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15916,43 +15963,31 @@ msgstr "�覽 Pidgin 官方網站"
 msgid "You do not have permission to uninstall this application."
 msgstr "您沒有權�移除程�。"
 
-#~ msgid "The certificate is not valid yet."
-#~ msgstr "這張憑證尚未生效。"
-
-#~ msgid "The nick name you entered is invalid."
-#~ msgstr "您所輸入的暱稱無效。"
-
-#~ msgid "MXit Login Name"
-#~ msgstr "MXit 帳號"
-
-# NOTE「Display Name�和「Nick Name�都是指�一個欄�，就是 profile->nickname
-#~ msgid "Nick Name"
-#~ msgstr "暱稱"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "這張憑證已逾期，應視作無效。"
 
-#~ msgid "Your Mobile Number..."
-#~ msgstr "行動電話號碼..."
+#~ msgid "Require SSL/TLS"
+#~ msgstr "需� SSL/TLS"
 
-#~ msgid "Rate to host"
-#~ msgstr "到伺�器速率"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "強迫使用舊� SSL (port 5223)"
 
-#~ msgid "Rate to client"
-#~ msgstr "到用戶端速率"
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "（無法顯示來自這個使用者的訊�，因為它包�了無效字元。）"
 
-# XXX æš«è­¯ - acli 20090730
-#~ msgid "/Media/_Hangup"
-#~ msgstr "/媒體/掛斷(_H)"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "�照資訊尋找好�"
 
-#~ msgid "Current Mood"
-#~ msgstr "目�的心情"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "您所輸入的�稱無效。"
 
-#~ msgid "New Mood"
-#~ msgstr "新心情"
-
-#~ msgid "Change your Mood"
-#~ msgstr "修改心情"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張憑證尚未生效。"
 
-#~ msgid "How do you feel right now?"
-#~ msgstr "您�在覺得怎樣？"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您所輸入的暱稱無效。"
 
-#~ msgid "Change Mood..."
-#~ msgstr "修改心情..."
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
diff --git a/share/ca-certs/Deutsche_Telekom_Root_CA_2.pem b/share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
new file mode 100644
index 0000000000..3d6e55b255
--- /dev/null
+++ b/share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
diff --git a/share/ca-certs/Go_Daddy_Class_2_CA.pem b/share/ca-certs/Go_Daddy_Class_2_CA.pem
new file mode 100644
index 0000000000..0569e5beda
--- /dev/null
+++ b/share/ca-certs/Go_Daddy_Class_2_CA.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQL
+EyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMx
+ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMo
+R28gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAw
+DQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d
+/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9
+S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32qRe3H3I2
+TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVl
+OARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFA
+pMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44
+dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLEsNKR1EwRcbNh
+yz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2oatTj
+oWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdy
+b3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYX
+MP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheab
+IZ0KbIIOqPjCDPoQHmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzr
+Tia2cyvk0/ZM/iZx4mERdEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBD
+pqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/Makefile.am b/share/ca-certs/Makefile.am
index 13097a340c..314cfbc4f2 100644
--- a/share/ca-certs/Makefile.am
+++ b/share/ca-certs/Makefile.am
@@ -2,23 +2,29 @@ CERTIFICATES = \
 		America_Online_Root_Certification_Authority_1.pem \
 		CAcert_Root.pem \
 		CAcert_Class3.pem \
+		Deutsche_Telekom_Root_CA_2.pem \
 		Entrust.net_Secure_Server_CA.pem \
 		Equifax_Secure_CA.pem \
 		Equifax_Secure_Global_eBusiness_CA-1.pem \
+		Go_Daddy_Class_2_CA.pem \
 		GTE_CyberTrust_Global_Root.pem \
 		StartCom_Certification_Authority.pem \
 		StartCom_Free_SSL_CA.pem \
 		Thawte_Premium_Server_CA.pem \
+		Thawte_Primary_Root_CA.pem \
 		ValiCert_Class_2_VA.pem \
 		Verisign_RSA_Secure_Server_CA.pem \
 		Verisign_Class3_Primary_CA.pem \
+		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem \
 		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
 		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
 
 EXTRA_CERTS = \
 		AOL_Member_CA.pem \
 		Microsoft_Internet_Authority.pem \
+		Microsoft_Internet_Authority_2010.pem \
 		Microsoft_Secure_Server_Authority.pem \
+		Microsoft_Secure_Server_Authority_2010.pem \
 		VeriSign_Class3_Extended_Validation_CA.pem \
 		VeriSign_International_Server_Class_3_CA.pem
 
diff --git a/share/ca-certs/Microsoft_Internet_Authority_2010.pem b/share/ca-certs/Microsoft_Internet_Authority_2010.pem
new file mode 100644
index 0000000000..1bb8ee6325
--- /dev/null
+++ b/share/ca-certs/Microsoft_Internet_Authority_2010.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFEjCCBHugAwIBAgIEBydiAjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MB4XDTEwMDQxNDE4MTIyNloXDTE4MDQxNDE4MTIxNFowJzElMCMG
+A1UEAxMcTWljcm9zb2Z0IEludGVybmV0IEF1dGhvcml0eTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAL30zSelStiQGduyCntgpE6PDpijnHxQduuzSoyf
+GLDnmsUrgoYJKKwREjIm9Rnq8LhnaMUG/fQZrtkToNCBJwimeZwE9UgyLjYfq2sm
+7KFDtJ2AsEkD6oJJXwUTxaCDX+Eq9AQZS37I2oi8tV0DvHhWoel/xWrvtv8dAVm3
+H1NaX8b4kW3FfUOTGHRF7RW6snzIOjQUHqpj9+XUS8gjK4dplROZCRTvegEgTrfG
+SEGuyYcBKdnChzh/tkKk8LLOLf20TFfwqNbLTvpfXf25+wncFoVk5XGc1fEzlzhn
+Lpu8FzYFfhA2f37rmFpbHK2l5wkQfflKL7OPNxXWb7lbN9y3n3+OZn8jXO0Sf4wH
+8P4Z+bg0Q3uy6oX7jKmq3/2RDSz1+6+XifEGiq9J9jwuI/ZEFiWREeIjw8qFVUkq
+yCGvfREmhrAoRbqH7jYTgdVLRxqO2wnx0ZcpUBQymQnj8sDnU49r9PoTXDyN7lSZ
+DydHTjwS848SF0bwiWpFs7U8DHdFBC+9vrWemDwFO7tBOYQgvHkE1kLNPonp53o3
+SRC0zJ8kXCOmSG7749TuISmT5P2AGhs6bMH369nUTb7xEfaijkIkoU9ptdJoFInZ
+n5DYH54b5m1kJSm2NEOkW/UN63QGfp/xY9xFp3w6mlxrc9jDWASOiG8T0ObQ383E
+Cg4HAgMBAAGjggF3MIIBczASBgNVHRMBAf8ECDAGAQH/AgEBMFsGA1UdIARUMFIw
+SAYJKwYBBAGxPgEAMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly9jeWJlcnRydXN0Lm9t
+bmlyb290LmNvbS9yZXBvc2l0b3J5LmNmbTAGBgRVHSAAMA4GA1UdDwEB/wQEAwIB
+hjCBiQYDVR0jBIGBMH+heaR3MHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
+Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywg
+SW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3SCAgGlMEUG
+A1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly93d3cucHVibGljLXRydXN0LmNvbS9jZ2kt
+YmluL0NSTC8yMDE4L2NkcC5jcmwwHQYDVR0OBBYEFDMh8Mv+oqBEkt72OzPYXwFL
+l3hdMA0GCSqGSIb3DQEBBQUAA4GBACtI85T7RMWTatZN/rQTThImF8qyWqsJuVak
+b39XnmSy9eTTNe9jZcvlLBWc7874KsWSZCtJPjw2bL0Ym2Rnlz/taNAWwRM88lGg
+V94kzjWraZBOKww6+bTxgPptAHmmOpaZTjpuVNCjWW6LHZVJu5XYdbjhEjOsXCe7
+y1Vx1frt
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem b/share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
new file mode 100644
index 0000000000..f9113e82ed
--- /dev/null
+++ b/share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGEzCCA/ugAwIBAgIKYQMzNgAFAAAAMDANBgkqhkiG9w0BAQUFADAnMSUwIwYD
+VQQDExxNaWNyb3NvZnQgSW50ZXJuZXQgQXV0aG9yaXR5MB4XDTEwMDUxOTIyMTMz
+MFoXDTE0MDUxOTIyMjMzMFowgYsxEzARBgoJkiaJk/IsZAEZFgNjb20xGTAXBgoJ
+kiaJk/IsZAEZFgltaWNyb3NvZnQxFDASBgoJkiaJk/IsZAEZFgRjb3JwMRcwFQYK
+CZImiZPyLGQBGRYHcmVkbW9uZDEqMCgGA1UEAxMhTWljcm9zb2Z0IFNlY3VyZSBT
+ZXJ2ZXIgQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+6p9fkQvNGYJfkeqr9Yso2Iv1HOCRybzNAhBQIrc4ClzPcQxYLYhsqLg8M2P5c508
+6cN57fL+ycvDbiTiPEJw2F+3W/ebX/Unb3gA65Zdt2/P5EEE8LtDvW9fJg+3jjdB
+E1RnG5AAJzi4GsOWbRwxNTVJxUYe53OkygMReUGBr9OORqLFvgBTBbk4nLdgKbPK
+UpqSxVMntkENQPgvm+eBSRpaaqhPccfobYG+J+/J1saSKxDkNjVACNBNcP1wmyAc
+s7nfdZ0rd9DEzWpx71pYC/lwhYgFiW1mkjCrr4g519QtC5aceCSvAKvPCT4TrmvD
+4OHPYH+LU9wC0POwhhHevQIDAQABo4IB2jCCAdYwEgYDVR0TAQH/BAgwBgEB/wIB
+ADAdBgNVHQ4EFgQUCELj204RZvO1CMVA21V8M0YRgzgwCwYDVR0PBAQDAgGGMBIG
+CSsGAQQBgjcVAQQFAgMIAAgwIwYJKwYBBAGCNxUCBBYEFH6KwpxaMozCcaLZT3Vw
+96kb9pQFMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMB8GA1UdIwQYMBaAFDMh
+8Mv+oqBEkt72OzPYXwFLl3hdMIGjBgNVHR8EgZswgZgwgZWggZKggY+GNmh0dHA6
+Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL21zd3d3KDUpLmNy
+bIY0aHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL21zd3d3
+KDUpLmNybIYfaHR0cDovL2NvcnBwa2kvY3JsL21zd3d3KDUpLmNybDB5BggrBgEF
+BQcBAQRtMGswPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9w
+a2kvbXNjb3JwL21zd3d3KDUpLmNydDArBggrBgEFBQcwAoYfaHR0cDovL2NvcnBw
+a2kvYWlhL21zd3d3KDUpLmNydDANBgkqhkiG9w0BAQUFAAOCAgEAj8LRXO8UEXcX
+Ywc8THxo2v6GSuIgzD+wJz3R4qzIi0im5Fn3OgatfVLx9mVhliEirmi+L3reswz1
+6cXd+GWCXctsPgw3EXQVCXhVvSYSu9aVdNO89XYJKmrfNsSOVtUfIN9/gjDXQ6to
+IotqWsWb0J2NCwxQhX7MWoAHiwNOv71fbFYPBaniVMOl01JcX00L3QX4URIDIW+c
+bJeYKsHBEby9G67741dfTx8AnuKkUdP3rAk3WKUJIdFy0LLBi9tN3BPRVFhNK8Ct
++lMZNbEVqEJkt+3HH6V5qA041FC/9Fr/L+m/P3045fsgDNRO4C8dRXr7KC8xSG/M
+blxoQvrqyAsBMOwQJkI4I6nDGbjZcBpoLJLLn3PmzP8zI+7bXrV/BVg/UMUcCBj0
+6y9iqlP3oc3e4+uCHBpna6FMp2hxQNFlO0EYnEnjcfvrTYOT00fmZELLtjUc+zQO
+oSj7jKGnHwEoUeVxlDec3EFbfH7pLCNnlJ1z319AeaONlTDMUxcIvFCG8/wQGYH8
+9Fpu89yimnV7w6ygUe0ytljfT46RU2rSqhtd5lO4iaOeiaHjKeCzbOsazG9aqsLi
+9h5FKe/WwkOxO60+JvyBl1xI/WJZNJLJ+7mh10IF+xn2fjL7KTTVh2blBB3IPhD6
+pnj1Hn3eGjp4fNwqcQajLW8FVSOLkO8=
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/Thawte_Primary_Root_CA.pem b/share/ca-certs/Thawte_Primary_Root_CA.pem
new file mode 100644
index 0000000000..998460f1c2
--- /dev/null
+++ b/share/ca-certs/Thawte_Primary_Root_CA.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
new file mode 100644
index 0000000000..2202c69287
--- /dev/null
+++ b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----