changeset 18119:59aec2d6ec43

propagate from branch 'im.pidgin.pidgin.2.1.0' (head 86fd5e0d8b80a9da3103e850c97f1e04a2333961) to branch 'im.pidgin.pidgin' (head 999df812d342023b977c17afda10ed0238f1f80d)
author Richard Laager <rlaager@wiktel.com>
date Sat, 16 Jun 2007 19:48:23 +0000
parents ab6d2763b8d8 (current diff) c0cd4d84ba52 (diff)
children cd385a6206e2
files libpurple/blist.c libpurple/idle.c libpurple/notify.c libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkmain.c pidgin/gtkutils.c
diffstat 158 files changed, 27532 insertions(+), 17998 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jun 16 19:44:59 2007 +0000
+++ b/ChangeLog	Sat Jun 16 19:48:23 2007 +0000
@@ -18,10 +18,17 @@
 	  second time will raise the buddy list.  (Gabriel Schulhof)
 	* Undo capability in the conversation window
 
-version 2.0.2 (??/??/????):
+version 2.0.2 (06/14/2007):
 	Pidgin:
 	* Added a custom conversation font option to preferences
 	* Fixed smiley ordering in the insert smiley popup to be more intuitive
+	* Conversation->More menu items work for Chats as well as Buddies,
+	  including those not on your buddy list
+	* newline plugin should work better with conversation colors plugin now
+	* Get Info on users now provides immediate feedback that something is
+	  happening
+	* Aliasing a buddy will not be interrupted by other buddy list activity
+	* Using the -l option to log in to a specific account works better
 
 	libpurple:
 	* Moving an ICQ buddy from one group to another no longer
@@ -32,6 +39,11 @@
 	* Fix MSN to correctly detect incorrect passwords and disable the account
 	* Get User Info on MSN is now more reliable & accurate
 	* Updated SILC protocol to support SILC Toolkit 1.1 (Pekka Riikonen)
+	* Fix for some QQ authentication problems
+	* Fix for building on FreeBSD
+	* Prevent "Logged in:" times for AIM buddies being ridiculously high
+	* Updates and fixes to Bonjour support
+	* Improve ICQ encoding support for some non-latin languages
 
 	Finch:
 	* Auto account reconnecting
--- a/ChangeLog.win32	Sat Jun 16 19:44:59 2007 +0000
+++ b/ChangeLog.win32	Sat Jun 16 19:48:23 2007 +0000
@@ -1,4 +1,4 @@
-version 2.0.2 (??/??/????):
+version 2.0.2 (6/14/2007):
 	* Add Bonjour protocol support thanks to Chris Davies. This requires
 	  Apple Bonjour for Windows from:
 	  http://www.apple.com/support/downloads/bonjourforwindows.html
--- a/NEWS	Sat Jun 16 19:44:59 2007 +0000
+++ b/NEWS	Sat Jun 16 19:48:23 2007 +0000
@@ -1,5 +1,18 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.0.2 (6/14/2007):
+	Sean: Another big maintenance release. Again, about 100 tickets were
+	resolved in this release, and they keep coming in. Lots of bug fixes,
+	some minor icon adjustements, hopefully we addressed some ICQ
+	internationalization issues, and support for Bonjour on Windows!
+	Our next release will be 2.1.0, and will come with some great new
+	features.
+
+	Stu: I think we're gradually getting the hang of this 3 week thing
+	again. This release includes yet more bug fixes. I'd also like to
+	specifically thank Pekka Riikonen for the patch to enable using SILC
+	Toolkit 1.1 with Pidgin/libpurple that is included in this release.
+
 2.0.1 (5/24/2007):
 	Sean: 2.0.1! Three weeks later, as scheduled! It is so nice to have
 	regular, frequent, releases again! This is a bugfix release; We have
--- a/configure.ac	Sat Jun 16 19:44:59 2007 +0000
+++ b/configure.ac	Sat Jun 16 19:48:23 2007 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [1])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [0])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
@@ -142,7 +142,7 @@
 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
 dnl AM_GLIB_GNU_GETTEXT found it.
 
-if test x$MSGFMT = xno -o x$GMSGFMT = x
+if test x$MSGFMT = xno
 then
 	AC_ERROR([
 
@@ -2104,6 +2104,8 @@
 		   pidgin/pixmaps/tray/16/scalable/Makefile
 		   pidgin/pixmaps/tray/22/Makefile
 		   pidgin/pixmaps/tray/22/scalable/Makefile
+		   pidgin/pixmaps/tray/32/Makefile
+		   pidgin/pixmaps/tray/48/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
 		   pidgin/plugins/gestures/Makefile
--- a/finch/gntconn.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/finch/gntconn.c	Sat Jun 16 19:48:23 2007 +0000
@@ -24,7 +24,7 @@
  */
 #include "account.h"
 #include "core.h"
-#include "connection.c"
+#include "connection.h"
 #include "debug.h"
 #include "request.h"
 
--- a/libpurple/Makefile.mingw	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/Makefile.mingw	Sat Jun 16 19:48:23 2007 +0000
@@ -72,6 +72,7 @@
 			upnp.c \
 			util.c \
 			value.c \
+			version.c \
 			xmlnode.c \
 			whiteboard.c \
 			win32/giowin32.c \
--- a/libpurple/blist.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/blist.c	Sat Jun 16 19:48:23 2007 +0000
@@ -1774,7 +1774,7 @@
 
 	node = (PurpleBlistNode *)buddy;
 	cnode = node->parent;
-	gnode = cnode->parent;
+	gnode = (cnode != NULL) ? cnode->parent : NULL;
 	contact = (PurpleContact *)cnode;
 	group = (PurpleGroup *)gnode;
 
@@ -1783,35 +1783,37 @@
 		node->prev->next = node->next;
 	if (node->next)
 		node->next->prev = node->prev;
-	if (cnode->child == node)
+	if ((cnode != NULL) && (cnode->child == node))
 		cnode->child = node->next;
 
 	/* Adjust size counts */
-	if (PURPLE_BUDDY_IS_ONLINE(buddy)) {
-		contact->online--;
-		if (contact->online == 0)
-			group->online--;
+	if (contact != NULL) {
+		if (PURPLE_BUDDY_IS_ONLINE(buddy)) {
+			contact->online--;
+			if (contact->online == 0)
+				group->online--;
+		}
+		if (purple_account_is_connected(buddy->account)) {
+			contact->currentsize--;
+			if (contact->currentsize == 0)
+				group->currentsize--;
+		}
+		contact->totalsize--;
+
+		/* Re-sort the contact */
+		if (cnode->child && contact->priority == buddy) {
+			purple_contact_invalidate_priority_buddy(contact);
+			if (ops && ops->update)
+				ops->update(purplebuddylist, cnode);
+		}
 	}
-	if (purple_account_is_connected(buddy->account)) {
-		contact->currentsize--;
-		if (contact->currentsize == 0)
-			group->currentsize--;
-	}
-	contact->totalsize--;
 
 	purple_blist_schedule_save();
 
-	/* Re-sort the contact */
-	if (cnode->child && contact->priority == buddy) {
-		purple_contact_invalidate_priority_buddy(contact);
-		if (ops && ops->update)
-			ops->update(purplebuddylist, cnode);
-	}
-
 	/* Remove this buddy from the buddies hash table */
 	hb.name = g_strdup(purple_normalize(buddy->account, buddy->name));
 	hb.account = buddy->account;
-	hb.group = ((PurpleBlistNode*)buddy)->parent->parent;
+	hb.group = gnode;
 	g_hash_table_remove(purplebuddylist->buddies, &hb);
 	g_free(hb.name);
 
@@ -1841,7 +1843,7 @@
 	while (g_source_remove_by_user_data((gpointer *)buddy));
 
 	/* If the contact is empty then remove it */
-	if (!cnode->child)
+	if ((contact != NULL) && !cnode->child)
 		purple_blist_remove_contact(contact);
 }
 
--- a/libpurple/idle.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/idle.c	Sat Jun 16 19:48:23 2007 +0000
@@ -304,6 +304,14 @@
 	return &handle;
 }
 
+static gboolean _do_purple_idle_touch_cb(gpointer data)
+{
+	purple_idle_touch();
+
+	return FALSE;
+}
+
+
 void
 purple_idle_init()
 {
@@ -325,7 +333,10 @@
 	purple_prefs_connect_callback(purple_idle_get_handle(), "/purple/away/idle_reporting",
 	                              idle_reporting_cb, NULL);
 
-	purple_idle_touch();
+	/* Initialize the idleness asynchronously so it doesn't check idleness,
+	 * and potentially try to change the status before the UI is initialized */
+	g_idle_add(_do_purple_idle_touch_cb, NULL);
+
 }
 
 void
--- a/libpurple/notify.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/notify.c	Sat Jun 16 19:48:23 2007 +0000
@@ -749,18 +749,16 @@
 void
 purple_notify_close_with_handle(void *handle)
 {
-	GList *l, *l_next;
+	GList *l, *prev = NULL;
 	PurpleNotifyUiOps *ops;
 
 	g_return_if_fail(handle != NULL);
 
 	ops = purple_notify_get_ui_ops();
 
-	for (l = handles; l != NULL; l = l_next) {
+	for (l = handles; l != NULL; l = prev ? prev->next : handles) {
 		PurpleNotifyInfo *info = l->data;
 
-		l_next = l->next;
-
 		if (info->handle == handle) {
 			handles = g_list_remove(handles, info);
 
@@ -771,7 +769,8 @@
 				info->cb(info->cb_user_data);
 
 			g_free(info);
-		}
+		} else
+			prev = l;
 	}
 }
 
--- a/libpurple/plugins/Makefile.mingw	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Sat Jun 16 19:48:23 2007 +0000
@@ -63,6 +63,7 @@
 		autoaccept.dll \
 		buddynote.dll \
 		idle.dll \
+		joinpart.dll \
 		log_reader.dll \
 		newline.dll \
 		offlinemsg.dll \
--- a/libpurple/plugins/buddynote.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Sat Jun 16 19:48:23 2007 +0000
@@ -58,6 +58,9 @@
 {
 	PurpleMenuAction *bna = NULL;
 
+	if (purple_blist_node_get_flags(node) & PURPLE_BLIST_NODE_FLAG_NO_SAVE)
+		return;
+
 	*m = g_list_append(*m, bna);
 	bna = purple_menu_action_new(_("Edit Notes..."), PURPLE_CALLBACK(buddynote_edit_cb), NULL, NULL);
 	*m = g_list_append(*m, bna);
--- a/libpurple/plugins/log_reader.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Sat Jun 16 19:48:23 2007 +0000
@@ -1290,9 +1290,16 @@
 						list = g_list_delete_link(list, last);
 					}
 				}
-			} else if (line[0] && line[1] && line [3] &&
+			} else if (line[0] && line[1] && line[2] &&
 					   purple_str_has_prefix(&line[3], "sion Start ")) {
-
+				/* The conditional is to make sure we're not reading off
+				 * the end of the string.  We don't want strlen(), as that'd
+				 * have to count the whole string needlessly.
+				 * 
+				 * The odd check here is because a Session Start at the
+				 * beginning of the file can be overwritten with a UTF-8
+				 * byte order mark.  Yes, it's weird.
+				 */
 				char *their_nickname = line;
 				char *timestamp;
 
--- a/libpurple/plugins/newline.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/plugins/newline.c	Sat Jun 16 19:48:23 2007 +0000
@@ -32,7 +32,7 @@
 					 PurpleConversation *conv, int *flags, void *data)
 {
 	if (g_ascii_strncasecmp(*message, "/me ", strlen("/me "))) {
-		char *tmp = g_strdup_printf("\n%s", *message);
+		char *tmp = g_strdup_printf("<br/>%s", *message);
 		g_free(*message);
 		*message = tmp;
 	}
--- a/libpurple/protocols/Makefile.mingw	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/Makefile.mingw	Sat Jun 16 19:48:23 2007 +0000
@@ -8,7 +8,7 @@
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour
+SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc10 simple yahoo bonjour
 
 .PHONY: all install clean
 
--- a/libpurple/protocols/bonjour/jabber.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Sat Jun 16 19:48:23 2007 +0000
@@ -736,15 +736,16 @@
 	if (bb->conversation == NULL)
 	{
 		PurpleProxyConnectData *connect_data;
+		PurpleProxyInfo *proxy_info;
 
 		/* Make sure that the account always has a proxy of "none".
 		 * This is kind of dirty, but proxy_connect_none() isn't exposed. */
-		static PurpleProxyInfo *tmp_none_proxy_info = NULL;
-		if (!tmp_none_proxy_info) {
-			tmp_none_proxy_info = purple_proxy_info_new();
-			purple_proxy_info_set_type(tmp_none_proxy_info, PURPLE_PROXY_NONE);
+		proxy_info = purple_account_get_proxy_info(data->account);
+		if (proxy_info == NULL) {
+			proxy_info = purple_proxy_info_new();
+			purple_account_set_proxy_info(data->account, proxy_info);
 		}
-		purple_account_set_proxy_info(data->account, tmp_none_proxy_info);
+		purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE);
 
 		connect_data =
 			purple_proxy_connect(data->account->gc, data->account, bb->ip,
--- a/libpurple/protocols/jabber/iq.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/jabber/iq.c	Sat Jun 16 19:48:23 2007 +0000
@@ -232,7 +232,8 @@
 
 		query = xmlnode_get_child(iq->node, "query");
 
-		xmlnode_insert_data(xmlnode_new_child(query, "name"), PACKAGE, -1);
+		/* TODO: ask the core for the version of libpurple and the name and version of the UI */
+		xmlnode_insert_data(xmlnode_new_child(query, "name"), "libpurple", -1);
 		xmlnode_insert_data(xmlnode_new_child(query, "version"), VERSION, -1);
 		if(os) {
 			xmlnode_insert_data(xmlnode_new_child(query, "os"), os, -1);
--- a/libpurple/protocols/jabber/libxmpp.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sat Jun 16 19:48:23 2007 +0000
@@ -66,7 +66,7 @@
 	jabber_set_info,				/* set_info */
 	jabber_send_typing,				/* send_typing */
 	jabber_buddy_get_info,			/* get_info */
-	jabber_presence_send,			/* set_away */
+	jabber_presence_send,			/* set_status */
 	jabber_idle_set,				/* set_idle */
 	NULL,							/* change_passwd */
 	jabber_roster_add_buddy,		/* add_buddy */
--- a/libpurple/protocols/jabber/presence.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sat Jun 16 19:48:23 2007 +0000
@@ -379,8 +379,7 @@
 			} else if(xmlns && !strcmp(xmlns, "vcard-temp:x:update")) {
 				xmlnode *photo = xmlnode_get_child(y, "photo");
 				if(photo) {
-					if(avatar_hash)
-						g_free(avatar_hash);
+					g_free(avatar_hash);
 					avatar_hash = xmlnode_get_data(photo);
 				}
 			}
@@ -409,8 +408,7 @@
 			jabber_id_free(jid);
 			g_free(status);
 			g_free(room_jid);
-			if(avatar_hash)
-				g_free(avatar_hash);
+			g_free(avatar_hash);
 			return;
 		}
 
@@ -426,8 +424,7 @@
 				jabber_id_free(jid);
 				g_free(status);
 				g_free(room_jid);
-				if(avatar_hash)
-					g_free(avatar_hash);
+				g_free(avatar_hash);
 				return;
 			}
 
@@ -510,8 +507,7 @@
 			purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%x)",
 				buddy_name, purple_account_get_username(js->gc->account), js->gc->account);
 			jabber_id_free(jid);
-			if(avatar_hash)
-				g_free(avatar_hash);
+			g_free(avatar_hash);
 			g_free(buddy_name);
 			g_free(status);
 			return;
@@ -568,8 +564,7 @@
 	}
 	g_free(status);
 	jabber_id_free(jid);
-	if(avatar_hash)
-		g_free(avatar_hash);
+	g_free(avatar_hash);
 }
 
 void jabber_presence_subscription_set(JabberStream *js, const char *who, const char *type)
@@ -608,7 +603,7 @@
 				formatted_msg = NULL;
 
 			if(formatted_msg)
-				purple_markup_html_to_xhtml(formatted_msg, NULL, msg);
+				*msg = purple_markup_strip_html(formatted_msg);
 		}
 
 		if(priority)
--- a/libpurple/protocols/msn/notification.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sat Jun 16 19:48:23 2007 +0000
@@ -591,12 +591,23 @@
 static void
 qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
+	MsnSession *session;
 	static int count = 0;
-	MsnSession *session = cmdproc->session;
+	const char *passport;
+	PurpleAccount *account;
+
+	session = cmdproc->session;
+	account = session->account;
 
 	if (session->passport_info.file == NULL)
 		return;
 
+	passport = purple_normalize(account, purple_account_get_username(account));
+
+	if ((strstr(passport, "@hotmail.") != NULL) ||
+		(strstr(passport, "@msn.com") != NULL))
+		return;
+
 	if (count++ < 26)
 		return;
 
--- a/libpurple/protocols/msn/servconn.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/msn/servconn.c	Sat Jun 16 19:48:23 2007 +0000
@@ -352,7 +352,7 @@
 
 		if (ret < 0 && errno == EAGAIN)
 			ret = 0;
-		if (ret < len) {
+		if (ret >= 0 && ret < len) {
 			if (servconn->tx_handler == -1)
 				servconn->tx_handler = purple_input_add(
 					servconn->fd, PURPLE_INPUT_WRITE,
--- a/libpurple/protocols/msn/session.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Sat Jun 16 19:48:23 2007 +0000
@@ -386,6 +386,7 @@
 	PurpleAccount *account;
 	PurpleConnection *gc;
 	PurpleStoredImage *img;
+	const char *passport;
 
 	if (session->logged_in)
 		return;
@@ -409,5 +410,12 @@
 	 * and @msn.com accounts don't automatically get the initial email
 	 * notification so we always request it on login
 	 */
-	msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
+
+	passport = purple_normalize(account, purple_account_get_username(account));
+
+	if ((strstr(passport, "@hotmail.") != NULL) ||
+		(strstr(passport, "@msn.com") != NULL))
+	{
+		msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
+	}
 }
--- a/libpurple/protocols/oscar/oscar.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Jun 16 19:48:23 2007 +0000
@@ -298,7 +298,7 @@
 }
 
 gchar *
-oscar_encoding_to_utf8(const char *encoding, const char *text, int textlen)
+oscar_encoding_to_utf8(PurpleAccount *account, const char *encoding, const char *text, int textlen)
 {
 	gchar *utf8 = NULL;
 
@@ -311,7 +311,25 @@
 	{
 		utf8 = g_convert(text, textlen, "UTF-8", "Windows-1252", NULL, NULL, NULL);
 	} else if (!g_ascii_strcasecmp(encoding, "unicode-2-0")) {
-		utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL);
+		/* Some official ICQ clients are apparently total crack,
+		 * and have been known to save a UTF-8 string converted
+		 * from the locale character set to UCS-2 (not from UTF-8
+		 * to UCS-2!) in the away message.  This hack should find
+		 * and do something (un)reasonable with that, and not
+		 * mess up too much else. */
+		const gchar *charset = purple_account_get_string(account, "encoding", NULL);
+		if (charset) {
+			gsize len;
+			utf8 = g_convert(text, textlen, charset, "UCS-2BE", &len, NULL, NULL);
+			if (!utf8 || len != textlen || !g_utf8_validate(utf8, -1, NULL)) {
+				g_free(utf8);
+				utf8 = NULL;
+			} else {
+				purple_debug_info("oscar", "Used broken ICQ fallback encoding\n");
+			}
+		}
+		if (!utf8)
+			utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL);
 	} else if (g_ascii_strcasecmp(encoding, "utf-8")) {
 		purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", "
 						   "attempting to convert to UTF-8 anyway\n", encoding);
@@ -1774,7 +1792,7 @@
 	{
 		have_status_message = TRUE;
 		if (info->status[0] != '\0')
-			message = oscar_encoding_to_utf8(info->status_encoding,
+			message = oscar_encoding_to_utf8(account, info->status_encoding,
 											 info->status, info->status_len);
 	}
 
@@ -1790,7 +1808,7 @@
 		if ((status_id == OSCAR_STATUS_ID_AVAILABLE) && (info->itmsurl != NULL))
 		{
 			char *itmsurl;
-			itmsurl = oscar_encoding_to_utf8(info->itmsurl_encoding,
+			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
 					info->itmsurl, info->itmsurl_len);
 			purple_prpl_got_user_status(account, info->sn, status_id,
 					"message", message, "itmsurl", itmsurl, NULL);
@@ -1825,9 +1843,8 @@
 		signon = time(NULL) - info->sessionlen;
 	if (!aim_sncmp(purple_account_get_username(account), info->sn)) {
 		purple_connection_set_display_name(gc, info->sn);
-		od->timeoffset = signon - purple_presence_get_login_time(presence);
-	}
-	purple_prpl_got_user_login_time(account, info->sn, signon - od->timeoffset);
+	}
+	purple_prpl_got_user_login_time(account, info->sn, signon);
 
 	/* Idle time stuff */
 	/* info->idletime is the number of minutes that this user has been idle */
@@ -2048,7 +2065,8 @@
 		{
 			char *encoding = NULL;
 			encoding = oscar_encoding_extract(args->encoding);
-			message = oscar_encoding_to_utf8(encoding, args->msg, args->msglen);
+			message = oscar_encoding_to_utf8(account, encoding, args->msg,
+			                                 args->msglen);
 			g_free(encoding);
 		} else {
 			if (g_utf8_validate(args->msg, args->msglen, NULL))
@@ -2066,7 +2084,7 @@
 			return 1;
 		}
 		encoding = args->encoding ? oscar_encoding_extract(args->encoding) : NULL;
-		utf8name = oscar_encoding_to_utf8(encoding,
+		utf8name = oscar_encoding_to_utf8(account, encoding,
 				args->info.chat.roominfo.name,
 				args->info.chat.roominfo.namelen);
 		g_free(encoding);
@@ -2849,12 +2867,12 @@
 	g_free(tmp);
 
 	if (userinfo->present & AIM_USERINFO_PRESENT_ONLINESINCE) {
-		time_t t = userinfo->onlinesince - od->timeoffset;
+		time_t t = userinfo->onlinesince;
 		oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
 	}
 
 	if (userinfo->present & AIM_USERINFO_PRESENT_MEMBERSINCE) {
-		time_t t = userinfo->membersince - od->timeoffset;
+		time_t t = userinfo->membersince;
 		oscar_user_info_add_pair(user_info, _("Member Since"), purple_date_format_full(localtime(&t)));
 	}
 
@@ -2876,12 +2894,12 @@
 	if ((userinfo->status != NULL) && !(userinfo->flags & AIM_FLAG_AWAY))
 	{
 		if (userinfo->status[0] != '\0')
-			tmp = oscar_encoding_to_utf8(userinfo->status_encoding,
+			tmp = oscar_encoding_to_utf8(account, userinfo->status_encoding,
 											 userinfo->status, userinfo->status_len);
 #if defined (_WIN32) || defined (__APPLE__)
 		if (userinfo->itmsurl && (userinfo->itmsurl[0] != '\0')) {
 			gchar *itmsurl, *tmp2;
-			itmsurl = oscar_encoding_to_utf8(userinfo->itmsurl_encoding,
+			itmsurl = oscar_encoding_to_utf8(account, userinfo->itmsurl_encoding,
 					userinfo->itmsurl, userinfo->itmsurl_len);
 			tmp2 = g_strdup_printf("<a href=\"%s\">%s</a>",
 					itmsurl, tmp);
@@ -2897,7 +2915,8 @@
 	/* Away message */
 	if ((userinfo->flags & AIM_FLAG_AWAY) && (userinfo->away_len > 0) && (userinfo->away != NULL) && (userinfo->away_encoding != NULL)) {
 		tmp = oscar_encoding_extract(userinfo->away_encoding);
-		away_utf8 = oscar_encoding_to_utf8(tmp, userinfo->away, userinfo->away_len);
+		away_utf8 = oscar_encoding_to_utf8(account, tmp, userinfo->away,
+		                                   userinfo->away_len);
 		g_free(tmp);
 		if (away_utf8 != NULL) {
 			tmp = purple_str_sub_away_formatters(away_utf8, purple_account_get_username(account));
@@ -2911,7 +2930,8 @@
 	/* Info */
 	if ((userinfo->info_len > 0) && (userinfo->info != NULL) && (userinfo->info_encoding != NULL)) {
 		tmp = oscar_encoding_extract(userinfo->info_encoding);
-		info_utf8 = oscar_encoding_to_utf8(tmp, userinfo->info, userinfo->info_len);
+		info_utf8 = oscar_encoding_to_utf8(account, tmp, userinfo->info,
+		                                   userinfo->info_len);
 		g_free(tmp);
 		if (info_utf8 != NULL) {
 			tmp = purple_str_sub_away_formatters(info_utf8, purple_account_get_username(account));
@@ -2931,6 +2951,7 @@
 static int purple_got_infoblock(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
 	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleBuddy *b;
 	PurplePresence *presence;
 	PurpleStatus *status;
@@ -2943,7 +2964,7 @@
 	userinfo = va_arg(ap, aim_userinfo_t *);
 	va_end(ap);
 
-	b = purple_find_buddy(purple_connection_get_account(gc), userinfo->sn);
+	b = purple_find_buddy(account, userinfo->sn);
 	if (b == NULL)
 		return 1;
 
@@ -2963,7 +2984,9 @@
 		if ((userinfo->flags & AIM_FLAG_AWAY) &&
 			(userinfo->away_len > 0) && (userinfo->away != NULL) && (userinfo->away_encoding != NULL)) {
 			gchar *charset = oscar_encoding_extract(userinfo->away_encoding);
-			message = oscar_encoding_to_utf8(charset, userinfo->away, userinfo->away_len);
+			message = oscar_encoding_to_utf8(account, charset,
+			                                 userinfo->away,
+			                                 userinfo->away_len);
 			g_free(charset);
 			purple_status_set_attr_string(status, "message", message);
 			g_free(message);
@@ -3159,6 +3182,7 @@
 
 static int purple_conv_chat_incoming_msg(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
 	struct chat_connection *ccon = find_oscar_chat_by_conn(gc, conn);
 	gchar *utf8;
 	va_list ap;
@@ -3177,7 +3201,7 @@
 	charset = va_arg(ap, char *);
 	va_end(ap);
 
-	utf8 = oscar_encoding_to_utf8(charset, msg, len);
+	utf8 = oscar_encoding_to_utf8(account, charset, msg, len);
 	if (utf8 == NULL)
 		/* The conversion failed! */
 		utf8 = g_strdup(_("[Unable to display a message from this user because it contained invalid characters.]"));
@@ -4167,6 +4191,7 @@
 	PeerConnection *conn;
 	int ret;
 	char *tmp1, *tmp2;
+	gboolean is_html;
 
 	od = (OscarData *)gc->proto_data;
 	account = purple_connection_get_account(gc);
@@ -4185,7 +4210,6 @@
 	} else {
 		struct buddyinfo *bi;
 		struct aim_sendimext_args args;
-		gsize len;
 		PurpleConversation *conv;
 		PurpleStoredImage *img;
 
@@ -4276,22 +4300,43 @@
 		if (aim_sn_is_sms(name)) {
 			/* Messaging an SMS (mobile) user */
 			tmp2 = purple_markup_strip_html(tmp1);
+			is_html = FALSE;
 		} else if (aim_sn_is_icq(purple_account_get_username(account))) {
-			if (aim_sn_is_icq(name))
+			if (aim_sn_is_icq(name)) {
 				/* From ICQ to ICQ */
 				tmp2 = purple_markup_strip_html(tmp1);
-			else
+				is_html = FALSE;
+			} else {
 				/* From ICQ to AIM */
 				tmp2 = g_strdup(tmp1);
+				is_html = TRUE;
+			}
 		} else {
 			/* From AIM to AIM and AIM to ICQ */
 			tmp2 = g_strdup(tmp1);
+			is_html = TRUE;
 		}
 		g_free(tmp1);
 		tmp1 = tmp2;
-		len = strlen(tmp1);
 
 		purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
+		if (is_html && (args.msglen > MAXMSGLEN)) {
+			/* If the length was too long, try stripping the HTML and then running it back through
+			* purple_strdup_withhtml() and the encoding process. The result may be shorter. */
+			g_free((char *)args.msg);
+			
+			tmp2 = purple_markup_strip_html(tmp1);
+			g_free(tmp1);
+			
+			tmp1 = purple_strdup_withhtml(tmp2);
+			g_free(tmp2);
+			
+			purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
+
+			purple_debug_info("oscar", "Sending %s as %s because the original was too long.",
+								  message, (char *)args.msg);
+		}
+
 		purple_debug_info("oscar", "Sending IM, charset=0x%04hx, charsubset=0x%04hx, length=%d\n",
 						args.charset, args.charsubset, args.msglen);
 		ret = aim_im_sendch1_ext(od, &args);
@@ -5323,7 +5368,7 @@
 	OscarData *od = (OscarData *)gc->proto_data;
 	PurpleConversation *conv = NULL;
 	struct chat_connection *c = NULL;
-	char *buf, *buf2;
+	char *buf, *buf2, *buf3;
 	guint16 charset, charsubset;
 	char *charsetstr = NULL;
 	int len;
@@ -5335,7 +5380,6 @@
 		return -EINVAL;
 
 	buf = purple_strdup_withhtml(message);
-	len = strlen(buf);
 
 	if (strstr(buf, "<IMG "))
 		purple_conversation_write(conv, "",
@@ -5349,8 +5393,28 @@
 	 * visible characters" and not "number of bytes"
 	 */
 	if ((len > c->maxlen) || (len > c->maxvis)) {
+		/* If the length was too long, try stripping the HTML and then running it back through
+		 * purple_strdup_withhtml() and the encoding process. The result may be shorter. */
 		g_free(buf2);
-		return -E2BIG;
+
+		buf3 = purple_markup_strip_html(buf);
+		g_free(buf);
+
+		buf = purple_strdup_withhtml(buf3);
+		g_free(buf3);
+
+		purple_plugin_oscar_convert_to_best_encoding(gc, NULL, buf, &buf2, &len, &charset, &charsubset);
+
+		if ((len > c->maxlen) || (len > c->maxvis)) {
+			purple_debug_warning("oscar", "Could not send %s because (%i > maxlen %i) or (%i > maxvis %i)",
+					buf2, len, c->maxlen, len, c->maxvis);
+			g_free(buf);
+			g_free(buf2);
+			return -E2BIG;
+		}
+
+		purple_debug_info("oscar", "Sending %s as %s because the original was too long.",
+				message, buf2);
 	}
 
 	if (charset == AIM_CHARSET_ASCII)
@@ -5361,6 +5425,7 @@
 		charsetstr = "iso-8859-1";
 	aim_chat_send_im(od, c->conn, 0, buf2, len, charsetstr, "en");
 	g_free(buf2);
+	g_free(buf);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/oscar.h	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Sat Jun 16 19:48:23 2007 +0000
@@ -447,7 +447,6 @@
 	guint icontimer;
 	guint getblisttimer;
 	guint getinfotimer;
-	gint timeoffset;
 
 	struct {
 		guint maxwatchers; /* max users who can watch you */
@@ -935,7 +934,7 @@
 /* 0x0014 */ int aim_im_sendmtn(OscarData *od, guint16 type1, const char *sn, guint16 type2);
 void aim_icbm_makecookie(guchar* cookie);
 gchar *oscar_encoding_extract(const char *encoding);
-gchar *oscar_encoding_to_utf8(const char *encoding, const char *text, int textlen);
+gchar *oscar_encoding_to_utf8(PurpleAccount *account, const char *encoding, const char *text, int textlen);
 gchar *purple_plugin_oscar_decode_im_part(PurpleAccount *account, const char *sourcesn, guint16 charset, guint16 charsubset, const gchar *data, gsize datalen);
 
 
--- a/libpurple/protocols/qq/header_info.h	Sat Jun 16 19:44:59 2007 +0000
+++ b/libpurple/protocols/qq/header_info.h	Sat Jun 16 19:48:23 2007 +0000
@@ -33,7 +33,7 @@
 #define QQ_PACKET_TAG           0x02	/* all QQ text packets starts with it */
 #define QQ_PACKET_TAIL          0x03	/* all QQ text packets end with it */
 
-#define QQ_CLIENT       0x0f15
+#define QQ_CLIENT       0x0E1B
 
 /* list of known QQ commands */
 enum {
--- a/pidgin/Makefile.am	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -197,6 +197,7 @@
 	-DLIBDIR=\"$(libdir)/pidgin/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple/ \
 	$(GLIB_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
--- a/pidgin/gtkblist.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Jun 16 19:48:23 2007 +0000
@@ -108,6 +108,7 @@
 
 static guint visibility_manager_count = 0;
 static gboolean gtk_blist_obscured = FALSE;
+static gboolean editing_blist = FALSE;
 
 static GList *pidgin_blist_sort_methods = NULL;
 static struct pidgin_blist_sort_method *current_sort_method = NULL;
@@ -310,6 +311,12 @@
 	gtk_blist_join_chat(chat);
 }
 
+static void gtk_blist_renderer_editing_cancelled_cb(GtkCellRenderer *renderer, PurpleBuddyList *list)
+{
+	editing_blist = FALSE;
+	pidgin_blist_refresh(list);
+}
+
 static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer,
 		GtkCellEditable *editable,
 		gchar *path_str,
@@ -346,10 +353,11 @@
 		GtkEntry *entry = GTK_ENTRY (editable);
 		gtk_entry_set_text(entry, text);
 	}
+	editing_blist = TRUE;
 }
 
 static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1,
-					 char *arg2, gpointer nada)
+					 char *arg2, PurpleBuddyList *list)
 {
 	GtkTreeIter iter;
 	GtkTreePath *path;
@@ -357,6 +365,7 @@
 	PurpleBlistNode *node;
 	PurpleGroup *dest;
 
+	editing_blist = FALSE;
 	path = gtk_tree_path_new_from_string (arg1);
 	gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
 	gtk_tree_path_free (path);
@@ -401,6 +410,7 @@
 		default:
 			break;
 	}
+	pidgin_blist_refresh(list);
 }
 
 static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node)
@@ -481,6 +491,11 @@
 	pidgin_syslog_show();
 }
 
+static void gtk_blist_show_onlinehelp_cb()
+{
+	purple_notify_uri(NULL, PURPLE_WEBSITE "documentation");
+}
+
 static void
 do_join_chat(PidginJoinChatData *data)
 {
@@ -2865,6 +2880,11 @@
 	{ N_("/Tools/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
+	/* Help */
+	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
+	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
+	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
 };
 
 /*********************************************************
@@ -2990,7 +3010,14 @@
 		signon = purple_presence_get_login_time(presence);
 		if (full && PURPLE_BUDDY_IS_ONLINE(b) && signon > 0)
 		{
-			tmp = purple_str_seconds_to_string(time(NULL) - signon);
+			if (time(NULL) - signon > 63072000 /* 2 years */) {
+				/*
+				 * Our local clock must be wrong, show the actual
+				 * date instead of "4 days", etc.
+				 */
+				tmp = g_strdup(purple_date_format_long(localtime(&signon)));
+			} else
+				tmp = purple_str_seconds_to_string(time(NULL) - signon);
 			purple_notify_user_info_add_pair(user_info, _("Logged In"), tmp);
 			g_free(tmp);
 		}
@@ -3729,8 +3756,11 @@
 
 gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node)
 {
-	if PURPLE_BLIST_NODE_IS_BUDDY(node)
+	if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		node = node->parent;
+		if (node == NULL)
+			return FALSE;
+	}
 
 	g_return_val_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node), FALSE);
 
@@ -4436,7 +4466,8 @@
 										"markup", NAME_COLUMN,
 										NULL);
 	g_signal_connect(G_OBJECT(rend), "editing-started", G_CALLBACK(gtk_blist_renderer_editing_started_cb), NULL);
-	g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), NULL);
+	g_signal_connect(G_OBJECT(rend), "editing-canceled", G_CALLBACK(gtk_blist_renderer_editing_cancelled_cb), list);
+	g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), list);
 	g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL);
 #if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
@@ -4778,9 +4809,10 @@
 
 	gtk_tree_path_free(newpath);
 
-	gtk_tree_store_set(gtkblist->treemodel, iter,
-			NODE_COLUMN, node,
-			-1);
+	if (!editing_blist)
+		gtk_tree_store_set(gtkblist->treemodel, iter,
+				NODE_COLUMN, node,
+				-1);
 
 	if(node->parent) {
 		GtkTreePath *expand = NULL;
@@ -4813,6 +4845,9 @@
 
 	g_return_if_fail(node != NULL);
 
+	if (editing_blist)
+		return;
+	
 	if (PURPLE_BLIST_NODE_IS_GROUP(node))
 		gnode = node;
 	else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
@@ -4914,6 +4949,9 @@
 	gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
 	presence = purple_buddy_get_presence(buddy);
 
+	if (editing_blist)
+		return;
+	
 	status = pidgin_blist_get_status_icon((PurpleBlistNode*)buddy,
 						PIDGIN_STATUS_ICON_SMALL);
 
@@ -4992,6 +5030,8 @@
 	PurpleContact *contact;
 	PurpleBuddy *buddy;
 	struct _pidgin_blist_node *gtknode;
+	if (editing_blist)
+		return;
 
 	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
 		cnode = node->parent;
@@ -5088,6 +5128,8 @@
 	PurpleChat *chat;
 
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_CHAT(node));
+	if (editing_blist)
+		return;
 
 	/* First things first, update the group */
 	pidgin_blist_update_group(list, node->parent);
--- a/pidgin/gtkconv.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Jun 16 19:48:23 2007 +0000
@@ -49,6 +49,7 @@
 #include "prpl.h"
 #include "request.h"
 #include "util.h"
+#include "version.h"
 
 #include "gtkdnd-hints.h"
 #include "gtkblist.h"
@@ -1821,6 +1822,9 @@
 				if (!gtkconv->send_history)
 					break;
 
+				if (gtkconv->entry != entry)
+					break;
+
 				if (!gtkconv->send_history->prev) {
 					GtkTextIter start, end;
 
@@ -1869,6 +1873,9 @@
 				if (!gtkconv->send_history)
 					break;
 
+				if (gtkconv->entry != entry)
+					break;
+
 				if (gtkconv->send_history->prev && gtkconv->send_history->prev->data) {
 					GObject *object;
 					GtkTextIter iter;
@@ -1972,6 +1979,8 @@
 		switch (event->keyval)
 		{
 			case GDK_Tab:
+				if (gtkconv->entry != entry)
+					break;
 				return tab_complete(conv);
 				break;
 
@@ -2048,6 +2057,9 @@
 	return TRUE;
 }
 
+static void
+regenerate_options_items(PidginWindow *win);
+
 void
 pidgin_conv_switch_active_conversation(PurpleConversation *conv)
 {
@@ -2148,6 +2160,8 @@
 
 	gray_stuff_out(gtkconv);
 	update_typing_icon(gtkconv);
+	g_object_set_data(G_OBJECT(entry), "transient_buddy", NULL);
+	regenerate_options_items(gtkconv->win);
 
 	gtk_window_set_title(GTK_WINDOW(gtkconv->win->window),
 	                     gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)));
@@ -2894,11 +2908,45 @@
 
 	menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/More"));
 
-	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 		chat = purple_blist_find_chat(conv->account, conv->name);
-	else
+
+		if ((chat == NULL) && (gtkconv->imhtml != NULL)) {
+			chat = g_object_get_data(G_OBJECT(gtkconv->imhtml), "transient_chat");
+		}
+
+		if ((chat == NULL) && (gtkconv->imhtml != NULL)) {
+			GHashTable *components;
+			components = g_hash_table_new_full(g_str_hash, g_str_equal,
+					g_free, g_free);
+			g_hash_table_replace(components, g_strdup("channel"),
+					g_strdup(conv->name));
+			chat = purple_chat_new(conv->account, NULL, components);
+			purple_blist_node_set_flags((PurpleBlistNode *)chat,
+					PURPLE_BLIST_NODE_FLAG_NO_SAVE);
+			g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_chat",
+					chat, (GDestroyNotify)purple_blist_remove_chat);
+		}
+	} else {
 		buddy = purple_find_buddy(conv->account, conv->name);
 
+		/* gotta remain bug-compatible :( libpurple < 2.0.2 didn't handle
+		 * removing "isolated" buddy nodes well */
+		if (purple_version_check(2, 0, 2) == NULL) {
+			if ((buddy == NULL) && (gtkconv->imhtml != NULL)) {
+				buddy = g_object_get_data(G_OBJECT(gtkconv->imhtml), "transient_buddy");
+			}
+
+			if ((buddy == NULL) && (gtkconv->imhtml != NULL)) {
+				buddy = purple_buddy_new(conv->account, conv->name, NULL);
+				purple_blist_node_set_flags((PurpleBlistNode *)buddy,
+						PURPLE_BLIST_NODE_FLAG_NO_SAVE);
+				g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy",
+						buddy, (GDestroyNotify)purple_blist_remove_buddy);
+			}
+		}
+	}
+
 	if (chat)
 		node = (PurpleBlistNode *)chat;
 	else if (buddy)
@@ -4230,6 +4278,8 @@
 
 		gtk_box_pack_start(GTK_BOX(hbox), gtkchat->topic_text, TRUE, TRUE, 0);
 		gtk_widget_show(gtkchat->topic_text);
+		g_signal_connect(G_OBJECT(gtkchat->topic_text), "key_press_event",
+			             G_CALLBACK(entry_key_press_cb), gtkconv);
 	}
 }
 
--- a/pidgin/gtkdialogs.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sat Jun 16 19:48:23 2007 +0000
@@ -1232,3 +1232,4 @@
 
 	g_free(text);
 }
+}
--- a/pidgin/gtkdocklet-x11.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Sat Jun 16 19:48:23 2007 +0000
@@ -125,8 +125,12 @@
 		int icon_size;
 		if (docklet_height < 22)
 			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
+		else if (docklet_height < 32)
+			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL);
+		else if (docklet_height < 48)
+			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM);
 		else
-			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL);
+			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE);
 
 		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, icon_size);
 	}
@@ -135,9 +139,9 @@
 static void
 docklet_x11_resize_icon(GtkWidget *widget)
 {
-	if (docklet_height == widget->allocation.height)
+	if (docklet_height == MIN(widget->allocation.height, widget->allocation.width))
 		return;
-	docklet_height = widget->allocation.height;
+	docklet_height = MIN(widget->allocation.height, widget->allocation.width);
 	pidgin_docklet_update_icon();
 }
 
--- a/pidgin/gtkft.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkft.c	Sat Jun 16 19:48:23 2007 +0000
@@ -248,10 +248,10 @@
 
 	get_xfer_info_strings(xfer, &kbsec, &time_elapsed, &time_remaining);
 
-	status = g_strdup_printf("%ld%% (%ld of %ld bytes)",
-							 (unsigned long)(purple_xfer_get_progress(xfer)*100),
-							 (unsigned long)purple_xfer_get_bytes_sent(xfer),
-							 (unsigned long)purple_xfer_get_size(xfer));
+	status = g_strdup_printf("%d%% (%" G_GSIZE_FORMAT " of %" G_GSIZE_FORMAT " bytes)",
+							 (int)(purple_xfer_get_progress(xfer)*100),
+							 purple_xfer_get_bytes_sent(xfer),
+							 purple_xfer_get_size(xfer));
 
 	if (purple_xfer_is_completed(xfer)) {
 
--- a/pidgin/gtkimhtml.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sat Jun 16 19:48:23 2007 +0000
@@ -3294,6 +3294,7 @@
 	char *basename = g_path_get_basename(filename);
 	char *ext = strrchr(basename, '.');
 #endif
+	char *newfilename;
 
 	gtk_widget_destroy(image->filesel);
 	image->filesel = NULL;
@@ -3308,7 +3309,7 @@
 			gchar *fmt_ext = extensions[0];
 			const gchar* file_ext = filename + strlen(filename) - strlen(fmt_ext);
 
-			if(!strcmp(fmt_ext, file_ext)){
+			if(!g_ascii_strcasecmp(fmt_ext, file_ext)){
 				type = gdk_pixbuf_format_get_name(format);
 				break;
 			}
@@ -3341,6 +3342,7 @@
 	/* If I can't find a valid type, I will just tell the user about it and then assume
 	   it's a png */
 	if (!type){
+		char *basename, *tmp;
 #if GTK_CHECK_VERSION(2,4,0)
 		GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
 						_("<span size='larger' weight='bold'>Unrecognized file type</span>\n\nDefaulting to PNG."));
@@ -3351,10 +3353,26 @@
 
 		g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
 		gtk_widget_show(dialog);
+
 		type = g_strdup("png");
+		basename = g_path_get_basename(filename);
+		tmp = strrchr(basename, '.');
+		if (tmp != NULL)
+			tmp[0] = '\0';
+		newfilename = g_strdup_printf("%s.png", basename);
+		g_free(basename);
+	} else {
+		/*
+		 * We're able to save the file in it's original format, so we
+		 * can use the original file name.
+		 */
+		newfilename = g_strdup(filename);
 	}
 
-	gdk_pixbuf_save(image->pixbuf, filename, type, &error, NULL);
+	gdk_pixbuf_save(image->pixbuf, newfilename, type, &error, NULL);
+
+	g_free(newfilename);
+	g_free(type);
 
 	if (error){
 #if GTK_CHECK_VERSION(2,4,0)
@@ -3368,8 +3386,6 @@
 		gtk_widget_show(dialog);
 		g_error_free(error);
 	}
-
-	g_free(type);
 }
 
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
--- a/pidgin/gtkmain.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkmain.c	Sat Jun 16 19:48:23 2007 +0000
@@ -108,21 +108,19 @@
 };
 #endif
 
-static int
+static void
 dologin_named(const char *name)
 {
 	PurpleAccount *account;
 	char **names;
 	int i;
-	int ret = -1;
 
 	if (name != NULL) { /* list of names given */
 		names = g_strsplit(name, ",", 64);
 		for (i = 0; names[i] != NULL; i++) {
 			account = purple_accounts_find(names[i], NULL);
 			if (account != NULL) { /* found a user */
-				ret = 0;
-				purple_account_connect(account);
+				purple_account_set_enabled(account, PIDGIN_UI, TRUE);
 			}
 		}
 		g_strfreev(names);
@@ -133,12 +131,9 @@
 		if (accounts != NULL)
 		{
 			account = (PurpleAccount *)accounts->data;
-			ret = 0;
-			purple_account_connect(account);
+			purple_account_set_enabled(account, PIDGIN_UI, TRUE);
 		}
 	}
-
-	return ret;
 }
 
 #ifdef HAVE_SIGNAL_H
@@ -439,7 +434,6 @@
 	char *opt_config_dir_arg = NULL;
 	char *opt_login_arg = NULL;
 	char *opt_session_arg = NULL;
-	int dologin_ret = -1;
 	char *search_path;
 	GList *accounts;
 #ifdef HAVE_SIGNAL_H
@@ -798,14 +792,23 @@
 		pidgin_debug_window_show();
 
 	if (opt_login) {
-		dologin_ret = dologin_named(opt_login_arg);
+		/* disable all accounts */
+		for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
+			PurpleAccount *account = accounts->data;
+			purple_account_set_enabled(account, PIDGIN_UI, FALSE);
+		}
+		/* honor the startup status preference */
+		if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
+			purple_savedstatus_activate(purple_savedstatus_get_startup());
+		/* now enable the requested ones */
+		dologin_named(opt_login_arg);
 		if (opt_login_arg != NULL) {
 			g_free(opt_login_arg);
 			opt_login_arg = NULL;
 		}
 	}
 
-	if (opt_nologin)
+	if (opt_nologin && !opt_login)
 	{
 		/* Set all accounts to "offline" */
 		PurpleSavedStatus *saved_status;
@@ -821,7 +824,7 @@
 		/* Set the status for each account */
 		purple_savedstatus_activate(saved_status);
 	}
-	else
+	else if (!opt_login)
 	{
 		/* Everything is good to go--sign on already */
 		if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
--- a/pidgin/gtknotify.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtknotify.c	Sat Jun 16 19:48:23 2007 +0000
@@ -40,6 +40,12 @@
 
 typedef struct
 {
+	GtkWidget *window;
+	int count;
+} PidginUserInfo;
+
+typedef struct
+{
 	PurpleAccount *account;
 	char *url;
 	GtkWidget *label;
@@ -622,7 +628,7 @@
 	gtk_widget_show(button);
 
 	g_signal_connect_swapped(G_OBJECT(button), "clicked",
-							 G_CALLBACK(formatted_close_cb), window);
+							 G_CALLBACK(gtk_widget_destroy), window);
 	g_signal_connect(G_OBJECT(window), "key_press_event",
 					 G_CALLBACK(formatted_input_cb), NULL);
 
@@ -874,6 +880,11 @@
 static void
 remove_userinfo(GtkWidget *widget, gpointer key)
 {
+	PidginUserInfo *pinfo = g_hash_table_lookup(userinfo, key);
+
+	while (pinfo->count--)
+		purple_notify_close(PURPLE_NOTIFY_USERINFO, widget);
+
 	g_hash_table_remove(userinfo, key);
 }
 
@@ -884,26 +895,33 @@
 	char *info;
 	void *ui_handle;
 	char *key = userinfo_hash(purple_connection_get_account(gc), who);
+	PidginUserInfo *pinfo = NULL;
 
 	if (!userinfo) {
-		userinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+		userinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	}
 
 	info = purple_notify_user_info_get_text_with_newline(user_info, "<br />");
-	ui_handle = g_hash_table_lookup(userinfo, key);
-	if (ui_handle != NULL) {
-		GtkIMHtml *imhtml = g_object_get_data(G_OBJECT(ui_handle), "info-widget");
+	pinfo = g_hash_table_lookup(userinfo, key);
+	if (pinfo != NULL) {
+		GtkIMHtml *imhtml = g_object_get_data(G_OBJECT(pinfo->window), "info-widget");
 		char *linked_text = purple_markup_linkify(info);
 		gtk_imhtml_clear(imhtml);
 		gtk_imhtml_append_text(imhtml, linked_text, notify_imhtml_options());
 		g_free(linked_text);
 		g_free(key);
+		ui_handle = pinfo->window;
+		pinfo->count++;
 	} else {
 		char *primary = g_strdup_printf(_("Info for %s"), who);
 		ui_handle = pidgin_notify_formatted(_("Buddy Information"), primary, NULL, info);
-		g_hash_table_insert(userinfo, key, ui_handle);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(ui_handle), G_CALLBACK(formatted_close_cb), NULL);
 		g_signal_connect(G_OBJECT(ui_handle), "destroy", G_CALLBACK(remove_userinfo), key);
 		g_free(primary);
+		pinfo = g_new0(PidginUserInfo, 1);
+		pinfo->window = ui_handle;
+		pinfo->count = 1;
+		g_hash_table_insert(userinfo, key, pinfo);
 	}
 	g_free(info);
 	return ui_handle;
--- a/pidgin/gtksound.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtksound.c	Sat Jun 16 19:48:23 2007 +0000
@@ -370,12 +370,12 @@
 		break;
 	case GST_MESSAGE_ERROR:
 		gst_message_parse_error(msg, &err, NULL);
-		purple_debug_error("gstreamer", err->message);
+		purple_debug_error("gstreamer", "%s\n", err->message);
 		g_error_free(err);
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);
-		purple_debug_warning("gstreamer", err->message);
+		purple_debug_warning("gstreamer", "%s\n", err->message);
 		g_error_free(err);
 		break;
 	default:
--- a/pidgin/gtkutils.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Jun 16 19:48:23 2007 +0000
@@ -2049,6 +2049,7 @@
 static void
 screenname_autocomplete_destroyed_cb(GtkWidget *widget, gpointer data)
 {
+	g_free(data);
 	purple_signals_disconnect_by_handle(widget);
 }
 
@@ -2130,7 +2131,7 @@
 	purple_signal_connect(purple_accounts_get_handle(), "account-removed", entry,
 						PURPLE_CALLBACK(repopulate_autocomplete), cb_data);
 
-	g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(screenname_autocomplete_destroyed_cb), NULL);
+	g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(screenname_autocomplete_destroyed_cb), data);
 }
 
 void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
--- a/pidgin/pidginstock.c	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pidginstock.c	Sat Jun 16 19:48:23 2007 +0000
@@ -162,14 +162,17 @@
 	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
-	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-message.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  }
+	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-new-im.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
+/* Uncomment me after 2.0.2!
+ *	{ PIDGIN_STOCK_TRAY_EMAIL, "tray", "tray-message.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
+ */
 };
 
 static gchar *
--- a/pidgin/pidginstock.h	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pidginstock.h	Sat Jun 16 19:48:23 2007 +0000
@@ -137,6 +137,9 @@
 #define PIDGIN_STOCK_TRAY_OFFLINE         "pidgin-tray-offline"
 #define PIDGIN_STOCK_TRAY_CONNECT         "pidgin-tray-connect"
 #define PIDGIN_STOCK_TRAY_PENDING         "pidgin-tray-pending"
+/* Uncomment me after 2.0.2! 
+ * #define PIDGIN_STOCK_TRAY_EMAIL		  "pidgin-tray-email"
+ */
 
 
 /*@}*/
Binary file pidgin/pixmaps/icons/16/pidgin.png has changed
--- a/pidgin/pixmaps/icons/16/scalable/pidgin.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/icons/16/scalable/pidgin.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -14,7 +14,7 @@
    id="svg4345"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop/icons/16/scalable"
+   sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/16/scalable"
    sodipodi:docname="pidgin.svg"
    inkscape:export-filename="/home/hbons/Desktop/pidgin16.png"
    inkscape:export-xdpi="90"
@@ -24,6 +24,54 @@
      id="defs4347">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient3157">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3159" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3161" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3141">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop3143" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0;"
+         offset="1"
+         id="stop3145" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3128">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3130" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3132" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient5438">
       <stop
          style="stop-color:white;stop-opacity:1;"
@@ -72,18 +120,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient5304">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop5306" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0;"
-         offset="1"
-         id="stop5308" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient5280">
       <stop
          style="stop-color:#82508e;stop-opacity:1;"
@@ -178,24 +214,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5304"
-       id="linearGradient5310"
-       x1="12.606371"
-       y1="15.069461"
-       x2="12.606371"
-       y2="21.152372"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6506"
-       id="linearGradient6512"
-       x1="15.645709"
-       y1="39.743458"
-       x2="15.645709"
-       y2="53.502155"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6537"
        id="linearGradient6543"
        x1="30.5"
@@ -211,7 +229,8 @@
        y1="38.950283"
        x2="5.7089725"
        y2="42.982571"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.63556,0,0,0.371995,11.16667,-5.489292)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5438"
@@ -221,6 +240,421 @@
        x2="30.152058"
        y2="23.011967"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3976">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop3978" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop3980" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3968">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop3970" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0;"
+         offset="1"
+         id="stop3972" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3958">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3960" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3962" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2850">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="0"
+         id="stop2852" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop2854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6563">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop6565" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop6567" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2110">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2112" />
+      <stop
+         id="stop2114"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2067" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25546"
+       id="radialGradient2069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       cx="7.8836637"
+       cy="1.5104795"
+       fx="7.8836637"
+       fy="1.5104795"
+       r="8.4883642" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25546"
+       id="radialGradient2071"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       cx="7.8836741"
+       cy="0.14505707"
+       fx="7.8836741"
+       fy="0.14505707"
+       r="8.4883642" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25546"
+       id="radialGradient2079"
+       cx="7.8836637"
+       cy="2.6242435"
+       fx="7.8836637"
+       fy="2.6242435"
+       r="8.4883642"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2081">
+      <stop
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2104" />
+      <stop
+         style="stop-color:#df9725;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2085" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6506"
+       id="linearGradient2101"
+       x1="15.645709"
+       y1="39.743458"
+       x2="14.943421"
+       y2="50.079575"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6537"
+       id="linearGradient2089"
+       x1="30.5"
+       y1="0.033532728"
+       x2="30.5"
+       y2="23.559282"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6563"
+       id="linearGradient6569"
+       x1="-1.6841649"
+       y1="39.902092"
+       x2="5.5366187"
+       y2="44.272076"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="23.011967"
+       x2="30.152058"
+       y1="-0.86487341"
+       x1="30.152058"
+       id="linearGradient2097"
+       xlink:href="#linearGradient5438"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="42.982571"
+       x2="5.7089725"
+       y1="38.950283"
+       x1="0.23931108"
+       id="linearGradient2095"
+       xlink:href="#linearGradient6817"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="50.726673"
+       x2="15.645709"
+       y1="40.434063"
+       x1="15.645709"
+       id="linearGradient2093"
+       xlink:href="#linearGradient6506"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2087">
+      <stop
+         id="stop2089"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2091"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient2085"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2077"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2075"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2067">
+      <stop
+         id="stop2069"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2071" />
+      <stop
+         id="stop2073"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3108"
+       inkscape:collect="always">
+      <stop
+         id="stop3110"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3112"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3116"
+       inkscape:collect="always">
+      <stop
+         id="stop3118"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop3120"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3124"
+       inkscape:collect="always">
+      <stop
+         id="stop3126"
+         offset="0"
+         style="stop-color:#3b1941;stop-opacity:1;" />
+      <stop
+         id="stop3128"
+         offset="1"
+         style="stop-color:#3b1941;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient2187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.769231,0,0,0.714287,47.76924,-9.285729)"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient2195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.769231,0,0,0.714287,13.76923,-8.28573)"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958"
+       id="radialGradient2209"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.116159,0,0,1.076653,14.60502,-22.28695)"
+       cx="9.0640488"
+       cy="21.511742"
+       fx="9.0640488"
+       fy="21.511742"
+       r="16.663956" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6506"
+       id="linearGradient2211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.660903,0,0,0.627207,18.73149,-12.3201)"
+       x1="15.645709"
+       y1="39.743458"
+       x2="15.645709"
+       y2="53.502155" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3968"
+       id="linearGradient2214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67692,0,0,0.646801,18.46433,-12.90841)"
+       x1="16.13257"
+       y1="40.781811"
+       x2="16.13257"
+       y2="48.068741" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="linearGradient2216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67692,0,0,0.646801,18.46433,-12.90841)"
+       x1="12.095973"
+       y1="40.907658"
+       x2="12.095973"
+       y2="46.463146" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6537"
+       id="linearGradient2219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.668893,0,0,0.668627,18.08624,-12.19246)"
+       x1="30.5"
+       y1="0.033532728"
+       x2="30.5"
+       y2="23.559282" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3108"
+       id="linearGradient2229"
+       gradientUnits="userSpaceOnUse"
+       x1="10.18327"
+       y1="16.618088"
+       x2="27.598003"
+       y2="36.64465"
+       gradientTransform="matrix(0.660903,0,0,0.627207,49.74106,-7.361383)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6506"
+       id="linearGradient2231"
+       gradientUnits="userSpaceOnUse"
+       x1="15.645709"
+       y1="39.743458"
+       x2="15.645709"
+       y2="53.502155"
+       gradientTransform="matrix(0.660903,0,0,0.627207,49.74106,-7.361383)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3116"
+       id="linearGradient2234"
+       gradientUnits="userSpaceOnUse"
+       x1="15.722902"
+       y1="39.585075"
+       x2="15.722902"
+       y2="45.76453"
+       gradientTransform="matrix(0.67692,0,0,0.646801,49.4739,-7.949693)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3124"
+       id="linearGradient2236"
+       gradientUnits="userSpaceOnUse"
+       x1="13.150809"
+       y1="39.39394"
+       x2="13.150809"
+       y2="45.551888"
+       gradientTransform="matrix(0.67692,0,0,0.646801,49.4739,-7.949693)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3128"
+       id="linearGradient3134"
+       x1="8.0725698"
+       y1="17.765934"
+       x2="24.284664"
+       y2="37.578945"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3141"
+       id="linearGradient3147"
+       x1="12.353984"
+       y1="38.611191"
+       x2="12.353984"
+       y2="45.595356"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3155"
+       x1="10.166225"
+       y1="38.766953"
+       x2="10.166225"
+       y2="45.595673"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3157"
+       id="linearGradient3163"
+       x1="11.982447"
+       y1="39.088425"
+       x2="11.982447"
+       y2="45.778931"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -229,17 +663,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="42.440064"
-     inkscape:cx="13.087113"
-     inkscape:cy="8.5298663"
+     inkscape:zoom="30.009658"
+     inkscape:cx="12.410351"
+     inkscape:cy="9.6914614"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1274"
-     inkscape:window-height="966"
-     inkscape:window-x="3"
-     inkscape:window-y="25"
+     inkscape:window-width="1434"
+     inkscape:window-height="840"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:grid-points="false"
@@ -268,7 +702,7 @@
        transform="matrix(1.148904,0,0,0.920169,-34.28919,-3.241212)"
        sodipodi:nodetypes="csccccc" />
     <path
-       style="opacity:1;fill:#82508e;fill-opacity:1;stroke:#3b1941;stroke-width:2.30209565;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient3147);fill-opacity:1.0;stroke:url(#linearGradient3155);stroke-width:2.30209565;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 3,31.153143 2.9750563,38.402618 2.9750563,45.572826 C 4.1625449,45.572826 27.946366,45.600605 30.637365,45.600605 C 32.751492,45.600605 32.586331,43.541005 32.586331,43.541005 C 32.586331,40.875594 27.597902,38.639057 25.813453,36.682531 C 23.985035,34.68151 26,30.884078 26,30.884078 C 26.641306,29.354278 28.01889,26.891006 28.01889,25.115922 C 28.01889,18.215923 21.624002,13 15,13 z "
        id="path5176"
        sodipodi:nodetypes="ccccszcsc"
@@ -284,34 +718,17 @@
        ry="0.32910046"
        transform="matrix(1.147027,0,0,0.866113,-0.324314,2.386999)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5286);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5273"
-       sodipodi:cx="15.004828"
-       sodipodi:cy="39.80859"
-       sodipodi:rx="9.7225161"
-       sodipodi:ry="7.119638"
-       d="M 24.727345 39.80859 A 9.7225161 7.119638 0 1 1  5.2823124,39.80859 A 9.7225161 7.119638 0 1 1  24.727345 39.80859 z"
-       transform="matrix(0.434788,0,0,0.500648,-1.130366,-6.547801)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -42.833794,49.038847 C -42.833794,49.038847 -42.815855,44.709724 -42.815855,37.951005 C -42.815855,37.951005 -39.03087,40.509965 -38.631892,41.678764 C -39.153711,41.596001 -40.372039,41.685633 -40.372039,41.685633 C -40.038351,42.463101 -38.163796,45.952105 -36.121045,48.058218 C -37.780497,47.329365 -39.471111,47.196178 -39.471111,47.196178 C -39.009636,48.111847 -37.250115,48.69173 -36.943887,49.110993 C -36.943887,49.110993 -41.348464,49.038847 -42.833794,49.038847 z "
-       id="rect5312"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(0.446908,0,0,0.358425,20.14277,-2.602607)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -49.441852,47.4154 C -47.112614,42.001764 -42.19329,43.469796 -40.961409,37.951005 C -40.961409,37.951005 -39.025024,40.280009 -38.974466,41.581367 C -39.496285,41.498604 -39.881988,41.516405 -39.881988,41.516405 C -39.5483,42.293873 -38.196948,45.748112 -36.154197,47.854225 C -37.813649,47.125372 -38.925816,46.898039 -38.925816,46.898039 C -38.847603,47.794771 -38.376224,47.369394 -38.122982,48.215235 C -42.942294,48.046898 -46.252916,49.195571 -49.441852,47.4154 z "
-       id="path5317"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(-0.376289,0,0,0.381853,-5.604413,-3.491724)" />
-    <path
        transform="matrix(0.399589,0,0,0.393554,-5.973603e-2,-3.038964)"
-       style="opacity:0.31004363;fill:url(#linearGradient5310);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:2.5216887;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.5;fill:url(#linearGradient3134);fill-opacity:1.0;stroke:url(#linearGradient3163);stroke-width:2.5216887;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0617033,25.489349 4.0625,25.5 C 4.0625,32.787473 3.9033639,38.26012 3.9033639,44.499878 C 5.8399452,44.499878 24.86993,44.470084 30.695903,44.470084 C 29.746978,42.549359 26.273076,40.711023 23.972608,38.78763 C 23.362603,37.973536 23.023697,35.459892 22.969233,34.418473 C 23.611113,31.359155 25.129532,28.401757 26.527172,25.440129 C 26.527172,19.094533 21.022436,14.0625 15,14.0625 z "
        id="path5241"
        sodipodi:nodetypes="csccccccc" />
     <path
+       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6,7.2175674 C 6,8.8735678 4.5070272,10 3.4999996,10 C 2.1199999,10 1,8.6559998 1,6.9999995 C 1,5.5609093 1.7677476,4 3.1477475,4 C 4.5277481,4 6,5.9092686 6,7.2175674 z "
+       id="path3137"
+       sodipodi:nodetypes="csssc" />
+    <path
        transform="matrix(0.626764,0,0,0.689441,-3.309086,-9.833164)"
        style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
        d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
@@ -326,7 +743,12 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805756,0,0,0.772414,-5.19425,-11.77932)" />
+       transform="matrix(1.208634,0,0,1.158623,-8.791372,-20.66902)" />
+    <path
+       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 11.387086,4.6790601 C 10.509745,3.6558267 9.0824486,3.9284339 8.5222543,4.5817815 C 7.7545814,5.4771092 7.8435868,7.0342022 8.7209273,8.0574357 C 9.4833498,8.9466415 10.737398,9.413013 11.505071,8.5176851 C 12.272744,7.6223568 12.080215,5.4874505 11.387086,4.6790601 z "
+       id="path3139"
+       sodipodi:nodetypes="csssc" />
     <path
        transform="matrix(0.29055,-0.412361,-0.273947,-0.388798,13.58792,20.45445)"
        style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
@@ -342,30 +764,21 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805755,0,0,0.772417,0.805755,-11.77938)" />
+       transform="matrix(1.208633,0,0,1.158626,-2.791363,-20.66909)" />
     <path
-       transform="matrix(0.63556,0,0,0.371992,4.635114,-6.489142)"
-       style="fill:#f9751a;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="rect5187"
-       sodipodi:nodetypes="ccczc" />
-    <path
-       transform="matrix(0.743268,0,0,0.267357,-7.659906,-1.671861)"
        style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.651119,11.193815 C 13.577759,8.2509126 16.249277,11.481501 17.614226,12.804399 L 14.761306,13.747613 L 11.651119,11.193815 z "
+       d="M -3.174544e-16,1.7837407 C 0.49897694,0.43045085 3.4176637,1.3941391 4.4321866,1.7478251 L 2.7448964,2 L -3.174544e-16,1.7837407 z "
        id="path5192"
        sodipodi:nodetypes="cccc" />
     <path
-       transform="matrix(0.686065,0,0,0.46633,-5.019573,-4.365629)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.689238,9.8218679 C 13.591296,8.0161941 17.174576,11.994261 17.519594,13.650486 L 14.543472,12.891665 L 11.689238,9.8218679 z "
-       id="rect5189"
-       sodipodi:nodetypes="cccc" />
+       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 4,8.9694498 C 6.5363255,9.6796143 7.1434322,8 7.6676187,8 C 8.1845929,8 8.1150542,9.7216455 10.752536,9.1373864 C 10.257681,9.8617678 8.7366795,11 8.0954601,11 C 7.4470215,11 4.8041406,10.039472 4,8.9694498 z "
+       id="path3987"
+       sodipodi:nodetypes="czczc" />
     <path
-       transform="matrix(0.63556,0,0,0.371995,4.635112,-6.489295)"
-       style="fill:url(#linearGradient6823);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="path6815"
-       sodipodi:nodetypes="ccczc" />
+       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 2.5678134,0.78213791 C 3.0667903,-0.57115198 7,-0.11652293 7,1.7459005 L 5.3127098,0.99839721 L 2.5678134,0.78213791 z "
+       id="path1991"
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
Binary file pidgin/pixmaps/icons/24/pidgin.png has changed
--- a/pidgin/pixmaps/icons/24/scalable/pidgin.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/icons/24/scalable/pidgin.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -14,9 +14,9 @@
    id="svg4345"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop/icons/24/scalable"
+   sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/24/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin24-2.png"
+   inkscape:export-filename="/home/hbons/Desktop/pidgin24.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    version="1.0">
@@ -24,6 +24,42 @@
      id="defs4347">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient3124">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop3126" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop3128" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3116">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop3118" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0;"
+         offset="1"
+         id="stop3120" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3108">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3110" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3112" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient5438">
       <stop
          style="stop-color:white;stop-opacity:1;"
@@ -71,30 +107,6 @@
          id="stop6510" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5304">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop5306" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0;"
-         offset="1"
-         id="stop5308" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5280">
-      <stop
-         style="stop-color:#82508e;stop-opacity:1;"
-         offset="0"
-         id="stop5282" />
-      <stop
-         style="stop-color:#82508e;stop-opacity:0;"
-         offset="1"
-         id="stop5284" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient2804">
       <stop
          style="stop-color:black;stop-opacity:0;"
@@ -165,43 +177,14 @@
          offset="1.0000000"
          id="stop3804" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5280"
-       id="radialGradient5286"
-       cx="15.004828"
-       cy="39.80859"
-       fx="15.004828"
-       fy="39.80859"
-       r="9.7225161"
-       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5304"
-       id="linearGradient5310"
-       x1="12.606371"
-       y1="15.069461"
-       x2="12.606371"
-       y2="21.152372"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6506"
        id="linearGradient6512"
        x1="15.645709"
-       y1="39.743458"
+       y1="40.434063"
        x2="15.645709"
-       y2="53.502155"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6537"
-       id="linearGradient6543"
-       x1="30.5"
-       y1="0.033532728"
-       x2="30.5"
-       y2="23.559282"
+       y2="43.693668"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -221,6 +204,250 @@
        x2="30.152058"
        y2="23.011967"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.272076"
+       x2="5.5366187"
+       y1="39.902092"
+       x1="-1.6841649"
+       id="linearGradient6569"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="23.559282"
+       x2="30.5"
+       y1="0.033532728"
+       x1="30.5"
+       id="linearGradient2089"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="50.079575"
+       x2="14.943421"
+       y1="39.743458"
+       x1="15.645709"
+       id="linearGradient2087"
+       xlink:href="#linearGradient6506"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2081">
+      <stop
+         id="stop2083"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2085"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient2079"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2071"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2069"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2061">
+      <stop
+         id="stop2063"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2065" />
+      <stop
+         id="stop2067"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6563"
+       inkscape:collect="always">
+      <stop
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2850"
+       inkscape:collect="always">
+      <stop
+         id="stop2852"
+         offset="0"
+         style="stop-color:#ce5c00;stop-opacity:1;" />
+      <stop
+         id="stop2854"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3958"
+       inkscape:collect="always">
+      <stop
+         id="stop3960"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3962"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3968"
+       inkscape:collect="always">
+      <stop
+         id="stop3970"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop3972"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3976"
+       inkscape:collect="always">
+      <stop
+         id="stop3978"
+         offset="0"
+         style="stop-color:#3b1941;stop-opacity:1;" />
+      <stop
+         id="stop3980"
+         offset="1"
+         style="stop-color:#3b1941;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient2149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.769231,0,0,0.714287,-34.23081,-12.28573)"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958"
+       id="radialGradient2191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.116159,0,0,1.076653,-36.39499,-20.28695)"
+       cx="9.0640488"
+       cy="21.511742"
+       fx="9.0640488"
+       fy="21.511742"
+       r="16.663956" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6506"
+       id="linearGradient2193"
+       gradientUnits="userSpaceOnUse"
+       x1="15.645709"
+       y1="39.743458"
+       x2="15.645709"
+       y2="53.502155"
+       gradientTransform="matrix(0.660903,0,0,0.627207,-32.26852,-10.3201)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3968"
+       id="linearGradient2196"
+       gradientUnits="userSpaceOnUse"
+       x1="16.13257"
+       y1="40.781811"
+       x2="16.13257"
+       y2="48.068741"
+       gradientTransform="matrix(0.67692,0,0,0.646801,-32.53568,-10.90841)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="linearGradient2198"
+       gradientUnits="userSpaceOnUse"
+       x1="12.095973"
+       y1="40.907658"
+       x2="12.095973"
+       y2="46.463146"
+       gradientTransform="matrix(0.67692,0,0,0.646801,-32.53568,-10.90841)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6537"
+       id="linearGradient2201"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5"
+       y1="0.033532728"
+       x2="30.5"
+       y2="23.559282"
+       gradientTransform="matrix(0.668893,0,0,0.668627,-32.91377,-10.19246)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3108"
+       id="linearGradient3114"
+       x1="10.18327"
+       y1="16.618088"
+       x2="27.598003"
+       y2="36.64465"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3116"
+       id="linearGradient3122"
+       x1="15.722902"
+       y1="39.585075"
+       x2="15.722902"
+       y2="45.76453"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3124"
+       id="linearGradient3130"
+       x1="13.150809"
+       y1="39.39394"
+       x2="13.150809"
+       y2="45.551888"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient3146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.769231,0,0,0.714287,-3.230767,-7.285729)"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -229,17 +456,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="26.124924"
-     inkscape:cx="19.621039"
-     inkscape:cy="12.735051"
+     inkscape:zoom="16.081777"
+     inkscape:cx="21.855503"
+     inkscape:cy="14.873812"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1274"
-     inkscape:window-height="966"
-     inkscape:window-x="3"
-     inkscape:window-y="25"
+     inkscape:window-width="1434"
+     inkscape:window-height="840"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:grid-points="false"
@@ -282,44 +509,21 @@
        transform="matrix(1.747787,0,0,1.397993,-52.41719,-5.183942)"
        sodipodi:nodetypes="csccccc" />
     <path
-       style="opacity:1;fill:#82508e;fill-opacity:1;stroke:#3b1941;stroke-width:1.51128328;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient3122);fill-opacity:1.0;stroke:url(#linearGradient3130);stroke-width:1.51128328;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 3,31.153143 2.9750563,38.402618 2.9750563,45.572826 C 4.1625449,45.572826 27.946366,45.600605 30.637365,45.600605 C 32.751492,45.600605 32.586331,43.541005 32.586331,43.541005 C 32.586331,40.875594 27.597902,38.639057 25.813453,36.682531 C 23.985035,34.68151 26,30.5 26,30.5 C 26.641306,28.9702 27,27.275084 27,25.5 C 27,18.600001 21.624002,13 15,13 z "
        id="path5176"
        sodipodi:nodetypes="ccccszcsc"
        transform="matrix(0.67692,0,0,0.646801,-1.52611,-5.949693)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5286);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5273"
-       sodipodi:cx="15.004828"
-       sodipodi:cy="39.80859"
-       sodipodi:rx="9.7225161"
-       sodipodi:ry="7.119638"
-       d="M 24.727345 39.80859 A 9.7225161 7.119638 0 1 1  5.2823124,39.80859 A 9.7225161 7.119638 0 1 1  24.727345 39.80859 z"
-       transform="matrix(0.661428,0,0,0.760624,-1.973841,-10.20757)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -42.833794,49.038847 C -42.833794,49.038847 -42.815855,44.709724 -42.815855,37.951005 C -42.815855,37.951005 -39.03087,40.509965 -38.631892,41.678764 C -39.153711,41.596001 -40.372039,41.685633 -40.372039,41.685633 C -40.038351,42.463101 -38.163796,45.952105 -36.121045,48.058218 C -37.780497,47.329365 -39.471111,47.196178 -39.471111,47.196178 C -39.009636,48.111847 -37.250115,48.69173 -36.943887,49.110993 C -36.943887,49.110993 -41.348464,49.038847 -42.833794,49.038847 z "
-       id="rect5312"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(0.799568,0,0,0.627241,35.24855,-7.804428)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -49.441852,47.4154 C -48.364983,40.273995 -40.690447,44.765623 -40.961409,37.951005 C -40.961409,37.951005 -39.025024,40.280009 -38.974466,41.581367 C -39.496285,41.498604 -39.881988,41.516405 -39.881988,41.516405 C -39.5483,42.293873 -38.196948,45.748112 -36.154197,47.854225 C -37.813649,47.125372 -38.925816,46.898039 -38.925816,46.898039 C -38.847603,47.794771 -38.376224,47.369394 -38.122982,48.215235 C -42.942294,48.046898 -46.252916,49.195571 -49.441852,47.4154 z "
-       id="path5317"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(-0.602064,0,0,0.572779,-9.767144,-4.737575)" />
-    <path
        transform="matrix(0.660903,0,0,0.627207,-1.258953,-5.361383)"
-       style="opacity:0.31004363;fill:url(#linearGradient5310);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:1.55319395;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="opacity:0.5;fill:url(#linearGradient3114);fill-opacity:1.0;stroke:url(#linearGradient6512);stroke-width:1.55319395;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0617033,25.489349 4.0625,25.5 C 4.0625,32.787473 3.9033639,38.26012 3.9033639,44.499878 C 5.8399452,44.499878 22.452275,44.470084 28.278248,44.470084 C 29.445455,44.470084 31.431654,44.974157 31.431654,43.509594 C 31.431654,43.287851 31.231903,42.870917 30.681654,42.353344 C 30.131405,41.835771 29.308414,41.280003 28.400404,40.728344 C 26.665321,39.858723 25.411769,39.090553 24.621247,37.290844 C 24.011242,36.47675 23.731303,35.519763 23.676839,34.478344 C 23.622375,33.436925 24.107721,32.319635 24.224561,31.259594 C 24.458241,29.139511 24.96875,30.28125 24.96875,30.28125 C 24.98374,30.216952 25.004663,30.154183 25.03125,30.09375 C 25.618731,28.692346 25.9375,27.131297 25.9375,25.5 C 25.9375,19.154404 21.022436,14.0625 15,14.0625 z "
        id="path5241"
        sodipodi:nodetypes="cscccssccsscssc" />
     <path
-       transform="matrix(-0.861857,-0.809791,0.812609,-0.76352,-5.667036,37.33378)"
-       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5160"
+       style="fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 3.072604,7.0864988 C 4.607952,5.4493238 7.105721,5.8854918 8.086061,6.9308478 C 9.4294869,8.3633698 9.273726,10.85472 7.738379,12.491894 C 6.404137,13.914624 4.209552,14.660821 2.866124,13.228299 C 1.522696,11.795776 1.859625,8.3799248 3.072604,7.0864988 z "
+       id="path3138"
        sodipodi:nodetypes="csssc" />
     <path
        transform="matrix(1.010846,0,0,1.029732,-5.552971,-15.17001)"
@@ -336,45 +540,7 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805757,0,0,0.772415,-3.184731,-8.820615)" />
-    <path
-       transform="matrix(0.596326,-0.813274,-0.562251,-0.766804,22.42583,37.43862)"
-       style="opacity:1;fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5167"
-       sodipodi:nodetypes="csssc" />
-    <path
-       transform="matrix(0.447398,-0.672135,-0.421833,-0.633728,21.07418,32.19024)"
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5169"
-       sodipodi:nodetypes="csssc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5171"
-       sodipodi:cx="10.169642"
-       sodipodi:cy="24.3125"
-       sodipodi:rx="1.2410715"
-       sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805756,0,0,0.784291,6.815275,-9.124735)" />
-    <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5215"
-       width="5.6071429"
-       height="2.1785715"
-       x="16"
-       y="27"
-       transform="matrix(0.724348,0,0,0.459012,-2.641559,0.565398)"
-       rx="0.87366539"
-       ry="1.0892857" />
-    <path
-       transform="matrix(0.798987,0,0,0.495994,7.007995,-6.360384)"
-       style="fill:#f9751a;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="rect5187"
-       sodipodi:nodetypes="ccczc" />
+       transform="matrix(1.208633,0,0,1.158621,-6.791366,-17.66897)" />
     <path
        transform="matrix(0.670792,0,0,0.486348,-3.805943,-3.90166)"
        style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
@@ -387,11 +553,53 @@
        d="M 11.689238,9.8218679 C 13.591296,8.0161941 17.174576,11.994261 17.519594,13.650486 L 14.543472,12.891665 L 11.689238,9.8218679 z "
        id="rect5189"
        sodipodi:nodetypes="cccc" />
+    <rect
+       style="opacity:0.23144106;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3034"
+       width="36.000004"
+       height="2.9999979"
+       x="-84.444725"
+       y="32.42485"
+       rx="2.0412357"
+       ry="1.4999989" />
     <path
-       transform="matrix(0.798987,0,0,0.495994,7.007995,-6.360384)"
-       style="fill:url(#linearGradient6823);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="path6815"
-       sodipodi:nodetypes="ccczc" />
+       style="fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 16.371022,7.8148748 C 15.47069,6.586993 14.005993,6.9141191 13.43112,7.6981356 C 12.643332,8.7725276 12.734671,10.64104 13.635002,11.868921 C 14.417404,12.93597 15.704314,13.495617 16.492103,12.421225 C 17.279892,11.346833 17.082315,8.7849447 16.371022,7.8148748 z "
+       id="path3132"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 16.502957,8.5432477 C 15.827476,7.7246593 14.728576,7.9427464 14.297274,8.4654263 C 13.706229,9.1816906 13.774757,10.427368 14.450238,11.245957 C 15.037241,11.957323 16.002754,12.33042 16.593798,11.614156 C 17.184843,10.897891 17.03661,9.1899614 16.502957,8.5432477 z "
+       id="path3134"
+       sodipodi:nodetypes="csssc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3136"
+       sodipodi:cx="10.169642"
+       sodipodi:cy="24.3125"
+       sodipodi:rx="1.2410715"
+       sodipodi:ry="1.2946428"
+       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
+       transform="matrix(1.153827,0,0,1.158621,3.593156,-17.66895)" />
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3140"
+       width="4.4400907"
+       height="1"
+       x="8.5358553"
+       y="13"
+       rx="0.69182354"
+       ry="0.5" />
+    <path
+       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6,13.893438 C 11.088512,17.243015 10.655188,12 11.431469,12 C 12.197069,12 11.699301,17.201991 16,13.895644 C 15.267157,15.102946 13.014668,17 12.06507,17 C 11.104781,17 7.190872,15.676807 6,13.893438 z "
+       id="path3142"
+       sodipodi:nodetypes="czczc" />
+    <path
+       style="fill:url(#linearGradient3146);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6,13.893439 C 10.740404,18.171305 10.655188,12 11.431469,12 C 12.197069,12 11.641283,17.027939 16,13.895646 C 15.267157,15.102947 13.014668,17 12.06507,17 C 11.104781,17 7.190873,15.676809 6,13.893439 z "
+       id="path3144"
+       sodipodi:nodetypes="czczc" />
   </g>
 </svg>
Binary file pidgin/pixmaps/icons/32/pidgin.png has changed
--- a/pidgin/pixmaps/icons/32/scalable/pidgin.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/icons/32/scalable/pidgin.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -14,9 +14,9 @@
    id="svg4345"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/icons/32/scalable"
+   sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/32/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/icons/32/pidgin.png"
+   inkscape:export-filename="/home/hbons/Desktop/pidgin32.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    version="1.0">
@@ -24,18 +24,131 @@
      id="defs4347">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient6817">
+       id="linearGradient3976">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop3978" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop3980" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3968">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop3970" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0;"
+         offset="1"
+         id="stop3972" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3958">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3960" />
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3962" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2850">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="0"
+         id="stop2852" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop2854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient2856"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-47,-15.99998)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2816">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
          offset="0"
-         id="stop6819" />
+         id="stop2818" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop2820" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2816"
+       id="radialGradient2824"
+       cx="9.4288578"
+       cy="19.283415"
+       fx="9.4288578"
+       fy="19.283415"
+       r="16.390338"
+       gradientTransform="matrix(1.556432,0,0,1.618148,-52.04294,-30.39321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2826">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop2828" />
       <stop
-         style="stop-color:white;stop-opacity:0;"
+         style="stop-color:#3b1941;stop-opacity:0;"
          offset="1"
-         id="stop6821" />
+         id="stop2830" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
+       xlink:href="#linearGradient2826"
+       id="linearGradient2832"
+       x1="13.191773"
+       y1="41.606163"
+       x2="13.191773"
+       y2="47.843258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.988192,-46.55265,-16.48621)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2834">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop2836" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0;"
+         offset="1"
+         id="stop2838" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2834"
+       id="linearGradient2840"
+       x1="11.373499"
+       y1="41.566242"
+       x2="11.373499"
+       y2="47.746658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.988192,-46.55265,-16.48621)" />
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient6563">
       <stop
          style="stop-color:white;stop-opacity:1;"
@@ -71,30 +184,6 @@
          id="stop6510" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5304">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop5306" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0;"
-         offset="1"
-         id="stop5308" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5280">
-      <stop
-         style="stop-color:#82508e;stop-opacity:1;"
-         offset="0"
-         id="stop5282" />
-      <stop
-         style="stop-color:#82508e;stop-opacity:0;"
-         offset="1"
-         id="stop5284" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient2804">
       <stop
          style="stop-color:black;stop-opacity:0;"
@@ -165,34 +254,14 @@
          offset="1.0000000"
          id="stop3804" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5280"
-       id="radialGradient5286"
-       cx="15.004828"
-       cy="39.80859"
-       fx="15.004828"
-       fy="39.80859"
-       r="9.7225161"
-       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5304"
-       id="linearGradient5310"
-       x1="12.606371"
-       y1="15.069461"
-       x2="12.606371"
-       y2="21.152372"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6506"
        id="linearGradient6512"
        x1="15.645709"
        y1="39.743458"
-       x2="15.645709"
-       y2="53.502155"
+       x2="14.943421"
+       y2="50.079575"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -214,13 +283,62 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6817"
-       id="linearGradient6823"
-       x1="0.23931108"
-       y1="38.950283"
-       x2="5.7089725"
-       y2="42.982571"
+       xlink:href="#linearGradient6537"
+       id="linearGradient3069"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5"
+       y1="0.033532728"
+       x2="30.5"
+       y2="23.559282" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6506"
+       id="linearGradient3071"
+       gradientUnits="userSpaceOnUse"
+       x1="15.645709"
+       y1="39.743458"
+       x2="15.645709"
+       y2="53.502155"
+       gradientTransform="translate(-47,-15)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958"
+       id="radialGradient3966"
+       cx="9.0640488"
+       cy="21.511742"
+       fx="9.0640488"
+       fy="21.511742"
+       r="16.663956"
+       gradientTransform="matrix(1.68884,0,0,1.716583,-6.243689,-15.89085)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3968"
+       id="linearGradient3974"
+       x1="16.13257"
+       y1="40.781811"
+       x2="16.13257"
+       y2="48.068741"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="linearGradient3982"
+       x1="12.095973"
+       y1="40.907658"
+       x2="12.095973"
+       y2="46.463146"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient3991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.769231,0,0,0.714287,-1.230773,-2.285726)"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -229,17 +347,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="21.220032"
-     inkscape:cx="25.558911"
-     inkscape:cy="16.91503"
+     inkscape:zoom="17.236022"
+     inkscape:cx="21.944662"
+     inkscape:cy="16.287609"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1274"
-     inkscape:window-height="966"
-     inkscape:window-x="3"
-     inkscape:window-y="25"
+     inkscape:window-width="1434"
+     inkscape:window-height="840"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:grid-points="false"
@@ -261,16 +379,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="opacity:0.23144106;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6514"
-       width="5.0217423"
-       height="5.2252574"
-       x="42.978256"
-       y="44"
-       rx="0.28473777"
-       ry="2.6126287"
-       transform="matrix(4.779203,0,0,0.382753,-205.4017,13.15888)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-1.0057179"
@@ -292,51 +400,28 @@
        id="path6535"
        sodipodi:nodetypes="cccccccccccccc" />
     <path
-       style="opacity:1;fill:#82508e;fill-opacity:1;stroke:#3b1941;stroke-width:1.51128328;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient3974);fill-opacity:1.0;stroke:url(#linearGradient3982);stroke-width:1.51128328;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 4.8460021,40.483064 0.49299658,38.484005 0.052646307,45.33795 C 0.052646307,47.422072 1.0380664,48.413461 3.1446965,48.413461 C 4.3321851,48.413461 29.360035,48.5596 32.051034,48.5596 C 34.165161,48.5596 34,46.5 34,46.5 C 34,43.834589 27.597902,41.598052 25.813453,39.641526 C 23.985035,37.640505 26,30.5 26,30.5 C 26.641306,28.9702 27,27.275084 27,25.5 C 27,18.600001 21.624002,13 15,13 z "
        id="path5176"
        sodipodi:nodetypes="cccccszcsc"
        transform="matrix(0.67692,0,0,0.646801,0.464358,-0.908413)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5286);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5273"
-       sodipodi:cx="15.004828"
-       sodipodi:cy="39.80859"
-       sodipodi:rx="9.7225161"
-       sodipodi:ry="7.119638"
-       d="M 24.727345 39.80859 A 9.7225161 7.119638 0 1 1  5.2823124,39.80859 A 9.7225161 7.119638 0 1 1  24.727345 39.80859 z"
-       transform="matrix(0.661428,0,0,0.760624,1.662895e-2,-5.166292)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -42.833794,47.629347 C -42.833794,47.629347 -43.26687,44.687985 -40.223294,37.951005 C -40.223294,37.951005 -39.03087,40.509965 -38.631892,41.678764 C -39.153711,41.596001 -40.372039,41.685633 -40.372039,41.685633 C -40.038351,42.463101 -38.163796,45.952105 -36.121045,48.058218 C -37.780497,47.329365 -39.471111,47.196178 -39.471111,47.196178 C -39.009636,48.111847 -37.250115,48.69173 -36.943887,49.110993 C -36.943887,49.110993 -42.597127,49.864236 -42.833794,47.629347 z "
-       id="rect5312"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(0.797045,0,0,0.733236,35.01127,-5.421684)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -49.441852,47.4154 C -48.364983,40.273995 -40.690447,44.765623 -40.961409,37.951005 C -40.961409,37.951005 -39.025024,40.280009 -38.974466,41.581367 C -39.496285,41.498604 -39.881988,41.516405 -39.881988,41.516405 C -39.5483,42.293873 -38.196948,45.748112 -36.154197,47.854225 C -37.813649,47.125372 -38.925816,46.898039 -38.925816,46.898039 C -38.847603,47.794771 -38.376224,47.369394 -38.122982,48.215235 C -42.942294,48.046898 -46.252916,49.195571 -49.441852,47.4154 z "
-       id="path5317"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(-0.724368,0,0,0.660383,-12.52413,-1.979892)" />
-    <path
-       transform="matrix(0.660903,0,0,0.627207,0.731515,-0.320103)"
-       style="opacity:0.31004363;fill:url(#linearGradient5310);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:1.55319357;stroke-miterlimit:4;stroke-opacity:1"
+       style="opacity:0.5;fill:url(#radialGradient3966);fill-opacity:1.0;stroke:url(#linearGradient6512);stroke-width:1.55319357;stroke-miterlimit:4;stroke-opacity:1"
        d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0625,25.489316 4.0625,25.5 C 4.9744187,33.020507 4.3062656,37.469969 2.59375,40.59375 C -0.19778709,46.24536 1.5610206,47.490284 3.9033639,47.490284 C 5.8399452,47.490284 23.958121,47.46049 29.784094,47.46049 C 30.951301,47.46049 32.9375,47.964563 32.9375,46.5 C 32.9375,46.278257 32.737749,45.861323 32.1875,45.34375 C 31.637251,44.826177 30.81426,44.270409 29.90625,43.71875 C 28.99824,43.167091 28.02821,42.609033 27.15625,42.0625 C 26.28429,41.515967 25.511654,41.005793 24.96875,40.28125 C 24.358745,39.467156 24.078806,38.510169 24.024342,37.46875 C 23.969878,36.427331 24.107721,35.310041 24.224561,34.25 C 24.458241,32.129917 24.96875,30.28125 24.96875,30.28125 C 24.98374,30.216952 25.004663,30.154183 25.03125,30.09375 C 25.618731,28.692346 25.9375,27.131297 25.9375,25.5 C 25.9375,19.154404 21.022436,14.0625 15,14.0625 z "
        id="path5241"
-       sodipodi:nodetypes="csscccssssssscssc" />
+       sodipodi:nodetypes="csscccssssssscssc"
+       transform="matrix(0.660903,0,0,0.627207,0.731515,-0.320103)" />
     <path
-       transform="matrix(-0.861857,-0.809791,0.812609,-0.76352,-3.676568,42.37505)"
        style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
+       d="M 5.0726004,12.086499 C 6.6079483,10.449324 9.1057173,10.885492 10.086057,11.930848 C 11.429483,13.36337 11.273722,15.85472 9.7383746,17.491894 C 8.4041332,18.914624 6.2095475,19.660821 4.8661202,18.228299 C 3.5226923,16.795776 3.8596213,13.379925 5.0726004,12.086499 z "
        id="path5160"
        sodipodi:nodetypes="csssc" />
     <path
-       transform="matrix(1.010846,0,0,1.029732,-3.562503,-10.12874)"
        style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
        d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
        id="path5157"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:nodetypes="csssc"
+       transform="matrix(1.010846,0,0,1.029732,-3.562503,-10.12874)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -346,7 +431,7 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805757,0,0,0.772415,-1.194263,-3.779337)" />
+       transform="matrix(1.208633,0,0,1.158621,-4.791365,-12.66897)" />
     <path
        transform="matrix(0.596326,-0.813274,-0.562251,-0.766804,24.4163,42.47989)"
        style="opacity:1;fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
@@ -354,11 +439,11 @@
        id="path5167"
        sodipodi:nodetypes="csssc" />
     <path
-       transform="matrix(0.447398,-0.542185,-0.421833,-0.511203,23.06465,33.31996)"
        style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
        d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
        id="path5169"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:nodetypes="csssc"
+       transform="matrix(0.447398,-0.542185,-0.421833,-0.511203,23.06465,33.31996)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -368,23 +453,16 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805756,0,0,0.784291,8.805745,-4.083452)" />
+       transform="matrix(1.208633,0,0,1.158621,5.208632,-12.66896)" />
     <rect
        style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5215"
-       width="5.6071429"
-       height="2.1785715"
-       x="16"
-       y="27"
-       transform="matrix(0.724348,0,0,0.459012,-0.651091,5.606678)"
-       rx="0.87366539"
-       ry="1.0892857" />
-    <path
-       transform="matrix(0.798987,0,0,0.495994,8.99846,-1.319104)"
-       style="fill:#f9751a;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="rect5187"
-       sodipodi:nodetypes="ccczc" />
+       width="4.4400907"
+       height="1"
+       x="10.535856"
+       y="18"
+       rx="0.69182354"
+       ry="0.5" />
     <path
        transform="matrix(0.670792,0,0,0.486348,-1.815475,1.13962)"
        style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
@@ -398,10 +476,14 @@
        id="rect5189"
        sodipodi:nodetypes="cccc" />
     <path
-       transform="matrix(0.798987,0,0,0.495994,8.99846,-1.319104)"
-       style="fill:url(#linearGradient6823);fill-opacity:1.0;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="path6815"
-       sodipodi:nodetypes="ccczc" />
+       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 8,18.893438 C 13.088512,22.243015 12.655188,17 13.431469,17 C 14.197069,17 13.699301,22.201991 18,18.895644 C 17.267157,20.102946 15.014668,22 14.06507,22 C 13.104781,22 9.1908718,20.676807 8,18.893438 z "
+       id="path3987"
+       sodipodi:nodetypes="czczc" />
+    <path
+       style="fill:url(#linearGradient3991);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 8,18.893439 C 12.740404,23.171305 12.655188,17 13.431469,17 C 14.197069,17 13.641283,22.027939 18,18.895646 C 17.267157,20.102947 15.014668,22 14.06507,22 C 13.104781,22 9.1908731,20.676809 8,18.893439 z "
+       id="path3989"
+       sodipodi:nodetypes="czczc" />
   </g>
 </svg>
Binary file pidgin/pixmaps/icons/48/pidgin.png has changed
--- a/pidgin/pixmaps/icons/48/scalable/pidgin.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/icons/48/scalable/pidgin.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -14,15 +14,63 @@
    id="svg4345"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop/icons/48/scalable"
+   sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/48/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin.png"
+   inkscape:export-filename="/home/hbons/Desktop/pidgin48.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
      id="defs4347">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient2850">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="0"
+         id="stop2852" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop2854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2834">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop2836" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0;"
+         offset="1"
+         id="stop2838" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2826">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop2828" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop2830" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2816">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop2818" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop2820" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient6563">
       <stop
          style="stop-color:white;stop-opacity:1;"
@@ -71,18 +119,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient5304">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop5306" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0;"
-         offset="1"
-         id="stop5308" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient5280">
       <stop
          style="stop-color:#82508e;stop-opacity:1;"
@@ -177,15 +213,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5304"
-       id="linearGradient5310"
-       x1="12.606371"
-       y1="15.069461"
-       x2="12.606371"
-       y2="23.043955"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6493"
        id="linearGradient6499"
        x1="3.3105288"
@@ -198,27 +225,19 @@
        xlink:href="#linearGradient6506"
        id="linearGradient6512"
        x1="15.645709"
-       y1="39.743458"
+       y1="41.751736"
        x2="15.645709"
-       y2="53.502155"
-       gradientUnits="userSpaceOnUse" />
+       y2="47.370037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.988192,0.5625,-1.39645)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6537"
        id="linearGradient6543"
        x1="30.5"
-       y1="0.033532728"
+       y1="5.7732024"
        x2="30.5"
-       y2="23.559282"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6563"
-       id="linearGradient6569"
-       x1="-1.6841649"
-       y1="39.902092"
-       x2="5.5366187"
-       y2="44.272076"
+       y2="19.518673"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -229,6 +248,45 @@
        y1="38.950283"
        x2="5.5366187"
        y2="44.272076" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2816"
+       id="radialGradient2824"
+       cx="9.4288578"
+       cy="19.283415"
+       fx="9.4288578"
+       fy="19.283415"
+       r="16.390338"
+       gradientTransform="matrix(1.556432,0,0,1.618148,-5.04294,-15.39321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2826"
+       id="linearGradient2832"
+       x1="13.191773"
+       y1="41.606163"
+       x2="13.191773"
+       y2="47.843258"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2834"
+       id="linearGradient2840"
+       x1="11.373499"
+       y1="41.566242"
+       x2="11.373499"
+       y2="47.746658"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2850"
+       id="linearGradient2856"
+       x1="21.785719"
+       y1="28.142857"
+       x2="17.785713"
+       y2="30.07143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.999982)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -237,17 +295,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.1545694"
-     inkscape:cx="31.681369"
-     inkscape:cy="18.601404"
+     inkscape:zoom="14"
+     inkscape:cx="34.459692"
+     inkscape:cy="22.220728"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1274"
-     inkscape:window-height="966"
-     inkscape:window-x="3"
-     inkscape:window-y="25"
+     inkscape:window-width="1434"
+     inkscape:window-height="840"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:grid-points="true" />
@@ -267,15 +325,14 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:0.23144105;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.23144106;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6514"
-       width="5.0217423"
-       height="5.2252574"
-       x="42.978256"
-       y="44"
-       rx="0.28473777"
-       ry="2.6126287"
-       transform="matrix(7.168827,0,0,0.574134,-308.1037,19.73808)" />
+       width="36.000004"
+       height="2.9999979"
+       x="-4.4446878"
+       y="57.424854"
+       rx="2.0412357"
+       ry="1.4999989" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-1.0057179"
@@ -296,43 +353,19 @@
        id="path6535"
        d="M 20.53125,2.53125 C 17.841732,2.53125 15.53125,5.0973912 15.53125,8.46875 L 15.53125,20.53125 C 15.53125,23.902609 17.841732,26.46875 20.53125,26.46875 L 34.53125,26.46875 C 35.097743,26.476048 35.555202,26.933507 35.5625,27.5 L 35.5625,29 L 38.71875,26.65625 C 38.901723,26.528628 39.120742,26.462922 39.34375,26.46875 L 41.5,26.46875 C 43.235888,26.46875 44.009537,25.921608 44.59375,24.9375 C 45.177963,23.953392 45.46875,22.367968 45.46875,20.53125 L 45.46875,8.46875 C 45.46875,5.0973915 43.158268,2.53125 40.46875,2.53125 L 20.53125,2.53125 z " />
     <path
-       style="opacity:1;fill:#82508e;fill-opacity:1;stroke:#3b1941;stroke-width:1.00595677;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient2840);fill-opacity:1.0;stroke:url(#linearGradient2832);stroke-width:1.00595677;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 4.8460021,40.483064 0.49299658,38.484005 0.052646307,45.33795 C 0.052646307,47.422072 1.0380664,48.413461 3.1446965,48.413461 C 4.3321851,48.413461 29.360035,48.5596 32.051034,48.5596 C 34.165161,48.5596 34,46.5 34,46.5 C 34,43.834589 27.597902,41.598052 25.813453,39.641526 C 23.985035,37.640505 26,30.5 26,30.5 C 26.641306,28.9702 27,27.275084 27,25.5 C 27,18.600001 21.624002,13 15,13 z "
        id="path5176"
        sodipodi:nodetypes="cccccszcsc"
        transform="matrix(1,0,0,0.988192,0.447354,-1.486208)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5286);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5273"
-       sodipodi:cx="15.004828"
-       sodipodi:cy="39.80859"
-       sodipodi:rx="9.7225161"
-       sodipodi:ry="7.119638"
-       d="M 24.727345 39.80859 A 9.7225161 7.119638 0 1 1  5.2823124,39.80859 A 9.7225161 7.119638 0 1 1  24.727345 39.80859 z"
-       transform="matrix(0.977113,0,0,1.123653,-0.214066,-6.870732)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -42.833794,47.629347 C -42.833794,47.629347 -43.26687,44.687985 -40.223294,37.951005 C -40.223294,37.951005 -39.03087,40.509965 -38.631892,41.678764 C -39.153711,41.596001 -40.372039,41.685633 -40.372039,41.685633 C -40.038351,42.463101 -38.163796,45.952105 -36.121045,48.058218 C -37.780497,47.329365 -39.471111,47.196178 -39.471111,47.196178 C -39.009636,48.111847 -37.250115,48.69173 -36.943887,49.110993 C -36.943887,49.110993 -42.597127,49.864236 -42.833794,47.629347 z "
-       id="rect5312"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(1.177457,0,0,1.083194,51.48278,-7.248017)" />
-    <path
-       style="opacity:0.5152838;fill:#5c3466;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -49.441852,47.4154 C -48.364983,40.273995 -40.690447,44.765623 -40.961409,37.951005 C -40.961409,37.951005 -39.025024,40.280009 -38.974466,41.581367 C -39.496285,41.498604 -39.881988,41.516405 -39.881988,41.516405 C -39.5483,42.293873 -38.196948,45.748112 -36.154197,47.854225 C -37.813649,47.125372 -38.925816,46.898039 -38.925816,46.898039 C -38.847603,47.794771 -38.376224,47.369394 -38.122982,48.215235 C -42.942294,48.046898 -46.252916,49.195571 -49.441852,47.4154 z "
-       id="path5317"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(-1.070093,0,0,1.114946,-18.74027,-7.453016)" />
-    <path
-       transform="matrix(1,0,0,0.988192,0.40625,-1.486208)"
-       style="opacity:0.31004367;fill:url(#linearGradient5310);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:1.00595677;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0625,25.489316 4.0625,25.5 C 4.9744187,33.020507 4.3062656,37.469969 2.59375,40.59375 C -0.19778709,46.24536 1.5610206,47.490284 3.9033639,47.490284 C 5.8399452,47.490284 23.958121,47.46049 29.784094,47.46049 C 30.951301,47.46049 32.9375,47.964563 32.9375,46.5 C 32.9375,46.278257 32.737749,45.861323 32.1875,45.34375 C 31.637251,44.826177 30.81426,44.270409 29.90625,43.71875 C 28.99824,43.167091 28.02821,42.609033 27.15625,42.0625 C 26.28429,41.515967 25.511654,41.005793 24.96875,40.28125 C 24.358745,39.467156 24.078806,38.510169 24.024342,37.46875 C 23.969878,36.427331 24.107721,35.310041 24.224561,34.25 C 24.458241,32.129917 24.96875,30.28125 24.96875,30.28125 C 24.98374,30.216952 25.004663,30.154183 25.03125,30.09375 C 25.618731,28.692346 25.9375,27.131297 25.9375,25.5 C 25.9375,19.154404 21.022436,14.0625 15,14.0625 z "
+       style="opacity:0.5;fill:url(#radialGradient2824);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.5625,12.5 C 9.550204,12.5 4.641496,17.515648 4.625,23.771565 C 4.624972,23.782116 4.625,23.791888 4.625,23.802446 C 5.536919,31.234151 4.868766,35.631074 3.15625,38.717969 C 0.36471303,44.302845 2.123521,45.533069 4.465864,45.533069 C 6.402445,45.533069 24.520621,45.503627 30.346594,45.503627 C 31.513801,45.503627 33.5,46.001748 33.5,44.554478 C 33.5,44.335354 33.300249,43.923343 32.75,43.411881 C 32.199751,42.90042 31.37676,42.351214 30.46875,41.806069 C 29.56074,41.260924 28.59071,40.709456 27.71875,40.169376 C 26.84679,39.629297 26.074154,39.125147 25.53125,38.409159 C 24.921245,37.604678 24.641306,36.658991 24.586842,35.629869 C 24.532378,34.600747 24.670221,33.49665 24.787061,32.449126 C 25.020741,30.354077 25.53125,28.527239 25.53125,28.527239 C 25.54624,28.4637 25.567163,28.401673 25.59375,28.341953 C 26.181231,26.957097 26.5,25.414481 26.5,23.802446 C 26.5,17.531779 21.584936,12.5 15.5625,12.5 z "
        id="path5241"
        sodipodi:nodetypes="csscccssssssscssc" />
     <path
-       transform="matrix(-1.162197,-1.219912,1.095788,-1.150206,-4.404363,64.58016)"
        style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
+       d="M 7.269301,19.503118 C 9.2717505,17.238166 12.529418,17.841584 13.808008,19.287784 C 15.560146,21.269611 15.356996,24.71627 13.354547,26.981222 C 11.614386,28.949501 8.7521391,29.981828 7,28 C 5.2478601,26.018172 5.6872953,21.292511 7.269301,19.503118 z "
        id="path5160"
        sodipodi:nodetypes="csssc" />
     <path
@@ -350,7 +383,7 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208632,0,0,1.158617,-1.844007,-4.808565)" />
+       transform="matrix(1.208632,0,0,1.544828,-1.738701,-14.41893)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -360,11 +393,10 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.402878,0,0,0.386209,6.350228,13.9706)" />
+       transform="matrix(0.402878,0,0,0.514947,6.455534,10.62004)" />
     <path
-       transform="matrix(0.871648,-1.084366,-0.821841,-1.022405,36.71113,59.50016)"
        style="opacity:1;fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
+       d="M 27.88281,19.946791 C 26.359012,18.309616 23.880032,18.745786 22.907068,19.791141 C 21.573747,21.223665 21.728337,23.715015 23.252136,25.35219 C 24.576341,26.77492 26.754418,27.521117 28.087739,26.088593 C 29.42106,24.656068 29.086665,21.240217 27.88281,19.946791 z "
        id="path5167"
        sodipodi:nodetypes="csssc" />
     <path
@@ -382,7 +414,7 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208632,0,0,1.158617,13.15599,-4.808572)" />
+       transform="matrix(1.208632,0,0,1.598777,13.20865,-15.80042)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -392,21 +424,19 @@
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
        d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.402878,0,0,0.386209,21.35023,13.9706)" />
+       transform="matrix(0.402878,0,0,0.53293,21.40289,10.11299)" />
     <rect
        style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5215"
-       width="5.6071429"
-       height="2.1785715"
-       x="16"
-       y="27"
-       transform="matrix(1.070064,0,0,0.918028,-1.173674,3.073548)"
-       rx="1.0892857"
-       ry="1.0892857" />
+       width="7"
+       height="1.8602936"
+       x="15"
+       y="27.000017"
+       rx="0.81387848"
+       ry="0.93014681" />
     <path
-       transform="matrix(1.180326,0,0,0.867993,13.1795,-6.80859)"
-       style="fill:#f9751a;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 3.5188333,45.348102 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 6.1724645,45.375511 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
+       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.000005,28.650812 C 17.33287,31.553263 18.051747,26 19.060912,26 C 20.056192,26 20.46502,31.577054 25,28.653901 C 24.047304,30.344123 21.119071,32.999996 19.884593,32.999996 C 18.636217,32.999996 13.548138,31.147528 12.000005,28.650812 z "
        id="rect5187"
        sodipodi:nodetypes="czczc" />
     <path
@@ -422,9 +452,8 @@
        id="rect5189"
        sodipodi:nodetypes="cccc" />
     <path
-       transform="matrix(1.180326,0,0,0.867993,13.1795,-6.80859)"
-       style="fill:url(#linearGradient6569);fill-opacity:1.0;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 3.5188333,45.348102 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 6.1724645,45.375511 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
+       style="fill:url(#linearGradient2856);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.000005,28.650834 C 17.332871,31.553285 18.051747,26.000022 19.060912,26.000022 C 20.056192,26.000022 20.46502,31.577076 25,28.653923 C 24.047304,30.344145 21.119071,33.000018 19.884593,33.000018 C 18.636217,33.000018 13.548139,31.14755 12.000005,28.650834 z "
        id="path6561"
        sodipodi:nodetypes="czczc" />
   </g>
Binary file pidgin/pixmaps/status/16/available.png has changed
Binary file pidgin/pixmaps/status/16/away.png has changed
Binary file pidgin/pixmaps/status/16/busy.png has changed
Binary file pidgin/pixmaps/status/16/invisible.png has changed
Binary file pidgin/pixmaps/status/16/offline.png has changed
--- a/pidgin/pixmaps/status/16/scalable/available.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/available.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,23 +7,53 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/16/available16.png"
+   inkscape:export-filename="/home/hbons/GUI/Tango/Gaim Refresh/status/16/available.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/16/scalable"
-   sodipodi:docname="available16.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/16/scalable"
+   sodipodi:docname="available.svg">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient4738"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient4740"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient3149"
        id="linearGradient2269"
        gradientUnits="userSpaceOnUse"
@@ -86,6 +116,118 @@
        x2="12.233074"
        y2="27.77807"
        gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804"
+       inkscape:collect="always">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3025"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -95,16 +237,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="25.992076"
-     inkscape:cx="16.806787"
-     inkscape:cy="8.1662141"
+     inkscape:cx="4.1907826"
+     inkscape:cy="8.6773979"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#eeeeec"
-     inkscape:window-width="1268"
-     inkscape:window-height="968"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1274"
+     inkscape:window-height="844"
+     inkscape:window-x="3"
+     inkscape:window-y="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -126,37 +268,19 @@
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       transform="matrix(0.923568,0,0,0.288615,-20.73469,8.013827)" />
-    <path
+       id="path2969"
+       style="color:black;fill:url(#radialGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       style="opacity:1;fill:url(#linearGradient2857);fill-opacity:1;fill-rule:evenodd;stroke:#418203;stroke-width:1.85686159;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2245"
-       sodipodi:cx="17.890068"
-       sodipodi:cy="17.572527"
-       sodipodi:rx="13.932817"
-       sodipodi:ry="13.932817"
-       d="M 31.822886 17.572527 A 13.932817 13.932817 0 1 1  3.9572506,17.572527 A 13.932817 13.932817 0 1 1  31.822886 17.572527 z"
-       transform="matrix(0.538543,0,0,0.538542,-1.633369,-1.462358)" />
-    <image
-       id="image1323"
-       height="64.794617"
-       width="64.794617"
-       sodipodi:absref="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       xlink:href="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       x="-74"
-       y="-17" />
+       transform="matrix(0.923568,0,0,0.173169,-20.73469,11.2083)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:0.5;fill:url(#linearGradient2269);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.14505577;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3145"
-       sodipodi:cx="17.890068"
-       sodipodi:cy="17.572527"
-       sodipodi:rx="13.932817"
-       sodipodi:ry="13.932817"
-       d="M 31.822886 17.572527 A 13.932817 13.932817 0 1 1  3.9572506,17.572527 A 13.932817 13.932817 0 1 1  31.822886 17.572527 z"
-       transform="matrix(0.466166,0,0,0.466212,-0.33531,-0.188412)" />
+       transform="matrix(0.538297,0,0,0.538297,-1.630177,-1.459246)"
+       style="fill:url(#linearGradient4738);fill-opacity:1;fill-rule:evenodd;stroke:#306300;stroke-width:1.85770929;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 31.822886,17.572527 C 31.822886,25.263442 25.580983,31.505344 17.890068,31.505344 C 10.199153,31.505344 3.9572506,25.263442 3.9572506,17.572527 C 3.9572506,9.8816117 10.199153,3.6397095 17.890068,3.6397095 C 25.580983,3.6397095 31.822886,9.8816117 31.822886,17.572527 z "
+       id="path4331" />
+    <path
+       transform="matrix(0.466524,0,0,0.466525,-0.346154,-0.198015)"
+       style="opacity:0.6;fill:url(#linearGradient4740);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:2.14350748;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 31.822886,17.572527 C 31.822886,25.263442 25.580983,31.505344 17.890068,31.505344 C 10.199153,31.505344 3.9572506,25.263442 3.9572506,17.572527 C 3.9572506,9.8816117 10.199153,3.6397095 17.890068,3.6397095 C 25.580983,3.6397095 31.822886,9.8816117 31.822886,17.572527 z "
+       id="path4333" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/16/scalable/away.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/away.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,43 +7,45 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
    inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/16/available16.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/16/scalable"
-   sodipodi:docname="away16.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/16/scalable"
+   sodipodi:docname="away.svg">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2239">
+       id="linearGradient2812">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#2e3436;stop-opacity:1;"
          offset="0"
-         id="stop2241" />
+         id="stop2814" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#2e3436;stop-opacity:0;"
          offset="1"
-         id="stop2243" />
+         id="stop2816" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2239"
-       id="linearGradient2245"
-       x1="15.602553"
-       y1="1.5657365"
-       x2="15.522223"
-       y2="33.483475"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+       id="linearGradient2804">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3149"
@@ -78,29 +80,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3816">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3818" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3820" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3816"
-       id="radialGradient3822"
-       cx="31.112698"
-       cy="19.008621"
-       fx="31.112698"
-       fy="19.008621"
-       r="8.6620579"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2851"
        id="linearGradient2857"
        x1="6.878005"
@@ -108,6 +87,25 @@
        x2="12.233074"
        y2="27.77807"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2810"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2818"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,16 +115,20 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="25.992076"
-     inkscape:cx="16.806787"
-     inkscape:cy="8.1662141"
+     inkscape:cx="14.729231"
+     inkscape:cy="2.7799575"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#eeeeec"
-     inkscape:window-width="1268"
-     inkscape:window-height="968"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:object-paths="false"
+     inkscape:grid-bbox="true"
+     inkscape:guide-bbox="false"
+     inkscape:grid-points="true" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,20 +151,12 @@
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
        id="path4318"
-       style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       style="opacity:1;color:black;fill:url(#radialGradient2818);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(0.923568,0,0,0.288615,-20.73469,8.013827)" />
-    <image
-       id="image1323"
-       height="64.794617"
-       width="64.794617"
-       sodipodi:absref="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       xlink:href="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       x="-74"
-       y="-17" />
+       transform="matrix(0.923568,0,0,0.173169,-20.73469,11.2083)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1.91314828px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       style="opacity:1;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:1.91314828px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        id="path1339"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
@@ -172,47 +166,113 @@
        transform="matrix(0.522697,0,0,0.522697,-0.148088,-0.661348)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:2.59300995px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       style="opacity:1;fill:#8ab0d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="-3.8088531"
+       sodipodi:cy="3.303823"
+       sodipodi:rx="3.1932809"
+       sodipodi:ry="3.3471739"
+       d="M -0.61557221 3.303823 A 3.1932809 3.3471739 0 1 1  -7.0021341,3.303823 A 3.1932809 3.3471739 0 1 1  -0.61557221 3.303823 z"
+       transform="matrix(2.192102,0,0,2.091316,16.34939,1.090661)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.40340911;color:black;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:2.60821199px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        id="path1341"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.385634,0,0,0.38567,1.998372,1.598697)" />
+       transform="matrix(0.383404,0,0,0.383404,2.022641,1.646167)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#dcdcd8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2796"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 7.6561793 7.5551186 A 1.615877 1.3273276 0 1 1  4.4244252,7.5551186 A 1.615877 1.3273276 0 1 1  7.6561793 7.5551186 z"
+       transform="matrix(3.094296,0,0,3.766968,-10.69048,-20.45989)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:9.63841057px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2216"
-       sodipodi:cx="15.590227"
-       sodipodi:cy="16.57217"
-       sodipodi:rx="14.345175"
-       sodipodi:ry="14.345175"
-       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.103753,0,0,0.103753,6.37887,6.27699)" />
-    <path
-       style="opacity:0.5;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2245);stroke-width:0.99999881px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 14.509853,7.9958041 C 14.509853,11.591436 11.591612,14.50963 7.9959211,14.50963 C 4.4002314,14.50963 1.4819904,11.591436 1.4819904,7.9958041 C 1.4819904,4.4001725 4.4002314,1.4819783 7.9959211,1.4819783 C 11.591612,1.4819783 14.509853,4.4001725 14.509853,7.9958041 z "
-       id="path2220" />
+       style="opacity:0.76704544;fill:none;fill-opacity:1;stroke:url(#linearGradient2810);stroke-width:0.80677563;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2802"
+       sodipodi:cx="7.5"
+       sodipodi:cy="7"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5"
+       d="M 13 7 A 5.5 5 0 1 1  2,7 A 5.5 5 0 1 1  13 7 z"
+       transform="matrix(1.18182,0,0,1.3,-0.86365,-1.1)" />
+    <rect
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2820"
+       width="1"
+       height="1"
+       x="5"
+       y="-11"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2832"
+       width="1"
+       height="1"
+       x="7"
+       y="-9"
+       transform="matrix(0,1,-1,0,0,0)" />
     <path
        sodipodi:type="arc"
+       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2852"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 4.835244,8.4394021 A 1.615877,1.3273276 0 0 1 6.0776839,6.2281462 L 6.0403023,7.5551186 z"
+       transform="matrix(2.475436,0,0,3.013575,-6.952382,-14.76791)"
+       sodipodi:start="2.4124729"
+       sodipodi:end="4.735525" />
+    <rect
        style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path1588"
-       sodipodi:cx="20.264311"
-       sodipodi:cy="14.476474"
-       sodipodi:rx="2.9448855"
-       sodipodi:ry="0.78724658"
-       d="M 23.209196 14.476474 A 2.9448855 0.78724658 0 1 1  17.319425,14.476474 A 2.9448855 0.78724658 0 1 1  23.209196 14.476474 z"
-       transform="matrix(-1.244057e-16,-0.509358,1.270255,5.747542e-7,-10.38882,15.82177)" />
-    <path
-       sodipodi:type="arc"
+       id="rect2838"
+       width="2"
+       height="2"
+       x="7"
+       y="-9"
+       rx="1"
+       ry="1"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2840"
+       width="1"
+       height="1"
+       x="6"
+       y="-10"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
        style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path1314"
-       sodipodi:cx="20.264311"
-       sodipodi:cy="14.476474"
-       sodipodi:rx="2.9448855"
-       sodipodi:ry="0.78724658"
-       d="M 23.209196 14.476474 A 2.9448855 0.78724658 0 1 1  17.319425,14.476474 A 2.9448855 0.78724658 0 1 1  23.209196 14.476474 z"
-       transform="matrix(0.509355,-4.991037e-16,-5.747516e-7,1.270255,0.178284,-10.38882)" />
+       id="rect2846"
+       width="1"
+       height="1"
+       x="-11"
+       y="-11"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2848"
+       width="1"
+       height="1"
+       x="-9"
+       y="-9"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2850"
+       width="1"
+       height="1"
+       x="-10"
+       y="-10"
+       transform="matrix(0,-1,-1,0,0,0)" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/16/scalable/busy.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/busy.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,23 +7,68 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
    inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/16/available16.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/16/scalable"
-   sodipodi:docname="busy16.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/16/scalable"
+   sodipodi:docname="busy.svg">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3025"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient2186">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -38,8 +83,8 @@
        inkscape:collect="always"
        xlink:href="#linearGradient2186"
        id="linearGradient2194"
-       x1="11.226587"
-       y1="-5.4832759"
+       x1="9.2594385"
+       y1="-1.5641226"
        x2="11.226587"
        y2="17.697369"
        gradientUnits="userSpaceOnUse"
@@ -60,10 +105,10 @@
        inkscape:collect="always"
        xlink:href="#linearGradient2239"
        id="linearGradient2245"
-       x1="15.602553"
-       y1="1.5657365"
-       x2="15.522223"
-       y2="33.483475"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
     <linearGradient
@@ -139,16 +184,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="25.992076"
-     inkscape:cx="16.806787"
-     inkscape:cy="8.1662141"
+     inkscape:cx="8.3811422"
+     inkscape:cy="5.1075896"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#eeeeec"
      inkscape:window-width="1268"
-     inkscape:window-height="968"
+     inkscape:window-height="844"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -170,18 +215,10 @@
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2969"
+       style="color:black;fill:url(#radialGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(0.923568,0,0,0.288615,-20.73469,8.013827)" />
-    <image
-       id="image1323"
-       height="64.794617"
-       width="64.794617"
-       sodipodi:absref="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       xlink:href="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       x="-74"
-       y="-17" />
+       transform="matrix(0.923568,0,0,0.173169,-20.73469,11.2083)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
@@ -194,7 +231,7 @@
        transform="matrix(0.468971,0,0,0.468971,0.730372,0.26987)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1.91298747px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       style="opacity:1;color:#000000;fill:#f24747;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.91298747px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        id="path1339"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
@@ -206,10 +243,14 @@
        style="opacity:0.6;color:#000000;fill:url(#linearGradient2194);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2245);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        d="M 14.525974,7.9894993 C 14.525974,11.598577 11.608166,14.527685 8.0130095,14.527685 C 4.4178543,14.527685 1.500047,11.598577 1.500047,7.9894993 C 1.500047,4.3804219 4.4178543,1.4513155 8.0130095,1.4513155 C 11.608166,1.4513155 14.525974,4.3804219 14.525974,7.9894993 z "
        id="path2220" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.99999833px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 13.49379,7.9436678 C 13.49379,9.8082522 12.846021,9.4786261 7.9525684,9.4786261 C 3.1055026,9.4786261 2.5041877,9.7778545 2.5041877,8.0257093 C 2.5041877,6.2462172 3.8951545,6.5604085 7.9989886,6.5604085 C 12.072197,6.5604085 13.49379,6.0517387 13.49379,7.9436678 z "
-       id="path1341"
-       sodipodi:nodetypes="czzzz" />
+    <rect
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#a40000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3207"
+       width="11.000004"
+       height="2.9999959"
+       x="2.500001"
+       y="6.5000038"
+       rx="0.96183157"
+       ry="0.96183157" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/16/scalable/offline.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/offline.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -15,10 +15,10 @@
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
    version="1.0"
-   inkscape:export-filename="/home/hbons/GUI/Tango/Gaim Refresh/status/16/offline.png"
+   inkscape:export-filename="/home/hbons/Desktop/offline.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/GUI/Tango/Gaim Refresh/status/16/scalable"
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/16/scalable"
    sodipodi:docname="offline.svg">
   <defs
      id="defs4">
@@ -160,16 +160,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="25.992076"
-     inkscape:cx="16.806787"
-     inkscape:cy="8.1469775"
+     inkscape:cx="26.27121"
+     inkscape:cy="5.5692688"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#eeeeec"
-     inkscape:window-width="1268"
-     inkscape:window-height="968"
-     inkscape:window-x="6"
-     inkscape:window-y="23" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -195,14 +195,6 @@
        style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
        transform="matrix(0.923568,0,0,0.288615,-20.73469,8.013827)" />
-    <image
-       id="image1323"
-       height="64.794617"
-       width="64.794617"
-       sodipodi:absref="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       xlink:href="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       x="-74"
-       y="-17" />
     <path
        style="fill:#888a85;fill-opacity:1;stroke:#2e3436;stroke-width:0.99999827;stroke-miterlimit:4;stroke-opacity:1"
        d="M 13.307074,13.307079 C 10.376958,16.237198 5.6213214,16.237693 2.6918157,13.308187 C -0.23769028,10.378679 -0.23719421,5.623042 2.692923,2.6929237 C 5.62304,-0.23719442 10.378675,-0.23769056 13.308181,2.6918165 C 16.237687,5.6213234 16.237192,10.376962 13.307074,13.307079 z "
@@ -218,9 +210,9 @@
        d="M 8,1.5 C 6.3326173,1.5001739 4.674966,2.1375335 3.40625,3.40625 C 0.86479124,5.9477097 0.86538373,10.052882 3.40625,12.59375 C 5.9471154,15.134616 10.052293,15.135209 12.59375,12.59375 C 15.135209,10.052292 15.134616,5.9471167 12.59375,3.40625 C 11.325315,2.1378146 9.6669929,1.4998261 8,1.5 z "
        transform="matrix(1.000056,0,0,1.000028,-4.353349e-4,-2.926381e-5)" />
     <path
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:0.99999946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10.018233,3.7131793 L 8,5.8786797 L 5.9817663,3.727906 L 3.7131793,5.9817663 L 5.8786797,8 L 3.7131793,10.03296 L 5.9964929,12.316274 L 8,10.12132 L 10.018233,12.301548 L 12.301548,10.018233 L 10.12132,8 L 12.286821,5.9964929 L 10.018233,3.7131793 z "
-       id="rect1322"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.54182,4.2658182 C 10.931116,3.6551131 10.447965,3.347327 9.8372602,3.9580321 L 8.0000001,5.7952921 L 6.1627401,3.9580321 C 5.5520351,3.3473271 4.9919392,3.7705329 4.381234,4.381238 C 3.770529,4.991943 3.347323,5.5520393 3.9580281,6.1627441 L 5.7952881,8.0000041 L 3.9580281,9.8372641 C 3.3473229,10.447969 3.6935827,10.969592 4.3042875,11.580298 C 4.9149927,12.191002 5.5520349,12.652681 6.1627401,12.041977 L 8.0000001,10.204716 L 9.8372602,12.041977 C 10.447965,12.652681 11.046535,12.306422 11.657239,11.695718 C 12.267944,11.085012 12.652677,10.447969 12.041972,9.8372641 L 10.204713,8.0000041 L 12.041972,6.1627441 C 12.652677,5.552039 12.152526,4.8765236 11.54182,4.2658182 z "
+       id="rect2920"
+       sodipodi:nodetypes="ccccscccscccscccc" />
   </g>
 </svg>
Binary file pidgin/pixmaps/status/22/available.png has changed
Binary file pidgin/pixmaps/status/22/away.png has changed
Binary file pidgin/pixmaps/status/22/invisible.png has changed
Binary file pidgin/pixmaps/status/22/offline.png has changed
--- a/pidgin/pixmaps/status/22/scalable/available.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/22/scalable/available.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,19 +7,19 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/22/available22.png"
+   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/32/available32.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/22"
-   sodipodi:docname="available22.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/22/scalable"
+   sodipodi:docname="available.svg">
   <defs
      id="defs4">
     <linearGradient
@@ -72,14 +72,316 @@
        xlink:href="#linearGradient3149"
        id="linearGradient3155"
        x1="17.890068"
-       y1="2.197206"
+       y1="8.3091545"
        x2="17.890068"
-       y2="18.507565"
+       y2="36.574547"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3025"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3007"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3005"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2804">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2949"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2953" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2955" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2963"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2810"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2818"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient2904"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient1955"
        xlink:href="#linearGradient2851"
-       id="linearGradient2857"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1953"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1935">
+      <stop
+         id="stop1937"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop1939"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4740"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4738"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2898"
+       inkscape:collect="always">
+      <stop
+         id="stop2900"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2902"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient1983"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-2.476351,-2.157242)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1986"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(1.076595,0,0,1.076595,-3.760351,-3.418494)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient1990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1992"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2073"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2057"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2032"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2040"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1985"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2100"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2086"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2080">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2084" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2072"
        x1="6.878005"
        y1="11.789385"
        x2="12.233074"
@@ -87,13 +389,386 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2070"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2068"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       r="5.7619157"
+       fy="5.3375292"
+       fx="10.99079"
+       cy="5.3375292"
+       cx="10.99079"
+       id="radialGradient5135"
+       xlink:href="#linearGradient5129"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient3156"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5129"
+       inkscape:collect="always">
+      <stop
+         id="stop5131"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop5133"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient3149"
-       id="linearGradient2269"
+       id="linearGradient2126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-58.76363,3.243275)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2148"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="34.774117"
+       x2="17.890068"
+       y1="0.6668244"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1999"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2857"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="18.507565"
+       x2="17.890068"
+       y1="2.197206"
+       x1="17.890068"
+       id="linearGradient1996"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1994"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1976">
+      <stop
+         id="stop1978"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop1980"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2011"
        gradientUnits="userSpaceOnUse"
        x1="17.890068"
-       y1="0.6668244"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2013"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2015"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-24.28038,0.710083)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2059"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2147"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2145"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2143"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2141"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2139"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2124"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
        x2="17.890068"
-       y2="34.774117" />
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2118">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2120" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2122" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2110"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2108"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2106"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       r="5.7619157"
+       fy="5.3375292"
+       fx="10.99079"
+       cy="5.3375292"
+       cx="10.99079"
+       id="radialGradient2104"
+       xlink:href="#linearGradient5129"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.705322,0,0,0.705327,-24.28038,0.710083)"
+       gradientUnits="userSpaceOnUse"
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient2095"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2087"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2167"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-2.476351,-2.157242)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2184"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.789503,0,0,0.789503,-2.624255,-2.373563)"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.717731,0,0,0.71773,-1.34025,-1.112314)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -102,17 +777,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="25.992076"
-     inkscape:cx="20.3848"
-     inkscape:cy="9.8287529"
+     inkscape:zoom="14.928527"
+     inkscape:cx="26.286595"
+     inkscape:cy="13.181001"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#eeeeec"
-     inkscape:window-width="1268"
-     inkscape:window-height="968"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     height="24px"
+     width="24px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -134,37 +811,17 @@
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       transform="matrix(1.385352,0,0,0.634953,-31.10204,6.430418)" />
-    <path
+       id="path1948"
+       style="color:black;fill:url(#radialGradient2184);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       style="opacity:1;fill:url(#linearGradient2857);fill-opacity:1;fill-rule:evenodd;stroke:#418203;stroke-width:1.32699585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2245"
-       sodipodi:cx="17.890068"
-       sodipodi:cy="17.572527"
-       sodipodi:rx="13.932817"
-       sodipodi:ry="13.932817"
-       d="M 31.822886 17.572527 A 13.932817 13.932817 0 1 1  3.9572506,17.572527 A 13.932817 13.932817 0 1 1  31.822886 17.572527 z"
-       transform="matrix(0.75357,0,0,0.753592,-1.481423,-1.2422)" />
-    <image
-       id="image1323"
-       height="64.794617"
-       width="64.794617"
-       sodipodi:absref="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       xlink:href="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       x="-74"
-       y="-17" />
+       transform="matrix(1.269906,0,0,0.346338,-27.5102,14.41659)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:0.5;fill:url(#linearGradient2269);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.46676958;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3145"
-       sodipodi:cx="17.890068"
-       sodipodi:cy="17.572527"
-       sodipodi:rx="13.932817"
-       sodipodi:ry="13.932817"
-       d="M 31.822886 17.572527 A 13.932817 13.932817 0 1 1  3.9572506,17.572527 A 13.932817 13.932817 0 1 1  31.822886 17.572527 z"
-       transform="matrix(0.681795,0,0,0.681747,-0.197796,2.041858e-2)" />
+       style="fill:url(#linearGradient2189);fill-opacity:1;fill-rule:evenodd;stroke:#306300;stroke-width:0.99999911;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 22.500011,11.499997 C 22.500011,17.571995 17.57201,22.499994 11.500011,22.499994 C 5.428011,22.499994 0.50001162,17.571995 0.50001162,11.499997 C 0.50001162,5.4279975 5.428011,0.4999987 11.500011,0.4999987 C 17.57201,0.4999987 22.500011,5.4279975 22.500011,11.499997 z "
+       id="path4331" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient2191);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999809;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 21.500009,11.499995 C 21.500009,17.019992 17.020007,21.499992 11.500005,21.499992 C 5.9800027,21.499992 1.4999988,17.019992 1.4999988,11.499995 C 1.4999988,5.9799971 5.9800027,1.4999992 11.500005,1.4999992 C 17.020007,1.4999992 21.500009,5.9799971 21.500009,11.499995 z "
+       id="path4333" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/22/scalable/away.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/22/scalable/away.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,23 +7,47 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
    id="svg1331"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/away.png"
+   inkscape:export-filename="/home/hbons/Desktop/away.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/22/scalable"
-   sodipodi:docname="away22.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/22/scalable"
+   sodipodi:docname="away.svg">
   <defs
      id="defs1333">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient2811">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2813" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2815" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5129">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5131" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop5133" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient3816">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -85,10 +109,175 @@
        id="linearGradient2245"
        x1="15.602553"
        y1="1.5657365"
-       x2="15.522223"
+       x2="15.602553"
+       y2="21.045444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-24.28038,0.710083)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5129"
+       id="radialGradient5135"
+       cx="10.99079"
+       cy="5.3375292"
+       fx="10.99079"
+       fy="5.3375292"
+       r="5.7619157"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2857"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804"
+       inkscape:collect="always">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1983"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1985"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)"
+       gradientUnits="userSpaceOnUse"
        y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient2040"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.705322,0,0,0.705327,0.719621,0.710083)" />
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2032"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2057"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-24.28038,0.710083)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2811"
+       id="radialGradient2817"
+       cx="5.2511673"
+       cy="7.3335675"
+       fx="5.2511673"
+       fy="7.3335675"
+       r="0.82651663"
+       gradientTransform="matrix(1,0,0,1.337946,0,-2.478349)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -97,18 +286,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.69831"
-     inkscape:cx="17.254293"
-     inkscape:cy="10.464226"
+     inkscape:zoom="13.928809"
+     inkscape:cx="38.913091"
+     inkscape:cy="9.6136547"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      fill="#729fcf"
-     inkscape:window-width="1268"
-     inkscape:window-height="972"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
      id="metadata1336">
     <rdf:RDF>
@@ -130,63 +319,162 @@
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1948"
+       style="color:black;fill:url(#radialGradient1985);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(1.385352,0,0,0.634953,-31.10204,6.430418)" />
+       transform="matrix(1.269906,0,0,0.346338,-27.5102,14.41659)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1339"
+       style="color:black;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:1.3043046px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1951"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.732268,0,0,0.732268,0.582335,-0.13671)" />
+       transform="matrix(0.766665,0,0,0.766715,-0.450429,-1.204777)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1.68800032px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1341"
+       style="fill:#8ab0d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="-3.8088531"
+       sodipodi:cy="3.303823"
+       sodipodi:rx="3.1932809"
+       sodipodi:ry="3.3471739"
+       d="M -0.61557221 3.303823 A 3.1932809 3.3471739 0 1 1  -7.0021341,3.303823 A 3.1932809 3.3471739 0 1 1  -0.61557221 3.303823 z"
+       transform="matrix(3.246937,0,0,3.097864,23.99872,1.396119)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.40340911;color:black;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:1.59390604px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1954"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.592417,0,0,0.592416,2.763254,2.183203)" />
+       transform="matrix(0.627389,0,0,0.627389,1.718859,1.102807)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:7.84294748px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2216"
-       sodipodi:cx="15.590227"
-       sodipodi:cy="16.57217"
-       sodipodi:rx="14.345175"
-       sodipodi:ry="14.345175"
-       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.127505,0,0,0.127505,10.01337,9.888169)" />
+       style="fill:#dcdcd8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2796"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 7.6561793 7.5551186 A 1.615877 1.3273276 0 1 1  4.4244252,7.5551186 A 1.615877 1.3273276 0 1 1  7.6561793 7.5551186 z"
+       transform="matrix(5.2603,0,0,6.403843,-20.2738,-36.88179)" />
     <path
-       style="opacity:0.5;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2245);stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 21.51933,11.9953 C 21.51933,17.24738 17.256803,21.509937 12.004759,21.509937 C 6.7527164,21.509937 2.4901888,17.24738 2.4901888,11.9953 C 2.4901888,6.7432209 6.7527164,2.4806637 12.004759,2.4806637 C 17.256803,2.4806637 21.51933,6.7432209 21.51933,11.9953 z "
-       id="path2220" />
+       sodipodi:type="arc"
+       style="opacity:0.76704544;fill:none;fill-opacity:1;stroke:url(#linearGradient1983);stroke-width:0.52440464;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2802"
+       sodipodi:cx="7.5"
+       sodipodi:cy="7"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5"
+       d="M 13 7 A 5.5 5 0 1 1  2,7 A 5.5 5 0 1 1  13 7 z"
+       transform="matrix(1.818182,0,0,2,-2.136362,-2.499999)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path1588"
-       sodipodi:cx="20.264311"
-       sodipodi:cy="14.476474"
-       sodipodi:rx="2.9448855"
-       sodipodi:ry="0.78724658"
-       d="M 23.209196 14.476474 A 2.9448855 0.78724658 0 1 1  17.319425,14.476474 A 2.9448855 0.78724658 0 1 1  23.209196 14.476474 z"
-       transform="matrix(0.624124,-0.624126,1.00058,1.000585,-12.1323,7.162558)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2476"
-       sodipodi:cx="20.264311"
-       sodipodi:cy="14.476474"
-       sodipodi:rx="2.9448855"
-       sodipodi:ry="0.78724658"
-       d="M 23.209196 14.476474 A 2.9448855 0.78724658 0 1 1  17.319425,14.476474 A 2.9448855 0.78724658 0 1 1  23.209196 14.476474 z"
-       transform="matrix(0.624125,0.624124,1.000581,-1.00058,-12.13234,16.83743)" />
+       style="fill:url(#radialGradient2817);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2852"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 4.835244,8.4394021 A 1.615877,1.3273276 0 0 1 6.0776839,6.2281462 L 6.0403023,7.5551186 z"
+       transform="matrix(3.941577,0,0,4.521472,-12.44011,-23.15852)"
+       sodipodi:start="2.4124729"
+       sodipodi:end="4.735525" />
+    <rect
+       style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1926"
+       width="1"
+       height="1"
+       x="10"
+       y="-13"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1928"
+       width="1"
+       height="1"
+       x="12"
+       y="-13"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2838"
+       width="3"
+       height="3"
+       x="10"
+       y="-13"
+       rx="1.5"
+       ry="1.5"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1987"
+       width="1"
+       height="1"
+       x="11"
+       y="-12"
+       rx="0.5"
+       ry="0.5"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1991"
+       width="1"
+       height="1"
+       x="9"
+       y="-14"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1993"
+       width="1"
+       height="1"
+       x="8"
+       y="-15"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1995"
+       width="1"
+       height="1"
+       x="7"
+       y="-16"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1999"
+       width="1"
+       height="1"
+       x="-13.953762"
+       y="-14"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2001"
+       width="1"
+       height="1"
+       x="-14.953762"
+       y="-15"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2003"
+       width="1"
+       height="1"
+       x="-15.953762"
+       y="-16"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1932"
+       width="1"
+       height="1.0102224"
+       x="11"
+       y="10.989778" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/22/scalable/offline.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/22/scalable/offline.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,16 +7,16 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/22/scalable"
-   sodipodi:docname="offline22.svg"
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/22/scalable"
+   sodipodi:docname="offline.svg"
    inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/offline.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
@@ -24,6 +24,30 @@
      id="defs4">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient3034">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop3036" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop3038" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2784">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop2786" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0;"
+         offset="1"
+         id="stop2788" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient3816">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -108,7 +132,1189 @@
        x1="12.00096"
        y1="18.000015"
        x2="12.00096"
-       y2="12.421011" />
+       y2="12.421011"
+       gradientTransform="translate(-14.51828,-0.483273)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2784"
+       id="linearGradient2790"
+       x1="11.999999"
+       y1="17.358862"
+       x2="11.999999"
+       y2="11.173834"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3286"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3002"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3201"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2245"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-24.28038,0.710083)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5129"
+       id="radialGradient3210"
+       cx="10.99079"
+       cy="5.3375292"
+       fx="10.99079"
+       fy="5.3375292"
+       r="5.7619157"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3212"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient3214"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3216"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3224">
+      <stop
+         id="stop3226"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3228"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3230"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1983"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3245"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)"
+       gradientUnits="userSpaceOnUse"
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient3247"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3249"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3251"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-24.28038,0.710083)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <linearGradient
+       y2="32.896225"
+       x2="11.507221"
+       y1="4.5275822"
+       x1="6.6158633"
+       gradientTransform="matrix(1.535977,0,0,1.528473,-0.804927,-0.69647)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2210"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="10.792614"
+       x2="9.0812168"
+       y1="-0.76356995"
+       x1="3.3119085"
+       gradientTransform="matrix(2.177693,0,0,2.167044,-2.372032,-2.235246)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2208"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2141"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2149"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2157"
+       x1="9.2594385"
+       y1="-1.5641226"
+       x2="11.226587"
+       y2="17.697369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2165"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2167"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2169">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2171" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2173" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2187"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient1988"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3155"
+       x1="17.890068"
+       y1="8.3091545"
+       x2="17.890068"
+       y2="36.574547"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3007"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3005"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2804">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2949"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2953" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2955" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2963"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2810"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2818"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient1955"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1953"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1935">
+      <stop
+         id="stop1937"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop1939"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4740"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4738"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient1990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2073"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2057"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2032"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2040"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2100"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2086"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2080">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2084" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2072"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2070"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2068"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       r="5.7619157"
+       fy="5.3375292"
+       fx="10.99079"
+       cy="5.3375292"
+       cx="10.99079"
+       id="radialGradient5135"
+       xlink:href="#linearGradient5129"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient2921"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5129"
+       inkscape:collect="always">
+      <stop
+         id="stop5131"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop5133"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-58.76363,3.243275)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2898"
+       inkscape:collect="always">
+      <stop
+         id="stop2900"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop2902"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient3014"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.177693,0,0,2.167044,21.62797,-2.235244)"
+       x1="3.3119085"
+       y1="-0.76356995"
+       x2="9.0812168"
+       y2="10.792614" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3016"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.535977,0,0,1.528473,23.19507,-0.696468)"
+       x1="6.6158633"
+       y1="4.5275822"
+       x2="11.507221"
+       y2="32.896225" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3021"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3034"
+       id="linearGradient3040"
+       x1="11.500003"
+       y1="19.000008"
+       x2="11.500003"
+       y2="9.3821249"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3034"
+       id="linearGradient3044"
+       gradientUnits="userSpaceOnUse"
+       x1="11.500003"
+       y1="19.000008"
+       x2="11.500003"
+       y2="9.3821249"
+       gradientTransform="matrix(0.857143,0,0,0.857143,1.642855,1.64286)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3034"
+       id="linearGradient3048"
+       gradientUnits="userSpaceOnUse"
+       x1="11.500003"
+       y1="19.000008"
+       x2="11.500003"
+       y2="9.3821249" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2062"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientTransform="matrix(1.076595,0,0,1.076595,-34.76035,-3.418494)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2253"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-33.47635,-2.157242)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2056"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2246">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2248" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2250" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient1983"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2236"
+       x1="17.890068"
+       y1="8.3091545"
+       x2="17.890068"
+       y2="36.574547"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3025"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2232"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2230"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2215"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2209">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2211" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2213" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2206"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2204"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2202"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient2904"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2199"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2197"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2191">
+      <stop
+         id="stop2193"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2195"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2189"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2187"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2184"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2176"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-2.476351,-2.157242)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1986"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(1.076595,0,0,1.076595,-3.760351,-3.418494)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2173"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1992"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2170"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2167"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2165"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2163"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1985"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2160"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2158"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2151">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2153" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2155" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2149"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2147"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2144"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       r="5.7619157"
+       fy="5.3375292"
+       fx="10.99079"
+       cy="5.3375292"
+       cx="10.99079"
+       id="radialGradient2142"
+       xlink:href="#linearGradient5129"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient2035"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2127"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-58.76363,3.243275)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2148"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientTransform="matrix(1.40375,0,0,1.403934,-1.668488,-1.296374)"
+       y2="9.1482677"
+       x2="12.00096"
+       y1="17.203793"
+       x1="12.00096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2121"
+       xlink:href="#linearGradient2235"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       id="linearGradient2119"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient2105"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2097"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2225"
+       id="linearGradient2268"
+       gradientUnits="userSpaceOnUse"
+       x1="11.802028"
+       y1="1.9986149"
+       x2="11.802028"
+       y2="14.895812" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -118,16 +1324,18 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="20.899939"
-     inkscape:cx="21.212814"
-     inkscape:cy="11.149734"
+     inkscape:cx="22.169755"
+     inkscape:cy="10.589231"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#888a85"
-     inkscape:window-width="1268"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,39 +1357,29 @@
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:0.7;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1948"
+       style="color:black;fill:url(#radialGradient3021);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(1.385352,0,0,0.634953,-31.10204,6.430418)" />
+       transform="matrix(1.269906,0,0,0.346338,-27.5102,14.41659)" />
     <path
-       style="fill:#888a85;fill-opacity:1;stroke:#555753;stroke-width:0.99999809;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 19.424962,19.424965 C 15.325526,23.524403 8.6720624,23.525096 4.5734814,19.426514 C 0.47490009,15.327931 0.47559413,8.6744652 4.5750306,4.5750271 C 8.6744668,0.4755893 15.32793,0.47489516 19.426511,4.573478 C 23.525092,8.6720606 23.524399,15.325527 19.424962,19.424965 z "
+       style="fill:#888a85;fill-opacity:1;stroke:#2e3436;stroke-width:0.99999821;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 19.27853,19.278538 C 14.983883,23.573188 8.0135883,23.573914 3.719837,19.280161 C -0.57391464,14.986408 -0.57318755,8.0161106 3.72146,3.7214613 C 8.0161072,-0.57318761 14.986402,-0.57391481 19.280153,3.7198384 C 23.573904,8.0135915 23.573178,14.983889 19.27853,19.278538 z "
        id="path2187" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0137641"
-       inkscape:original="M 12 1.5 C 9.311882 1.5002804 6.612218 2.5127812 4.5625 4.5625 C 0.46306353 8.6619381 0.46391853 15.338917 4.5625 19.4375 C 8.661081 23.536082 15.338065 23.536938 19.4375 19.4375 C 23.536937 15.338062 23.53608 8.6610824 19.4375 4.5625 C 17.388209 2.5132086 14.688118 1.4997196 12 1.5 z "
-       xlink:href="#path2187"
-       style="fill:url(#linearGradient2231);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.99999809;stroke-miterlimit:4;stroke-opacity:1;opacity:0.4"
-       id="path2215"
-       inkscape:href="#path2187"
-       d="M 12,2.5 C 9.5663798,2.5002539 7.1342728,3.4282024 5.28125,5.28125 C 1.5710546,8.9914951 1.5718911,15.009341 5.28125,18.71875 C 8.9905967,22.428146 15.008567,22.428982 18.71875,18.71875 C 22.428945,15.008505 22.428107,8.990658 18.71875,5.28125 C 16.86613,3.4286052 14.43323,2.4997462 12,2.5 z " />
+       style="opacity:0.4;fill:url(#linearGradient2231);fill-opacity:1;stroke:white;stroke-width:0.99999809;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 11.5,1.5 C 8.9408673,1.500267 6.3904601,2.4845389 4.4375,4.4375 C 0.53092837,8.3440732 0.53180564,14.656804 4.4375,18.5625 C 8.3431938,22.468195 14.655929,22.469073 18.5625,18.5625 C 22.469072,14.655927 22.468194,8.3431958 18.5625,4.4375 C 16.609962,2.4849619 14.058743,1.4997331 11.5,1.5 z "
+       id="path2215" />
     <path
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15.713272,5.1062978 L 12.00096,8.8186095 L 8.2886482,5.1062978 L 5.0182784,8.3766676 L 8.7305901,12.088979 L 5.1066667,15.712903 L 8.3770366,18.983273 L 12.00096,15.359349 L 15.602786,18.961176 L 18.873156,15.690806 L 15.27133,12.088979 L 18.983642,8.3766676 L 15.713272,5.1062978 z "
-       id="path2233" />
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.527292,4.7878577 C 15.153659,4.4142246 14.558496,4.4142246 14.184863,4.7878577 L 11.500003,7.4727164 L 8.7941693,4.7668822 C 8.4383282,4.4110411 7.849532,4.4110411 7.4936909,4.7668822 L 4.7668812,7.4936919 C 4.4110402,7.8495329 4.4110401,8.4383292 4.7668812,8.7941703 L 7.4727154,11.500004 L 4.7878567,14.184864 C 4.4142238,14.558497 4.4142236,15.15366 4.7878567,15.527293 L 7.4727154,18.212151 C 7.8463484,18.585784 8.4415118,18.585784 8.8151448,18.212151 L 11.500003,15.527293 L 14.205838,18.233126 C 14.561679,18.588967 15.150475,18.588967 15.506317,18.233126 L 18.233125,15.506318 C 18.588966,15.150476 18.588965,14.56168 18.233125,14.205839 L 15.527292,11.500004 L 18.21215,8.8151458 C 18.585783,8.4415126 18.585784,7.84635 18.21215,7.4727164 L 15.527292,4.7878577 z "
+       id="path3032" />
     <path
-       style="opacity:1;fill:url(#linearGradient2270);fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15.713272,5.1062978 L 12.00096,8.8186095 L 8.2886482,5.1062978 L 5.0182784,8.3766676 L 8.7305901,12.088979 L 5.1066667,15.712903 L 8.3770366,18.983273 L 12.00096,15.359349 L 15.602786,18.961176 L 18.873156,15.690806 L 15.27133,12.088979 L 18.983642,8.3766676 L 15.713272,5.1062978 z "
-       id="rect2204" />
+       style="opacity:1;fill:url(#linearGradient3040);fill-opacity:1.0;stroke:#555753;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.527292,4.7878577 C 15.153659,4.4142246 14.558496,4.4142246 14.184863,4.7878577 L 11.500003,7.4727164 L 8.7941693,4.7668822 C 8.4383282,4.4110411 7.849532,4.4110411 7.4936909,4.7668822 L 4.7668812,7.4936919 C 4.4110402,7.8495329 4.4110401,8.4383292 4.7668812,8.7941703 L 7.4727154,11.500004 L 4.7878567,14.184864 C 4.4142238,14.558497 4.4142236,15.15366 4.7878567,15.527293 L 7.4727154,18.212151 C 7.8463484,18.585784 8.4415118,18.585784 8.8151448,18.212151 L 11.500003,15.527293 L 14.205838,18.233126 C 14.561679,18.588967 15.150475,18.588967 15.506317,18.233126 L 18.233125,15.506318 C 18.588966,15.150476 18.588965,14.56168 18.233125,14.205839 L 15.527292,11.500004 L 18.21215,8.8151458 C 18.585783,8.4415126 18.585784,7.84635 18.21215,7.4727164 L 15.527292,4.7878577 z "
+       id="rect3024" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0009557"
-       inkscape:original="M 8.28125 5.09375 L 5.03125 8.375 L 8.71875 12.09375 L 5.09375 15.71875 L 8.375 18.96875 L 12 15.34375 L 15.59375 18.96875 L 18.875 15.6875 L 15.28125 12.09375 L 18.96875 8.375 L 15.71875 5.09375 L 12 8.8125 L 8.28125 5.09375 z "
-       xlink:href="#rect2204"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#e1e1e1;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2268"
-       inkscape:href="#rect2204"
-       d="M 8.28125,6.53125 L 6.46875,8.375 L 9.4375,11.375 C 9.6319915,11.563548 9.7417695,11.822867 9.7417695,12.09375 C 9.7417695,12.364633 9.6319915,12.623952 9.4375,12.8125 L 6.53125,15.71875 L 8.375,17.53125 L 11.28125,14.625 C 11.469798,14.430508 11.729117,14.320731 12,14.320731 C 12.270883,14.320731 12.530202,14.430508 12.71875,14.625 L 15.59375,17.53125 L 17.4375,15.6875 L 14.5625,12.8125 C 14.368008,12.623952 14.258231,12.364633 14.258231,12.09375 C 14.258231,11.822867 14.368008,11.563548 14.5625,11.375 L 17.53125,8.375 L 15.71875,6.53125 L 12.71875,9.53125 C 12.530202,9.7257415 12.270883,9.8355195 12,9.8355195 C 11.729117,9.8355195 11.469798,9.7257415 11.28125,9.53125 L 8.28125,6.53125 z " />
+       style="fill:none;fill-opacity:1;stroke:white;stroke-width:1.00000024;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 8.15625,5.625 L 5.625,8.15625 L 8.21875,10.78125 C 8.6216689,11.187934 8.6216689,11.843316 8.21875,12.25 L 5.625,14.875 L 8.125,17.375 L 10.75,14.78125 C 11.156684,14.378331 11.812066,14.378331 12.21875,14.78125 L 14.84375,17.375 L 17.375,14.84375 L 14.78125,12.21875 C 14.378331,11.812066 14.378331,11.156684 14.78125,10.75 L 17.375,8.125 L 14.875,5.625 L 12.25,8.21875 C 11.843316,8.6216689 11.187934,8.6216689 10.78125,8.21875 L 8.15625,5.625 z "
+       id="path3050" />
   </g>
 </svg>
Binary file pidgin/pixmaps/status/32/available.png has changed
Binary file pidgin/pixmaps/status/32/away.png has changed
Binary file pidgin/pixmaps/status/32/busy.png has changed
Binary file pidgin/pixmaps/status/32/invisible.png has changed
Binary file pidgin/pixmaps/status/32/offline.png has changed
--- a/pidgin/pixmaps/status/32/scalable/available.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/available.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,19 +7,19 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
    height="32"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
    inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/32/available32.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/32/scalable"
-   sodipodi:docname="available32.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/32/scalable"
+   sodipodi:docname="available.svg">
   <defs
      id="defs4">
     <linearGradient
@@ -76,15 +76,434 @@
        x2="17.890068"
        y2="36.574547"
        gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3025"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3007"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3005"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2804">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2949"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2953" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2955" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2851"
-       id="linearGradient2857"
+       id="linearGradient2963"
        x1="6.878005"
        y1="11.789385"
        x2="12.233074"
        y2="27.77807"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2810"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2818"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient2904"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient1955"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1953"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1935">
+      <stop
+         id="stop1937"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop1939"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4740"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4738"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2898"
+       inkscape:collect="always">
+      <stop
+         id="stop2900"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2902"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient1983"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-2.476351,-2.157242)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1986"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(1.076595,0,0,1.076595,-3.760351,-3.418494)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient1990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1992"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2073"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2057"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2032"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2040"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1985"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2100"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2086"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2080">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2084" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2072"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2070"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2068"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       r="5.7619157"
+       fy="5.3375292"
+       fx="10.99079"
+       cy="5.3375292"
+       cx="10.99079"
+       id="radialGradient5135"
+       xlink:href="#linearGradient5129"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient3156"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5129"
+       inkscape:collect="always">
+      <stop
+         id="stop5131"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop5133"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-58.76363,3.243275)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2148"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -94,16 +513,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="14.928527"
-     inkscape:cx="21.066059"
-     inkscape:cy="16.155598"
+     inkscape:cx="1.0834072"
+     inkscape:cy="19.47767"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#eeeeec"
-     inkscape:window-width="1268"
-     inkscape:window-height="968"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -120,42 +539,22 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
-       sodipodi:ry="8.6620579"
-       sodipodi:rx="8.6620579"
-       sodipodi:cy="19.008621"
-       sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:1;color:black;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       transform="matrix(1.847136,0,0,0.865845,-41.46939,8.04148)" />
-    <path
+       transform="matrix(1.731691,0,0,0.461784,-37.88165,19.22212)"
        sodipodi:type="arc"
-       style="opacity:1;fill:url(#linearGradient2857);fill-opacity:1;fill-rule:evenodd;stroke:#418203;stroke-width:0.96092743;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2245"
-       sodipodi:cx="17.890068"
-       sodipodi:cy="17.572527"
-       sodipodi:rx="13.932817"
-       sodipodi:ry="13.932817"
-       d="M 31.822886 17.572527 A 13.932817 13.932817 0 1 1  3.9572506,17.572527 A 13.932817 13.932817 0 1 1  31.822886 17.572527 z"
-       transform="matrix(1.040661,0,0,1.040661,-2.617502,-2.287049)" />
+       style="color:black;fill:url(#radialGradient2148);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2173"
+       sodipodi:cx="31.112698"
+       sodipodi:cy="19.008621"
+       sodipodi:rx="8.6620579"
+       sodipodi:ry="8.6620579"
+       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z" />
     <path
-       sodipodi:type="arc"
-       style="opacity:0.5;fill:url(#linearGradient3155);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.03206742;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3145"
-       sodipodi:cx="17.890068"
-       sodipodi:cy="17.572527"
-       sodipodi:rx="13.932817"
-       sodipodi:ry="13.932817"
-       d="M 31.822886 17.572527 A 13.932817 13.932817 0 1 1  3.9572506,17.572527 A 13.932817 13.932817 0 1 1  31.822886 17.572527 z"
-       transform="matrix(0.968935,0,0,0.968925,-1.334307,-1.026606)" />
-    <image
-       id="image1323"
-       height="64.794617"
-       width="64.794617"
-       sodipodi:absref="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       xlink:href="/home/hbons/Desktop/Gaim Refresh/Tango-Palette.png"
-       x="-74"
-       y="-17" />
+       style="fill:url(#linearGradient1986);fill-opacity:1;fill-rule:evenodd;stroke:#306300;stroke-width:0.99999946;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 30.500005,15.500002 C 30.500005,23.780003 23.780005,30.500004 15.500008,30.500004 C 7.2200097,30.500004 0.50001191,23.780003 0.50001191,15.500002 C 0.50001191,7.2200001 7.2200097,0.49999934 15.500008,0.49999934 C 23.780005,0.49999934 30.500005,7.2200001 30.500005,15.500002 z "
+       id="path4331" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient1983);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999863;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 29.499996,15.5 C 29.499996,23.227999 23.227996,29.500002 15.499996,29.500002 C 7.7719974,29.500002 1.4999949,23.227999 1.4999949,15.5 C 1.4999949,7.7719992 7.7719974,1.4999993 15.499996,1.4999993 C 23.227996,1.4999993 29.499996,7.7719992 29.499996,15.5 z "
+       id="path4333" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/32/scalable/away.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/away.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,23 +7,47 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
    height="32"
    id="svg1331"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/32/away32.png"
+   inkscape:export-filename="/home/hbons/GUI/Tango/Gaim Refresh/status/22/away.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/32/scalable"
-   sodipodi:docname="away32.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/32/scalable"
+   sodipodi:docname="away.svg">
   <defs
      id="defs1333">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient2808">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2810" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2812" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5129">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5131" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop5133" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient3816">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -34,15 +58,28 @@
          offset="1"
          id="stop3820" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3150">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3152" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop3154" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3816"
-       id="radialGradient3822"
-       cx="31.112698"
-       cy="19.008621"
-       fx="31.112698"
-       fy="19.008621"
-       r="8.6620579"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3156"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -56,16 +93,171 @@
          offset="1"
          id="stop2243" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5129"
+       id="radialGradient5135"
+       cx="10.99079"
+       cy="5.3375292"
+       fx="10.99079"
+       fy="5.3375292"
+       r="5.7619157"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2857"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804"
+       inkscape:collect="always">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1983"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1985"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)"
+       gradientUnits="userSpaceOnUse"
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient2040"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2032"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2057"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2239"
-       id="linearGradient2245"
+       id="linearGradient2073"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
        x1="15.602553"
        y1="1.5657365"
-       x2="15.522223"
-       y2="33.483475"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)" />
+       x2="15.602553"
+       y2="21.045444" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2808"
+       id="radialGradient2814"
+       cx="5.2511673"
+       cy="7.3335675"
+       fx="5.2511673"
+       fy="7.3335675"
+       r="0.82651663"
+       gradientTransform="matrix(1,0,0,1.337946,0,-2.478349)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -74,20 +266,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.69831"
-     inkscape:cx="23.600016"
-     inkscape:cy="15.388506"
+     inkscape:zoom="13.928809"
+     inkscape:cx="28.28763"
+     inkscape:cy="14.998178"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      fill="#729fcf"
-     inkscape:window-width="1268"
-     inkscape:window-height="972"
-     inkscape:window-x="6"
-     inkscape:window-y="21"
-     showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     width="32px"
+     height="32px" />
   <metadata
      id="metadata1336">
     <rdf:RDF>
@@ -109,63 +301,101 @@
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:1;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1948"
+       style="color:black;fill:url(#radialGradient1985);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(1.847136,0,0,0.865845,-41.46939,8.04148)" />
+       transform="matrix(1.731691,0,0,0.461784,-37.87757,19.22211)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:0.98932087px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1339"
+       style="color:black;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:0.95645106px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1951"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(1.010793,0,0,1.010792,0.241509,-0.751017)" />
+       transform="matrix(1.045505,0,0,1.045554,-0.797598,-1.825749)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1.24782109px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1341"
+       style="fill:#8ab0d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="-3.8088531"
+       sodipodi:cy="3.303823"
+       sodipodi:rx="3.1932809"
+       sodipodi:ry="3.3471739"
+       d="M -0.61557221 3.303823 A 3.1932809 3.3471739 0 1 1  -7.0021341,3.303823 A 3.1932809 3.3471739 0 1 1  -0.61557221 3.303823 z"
+       transform="matrix(4.414832,0,0,4.210029,32.44953,1.716868)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.40340911;color:black;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:1.19542968px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1954"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.80139,0,0,0.801405,3.511281,2.723938)" />
+       transform="matrix(0.836518,0,0,0.836518,2.458491,1.637077)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#dcdcd8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2796"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 7.6561793 7.5551186 A 1.615877 1.3273276 0 1 1  4.4244252,7.5551186 A 1.615877 1.3273276 0 1 1  7.6561793 7.5551186 z"
+       transform="matrix(7.116878,0,0,8.664024,-27.4881,-49.95773)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:5.84032869px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2216"
+       style="opacity:0.76704544;fill:none;fill-opacity:1;stroke:url(#linearGradient1983);stroke-width:0.37457478;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2802"
+       sodipodi:cx="7.5"
+       sodipodi:cy="7"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5"
+       d="M 13 7 A 5.5 5 0 1 1  2,7 A 5.5 5 0 1 1  13 7 z"
+       transform="matrix(2.545454,0,0,2.8,-3.590908,-4.100001)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient2814);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2852"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 4.835244,8.4394021 A 1.615877,1.3273276 0 0 1 6.0776839,6.2281462 L 6.0403023,7.5551186 z"
+       transform="matrix(5.732654,0,0,7.234355,-19.36499,-39.05363)"
+       sodipodi:start="2.4124729"
+       sodipodi:end="4.735525" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:7.17263222px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2051"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.171225,0,0,0.171225,13.33055,13.16244)" />
-    <path
-       style="opacity:0.5;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2245);stroke-width:0.99999946px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 29.484663,15.989048 C 29.484663,23.430003 23.442356,29.46904 15.997368,29.46904 C 8.5523815,29.46904 2.5100737,23.430003 2.5100737,15.989048 C 2.5100737,8.5480941 8.5523815,2.5090586 15.997368,2.5090586 C 23.442356,2.5090586 29.484663,8.5480941 29.484663,15.989048 z "
-       id="path2220" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path1342"
-       sodipodi:cx="19.747887"
-       sodipodi:cy="9.4599953"
-       sodipodi:rx="1.4722075"
-       sodipodi:ry="2.6398203"
-       d="M 21.220094 9.4599953 A 1.4722075 2.6398203 0 1 1  18.275679,9.4599953 A 1.4722075 2.6398203 0 1 1  21.220094 9.4599953 z"
-       transform="matrix(0.882374,0.509439,-0.56822,0.984187,6.966287,-8.07548)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path1344"
-       sodipodi:cx="19.747887"
-       sodipodi:cy="9.4599953"
-       sodipodi:rx="1.4722075"
-       sodipodi:ry="2.6398203"
-       d="M 21.220094 9.4599953 A 1.4722075 2.6398203 0 1 1  18.275679,9.4599953 A 1.4722075 2.6398203 0 1 1  21.220094 9.4599953 z"
-       transform="matrix(0.882374,-0.509439,-0.56822,-0.984187,6.966287,40.07548)" />
+       transform="matrix(0.13942,0,0,0.139419,13.32641,13.18954)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:4.86999989;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234"
+       width="2.0651035"
+       height="6.1953154"
+       x="20.887754"
+       y="-8.7545109"
+       transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
+       rx="1.0325518"
+       ry="1.0027943" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:4.86999989;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2080"
+       width="2.065105"
+       height="6.1953192"
+       x="-1.0325458"
+       y="-30.674829"
+       transform="matrix(0.707107,-0.707107,-0.707107,-0.707107,0,0)"
+       rx="1.0325525"
+       ry="1.002795" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/32/scalable/busy.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/busy.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -7,19 +7,19 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
    height="32"
    id="svg1331"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
    inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/32/busy32.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/32/scalable"
-   sodipodi:docname="busy32.svg">
+   sodipodi:docbase="/home/hbons/Desktop/experiment/32/scalable"
+   sodipodi:docname="busy.svg">
   <defs
      id="defs1333">
     <linearGradient
@@ -34,16 +34,6 @@
          offset="1"
          id="stop3820" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3816"
-       id="radialGradient3822"
-       cx="31.112698"
-       cy="19.008621"
-       fx="31.112698"
-       fy="19.008621"
-       r="8.6620579"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient2186">
@@ -68,26 +58,554 @@
          offset="1"
          id="stop2243" />
     </linearGradient>
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2148"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2146"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-58.76363,3.243275)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2132"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2126"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5129">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5131" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop5133" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3150">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3152" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop3154" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3156"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5129"
+       id="radialGradient5135"
+       cx="10.99079"
+       cy="5.3375292"
+       fx="10.99079"
+       fy="5.3375292"
+       r="5.7619157"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2068"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2070"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2072"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2080">
+      <stop
+         id="stop2082"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2084"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2086"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2100"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1985"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)"
+       gradientUnits="userSpaceOnUse"
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient2040"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2032"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2057"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2239"
-       id="linearGradient2245"
-       x1="15.535398"
-       y1="1.8014067"
-       x2="15.535398"
-       y2="48.674999"
+       id="linearGradient2073"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <radialGradient
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1990"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient4738"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient4740"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient1935">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop1937" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop1939" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient1953"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1955"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804"
+       inkscape:collect="always">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000376,0,0,0.999343,-1.147524e-3,1.523185e-2)" />
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="36.574547"
+       x2="17.890068"
+       y1="8.3091545"
+       x1="17.890068"
+       id="linearGradient3155"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1988"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2070"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2083"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-54.47635,15.84276)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.076595,0,0,1.076595,-55.76035,14.58151)"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2093"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2857"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2187"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2169">
+      <stop
+         id="stop2171"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2173"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2167"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)"
+       gradientUnits="userSpaceOnUse"
+       y2="39.834526"
+       x2="31.18539"
+       y1="4.5934086"
+       x1="8.7505674"
+       id="linearGradient2165"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-1.5641226"
+       x1="9.2594385"
+       id="linearGradient2157"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2149"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient2141"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2186"
-       id="linearGradient2194"
-       x1="11.226587"
-       y1="-5.4832759"
-       x2="11.226587"
-       y2="17.697369"
+       id="linearGradient2208"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.418323,0,0,1.416852,-1.021803,-0.99085)" />
+       gradientTransform="matrix(3.048768,0,0,3.033857,-3.920843,-3.729339)"
+       x1="3.3119085"
+       y1="-0.76356995"
+       x2="9.0812168"
+       y2="10.792614" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2210"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.150367,0,0,2.139859,-1.726897,-1.575055)"
+       x1="6.6158633"
+       y1="4.5275822"
+       x2="11.507221"
+       y2="32.896225" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -96,18 +614,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="25.992076"
-     inkscape:cx="23.061682"
-     inkscape:cy="14.291409"
+     inkscape:zoom="11.313708"
+     inkscape:cx="32.077294"
+     inkscape:cy="17.208225"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      fill="#ef2929"
-     inkscape:window-width="1268"
-     inkscape:window-height="972"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="1440"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
      id="metadata1336">
     <rdf:RDF>
@@ -124,43 +642,47 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
-       sodipodi:ry="8.6620579"
-       sodipodi:rx="8.6620579"
-       sodipodi:cy="19.008621"
+       transform="matrix(1.731691,0,0,0.461784,-37.87759,19.22212)"
+       sodipodi:type="arc"
+       style="color:black;fill:url(#radialGradient2093);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2091"
        sodipodi:cx="31.112698"
-       id="path4318"
-       style="opacity:1;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       transform="matrix(1.847136,0,0,0.865845,-41.46938,8.041481)" />
+       sodipodi:cy="19.008621"
+       sodipodi:rx="8.6620579"
+       sodipodi:ry="8.6620579"
+       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1311"
+       style="color:black;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2194"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.989705,0,0,0.989705,0.437593,-0.53424)" />
+       transform="matrix(0.936036,0,0,0.936032,1.023071,0.100614)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.98950732px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1339"
+       style="color:black;fill:#f24747;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:0.95634508px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2196"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(1.010428,0,0,1.010778,0.242013,-0.750701)" />
+       transform="matrix(1.045648,0,0,1.045648,-0.801887,-1.828653)" />
     <path
-       style="opacity:0.6;color:#000000;fill:url(#linearGradient2194);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2245);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 29.499568,16.004716 C 29.499568,23.446135 23.453927,29.485548 16.004828,29.485548 C 8.5557329,29.485548 2.5100898,23.446135 2.5100898,16.004716 C 2.5100898,8.5632961 8.5557329,2.5238833 16.004828,2.5238833 C 23.453927,2.5238833 29.499568,8.5632961 29.499568,16.004716 z "
-       id="path2220" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.99999958px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 27.51954,15.864482 C 27.51954,20.204712 25.510558,19.437434 15.893137,19.437434 C 6.2213077,19.437434 4.46153,20.133953 4.46153,16.055453 C 4.46153,11.913293 6.4064326,12.529223 15.990534,12.529223 C 25.520227,12.529223 27.51954,11.460602 27.51954,15.864482 z "
-       id="path1341"
-       sodipodi:nodetypes="czzzz" />
+       style="opacity:0.6;color:black;fill:url(#linearGradient2208);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2210);stroke-width:0.99999946px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 29.499988,15.499986 C 29.499988,23.227979 23.227989,29.499978 15.49999,29.499978 C 7.7719953,29.499978 1.4999991,23.227979 1.4999991,15.499986 C 1.4999991,7.7719948 7.7719953,1.4999985 15.49999,1.4999985 C 23.227989,1.4999985 29.499988,7.7719948 29.499988,15.499986 z "
+       id="path2199" />
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:#a40000;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3207"
+       width="24"
+       height="5.9877748"
+       x="3.5000014"
+       y="12.535524"
+       rx="2.098541"
+       ry="1.919746" />
   </g>
 </svg>
--- a/pidgin/pixmaps/status/32/scalable/offline.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/offline.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/GUI/Tango/Gaim Refresh/status/32/scalable"
+   sodipodi:docbase="/home/hbons/Desktop/experiment/status/32/scalable"
    sodipodi:docname="offline.svg"
    inkscape:export-filename="/home/hbons/GUI/Tango/Gaim Refresh/status/32/offline.png"
    inkscape:export-xdpi="90"
@@ -106,10 +106,498 @@
        id="linearGradient2270"
        gradientUnits="userSpaceOnUse"
        x1="12.00096"
-       y1="18.000015"
+       y1="17.203793"
        x2="12.00096"
-       y2="12.421011"
-       gradientTransform="matrix(1.318182,0,0,1.318182,-2.3895e-2,0.33147)" />
+       y2="9.1482677"
+       gradientTransform="matrix(1.40375,0,0,1.403934,-1.668488,-1.296374)" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2148"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2146"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="21.045444"
+       x2="15.602553"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.705322,0,0,0.705327,-58.76363,3.243275)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2132"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientTransform="matrix(0.466524,0,0,0.466525,38.65385,10.80199)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2126"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5129">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5131" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop5133" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient2035"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5129"
+       id="radialGradient5135"
+       cx="10.99079"
+       cy="5.3375292"
+       fx="10.99079"
+       fy="5.3375292"
+       r="5.7619157"
+       gradientTransform="matrix(1,0,0,0.493392,0,4.185903)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2068"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2070"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2072"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2080">
+      <stop
+         id="stop2082"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2084"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2086"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2100"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient1985"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientTransform="matrix(0.999824,0,0,0.999281,2.209264e-4,5.644055e-4)"
+       gradientUnits="userSpaceOnUse"
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient2040"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2032"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2057"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2073"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.705322,0,0,0.705327,8.71963,7.710084)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.602553"
+       y2="21.045444" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1992"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1990"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.076595,0,0,1.076595,-3.760351,-3.418494)"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1986"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.004822,0,0,1.004822,-2.476351,-2.157242)"
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1983"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient4738"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient4740"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient1935">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop1937" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop1939" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient1953"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1955"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804"
+       inkscape:collect="always">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3025"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="36.574547"
+       x2="17.890068"
+       y1="8.3091545"
+       x1="17.890068"
+       id="linearGradient3155"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1983"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.004822,0,0,1.004822,-33.47635,-2.157242)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.076595,0,0,1.076595,-34.76035,-3.418494)"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2062"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -119,16 +607,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16.976026"
-     inkscape:cx="19.582303"
-     inkscape:cy="17.200313"
+     inkscape:cx="12.808044"
+     inkscape:cy="15.904368"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#888a85"
-     inkscape:window-width="1268"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="23" />
+     inkscape:window-width="1440"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -145,6 +633,16 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
+       transform="matrix(1.731691,0,0,0.461784,-37.87759,19.22212)"
+       sodipodi:type="arc"
+       style="color:black;fill:url(#radialGradient2062);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2173"
+       sodipodi:cx="31.112698"
+       sodipodi:cy="19.008621"
+       sodipodi:rx="8.6620579"
+       sodipodi:ry="8.6620579"
+       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z" />
+    <path
        d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
        sodipodi:ry="8.6620579"
        sodipodi:rx="8.6620579"
@@ -155,45 +653,26 @@
        sodipodi:type="arc"
        transform="matrix(1.847136,0,0,0.865845,-41.46938,8.041481)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3156);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3140"
-       sodipodi:cx="10.748654"
-       sodipodi:cy="10.457643"
-       sodipodi:rx="6.6449099"
-       sodipodi:ry="2.3675451"
-       d="M 17.393564 10.457643 A 6.6449099 2.3675451 0 1 1  4.1037445,10.457643 A 6.6449099 2.3675451 0 1 1  17.393564 10.457643 z"
-       transform="matrix(2.182121,0,0,1.391928,-7.954869,12.14827)" />
-    <path
-       style="fill:#888a85;fill-opacity:1;stroke:#2e3436;stroke-width:0.99999875;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 26.256921,26.256907 C 20.600315,31.913529 11.419537,31.914486 5.7641107,26.259045 C 0.10868503,20.603602 0.1096427,11.422797 5.7662484,5.7661742 C 11.422853,0.1095522 20.603631,0.10859439 26.259058,5.7640366 C 31.914483,11.419479 31.913526,20.600284 26.256921,26.256907 z "
+       style="fill:#888a85;fill-opacity:1;stroke:#2e3436;stroke-width:0.99999887;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 26.107102,26.107103 C 20.250761,31.963443 10.74581,31.964434 4.8906904,26.109316 C -0.9644283,20.254196 -0.96343682,10.749245 4.8929036,4.8929035 C 10.749243,-0.96343684 20.254194,-0.96442847 26.109314,4.8906904 C 31.964432,10.74581 31.963442,20.250761 26.107102,26.107103 z "
        id="path2187" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0137641"
-       inkscape:original="M 16 1.53125 C 12.290802 1.5316369 8.6095524 2.9529389 5.78125 5.78125 C 0.1246443 11.437873 0.094574465 20.594557 5.75 26.25 C 11.405426 31.905441 20.593393 31.906622 26.25 26.25 C 31.906605 20.593377 31.905425 11.405442 26.25 5.75 C 23.422286 2.9222789 19.709198 1.5308631 16 1.53125 z "
-       xlink:href="#path2187"
-       style="opacity:0.4;fill:url(#linearGradient2231);fill-opacity:1;stroke:#ffffff;stroke-width:0.99999809;stroke-miterlimit:4;stroke-opacity:1"
-       id="path2215"
-       inkscape:href="#path2187"
-       d="M 16,2.53125 C 12.549705,2.5316099 9.1373736,3.8626287 6.5,6.5 C 1.2289233,11.771071 1.2014746,20.26398 6.46875,25.53125 C 11.736026,30.798519 20.262813,30.799682 25.53125,25.53125 C 30.799686,20.262819 30.798523,11.736019 25.53125,6.46875 C 22.89972,3.837224 19.4556,2.5308896 16,2.53125 z " />
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 20.92264,5.5294893 L 15.440071,10.599712 L 10.134222,5.2349563 L 5.3520274,10.017152 L 10.598969,15.440813 L 5.6452582,20.865777 L 9.8972946,25.942506 L 15.322258,20.340822 L 20.894813,25.442125 L 25.618102,21.013369 L 20.222267,15.49972 L 25.469209,10.252778 L 20.92264,5.5294893 z "
+       id="path2233"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.689058,7.0625004 L 15.795555,11.956003 L 10.902052,7.0625004 L 6.5911096,11.373443 L 11.484612,16.266945 L 6.7076214,21.043936 L 11.018564,25.354879 L 15.795555,20.577888 L 20.543417,25.325751 L 24.85436,21.014808 L 20.106498,16.266945 L 25,11.373443 L 20.689058,7.0625004 z "
-       id="path2233" />
+       style="opacity:0.4;fill:url(#linearGradient2231);fill-opacity:1;stroke:white;stroke-width:0.99999809;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.5,1.5 C 11.919821,1.5003735 8.3615884,2.8884111 5.625,5.625 C 0.15534426,11.094657 0.15654704,19.906546 5.625,25.375 C 11.093454,30.843452 19.905345,30.844655 25.375,25.375 C 30.844655,19.905343 30.843452,11.093454 25.375,5.625 C 22.638996,2.8889961 19.07979,1.4996266 15.5,1.5 z "
+       id="path2215" />
     <path
        style="opacity:1;fill:url(#linearGradient2270);fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.999968,6.7515891 L 16.03118,11.543656 L 11.018644,6.7127252 L 6.7383758,11.020002 L 11.484612,16.031319 L 6.7076211,21.043936 L 11.018564,25.354879 L 16.028737,20.500159 L 20.97092,25.325751 L 25.242999,20.975944 L 20.534,16.033762 L 25.310911,11.101395 L 20.999968,6.7515891 z "
+       d="M 20.955744,5.3057668 L 15.428786,10.645198 L 10.208679,5.2643747 L 5.2971223,10.087479 L 10.587082,15.424797 L 5.3232778,20.999126 L 9.9729678,25.708323 L 15.426184,20.184349 L 20.92481,25.618393 L 25.650927,20.985618 L 20.223902,15.427399 L 25.723247,10.233074 L 20.955744,5.3057668 z "
        id="rect2204"
        sodipodi:nodetypes="ccccccccccccc" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0009557"
-       inkscape:original="M 11.03125 6.71875 L 6.75 11.03125 L 11.5 16.03125 L 6.71875 21.03125 L 11.03125 25.34375 L 16.03125 20.5 L 20.96875 25.3125 L 25.25 20.96875 L 20.53125 16.03125 L 25.3125 11.09375 L 21 6.75 L 16.03125 11.53125 L 11.03125 6.71875 z "
-       xlink:href="#rect2204"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#e1e1e1;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2268"
-       inkscape:href="#rect2204"
-       d="M 11.40625,8.5 L 8.53125,11.375 L 12.71875,15.5625 C 12.913242,15.751048 13.023019,16.010367 13.023019,16.28125 C 13.023019,16.552133 12.913242,16.811452 12.71875,17 L 8.65625,21.03125 L 11.53125,23.90625 L 15.5625,19.84375 C 15.751048,19.649258 16.010367,19.539481 16.28125,19.539481 C 16.552133,19.539481 16.811452,19.649258 17,19.84375 L 21.03125,23.875 L 23.90625,21 L 19.875,17 C 19.680508,16.811452 19.570731,16.552133 19.570731,16.28125 C 19.570731,16.010367 19.680508,15.751048 19.875,15.5625 L 24.0625,11.375 L 21.1875,8.5 L 17,12.6875 C 16.811452,12.881992 16.552133,12.991769 16.28125,12.991769 C 16.010367,12.991769 15.751048,12.881992 15.5625,12.6875 L 11.40625,8.5 z " />
+       style="fill:none;fill-opacity:1;stroke:#e1e1e1;stroke-width:1.00000036;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 10.21875,6.6875 L 6.75,10.09375 L 11.3125,14.71875 C 11.697174,15.10858 11.697174,15.73517 11.3125,16.125 L 6.6875,21 L 9.96875,24.28125 L 14.71875,19.46875 C 14.907298,19.274258 15.166617,19.164481 15.4375,19.164481 C 15.708383,19.164481 15.967702,19.274258 16.15625,19.46875 L 20.96875,24.21875 L 24.25,21 L 19.5,16.125 C 19.123854,15.726673 19.137781,15.099974 19.53125,14.71875 L 24.3125,10.1875 L 20.9375,6.71875 L 16.125,11.375 C 15.726673,11.751146 15.099974,11.737219 14.71875,11.34375 L 10.21875,6.6875 z "
+       id="path2268" />
   </g>
 </svg>
--- a/pidgin/pixmaps/tray/16/Makefile.am	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -6,6 +6,7 @@
 		tray-connecting.png \
 		tray-extended-away.png \
 		tray-message.png \
+		tray-new-im.png \
 		tray-offline.png \
 		tray-online.png
 
--- a/pidgin/pixmaps/tray/16/scalable/tray-away.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/tray/16/scalable/tray-away.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -14,7 +14,7 @@
    id="svg1872"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docbase="/home/hbons/Desktop/experiment/tray/16/scalable"
    sodipodi:docname="tray-away.svg">
   <defs
      id="defs1874">
@@ -549,37 +549,6 @@
          offset="1"
          style="stop-color:#eeeeec;stop-opacity:0;" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient3201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient3203"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2804"
-       id="linearGradient3205"
-       gradientUnits="userSpaceOnUse"
-       x1="21.875"
-       y1="48.000977"
-       x2="21.875"
-       y2="40" />
     <linearGradient
        y2="14.895812"
        x2="11.802028"
@@ -780,58 +749,297 @@
          offset="1.0000000"
          style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient3398"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2046"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
-    <radialGradient
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2048">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2050" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2052" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient3400"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
+       xlink:href="#linearGradient2851"
+       id="linearGradient2060"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2804"
-       id="linearGradient3402"
-       gradientUnits="userSpaceOnUse"
-       x1="21.875"
-       y1="48.000977"
-       x2="21.875"
-       y2="40" />
+       id="linearGradient2062"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2260"
-       id="radialGradient3404"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2177">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2179" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2181" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2170"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2168"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
-       cx="11.756953"
-       cy="17.588654"
+       r="6.3436799"
+       fy="17.588654"
        fx="11.756953"
-       fy="17.588654"
-       r="6.3436799" />
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2158"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2156"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2148"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2134"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2126"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2124"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2116"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2114"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2106">
+      <stop
+         id="stop2108"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2110" />
+      <stop
+         id="stop2112"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2104"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2098">
+      <stop
+         id="stop2100"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2102"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2989"
+       inkscape:collect="always">
+      <stop
+         id="stop2991"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2239"
-       id="linearGradient3409"
+       xlink:href="#linearGradient2989"
+       id="linearGradient2232"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.296524,0,0,0.296522,5.75564,5.75564)"
-       x1="15.602553"
-       y1="1.5657365"
-       x2="15.522223"
-       y2="33.483475" />
+       x1="1.5769236"
+       y1="1.3319674"
+       x2="10.043059"
+       y2="10.018044" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -840,15 +1048,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="15.940485"
-     inkscape:cy="11.44958"
+     inkscape:zoom="44.395604"
+     inkscape:cx="14.075416"
+     inkscape:cy="6.2074085"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      inkscape:window-width="1440"
-     inkscape:window-height="853"
+     inkscape:window-height="849"
      inkscape:window-x="0"
      inkscape:window-y="0" />
   <metadata
@@ -903,90 +1111,6 @@
        d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
        id="path5807"
        sodipodi:nodetypes="cccccccccccccc" />
-    <g
-       id="g3183"
-       style="opacity:0.3"
-       transform="matrix(-0.340425,0,0,0.625,-11.6596,-23.99648)">
-      <rect
-         transform="scale(-1,-1)"
-         y="-48"
-         x="-11"
-         height="8"
-         width="10"
-         id="rect3185"
-         style="opacity:1;color:black;fill:url(#radialGradient3201);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="40"
-         x="38"
-         height="8"
-         width="10"
-         id="rect3187"
-         style="opacity:1;color:black;fill:url(#radialGradient3203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="40"
-         x="11"
-         height="8"
-         width="27"
-         id="rect3189"
-         style="opacity:1;color:black;fill:url(#linearGradient3205);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M -14.90628,-7.496478 C -14.122201,-7.496478 -13.50003,-6.8637163 -13.50003,-6.058978 L -13.50003,2.066022 C -13.50003,2.87076 -14.1222,3.503522 -14.90628,3.503522 L -20.68753,3.503522 L -23.46878,5.941022 L -23.46878,3.503522 L -25.09378,3.503522 C -25.877859,3.503522 -26.500031,2.87076 -26.50003,2.066022 L -26.50003,-6.058978 C -26.50003,-6.8637163 -25.877859,-7.496478 -25.09378,-7.496478 L -14.90628,-7.496478 z "
-       id="path3192"
-       sodipodi:nodetypes="cccccccccccc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0047876"
-       inkscape:original="M 1.59375 0.5 C 0.990612 0.5 0.49999997 1.0124794 0.5 1.65625 L 0.5 8.34375 C 0.49999924 8.9875204 0.99061204 9.46875 1.59375 9.46875 L 2.46875 9.46875 L 2.46875 11.4375 L 5.25 9.46875 L 9.40625 9.46875 C 10.009388 9.46875 10.5 8.9875205 10.5 8.34375 L 10.5 1.65625 C 10.5 1.0124794 10.009387 0.50000001 9.40625 0.5 L 1.59375 0.5 z "
-       xlink:href="#path2221"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.19785893;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3194"
-       inkscape:href="#path2221"
-       d="M 1.59375,1.5 C 1.5597829,1.5 1.5,1.5229727 1.5,1.65625 L 1.5,8.34375 C 1.4999998,8.4770255 1.5250763,8.46875 1.59375,8.46875 L 2.46875,8.46875 C 3.0199231,8.4714246 3.4660754,8.9175769 3.46875,9.46875 L 3.46875,9.5 L 4.65625,8.65625 C 4.8293233,8.532463 5.0372235,8.4668103 5.25,8.46875 L 9.40625,8.46875 C 9.4749239,8.46875 9.5,8.4770272 9.5,8.34375 L 9.5,1.65625 C 9.5,1.5229737 9.4402151,1.5 9.40625,1.5 L 1.59375,1.5 z "
-       transform="matrix(-0.834823,0,0,0.834823,13.43129,5.899303)" />
-    <g
-       id="g3378"
-       style="opacity:0.3"
-       transform="matrix(-0.340425,0,0,0.625,-6.6596,-33.99648)">
-      <rect
-         transform="scale(-1,-1)"
-         y="-48"
-         x="-11"
-         height="8"
-         width="10"
-         id="rect3380"
-         style="opacity:1;color:black;fill:url(#radialGradient3398);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="40"
-         x="38"
-         height="8"
-         width="10"
-         id="rect3382"
-         style="opacity:1;color:black;fill:url(#radialGradient3400);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="40"
-         x="11"
-         height="8"
-         width="27"
-         id="rect3384"
-         style="opacity:1;color:black;fill:url(#linearGradient3402);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3404);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81530744;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2234"
-       sodipodi:cx="11.756953"
-       sodipodi:cy="17.588654"
-       sodipodi:rx="6.3436799"
-       sodipodi:ry="3.9753728"
-       d="M 18.100633 17.588654 A 6.3436799 3.9753728 0 1 1  5.4132733,17.588654 A 6.3436799 3.9753728 0 1 1  18.100633 17.588654 z"
-       transform="matrix(-1.024642,0,0,0.754646,3.54664,-13.27321)" />
-    <path
-       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M -9.90628,-17.49648 C -9.1222007,-17.49648 -8.5000301,-16.863718 -8.50003,-16.05898 L -8.50003,-7.93398 C -8.50003,-7.129242 -9.1222003,-6.49648 -9.90628,-6.49648 L -15.68753,-6.49648 L -18.46878,-4.05898 L -18.46878,-6.49648 L -20.09378,-6.49648 C -20.877859,-6.49648 -21.500031,-7.129242 -21.50003,-7.93398 L -21.50003,-16.05898 C -21.50003,-16.863718 -20.877859,-17.49648 -20.09378,-17.49648 L -9.90628,-17.49648 z "
-       id="path3387"
-       sodipodi:nodetypes="cccccccccccc" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-1.0047876"
@@ -998,47 +1122,89 @@
        d="M 1.59375,1.5 C 1.5597829,1.5 1.5,1.5229727 1.5,1.65625 L 1.5,8.34375 C 1.4999998,8.4770255 1.5250763,8.46875 1.59375,8.46875 L 2.46875,8.46875 C 3.0199231,8.4714246 3.4660754,8.9175769 3.46875,9.46875 L 3.46875,9.5 L 4.65625,8.65625 C 4.8293233,8.532463 5.0372235,8.4668103 5.25,8.46875 L 9.40625,8.46875 C 9.4749239,8.46875 9.5,8.4770272 9.5,8.34375 L 9.5,1.65625 C 9.5,1.5229737 9.4402151,1.5 9.40625,1.5 L 1.59375,1.5 z "
        transform="matrix(-1,0,0,1,-3e-5,-19.99648)" />
     <path
-       sodipodi:type="arc"
-       style="color:black;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:2.86901665px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1339"
-       sodipodi:cx="15.590227"
-       sodipodi:cy="16.57217"
-       sodipodi:rx="14.345175"
-       sodipodi:ry="14.345175"
-       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.348549,0,0,0.348549,5.066035,4.723779)" />
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 33.877402,-6.5000005 C 34.782108,-6.5000005 35.499998,-5.7936619 35.499998,-4.8953494 L 35.499998,4.174417 C 35.499998,5.07273 34.78211,5.491987 33.877402,5.491987 L 27.20673,5.491987 L 23.519125,8.212917 L 23.519125,5.491987 L 22.122596,5.491987 C 21.217889,5.491987 20.499999,5.07273 20.5,4.174417 L 20.5,-4.8953494 C 20.5,-5.7936619 21.217889,-6.5000005 22.122596,-6.5000005 L 33.877402,-6.5000005 z "
+       id="path2198"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0047876"
+       inkscape:original="M 1.59375 0.5 C 0.990612 0.5 0.49999997 1.0124794 0.5 1.65625 L 0.5 8.34375 C 0.49999924 8.9875204 0.99061204 9.46875 1.59375 9.46875 L 2.46875 9.46875 L 2.46875 11.4375 L 5.25 9.46875 L 9.40625 9.46875 C 10.009388 9.46875 10.5 8.9875205 10.5 8.34375 L 10.5 1.65625 C 10.5 1.0124794 10.009387 0.50000001 9.40625 0.5 L 1.59375 0.5 z "
+       xlink:href="#path2221"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2200"
+       inkscape:href="#path2221"
+       d="M 1.59375,1.5 C 1.5597829,1.5 1.5,1.5229727 1.5,1.65625 L 1.5,8.34375 C 1.4999998,8.4770255 1.5250763,8.46875 1.59375,8.46875 L 2.46875,8.46875 C 3.0199231,8.4714246 3.4660754,8.9175769 3.46875,9.46875 L 3.46875,9.5 L 4.65625,8.65625 C 4.8293233,8.532463 5.0372235,8.4668103 5.25,8.46875 L 9.40625,8.46875 C 9.4749239,8.46875 9.5,8.4770272 9.5,8.34375 L 9.5,1.65625 C 9.5,1.5229737 9.4402151,1.5 9.40625,1.5 L 1.59375,1.5 z "
+       transform="translate(19,-8)" />
     <path
        sodipodi:type="arc"
-       style="color:black;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:4.78170681px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path1341"
+       style="color:black;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#173867;stroke-width:2.86902547px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2069"
        sodipodi:cx="15.590227"
        sodipodi:cy="16.57217"
        sodipodi:rx="14.345175"
        sodipodi:ry="14.345175"
        d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
-       transform="matrix(0.20913,0,0,0.20913,7.239621,7.034267)" />
+       transform="matrix(0.348549,0,0,0.348549,5.066037,4.723781)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8ab0d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="-3.8088531"
+       sodipodi:cy="3.303823"
+       sodipodi:rx="3.1932809"
+       sodipodi:ry="3.3471739"
+       d="M -0.61557221 3.303823 A 3.1932809 3.3471739 0 1 1  -7.0021341,3.303823 A 3.1932809 3.3471739 0 1 1  -0.61557221 3.303823 z"
+       transform="matrix(1.409209,0,0,1.344418,15.86747,6.058282)" />
     <path
-       style="opacity:0.5;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3409);stroke-width:0.99999952px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 14.5,10.500004 C 14.5,12.708004 12.708,14.500005 10.499999,14.500005 C 8.2920005,14.500005 6.4999997,12.708004 6.4999997,10.500004 C 6.4999997,8.2920009 8.2920005,6.4999998 10.499999,6.4999998 C 12.708,6.4999998 14.5,8.2920009 14.5,10.500004 z "
-       id="path2220" />
+       sodipodi:type="arc"
+       style="fill:#dcdcd8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2796"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 7.6561793 7.5551186 A 1.615877 1.3273276 0 1 1  4.4244252,7.5551186 A 1.615877 1.3273276 0 1 1  7.6561793 7.5551186 z"
+       transform="matrix(2.784865,0,0,3.390272,-6.321424,-15.11391)" />
     <rect
-       style="fill:#2e3436;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3421"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2832"
        width="1"
-       height="3"
+       height="1"
        x="10"
-       y="8"
-       rx="0.5"
-       ry="0.5" />
+       y="-11"
+       transform="matrix(0,1,-1,0,0,0)" />
     <rect
-       style="fill:#2e3436;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3423"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2236"
+       width="1"
+       height="1"
+       x="9"
+       y="-12"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2240"
        width="1"
-       height="3"
-       x="10"
+       height="1"
+       x="11"
+       y="-12"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3133"
+       width="1"
+       height="1"
+       x="8"
        y="-13"
-       transform="matrix(0,1,-1,0,0,0)"
-       rx="0.5"
-       ry="0.5" />
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3135"
+       width="1"
+       height="1"
+       x="12"
+       y="-13"
+       transform="matrix(0,1,-1,0,0,0)" />
   </g>
 </svg>
--- a/pidgin/pixmaps/tray/16/scalable/tray-online.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/tray/16/scalable/tray-online.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -14,7 +14,7 @@
    id="svg1872"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docbase="/home/hbons/Desktop/experiment/tray/16/scalable"
    sodipodi:docname="tray-online.svg">
   <defs
      id="defs1874">
@@ -150,6 +150,573 @@
        y1="48.000977"
        x2="21.875"
        y2="40" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient4738"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient4740"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3044"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3046">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3048" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3050" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3066"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3025"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.018044"
+       x2="10.043059"
+       y1="1.3319674"
+       x1="1.5769236"
+       id="linearGradient2995"
+       xlink:href="#linearGradient2989"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2084"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2046"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2048">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2050" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2060"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2062"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2055">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2057" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2059" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2006">
+      <stop
+         id="stop2008"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2010" />
+      <stop
+         id="stop2012"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2989"
+       inkscape:collect="always">
+      <stop
+         id="stop2991"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2112"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2114"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2116"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2119"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(0.287092,0,0,0.287092,5.363901,5.455069)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2122"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.358865,0,0,0.358865,4.079883,4.193835)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -159,14 +726,14 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
-     inkscape:cx="24.938614"
-     inkscape:cy="9.7569307"
+     inkscape:cx="15.613366"
+     inkscape:cy="10.112799"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="853"
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
      inkscape:window-x="0"
      inkscape:window-y="0" />
   <metadata
@@ -222,12 +789,12 @@
        id="path5807"
        sodipodi:nodetypes="cccccccccccccc" />
     <path
-       style="fill:url(#linearGradient1959);fill-opacity:1;fill-rule:evenodd;stroke:#387101;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15.541385,10.5 C 15.541385,13.26 13.292114,15.5 10.520692,15.5 C 7.7492697,15.5 5.4999993,13.26 5.4999993,10.5 C 5.4999993,7.7399998 7.7492697,5.5000001 10.520692,5.5000001 C 13.292114,5.5000001 15.541385,7.7399998 15.541385,10.5 z "
-       id="path2245" />
+       style="fill:url(#linearGradient2122);fill-opacity:1;fill-rule:evenodd;stroke:#306300;stroke-width:0.99999887;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.500002,10.5 C 15.500002,13.26 13.260001,15.5 10.500001,15.5 C 7.7400006,15.5 5.4999996,13.26 5.4999996,10.5 C 5.4999996,7.739999 7.7400006,5.4999989 10.500001,5.4999989 C 13.260001,5.4999989 15.500002,7.739999 15.500002,10.5 z "
+       id="path4331" />
     <path
-       style="opacity:0.6;fill:url(#linearGradient1956);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 14.500006,10.499996 C 14.500006,12.707996 12.708004,14.499996 10.500004,14.499996 C 8.2920042,14.499996 6.5000039,12.707996 6.5000039,10.499996 C 6.5000039,8.2919968 8.2920042,6.4999962 10.500004,6.4999962 C 12.708004,6.4999962 14.500006,8.2919968 14.500006,10.499996 z "
-       id="path3145" />
+       style="opacity:0.6;fill:url(#linearGradient2119);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999845;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.500006,10.500002 C 14.500006,12.708002 12.708005,14.500003 10.500003,14.500003 C 8.2920011,14.500003 6.4999992,12.708002 6.4999992,10.500002 C 6.4999992,8.2920001 8.2920011,6.4999996 10.500003,6.4999996 C 12.708005,6.4999996 14.500006,8.2920001 14.500006,10.500002 z "
+       id="path4333" />
   </g>
 </svg>
Binary file pidgin/pixmaps/tray/16/tray-away.png has changed
Binary file pidgin/pixmaps/tray/16/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/16/tray-online.png has changed
--- a/pidgin/pixmaps/tray/22/Makefile.am	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -6,6 +6,7 @@
 		tray-extended-away.png \
 		tray-invisible.png \
 		tray-message.png \
+		tray-new-im.png \
 		tray-offline.png \
 		tray-online.png
 
--- a/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg	Sat Jun 16 19:48:23 2007 +0000
@@ -11,71 +11,62 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
-   id="svg4403"
+   id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/tray/22/scalable"
+   sodipodi:docbase="/home/hbons/Desktop"
    sodipodi:docname="tray-invisible.svg"
-   inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/tray/22/tray-invisible.png"
+   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/notification-area/tray-busy.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs4405">
+     id="defs4">
     <linearGradient
-       id="linearGradient5187"
-       inkscape:collect="always">
+       inkscape:collect="always"
+       id="linearGradient2989">
       <stop
-         id="stop5189"
+         style="stop-color:#eeeeec;stop-opacity:1;"
          offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
+         id="stop2991" />
       <stop
-         id="stop5191"
+         style="stop-color:#eeeeec;stop-opacity:0;"
          offset="1"
-         style="stop-color:#d3d7cf;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2851">
-      <stop
-         style="stop-color:#73d216;stop-opacity:1;"
-         offset="0"
-         id="stop2853" />
-      <stop
-         style="stop-color:#5ca911;stop-opacity:1;"
-         offset="1"
-         id="stop2855" />
+         id="stop2993" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2804"
-       id="linearGradient2261"
-       gradientUnits="userSpaceOnUse"
-       x1="21.875"
-       y1="48.000977"
-       x2="21.875"
-       y2="40" />
-    <radialGradient
+       id="linearGradient2225">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop2227" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop2229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop29420" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop29422" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient2259"
+       xlink:href="#linearGradient29418"
+       id="linearGradient29443"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient2257"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
     <linearGradient
        id="linearGradient2804">
       <stop
@@ -94,7 +85,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2804"
-       id="linearGradient7755"
+       id="linearGradient2831"
        gradientUnits="userSpaceOnUse"
        x1="21.875"
        y1="48.000977"
@@ -103,7 +94,7 @@
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2781"
-       id="radialGradient7753"
+       id="radialGradient2829"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2,0,0,0.8,36,8.8)"
        cx="1"
@@ -126,7 +117,7 @@
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2781"
-       id="radialGradient7751"
+       id="radialGradient2827"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
        cx="1"
@@ -136,14 +127,723 @@
        r="5" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5187"
-       id="linearGradient2220"
+       id="linearGradient2186">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2188" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2190" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2260">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop2262" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop2264" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3816">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3818" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3820" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3822"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2200">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2202" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2204" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2200"
+       id="radialGradient2216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       cx="9.9988937"
+       cy="8.963316"
+       fx="9.9988937"
+       fy="8.963316"
+       r="7.0034069" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2200"
+       id="radialGradient2225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       cx="9.9988937"
+       cy="8.963316"
+       fx="9.9988937"
+       fy="8.963316"
+       r="7.0034069" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2260"
+       id="radialGradient2266"
+       cx="11.756953"
+       cy="17.588654"
+       fx="11.756953"
+       fy="17.588654"
+       r="6.3436799"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient1357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       x1="11.226587"
+       y1="-5.4832759"
+       x2="11.226587"
+       y2="17.697369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2225"
+       id="linearGradient6606"
+       gradientUnits="userSpaceOnUse"
+       x1="11.802028"
+       y1="1.9986149"
+       x2="11.802028"
+       y2="14.895812" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2857"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2812"
+       inkscape:collect="always">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop2816"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2064"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2062"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2060"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2048">
+      <stop
+         id="stop2050"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2052"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2046"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2084"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2989"
+       id="linearGradient2995"
+       x1="1.5769236"
+       y1="1.3319674"
+       x2="10.043059"
+       y2="10.018044"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3025"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3007"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3005"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2949"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2953" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2955" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2963"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2810"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2818"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient2904"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.394752,0,0,0.394752,8.437859,8.563225)"
-       x1="19.461548"
-       y1="6.4422231"
-       x2="19.461548"
-       y2="28.669207" />
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3066"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3064"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3046">
+      <stop
+         id="stop3048"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3050"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3044"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4740"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2898"
+       inkscape:collect="always">
+      <stop
+         id="stop2900"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop2902"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2055"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2053"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2034">
+      <stop
+         id="stop2036"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2038"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2032"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)"
+       gradientUnits="userSpaceOnUse"
+       y2="39.834526"
+       x2="31.18539"
+       y1="4.5934086"
+       x1="8.7505674"
+       id="linearGradient2030"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-1.5641226"
+       x1="9.2594385"
+       id="linearGradient2022"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2014"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient2006"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3069"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3067"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3049">
+      <stop
+         id="stop3051"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3053"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3047"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)"
+       gradientUnits="userSpaceOnUse"
+       y2="39.834526"
+       x2="31.18539"
+       y1="4.5934086"
+       x1="8.7505674"
+       id="linearGradient3045"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)"
+       gradientUnits="userSpaceOnUse"
+       y2="19.159578"
+       x2="14.441897"
+       y1="3.7276814"
+       x1="6.2538223"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3030"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient3022"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3082"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3084"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37378,0,0,0.375227,5.518529,18.82427)"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3198"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3196"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3194"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3180"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3174">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3176" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3178" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3172"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3170"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3168"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3166"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3164"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3146">
+      <stop
+         id="stop3148"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3150"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3144"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="36.603138"
+       x2="24.240097"
+       y1="9.4211226"
+       x1="15.498499"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3142"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -152,21 +852,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="25.498579"
-     inkscape:cx="19.883015"
-     inkscape:cy="11.999162"
+     inkscape:zoom="20.899939"
+     inkscape:cx="26.526463"
+     inkscape:cy="11.289944"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     width="24px"
-     height="24px"
-     inkscape:window-width="1274"
-     inkscape:window-height="844"
-     inkscape:window-x="6"
+     fill="#d3d7cf"
+     inkscape:window-width="1440"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
      inkscape:window-y="0" />
   <metadata
-     id="metadata4408">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -177,53 +875,55 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="opacity:1;fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.877402,1.4999995 C 15.782108,1.4999995 16.499998,2.2063381 16.499998,3.1046506 L 16.499998,12.174417 C 16.499998,13.07273 15.78211,13.491987 14.877402,13.491987 L 8.2067299,13.491987 L 4.5191254,16.212917 L 4.5191254,13.491987 L 3.1225959,13.491987 C 2.2178895,13.491987 1.4999988,13.07273 1.5,12.174417 L 1.5,3.1046506 C 1.5,2.2063381 2.2178895,1.4999995 3.1225959,1.4999995 L 14.877402,1.4999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0047876"
+       inkscape:original="M 3.125 1.5 C 2.2202936 1.5 1.5 2.1954376 1.5 3.09375 L 1.5 12.1875 C 1.4999988 13.085813 2.2202937 13.5 3.125 13.5 L 4.53125 13.5 L 4.53125 16.21875 L 8.21875 13.5 L 14.875 13.5 C 15.779708 13.5 16.5 13.085813 16.5 12.1875 L 16.5 3.09375 C 16.5 2.1954375 15.779706 1.5 14.875 1.5 L 3.125 1.5 z "
+       xlink:href="#path2221"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5807"
+       inkscape:href="#path2221"
+       d="M 2.90625,2.5 C 2.6627552,2.5 2.5,2.6506524 2.5,2.9375 L 2.5,11.0625 C 2.4999996,11.349346 2.6627555,11.5 2.90625,11.5 L 4.53125,11.5 C 5.0824231,11.502675 5.5285754,11.948827 5.53125,12.5 L 5.53125,12.75 L 6.65625,11.75 C 6.8378154,11.590455 7.0708028,11.501698 7.3125,11.5 L 13.09375,11.5 C 13.337246,11.5 13.5,11.349348 13.5,11.0625 L 13.5,2.9375 C 13.5,2.6506524 13.337245,2.5 13.09375,2.5 L 2.90625,2.5 z " />
+    <g
+       id="g2057"
+       inkscape:label="Layer 1"
+       transform="translate(19.12926,4.037634)" />
     <g
-       id="g2249"
-       style="opacity:0.3"
-       transform="matrix(-0.340425,0,0,0.625,17.34043,-14)">
-      <rect
-         transform="scale(-1,-1)"
-         y="-48"
-         x="-11"
-         height="8"
-         width="10"
-         id="rect2251"
-         style="opacity:1;color:black;fill:url(#radialGradient2257);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="40"
-         x="38"
-         height="8"
-         width="10"
-         id="rect2253"
-         style="opacity:1;color:black;fill:url(#radialGradient2259);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="40"
-         x="11"
-         height="8"
-         width="27"
-         id="rect2255"
-         style="opacity:1;color:black;fill:url(#linearGradient2261);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+       id="g3200"
+       inkscape:label="Layer 1"
+       transform="translate(6.999999,7.000001)">
+      <g
+         style="opacity:0.8"
+         id="g1918">
+        <path
+           d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
+           sodipodi:ry="8.6620579"
+           sodipodi:rx="8.6620579"
+           sodipodi:cy="19.008621"
+           sodipodi:cx="31.112698"
+           id="path3203"
+           style="color:black;fill:url(#radialGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           sodipodi:type="arc"
+           transform="matrix(0.923568,0,0,0.173169,-20.73469,11.2083)" />
+        <path
+           transform="matrix(0.538297,0,0,0.538297,-1.630177,-1.459246)"
+           style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1.85770929;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 31.822886,17.572527 C 31.822886,25.263442 25.580983,31.505344 17.890068,31.505344 C 10.199153,31.505344 3.9572506,25.263442 3.9572506,17.572527 C 3.9572506,9.8816117 10.199153,3.6397095 17.890068,3.6397095 C 25.580983,3.6397095 31.822886,9.8816117 31.822886,17.572527 z "
+           id="path4331" />
+        <path
+           transform="matrix(0.466524,0,0,0.466525,-0.346154,-0.198015)"
+           style="opacity:0.6;fill:url(#linearGradient4740);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:2.14350748;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 31.822886,17.572527 C 31.822886,25.263442 25.580983,31.505344 17.890068,31.505344 C 10.199153,31.505344 3.9572506,25.263442 3.9572506,17.572527 C 3.9572506,9.8816117 10.199153,3.6397095 17.890068,3.6397095 C 25.580983,3.6397095 31.822886,9.8816117 31.822886,17.572527 z "
+           id="path4333" />
+      </g>
     </g>
-    <path
-       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 9.90625,2.5 C 9.1221707,2.5 8.5000001,3.1327617 8.5,3.9375 L 8.5,12.0625 C 8.5,12.867238 9.1221703,13.5 9.90625,13.5 L 15.6875,13.5 L 18.46875,15.9375 L 18.46875,13.5 L 20.09375,13.5 C 20.877829,13.5 21.500001,12.867238 21.5,12.0625 L 21.5,3.9375 C 21.5,3.1327617 20.877829,2.5 20.09375,2.5 L 9.90625,2.5 z "
-       id="path2221"
-       transform="matrix(-1,0,0,1,24,0)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 9.90625,3.5 C 9.6627547,3.5 9.5,3.650652 9.5,3.9375 L 9.5,12.0625 C 9.5,12.349348 9.6627543,12.5 9.90625,12.5 L 15.6875,12.5 C 15.929197,12.501698 16.162185,12.590455 16.34375,12.75 L 17.46875,13.75 L 17.46875,13.5 C 17.471425,12.948827 17.917577,12.502675 18.46875,12.5 L 20.09375,12.5 C 20.337245,12.5 20.5,12.349346 20.5,12.0625 L 20.5,3.9375 C 20.5,3.6506524 20.337245,3.5 20.09375,3.5 L 9.90625,3.5 z "
-       id="path5807"
-       transform="matrix(-1,0,0,1,24,0)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999863;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 21.500007,15.500001 C 21.500007,18.812 18.81201,21.499999 15.500004,21.499999 C 12.188,21.499999 9.5000032,18.812 9.5000032,15.500001 C 9.5000032,12.188001 12.188,9.5000014 15.500004,9.5000014 C 18.81201,9.5000014 21.500007,12.188001 21.500007,15.500001 z "
-       id="path4331" />
-    <path
-       style="opacity:0.6;fill:url(#linearGradient2220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.14350748;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 21,15.500001 C 21,18.536 18.535999,21 15.499999,21 C 12.464,21 10,18.536 10,15.500001 C 10,12.464 12.464,10 15.499999,10 C 18.535999,10 21,12.464 21,15.500001 z "
-       id="path4333" />
   </g>
 </svg>
Binary file pidgin/pixmaps/tray/22/tray-away.png has changed
Binary file pidgin/pixmaps/tray/22/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/22/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/22/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/22/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/22/tray-message.png has changed
Binary file pidgin/pixmaps/tray/22/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/22/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/22/tray-online.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/tray/32/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -0,0 +1,13 @@
+TRAY_ICONS =	tray-away.png \
+		tray-busy.png \
+		tray-connecting.png \
+		tray-extended-away.png \
+		tray-invisible.png \
+		tray-new-im.png \
+		tray-offline.png \
+		tray-online.png
+
+EXTRA_DIST =	$(TRAY_ICONS)
+
+pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/32
+pidgintraypix_DATA = $(TRAY_ICONS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/tray/32/Makefile.mingw	Sat Jun 16 19:48:23 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintraypix_DATA)'; then \
+	  mkdir -p $(pidgintraypixdir); \
+	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
+	fi;
+
Binary file pidgin/pixmaps/tray/32/tray-away.png has changed
Binary file pidgin/pixmaps/tray/32/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/32/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/32/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/32/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/32/tray-message.png has changed
Binary file pidgin/pixmaps/tray/32/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/32/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/32/tray-online.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/tray/48/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -0,0 +1,13 @@
+TRAY_ICONS =	tray-away.png \
+		tray-busy.png \
+		tray-connecting.png \
+		tray-extended-away.png \
+		tray-invisible.png \
+		tray-new-im.png \
+		tray-offline.png \
+		tray-online.png
+
+EXTRA_DIST =	$(TRAY_ICONS)
+
+pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/48
+pidgintraypix_DATA = $(TRAY_ICONS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/tray/48/Makefile.mingw	Sat Jun 16 19:48:23 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintraypix_DATA)'; then \
+	  mkdir -p $(pidgintraypixdir); \
+	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
+	fi;
+
Binary file pidgin/pixmaps/tray/48/tray-away.png has changed
Binary file pidgin/pixmaps/tray/48/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/48/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/48/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/48/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/48/tray-message.png has changed
Binary file pidgin/pixmaps/tray/48/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/48/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/48/tray-online.png has changed
--- a/pidgin/pixmaps/tray/Makefile.am	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/pixmaps/tray/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -1,7 +1,9 @@
-SUBDIRS = 16 22
+SUBDIRS = 16 22 32 48
 
 EXTRA_DIST = \
 	Makefile.mingw \
 	16/Makefile.mingw \
-	22/Makefile.mingw
+	22/Makefile.mingw \
+	32/Makefile.mingw \
+	48/Makefile.mingw
 
--- a/pidgin/plugins/Makefile.am	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Sat Jun 16 19:48:23 2007 +0000
@@ -30,6 +30,7 @@
 contact_priority_la_LDFLAGS = -module -avoid-version
 extplacement_la_LDFLAGS     = -module -avoid-version
 gtk_signals_test_la_LDFLAGS = -module -avoid-version
+gtkbuddynote_la_LDFLAGS     = -module -avoid-version
 history_la_LDFLAGS          = -module -avoid-version
 iconaway_la_LDFLAGS         = -module -avoid-version
 markerline_la_LDFLAGS       = -module -avoid-version
@@ -46,6 +47,7 @@
 plugin_LTLIBRARIES = \
 	convcolors.la       \
 	extplacement.la     \
+	gtkbuddynote.la     \
 	history.la          \
 	iconaway.la         \
 	markerline.la       \
@@ -65,6 +67,7 @@
 contact_priority_la_SOURCES = contact_priority.c
 extplacement_la_SOURCES     = extplacement.c
 gtk_signals_test_la_SOURCES = gtk-signals-test.c
+gtkbuddynote_la_SOURCES     = gtkbuddynote.c
 history_la_SOURCES          = history.c
 iconaway_la_SOURCES         = iconaway.c
 markerline_la_SOURCES       = markerline.c
@@ -80,6 +83,7 @@
 contact_priority_la_LIBADD  = $(GTK_LIBS)
 extplacement_la_LIBADD      = $(GTK_LIBS)
 gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
+gtkbuddynote_la_LIBADD      = $(GTK_LIBS)
 history_la_LIBADD           = $(GTK_LIBS)
 iconaway_la_LIBADD          = $(GTK_LIBS)
 markerline_la_LIBADD        = $(GTK_LIBS)
--- a/pidgin/plugins/Makefile.mingw	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Sat Jun 16 19:48:23 2007 +0000
@@ -77,11 +77,12 @@
 plugins: \
 		convcolors.dll \
 		extplacement.dll \
-		pidginrc.dll \
+		gtkbuddynote.dll \
 		history.dll \
 		iconaway.dll \
 		markerline.dll \
 		notify.dll \
+		pidginrc.dll \
 		relnot.dll \
 		spellchk.dll \
 		timestamp_format.dll \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/plugins/gtkbuddynote.c	Sat Jun 16 19:48:23 2007 +0000
@@ -0,0 +1,126 @@
+/*
+ * GtkBuddyNote - Store notes on particular buddies
+ * Copyright (C) 2007 Etan Reisner <deryni@pidgin.im>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#include "internal.h"
+
+#include <gtkblist.h>
+#include <gtkplugin.h>
+
+#include <debug.h>
+#include <version.h>
+
+static void
+append_to_tooltip(PurpleBlistNode *node, GString *text, gboolean full)
+{
+	if (full) {
+		const gchar *note = purple_blist_node_get_string(node, "notes");
+
+		if (note != NULL) {
+			g_string_append_printf(text, _("\nBuddy Note: %s"),
+			                       note);
+		}
+	}
+}
+
+static gboolean
+plugin_load(PurplePlugin *plugin)
+{
+	purple_signal_connect(pidgin_blist_get_handle(), "drawing-tooltip",
+	                      plugin, PURPLE_CALLBACK(append_to_tooltip), NULL);
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(PurplePlugin *plugin)
+{
+	PurplePlugin *buddynote = NULL;
+
+	buddynote = purple_plugins_find_with_id("core-plugin_pack-buddynote");
+
+	purple_plugin_unload(buddynote);
+
+	return TRUE;
+}
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_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 */
+	"gtkbuddynote",                                 /**< id */
+	N_("Buddy Notes"),                              /**< name */
+	VERSION,                                        /**< version */
+	N_("Store notes on particular buddies."),       /**< summary */
+	N_("Adds the option to store notes for buddies "
+	   "on your buddy list."),                      /**< description */
+	"Etan Reisner <deryni@pidgin.im>",              /**< author */
+	PURPLE_WEBSITE,                                 /**< homepage */
+	plugin_load,                                    /**< load */
+	plugin_unload,                                  /**< unload */
+	NULL,                                           /**< destroy */
+	NULL,                                           /**< ui_info */
+	NULL,                                           /**< extra_info */
+	NULL,                                           /**< prefs_info */
+	NULL,                                           /**< actions */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static gboolean
+check_for_buddynote(gpointer data)
+{
+	PurplePlugin *buddynote = NULL;
+
+	buddynote = purple_plugins_find_with_id("core-plugin_pack-buddynote");
+
+	if (buddynote == NULL) {
+		buddynote = purple_plugins_find_with_basename("buddynote");
+	}
+
+	if (buddynote != NULL) {
+		PurplePluginInfo *bninfo = buddynote->info;
+
+		bninfo->flags = PURPLE_PLUGIN_FLAG_INVISIBLE;
+
+		info.dependencies = g_list_append(info.dependencies,
+		                                  "core-plugin_pack-buddynote");
+	} else {
+		info.flags = PURPLE_PLUGIN_FLAG_INVISIBLE;
+	}
+
+	return FALSE;
+}
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+	/* Use g_idle_add so that the rest of the plugins can get loaded
+	 * before we do our check. */
+	g_idle_add(check_for_buddynote, plugin);
+}
+
+PURPLE_INIT_PLUGIN(gtkbuddynote, init_plugin, info)
--- a/pidgin/win32/nsis/langmacros.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -57,7 +57,6 @@
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE		${CUR_LANG}
 
   ; Pidgin Section Prompts and Texts
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_UNINSTALL_DESC			${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
 
   ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Sat Jun 16 19:48:23 2007 +0000
@@ -127,7 +127,7 @@
   !define MUI_FINISHPAGE_RUN			"$INSTDIR\pidgin.exe"
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_FINISHPAGE_LINK			$(PIDGIN_FINISH_VISIT_WEB_SITE)
-  !define MUI_FINISHPAGE_LINK_LOCATION		"http://pidgin.im/win32"
+  !define MUI_FINISHPAGE_LINK_LOCATION		"http://pidgin.im"
 
 ;--------------------------------
 ;Pages
@@ -358,7 +358,7 @@
   StrCmp $R0 "2" upgrade_gtk
   ;StrCmp $R0 "3" no_gtk no_gtk
 
-  no_gtk:
+  ;no_gtk:
     StrCmp $R1 "NONE" gtk_no_install_rights
     ClearErrors
     ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
@@ -431,7 +431,11 @@
     WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
-    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" $(PIDGIN_UNINSTALL_DESC)
+    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"
+    WriteRegDWORD HKLM "${PIDGIN_UNINSTALL_KEY}" "NoModify" 1
+    WriteRegDWORD HKLM "${PIDGIN_UNINSTALL_KEY}" "NoRepair" 1
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
     ; Sets scope of the desktop and Start Menu entries for all users.
     SetShellVarContext "all"
@@ -444,7 +448,11 @@
 
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
-    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" $(PIDGIN_UNINSTALL_DESC)
+    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"
+    WriteRegDWORD HKCU "${PIDGIN_UNINSTALL_KEY}" "NoModify" 1
+    WriteRegDWORD HKCU "${PIDGIN_UNINSTALL_KEY}" "NoRepair" 1
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
     Goto pidgin_install_files
 
@@ -689,6 +697,7 @@
     Delete "$INSTDIR\plugins\history.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
+    Delete "$INSTDIR\plugins\joinpart.dll"
     Delete "$INSTDIR\plugins\libaim.dll"
     Delete "$INSTDIR\plugins\libbonjour.dll"
     Delete "$INSTDIR\plugins\libgg.dll"
Binary file pidgin/win32/nsis/pixmaps/pidgin-header.bmp has changed
Binary file pidgin/win32/nsis/pixmaps/pidgin-intro.bmp has changed
--- a/pidgin/win32/nsis/translations/afrikaans.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/afrikaans.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besoek die WinPidgin-webblad"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (slegs verwydering)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Kan nie die tans genstalleerde weergawe van Pidgin verwyder nie. Die nuwe weergawe sal genstalleer word sonder om die huidige een te verwyder."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/albanian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/albanian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Vizitoni Faqen Web të Pidgin-it për Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin (vetëm hiq)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Shtegu që treguat nuk mund të arrihet ose krijohet."
--- a/pidgin/win32/nsis/translations/bulgarian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/bulgarian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -21,9 +21,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"  GTK+ runtime  .    ?$\rNote: Pidgin        ."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) ( )"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"    GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"        ."
--- a/pidgin/win32/nsis/translations/catalan.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/catalan.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pgina web de Pidgin per Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (noms esborrar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci GTK+."
 !define GTK_BAD_INSTALL_PATH			"El directori que has introdut no pot sser accedit o creat."
--- a/pidgin/win32/nsis/translations/czech.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/czech.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Navtvit Windows Pidgin Web Page"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (odinstalovat)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pi instalaci GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan cesta je nedostupn, nebo ji nelze vytvoit."
--- a/pidgin/win32/nsis/translations/danish.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/danish.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besg Windows Pidgin's hjemmeside"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (fjern)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Stien du har angivet kan ikke findes eller oprettes."
--- a/pidgin/win32/nsis/translations/dutch.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/dutch.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -31,9 +31,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Pidgin webpagina"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (alleen verwijderen)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
 !define GTK_BAD_INSTALL_PATH			"Het door u gegeven pad kan niet benaderd worden."
--- a/pidgin/win32/nsis/translations/english.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/english.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -38,10 +38,9 @@
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort."
 
 ; Installer Finish Page
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the WinPidgin Web Page"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the Pidgin Web Page"
 
 ; Pidgin Section Prompts and Texts
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_UNINSTALL_DESC			"$(^Name) (remove only)"
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/finnish.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/finnish.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidinin Windows -sivustolla"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (vain poisto)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Antamasi polku ei toimi tai sit ei voi luoda."
--- a/pidgin/win32/nsis/translations/french.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/french.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -42,7 +42,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visitez la page web de Pidgin Windows" 
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (supprimer uniquement)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Impossible de dsinstaller la version de Pidgin en place. La nouvelle version sera installe sans supprimer la version en place."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/galician.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/galician.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a pxina Web de Pidgin Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (slo eliminar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."
 !define GTK_BAD_INSTALL_PATH			"Non se puido acceder ou crear a ruta que vd. indicou."
--- a/pidgin/win32/nsis/translations/german.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -39,7 +39,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE	"Besuchen Sie die Windows Pidgin Webseite"
  
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nur entfernen)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gelscht wird."
  
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -39,7 +39,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin   "
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) ( )"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"       '.       ."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldalnak felkeresse"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin (csak eltvolts)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"A Pidgin jelenleg teleptett vltozata nem tvolthat el. Az j verzi a jelenleg teleptett verzi eltvoltsa nlkl kerl teleptsre. "
 
 
--- a/pidgin/win32/nsis/translations/italian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -25,10 +25,7 @@
 !define GTK_UPGRADE_PROMPT			" stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
 
 ; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows" 
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (solo rimozione)"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
--- a/pidgin/win32/nsis/translations/japanese.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/japanese.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -38,9 +38,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Windows PidginWeby[WKĂB"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (폜̂)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+^C̃CXg[ŃG[܂B"
 !define GTK_BAD_INSTALL_PATH			"Ȃ̓͂pXɃANZX܂͍쐬ł܂B"
--- a/pidgin/win32/nsis/translations/korean.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/korean.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -19,9 +19,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"  GTK+ Ÿ ãҽϴ. ׷̵ұ?$\rNote: ׷̵      ֽϴ."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (remove only)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ Ÿ ġ   ߻."
 !define GTK_BAD_INSTALL_PATH			"ԷϽ ο   ų   ϴ."
--- a/pidgin/win32/nsis/translations/kurdish.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/kurdish.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -37,9 +37,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Were Malpera Pidgin a Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (bi ten rake)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de ewt derket."
 !define GTK_BAD_INSTALL_PATH			"rya te nivsand nay gihitin an afirandin."
--- a/pidgin/win32/nsis/translations/lithuanian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -34,9 +34,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Aplankyti Windows Pidgin tinklalap"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (tik paalinti)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."
 !define GTK_BAD_INSTALL_PATH			"Js nurodytas katalogas neprieinamas ar negali bti sukurtas."
--- a/pidgin/win32/nsis/translations/norwegian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/norwegian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besk Pidgin for Windows' Nettside"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (kun avinstallering)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Stien du oppga kan ikke aksesseres eller lages."
--- a/pidgin/win32/nsis/translations/polish.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/polish.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Wejd na stron Pidgin Web Page"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (usu program)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Bd instalacji runtime-a GTK+."
 !define GTK_BAD_INSTALL_PATH			"Nie ma dostpu do wybranej cieki / aty."
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -31,9 +31,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Uma verso antiga do ambiente de tempo de execuo do GTK+ foi encontrada. Voc deseja atualiz-lo?$\rNota: O $(^Name) poder no funcionar a menos que voc o faa."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (apenas remover)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execuo do GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que voc digitou no pde ser acessado ou criado."
--- a/pidgin/win32/nsis/translations/portuguese.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a Pgina Web do Pidgin para Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (remover apenas)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execuo GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que digitou no pode ser acedido nem criado."
--- a/pidgin/win32/nsis/translations/romanian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/romanian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -35,9 +35,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE               "Vizitai pagina de web Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (doar dezinstalare)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
 !define GTK_BAD_INSTALL_PATH			"Directorul specificat nu poate fi accesat sau creat."
--- a/pidgin/win32/nsis/translations/russian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/russian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		" - Pidgin   Windows."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin ( )"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"    GTK+."
 !define GTK_BAD_INSTALL_PATH			"       ."
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/serbian-latin.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -19,9 +19,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Naena je stara verzija GTK+ izvrne okoline. Da li elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) moda nee raditi."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo uklanjanje)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Greka prilikom instalacije GTK+ okoline za izvravanje."
 !define GTK_BAD_INSTALL_PATH			"Putanja koju ste naveli se ne moe ni napraviti niti joj se moe prii."
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/simp-chinese.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -36,9 +36,6 @@
 ; Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		" Windows Pidgin ҳ"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (ֻɾ)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"װ GTK+ ʱʧܡ"
 !define GTK_BAD_INSTALL_PATH			"޷ʻ򴴽·"
--- a/pidgin/win32/nsis/translations/slovak.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovak.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Navtvi webstrnku Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (len odstrni)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri intalcii GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan cesta nie je prstupn alebo ju nie je mon vytvori."
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Obiite spletno stran Windows Pidgin"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo odstrani)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Trenutno nameene razliice Pidgina ni mogoe odstraniti. Nova razliica bo nameena brez odstranitve trenutno nameene razliice."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/spanish.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/spanish.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite la pgina Web de Pidgin Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (slo eliminar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."
 !define GTK_BAD_INSTALL_PATH			"No se pudo acceder o crear la ruta que vd. indic."
--- a/pidgin/win32/nsis/translations/swedish.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/swedish.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besk Windows-Pidgin hemsida"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (enbart fr avinstallation)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Den skvg du angivit gr inte att komma t eller skapa."
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -40,7 +40,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"X Windows Pidgin "
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (uѲ)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Lkثeww˪ PidginAsNbgªpUiwˡC"
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/valencian.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/valencian.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina de Pidgin per a Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nomes borrar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."
 !define GTK_BAD_INSTALL_PATH			"La ruta introduida no pot ser accedida o creada."
--- a/pidgin/win32/nsis/translations/vietnamese.nsh	Sat Jun 16 19:44:59 2007 +0000
+++ b/pidgin/win32/nsis/translations/vietnamese.nsh	Sat Jun 16 19:48:23 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Hãy xem trang chủ Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (chỉ bỏ cài đặt)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Đường dẫn mà bạn nhập có thể không truy cập được hay không tạo được."
--- a/po/ChangeLog	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/ChangeLog	Sat Jun 16 19:48:23 2007 +0000
@@ -1,7 +1,13 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.2
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* English (British) translation updated (Luke Ross)
+	* Finnish translation updated (Timo Jyrinki)
+	* Lithuanian translation updated (Laurynas Biveinis)
+	* Portuguese (Brazilian) translation updated (Mauricio de
+	  L R Collares Neto)
+	* Russian translation updated (Dmitry Beloglazov)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Slovenian win32 installer updated (Martin Srebotnjak)
 
--- a/po/fi.po	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/fi.po	Sat Jun 16 19:48:23 2007 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-21 18:54+0300\n"
-"PO-Revision-Date: 2007-05-21 18:54+0300\n"
+"POT-Creation-Date: 2007-06-11 15:25+0300\n"
+"PO-Revision-Date: 2007-06-11 15:25+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,15 +62,16 @@
 "Tutki asiaa ja suorita asetusten siirto käsin. Ilmoita tästä ongelmasta "
 "osoitteessa http://developer.pidgin.im/"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
 #: ../libpurple/protocols/jabber/buddy.c:1426
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Virhe"
 
@@ -82,16 +83,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Käyttäjätilin näyttönimi ei voi olla tyhjä."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3983
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
@@ -99,31 +100,29 @@
 msgid "New Account"
 msgstr "Uusi tili"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
-#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
@@ -135,13 +134,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:1788
 #: ../libpurple/protocols/jabber/buddy.c:1824
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6046
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -160,24 +160,32 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3231
-#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5863
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -190,12 +198,12 @@
 #: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
 #: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -208,14 +216,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
@@ -225,15 +233,16 @@
 "Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5862 ../pidgin/gtkconv.c:1686
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisää"
@@ -243,105 +252,110 @@
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavalistalleen%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "Valtuuta tuttava?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
 msgstr "Tuttavan näyttönimi on annettava."
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
 msgstr "Ryhmä on määritettävä."
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "Käyttäjätili täytyy valita."
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:285
 msgid "The selected account is not online."
 msgstr "Valittu käyttäjätili ei ole linjoilla."
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
 #: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
 #: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Tili"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5368
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "Syötä tuttavan tiedot."
 
-#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -349,176 +363,182 @@
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5748
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:402
 msgid "You can edit more information from the context menu later."
 msgstr "Voit muokata lisää tietoja myöhemmin pikavalikosta."
 
-#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "Virhe lisättäessä ryhmää"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:416
 msgid "You must give a name for the group to add."
 msgstr "Lisättävän ryhmän nimi on annettava."
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5859
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "Anna ryhmän nimi"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "Muokkaa ryhmäkeskustelua"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "Päivitä vaaditut kentät."
 
-#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../finch/gntblist.c:784
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "Muokkaa asetuksia"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
 msgid "Information"
 msgstr "Tiedot"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
 msgid "Retrieving..."
 msgstr "Haetaan..."
 
-#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "Lisää tuttavailmoitin"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1634
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "Näytä loki"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Anna uusi nimi kohteelle %s"
 
-#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:964
 msgid "Set Alias"
 msgstr "Aseta lempinimi"
 
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "Syötä tyhjä merkkijono palauttaaksesi oletusnimen."
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1041
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Kontaktin poistaminen poistaa myös kaikki kontaktissa olevat tuttavat"
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1049
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Ryhmän poistaminen poistaa myös kaikki ryhmässä olevat tuttavat"
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1054
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1055
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "Vahvista poistaminen"
 
-#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1683 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4227
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "Paikka merkitty"
 
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
 #: ../libpurple/protocols/jabber/buddy.c:1589
 #: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3016
+#: ../pidgin/gtkblist.c:3409 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -527,12 +547,12 @@
 "Kirjautuneena: %d\n"
 "Yhteensä: %d"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Tili: %s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -541,143 +561,144 @@
 "\n"
 "Viimeksi nähty: %s sitten"
 
-#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6003
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3982
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2189
 msgid "Show offline buddies"
 msgstr "Näytä poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "Lajittele tilan mukaan"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "Lajittele aakkosittain"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "Lajittele lokin koon mukaan"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "Yhteys katkennut kohteeseen %s."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"Yhteys katkesi kohteeseen %s seuraavasta syystä:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Yhteysvirhe"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Yhdistä"
+#: ../finch/gntconn.c:113
+#, 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"
+"Finch ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
+"otat tilin uudelleen käyttöön."
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
@@ -737,15 +758,15 @@
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -753,7 +774,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7171
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -761,24 +782,24 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7174
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7177
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7180
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7183
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
@@ -810,7 +831,7 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -818,7 +839,7 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -826,7 +847,7 @@
 msgid "Filter: "
 msgstr "Suodatin: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Tauko"
 
@@ -862,24 +883,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/jabber.c:1220
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:803
 #: ../libpurple/protocols/oscar/oscar.c:808
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3073 ../pidgin/gtkblist.c:3075
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Tila"
@@ -899,8 +920,9 @@
 #. Close button
 #: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
 #: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sulje"
 
@@ -926,7 +948,7 @@
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Siirtää"
 
@@ -938,7 +960,7 @@
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "Lähettäjä"
 
@@ -971,11 +993,11 @@
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1662 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Tiedot"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1623
 msgid "IM"
 msgstr "Pikaviesti"
 
@@ -1039,7 +1061,7 @@
 msgstr "Liitännäisen asetukset"
 
 #: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -1060,9 +1082,7 @@
 msgstr "Kenestä ilmoitetaan"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -1142,7 +1162,7 @@
 
 #: ../finch/gntpounce.c:445
 msgid "Pounce only when my status is not available"
-msgstr "Ilmoita vain kun tilani on \"ei tavoitettavissa\""
+msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
 #: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
@@ -1215,12 +1235,12 @@
 msgid "Based on keyboard use"
 msgstr "Perustuen näppäimistön käyttöön"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Ei koskaan"
@@ -1254,12 +1274,12 @@
 msgstr "Kirjaa tilamuutokset"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
@@ -1267,13 +1287,13 @@
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
@@ -1303,37 +1323,38 @@
 msgstr "Tyyppi"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5464
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5696
-#: ../libpurple/protocols/oscar/oscar.c:5712
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5506
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5738
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5768
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
@@ -1547,8 +1568,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3979
+msgid "Connection Error"
+msgstr "Yhteysvirhe"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
@@ -1597,7 +1623,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5258 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Tuttavat"
@@ -1623,7 +1649,7 @@
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -1640,7 +1666,8 @@
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
@@ -1652,32 +1679,32 @@
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -2195,12 +2222,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#: ../libpurple/protocols/oscar/oscar.c:6077
-#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Peru"
@@ -2243,8 +2270,8 @@
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -2473,30 +2500,30 @@
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "Käyttäjä on poissa linjoilta."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Automaattinen vastaus lähetetty:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s on kirjautunut ulos."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Yksi tai useampi viesti on saattanut jäädä lähettämättä."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2504,69 +2531,69 @@
 "Yhteyttä ei tällä hetkellä ole. Viestejä ei vastaanoteta ellet olet "
 "kirjautuneena sisään."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Viestiä ei voitu lähettää koska suurin viestin koko ylitettiin."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "Viestiäsi ei voitu lähetettää."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "Yleiset lokikatselimen asetukset"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "Nopeat koon laskemiset"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "Käytä nimiheuristiikkaa"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "Lokihakemisto"
 
@@ -2576,19 +2603,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "Lokikatselin"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2680,9 +2707,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -2690,9 +2719,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Ei"
 
@@ -2819,7 +2850,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2827,8 +2858,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -2838,7 +2869,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2846,8 +2877,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -2923,7 +2954,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcl-liitännäisten latauksen."
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2932,11 +2963,11 @@
 "ActiveTCL osoitteesta http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Ei voitu kuunnella sisääntulevia pikaviestintäyhteyksiä\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2945,18 +2976,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:5584
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Poissa"
@@ -2971,86 +3003,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Isäntä"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Sukunimi"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "Sähköposti"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "AIM-tili"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "Sähköposti"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "AIM-tili"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "XMPP-tili"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "Ei voitu liittää pistoketta porttiin"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "Ei voitu kuunnella pistoketta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3120,8 +3157,8 @@
 msgstr "Rekisteröinti onnistui!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "Salasana"
 
@@ -3147,9 +3184,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
@@ -3158,8 +3195,8 @@
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3172,14 +3209,14 @@
 msgstr "Mies vai nainen"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Mies"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3242,10 +3279,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5556
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3060 ../pidgin/gtkblist.c:3388
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Poissa linjoilta"
@@ -3255,22 +3292,23 @@
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Tavoitettavissa"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3687
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
 #: ../libpurple/protocols/jabber/buddy.c:1585
 #: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
@@ -3279,7 +3317,7 @@
 msgstr "Syntymävuosi"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3899
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
@@ -3408,21 +3446,24 @@
 msgstr "Gadu-Gadu-käyttäjä"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -3466,11 +3507,12 @@
 msgstr "Näytä MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanava:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -3480,21 +3522,21 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
@@ -3505,18 +3547,17 @@
 msgstr "Pistokkeen luominen epäonnistui"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
@@ -3525,15 +3566,18 @@
 msgstr "Virhe luettaessa"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Käyttäjät"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Aihe"
@@ -3557,23 +3601,26 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2130
-#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6623
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6626
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
@@ -3583,18 +3630,25 @@
 msgstr "Merkistöt"
 
 #: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -3633,13 +3687,15 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Kutsumanimi"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
@@ -3659,98 +3715,99 @@
 msgid "Glorious"
 msgstr "Loistokas"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s on poistanut aiheen."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC-palvelin vastaanotti viestin jota se ei ymmärtänyt."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3758,7 +3815,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3766,43 +3823,44 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Ei voitu liittyä kohteeseen %s: Vaatii rekisteröinnin."
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -3910,7 +3968,7 @@
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4018,21 +4076,21 @@
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nimi&gt;: Hae tietoja käyttäjästä joka on kirjautunut ulos."
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4075,10 +4133,10 @@
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:437
 #: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:714
-#: ../libpurple/protocols/jabber/auth.c:848
-#: ../libpurple/protocols/jabber/auth.c:873
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
@@ -4091,24 +4149,27 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL-virhe"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
@@ -4118,7 +4179,7 @@
 msgstr "Etunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4149,7 +4210,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Maa"
 
@@ -4163,8 +4225,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
 #: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Sähköposti"
@@ -4186,14 +4250,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3071
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Kuvaus"
@@ -4223,29 +4287,32 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:665
 #: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
-msgstr "Lähde"
+msgstr "Sijainti"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "Tärkeys"
 
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
@@ -4286,7 +4353,7 @@
 msgstr "Poista listalta"
 
 #: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
@@ -4295,9 +4362,9 @@
 msgstr "Pidennetty poissaolo"
 
 #: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5760
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
@@ -4308,7 +4375,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1587
 #: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "Last Name"
 msgstr "Sukunimi"
 
@@ -4346,8 +4413,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
@@ -4386,7 +4453,7 @@
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5246
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Huone:"
@@ -4456,7 +4523,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huonelistaa"
 
@@ -4491,424 +4559,442 @@
 msgid "Read Error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Ei voitu muodostaa yhteyttä palvelimeen:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Rekisteröi uusi XMPP-tili"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
-msgid "Remote Server Timeout"
-msgstr "Palvelin aikakatkaisi"
-
-#: ../libpurple/protocols/jabber/jabber.c:1516
-msgid "Server Overloaded"
-msgstr "Palvelin ylikuormitettu"
-
-#: ../libpurple/protocols/jabber/jabber.c:1518
-msgid "Service Unavailable"
-msgstr "Palvelu ei käytettävissä"
-
 #: ../libpurple/protocols/jabber/jabber.c:1520
-msgid "Subscription Required"
-msgstr "Vaatii tilailmoitukset"
+msgid "Remote Server Timeout"
+msgstr "Palvelin aikakatkaisi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1522
+msgid "Server Overloaded"
+msgstr "Palvelin ylikuormitettu"
+
+#: ../libpurple/protocols/jabber/jabber.c:1524
+msgid "Service Unavailable"
+msgstr "Palvelu ei käytettävissä"
+
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Subscription Required"
+msgstr "Vaatii tilailmoitukset"
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
-msgstr "Lähdekonflikti"
-
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+msgstr "Sijaintikonflikti"
+
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
-msgid "Invalid ID"
-msgstr "Epäkelpo ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Invalid Namespace"
-msgstr "Väärä nimiavaruus"
-
-#: ../libpurple/protocols/jabber/jabber.c:1575
-msgid "Invalid XML"
-msgstr "Epäkelpo XML"
-
 #: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Non-matching Hosts"
-msgstr "Verkkoisännät eivät täsmää"
+msgid "Invalid ID"
+msgstr "Epäkelpo ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1579
+msgid "Invalid Namespace"
+msgstr "Väärä nimiavaruus"
 
 #: ../libpurple/protocols/jabber/jabber.c:1581
+msgid "Invalid XML"
+msgstr "Epäkelpo XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1583
+msgid "Non-matching Hosts"
+msgstr "Verkkoisännät eivät täsmää"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
-msgstr "Lähderajoite"
-
-#: ../libpurple/protocols/jabber/jabber.c:1587
+msgstr "Sijaintirajoite"
+
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4916,7 +5002,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4924,20 +5010,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4959,7 +5045,7 @@
 msgstr "XMPP-yhteyskäytäntöliitännäinen"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
 msgid "Domain"
 msgstr "Palvelin"
 
@@ -4978,7 +5064,8 @@
 
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5011,7 +5098,7 @@
 msgid "XMPP Message Error"
 msgstr "XMPP-viestivirhe"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
@@ -5020,16 +5107,16 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5037,35 +5124,61 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Tiedostoa ei voitu lähettää käyttäjälle %s, virheellinen JID."
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei ole linjoilla"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Valitse käyttäjän %s sijainti johon haluat lähettää tiedoston"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Valitse sijainti"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5283,8 +5396,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
@@ -5383,8 +5497,8 @@
 msgstr "Olet hänen listallaan"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
@@ -5392,21 +5506,23 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Varattu"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
@@ -5455,31 +5571,31 @@
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5487,186 +5603,188 @@
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
-#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3781
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1829
 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 "
@@ -5675,7 +5793,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5683,7 +5801,7 @@
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profiilin URL"
@@ -5698,19 +5816,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -5741,7 +5859,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -5779,15 +5897,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voitu poistaa"
 
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5842,7 +5960,7 @@
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3455
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
@@ -5857,35 +5975,35 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tuttavalistaa ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
@@ -5923,16 +6041,25 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Viestiä ei voitu lähettää koska istuntoa palvelimen kanssa ei voitu "
+"muodostaa. Tämä on luultavasti ongelma palvelimella, yritä uudelleen "
+"muutaman minuutin päästä:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Viestiä ei voitu lähettää kytkentäpalvelimen kanssa tapahtuneen virheen "
 "vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
@@ -6311,19 +6438,19 @@
 msgstr "Palvelimen portti"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2284
-#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6333,21 +6460,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Ei voitu muodostaa yhteyttä palvelimeen:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6379,7 +6497,7 @@
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Merkistö"
@@ -6534,8 +6652,8 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
+#: ../pidgin/gtkutils.c:2339
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
@@ -6549,13 +6667,15 @@
 msgstr "AIM:n suora pikaviesti"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Keskustelu"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -6628,17 +6748,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:5732
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Varattu"
 
@@ -6647,7 +6767,7 @@
 msgstr "Net-tietoinen"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Näkymätön"
@@ -6657,13 +6777,13 @@
 msgstr "Linjoilla"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "IP-osoite"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:2847
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
@@ -6714,14 +6834,14 @@
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
 #: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Epäkelpo näyttöjänimi."
 
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
@@ -6773,10 +6893,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -6795,48 +6915,48 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttavalistalleni?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5193
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2276
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6847,17 +6967,17 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6870,7 +6990,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6883,7 +7003,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6896,38 +7016,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2553
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2562
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6936,21 +7056,21 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2580
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, 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."
@@ -6958,61 +7078,61 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2756
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2820
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2823
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2852
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2862
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2918
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:2995
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3182
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7020,7 +7140,7 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3385
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7028,85 +7148,86 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3457
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3470
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3747
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3936
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3959
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3990
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7115,14 +7236,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3996
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7131,7 +7252,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7140,7 +7261,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7149,7 +7270,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7158,32 +7279,32 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4023
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4195
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4461
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
+#: ../libpurple/protocols/oscar/oscar.c:4462
 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 "
@@ -7193,7 +7314,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4476
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7206,11 +7327,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4481
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4526
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7225,11 +7346,11 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7240,17 +7361,17 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+#: ../libpurple/protocols/oscar/oscar.c:4602
+#: ../libpurple/protocols/oscar/oscar.c:5025
+#: ../libpurple/protocols/oscar/oscar.c:5039
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4706
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7258,16 +7379,16 @@
 "Tuttavalistan hakeminen AIM-pavelimelta epäonnistui. Tuttavalistasi ei ole "
 "kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4890
-#: ../libpurple/protocols/oscar/oscar.c:4895
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#: ../libpurple/protocols/oscar/oscar.c:5077
+#: ../libpurple/protocols/oscar/oscar.c:4911
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5093
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5099
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7276,12 +7397,12 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7291,7 +7412,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5130
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7300,22 +7421,22 @@
 "Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen "
 "tuttavalistalleen. Haluatko lisätä hänet omallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5138
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5190
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7326,53 +7447,53 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5216
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5292
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
+#: ../libpurple/protocols/oscar/oscar.c:5886
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7380,65 +7501,65 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5927
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5941
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6038
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7446,73 +7567,73 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6399
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6475
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../libpurple/protocols/oscar/oscar.c:6588
+#: ../libpurple/protocols/oscar/oscar.c:6630
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8015,13 +8136,7 @@
 msgstr "Ei kyetty kirjautumaan, tarkista virheenjäljitysloki"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2378
-#: ../libpurple/protocols/yahoo/yahoo.c:2406
-#: ../libpurple/protocols/yahoo/yahoo.c:2513
-#: ../libpurple/protocols/yahoo/yahoo.c:2534
-#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8429,7 +8544,7 @@
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4250
 msgid "Topic:"
 msgstr "Aihe:"
 
@@ -8454,6 +8569,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3984
+msgid "Connect"
+msgstr "Yhdistä"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8688,60 +8807,85 @@
 msgstr "Piilota asiakasohjelman tunniste"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Käyttäjä %s ei ole läsnä verkossa"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Avainsopimus"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ei voida suorittaa avainsopimusta"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Virhe tapahtui avainsopimuksen aikana"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Avainsopimus epäonnistui"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Aikakatkaisu avainsopimuksen aikana"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Avainsopimus peruutettiin"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Avainsopimus peruutettiin"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Avainsopimus on jo aloitettu"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8750,7 +8894,8 @@
 "Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
 "avainsopimuksen?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8761,69 +8906,99 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Avainsopimuspyyntö"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Ei voida asettaa pikaviestiavainta"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Aseta pikaviestin salasana"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Käyttäjä %s ei ole luotettu"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8832,16 +9007,19 @@
 "Voit käyttää Hae julkinen avain -komentoa saadaksesi julkisen avaimen."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Tuttava %s ei ole kirjautuneena verkossa"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8849,15 +9027,18 @@
 "Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
 "tuodaksesi julkisen avaimen."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Valitse oikea käyttäjä"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8865,7 +9046,8 @@
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
 "käyttäjä listalta."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8874,237 +9056,318 @@
 "listalta."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Irroitettu"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Vastahakoinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Herätä minut"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiivinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robotti"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Onnellinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Surullinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Vihainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Häpeää"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Rakastunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Unelias"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Tylsistynyt"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Innostunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Levoton"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Mieliala"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Laite"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Piirrä kirjoitustaululle"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Salasana:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanavaa %s ei ole verkossa"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanavatiedot"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ei saada kanavatietoja"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanavan nimi:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Käyttäjämäärä:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanavan perustaja:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanavan salausalgoritmi:<b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanavan HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanavan tilat:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Fingerprint</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Babbleprint:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9118,333 +9381,446 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Lisää / poista"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Käyttäjäraja"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Turvallinen tiedostonsiirto"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Virhe tiedostonsiirrossa"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Etäpää katkaisi yhteyden"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Pääsy evätty"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Avain sopimus epäonnistui"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "Ei yhteyttä määräajassa"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Yhteyden muodostus epäonnistui"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Tiedostonsiirtoistuntoa ei ole"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Ei aktiivista tiedostonsiirtoistuntoa"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Tiedostonsiirto on jo aloitettu"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ei voitu suorittaa avainsopimusta tiedostonsiirtoa varten"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ei voitu aloittaa tiedostonsiirtoa"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Tiedoston lähetys ei onnistu"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Tapahtui virhe"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Poistettu käyttäjän %s toimesta (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Kirjaudu ulos palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Oikea nimi"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen sormenjälki"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen \"babbleprint\""
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Lisää..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Ei voida irroittaa"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Ei voida asettaa aihetta"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Huonelista"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Huonelistaa ei saatu"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Verkko on tyhjä"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Palvelimen tilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Ei saatu palvelimen tilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Palvelimen tilastoja ei saatavilla."
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9479,105 +9855,66 @@
 "Palvelinoperaattorit yhteensä: %d\n"
 "Reititinoperaattorit yhteensä: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping-vastaus saatu palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Ei voitu poistaa käyttäjää"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Avaintenvaihto epäonnistui"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
-"luodaksesi uuden yhteyden."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Palvelin katkaisi yhteyden"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "TARKKAILE"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Et voi tarkkailla käyttäjää"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Virhe: Virheellinen allekirjoitus"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Virhe: Virheellinen eväste"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Virhe: Todennus epäonnistui"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9586,12 +9923,12 @@
 "Vastaanotettiin käyttäjän %s julkinen avain. Paikallinen kopiosi ei täsmää. "
 "Haluatko silti hyväksyä tämän julkisen avaimen?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Vastaanotettiin julkinen avain käyttäjältä %s. Hyväksytäänkö se?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9604,73 +9941,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Tarkista julkinen avain"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Näytä..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Palvelin katkaisi yhteyden"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Avaintenvaihto epäonnistui"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
+"luodaksesi uuden yhteyden."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Yhdistetään SILC-palvelimelle"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Ei voitu ladata SILC-avainparia"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Yhteyden luominen epäonnistui"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Pertti Perusnimi"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Ei voida alustaa SILC-yhteyskäytäntöä"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Ei voida löytää/käyttää ~/.silc-hakemistoa"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Yhdistetään SILC-palvelimelle"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Ei voitu ladata SILC-avainparia: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Yhteyden luominen epäonnistui"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Virhe ladattaessa SILC-avainparia"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Rakastunut"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9678,46 +10042,63 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online-palvelut"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Aikavyöhyke (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9727,168 +10108,212 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Avaimen pituus"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti asiakasohjelman virhe)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9896,7 +10321,8 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9904,15 +10330,18 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9920,37 +10349,45 @@
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
 "kanavan kutsu- listalta"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9967,116 +10404,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "Käytä täydellistä jatkosalaisuutta (PFS)"
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Evää katsominen toisilta käyttäjiltä"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Estä kutsut"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Evää paikallaolotilan pyynnöt"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "Avaa kirjoitustaulu automaattisesti"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "Luodaan SILC-avainpari"
+msgstr "Luodaan SILC-avainpari..."
+
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "SILC-avainparia ei voida luoda\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Palvelin: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus: \t%d bittiä\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versio: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10087,7 +10549,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10096,38 +10559,45 @@
 "Julkisen avaimen babbleprint\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Pääte"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s lähetti viestin kirjoitustaululle. Haluatko aukaista kirjoitustaulun?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10136,10 +10606,71 @@
 "%s lähetti viestin kirjoitustaululle kanavalla %s. Haluatko aukaista "
 "kirjoitustaulun?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Kirjoitustaulu"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Palvelimen tilastoja ei saatavilla."
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Virhe: Virheellinen allekirjoitus"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Virhe: Virheellinen eväste"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Virhe: Todennus epäonnistui"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Pertti Perusnimi"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Ei voida löytää/käyttää ~/.silc-hakemistoa"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Ei voitu ladata SILC-avainparia: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10366,7 +10897,8 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5821
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -10427,32 +10959,32 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Valtuutuksen eväysviesti:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10461,11 +10993,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10476,11 +11008,11 @@
 "luultavasti mahdollista kirjautua Yahoo-palveluun tällä asiakasohjelmalla. "
 "Tarkista päivitykset osoitteesta: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10490,152 +11022,170 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2488
-#: ../libpurple/protocols/yahoo/yahoo.c:2667
-#: ../libpurple/protocols/yahoo/yahoo.c:2770
-#: ../libpurple/protocols/yahoo/yahoo.c:2780
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Yhteys palvelimeen %s katkesi:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Ei voitu muodostaa yhteyttä palvelimeen %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "Olet lähettänyt tönäisyn!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -10649,56 +11199,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -10787,7 +11337,7 @@
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Virhe kirjoituksessa"
 
@@ -11066,7 +11616,7 @@
 msgstr "Altistus"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11096,7 +11646,7 @@
 msgid "Error resolving %s"
 msgstr "Virhe selvitettäessä %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Ei voitu selvittää isäntänimeä"
 
@@ -11189,27 +11739,27 @@
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11218,62 +11768,67 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "%s:n avaaminen epäonnistui: uudelleenohjattu liian monta kertaa"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11282,17 +11837,17 @@
 "Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3523
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ei voitu yhdistää kohteeseen %s: %s"
@@ -11318,55 +11873,71 @@
 msgstr "Tarjottimen asento."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "Paikallinen lempinimi:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Yhteyskäy_täntö:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "Näyttö_nimi:"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "Paika_llinen lempinimi:"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "Muista _salasana"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "Il_moita uudesta sähköpostista"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjätilille:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "Käytä GNOMEn välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleisiä välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -11375,60 +11946,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:982
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:985
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11451,105 +12022,103 @@
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavalista-ikkunassa."
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:717
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:738
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:749 ../pidgin/gtkblist.c:5415
+#: ../pidgin/gtkblist.c:5782 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1038
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1089
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1092 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1098
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1105
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1109 ../pidgin/gtkblist.c:1113
+#: ../pidgin/gtkblist.c:1215 ../pidgin/gtkblist.c:1238
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1125 ../pidgin/gtkblist.c:1134
+#: ../pidgin/gtkblist.c:1223 ../pidgin/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1128 ../pidgin/gtkblist.c:1136
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1185
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1188
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1191
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1193
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1211 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1213
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1251 ../pidgin/gtkblist.c:1274
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1279
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1524 ../pidgin/gtkblist.c:1536
+#: ../pidgin/gtkblist.c:4529 ../pidgin/gtkblist.c:4539
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkblist.c:1996 ../pidgin/gtkconv.c:4610
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11558,125 +12127,116 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2836
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2837
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2843
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/_About Pidgin"
+msgstr "/Tuttavat/Tietoj_a Pidginistä"
+
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2856
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2857 ../pidgin/gtkblist.c:6480
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/muokkaa"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2860
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:2857
-msgid "/Tools/Plu_gins"
-msgstr "/Työkalut/_Liitännäiset"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Tools/Pr_eferences"
-msgstr "/Työkalut/A_setukset"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Tools/Pr_ivacy"
-msgstr "/Työkalut/Yks_ityisyys"
-
-#: ../pidgin/gtkblist.c:2861
-msgid "/Tools/_File Transfers"
-msgstr "/Työkalut/_Tiedostonsiirrot..."
-
 #: ../pidgin/gtkblist.c:2862
-msgid "/Tools/R_oom List"
-msgstr "/Työkalut/Huone_lista"
+msgid "/Tools/Plu_gins"
+msgstr "/Työkalut/_Liitännäiset"
 
 #: ../pidgin/gtkblist.c:2863
+msgid "/Tools/Pr_eferences"
+msgstr "/Työkalut/A_setukset"
+
+#: ../pidgin/gtkblist.c:2864
+msgid "/Tools/Pr_ivacy"
+msgstr "/Työkalut/Yks_ityisyys"
+
+#: ../pidgin/gtkblist.c:2866
+msgid "/Tools/_File Transfers"
+msgstr "/Työkalut/_Tiedostonsiirrot..."
+
+#: ../pidgin/gtkblist.c:2867
+msgid "/Tools/R_oom List"
+msgstr "/Työkalut/Huone_lista"
+
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2869
+msgid "/Tools/_Debug Window"
+msgstr "/Työkalut/_Virheenjäljitysikkuna"
+
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
-#. Help
-#: ../pidgin/gtkblist.c:2868
-msgid "/_Help"
-msgstr "/O_hje"
-
-#: ../pidgin/gtkblist.c:2869
-msgid "/Help/Online _Help"
-msgstr "/Ohje/O_hjeita verkossa"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Help/_Debug Window"
-msgstr "/Ohje/_Virheenjäljitysikkuna"
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Help/_About"
-msgstr "/Ohje/Tietoj_a"
-
 #: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
@@ -11690,123 +12250,123 @@
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3005
 msgid "Logged In"
 msgstr "Kirjautui sisään"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3051
 msgid "Last Seen"
 msgstr "Viimeksi nähty"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3071
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3073
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3075
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3404
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3406
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3551
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3552 ../pidgin/gtkblist.c:3585
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3553
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3554
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3555 ../pidgin/gtkblist.c:3588
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3556
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3591
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3594
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3691 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
 msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3768
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3770
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3771
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3772
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3974 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:3984
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4008
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4160
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4167
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4178
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4263
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4277
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11825,23 +12385,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4523
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4526
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4532
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4535
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5392
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -11851,17 +12411,20 @@
 "myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 "aina kuin mahdollista.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Ryhmä:"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5427
+msgid "_Screen name:"
+msgstr "_Näyttönimi:"
+
+#: ../pidgin/gtkblist.c:5449 ../pidgin/gtkblist.c:5803
+msgid "A_lias:"
+msgstr "A_lias:"
+
+#: ../pidgin/gtkblist.c:5715
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5731
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11869,7 +12432,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5772
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11877,39 +12440,39 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5860
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6500
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6524
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6537 ../pidgin/gtkconv.c:2984
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6545
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6557
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6563
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6612
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6682
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -11926,210 +12489,218 @@
 "%s ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:812
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:865
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:895
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:916
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2542 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:999
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1035
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1393
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1401
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
 "lokiin."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1649
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1652
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1672
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1695
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2550
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2601
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2653
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2658
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2661
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2665
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2678
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2820
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2822
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2830
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2837
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2839
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2841
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2851
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2860
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Keskustelu/Lisää lin_kki..."
+
+#: ../pidgin/gtkconv.c:2862
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Keskustelu/Liitä _kuva..."
+
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2872
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2873
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2874
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2875
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2877
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2878
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2954
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
@@ -12138,225 +12709,233 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3008 ../pidgin/gtkconv.c:3040
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3048
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3054
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3058
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3068
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3074
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3078
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3082
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3086
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3090
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3096
+msgid "/Conversation/Insert Link..."
+msgstr "/Keskustelu/Lisää linkki..."
+
+#: ../pidgin/gtkconv.c:3100
+msgid "/Conversation/Insert Image..."
+msgstr "/Keskustelu/Lisää kuva..."
+
+#: ../pidgin/gtkconv.c:3106
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3109
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3122
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3125
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3128
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3212 ../pidgin/gtkconv.c:3254
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3257
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3439
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4153
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4304
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6191 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6197
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6202
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6207 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6212
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7344
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7376
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:7898
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:7904
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:7912
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:7918
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8304
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8827
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8829
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8831 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8833
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8835
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Vain _kuvake"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "_Sekä kuvake että teksti"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Taso "
 
-#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Valitse virheenjäljityssuodattimen taso."
 
-#: ../pidgin/gtkdebug.c:831
-msgid "All"
-msgstr "Kaikki"
-
 #: ../pidgin/gtkdebug.c:832
+msgid "All"
+msgstr "Kaikki"
+
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Muut"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Varoitukset"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Virheet "
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
@@ -12370,8 +12949,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "kehittäjä"
 
@@ -12379,11 +12958,11 @@
 msgid "developer & webmaster"
 msgstr "kehittäjä & verkkosivujen ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "tuki"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "tuki/laadunvarmistus"
 
@@ -12421,7 +13000,7 @@
 msgstr "arabia"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -12434,8 +13013,8 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "katalaani"
 
@@ -12443,7 +13022,7 @@
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "tšekki"
 
@@ -12452,7 +13031,7 @@
 msgstr "tanska"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "saksa"
 
@@ -12481,9 +13060,9 @@
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "espanja"
 
@@ -12496,14 +13075,14 @@
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "ranska"
 
@@ -12519,7 +13098,7 @@
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "heprea"
 
@@ -12535,16 +13114,16 @@
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "georgia"
 
@@ -12560,7 +13139,7 @@
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "korea"
 
@@ -12569,126 +13148,128 @@
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "nepal"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:182
-msgid "Portuguese-Brazil"
-msgstr "portugali (brasilialainen)"
-
 #: ../pidgin/gtkdialogs.c:183
+msgid "Portuguese-Brazil"
+msgstr "portugali (brasilialainen)"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "paštu"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:195
-msgid "Thai"
-msgstr "thai"
-
 #: ../pidgin/gtkdialogs.c:196
+msgid "Thai"
+msgstr "thai"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:369
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -12711,92 +13292,86 @@
 "osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät anna "
 "ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode."
-"net<BR><BR>"
-
 #: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12811,30 +13386,30 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12842,29 +13417,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12873,11 +13448,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -12995,43 +13570,43 @@
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
-msgstr "_Kopioi linkin sijainti"
-
-#: ../pidgin/gtkimhtml.c:3211
+msgstr "_Kopioi linkin osoite"
+
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13041,7 +13616,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13051,7 +13626,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13062,7 +13637,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13073,35 +13648,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13109,81 +13684,81 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "Suurempi kirjasinkoko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "Pienempi kirjasinkoko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "Kirjasintyyppi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "Kirjasimen etualaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "Poista muotoilu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
@@ -13306,7 +13881,7 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:496
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13519,8 +14094,8 @@
 msgstr "_Esikatselu"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
+msgid "P_ounce only when my status is not Available"
+msgstr "I_lmoita vain kun tilani on \"tavoittamattomissa\""
 
 #: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
@@ -13554,7 +14129,7 @@
 msgid "_Show system tray icon:"
 msgstr "_Näytä tarjotinkuvake:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13573,7 +14148,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "Poissaollessa"
 
@@ -13622,39 +14197,55 @@
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "Korosta _väärinkirjoitetut sanat"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "Käytä portaatonta tekstinvieritystä"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Kirjasin"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Käytä asiakirjojen kirjasinta _teemasta"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Käytä kirjasinta _teemasta"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "Keskustelujen _kirjasin:"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13662,119 +14253,119 @@
 "Tältä ulosmenevä viesti näyttää kun käytät yhteyskäytäntöä joka tukee "
 "muotoiluja. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "Portit"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13783,80 +14374,80 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
 msgid "(default)"
 msgstr "(oletus)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "Komento"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13865,117 +14456,117 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
-msgstr "Kun ei tavoitettavissa"
-
-#: ../pidgin/gtkprefs.c:1655
+msgstr "Kun tavoittamattomissa"
+
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
@@ -14064,23 +14655,23 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
@@ -14103,7 +14694,7 @@
 msgstr "Haluatko varmasti poistaa valitut tallenetut tilat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Käytä"
 
@@ -14115,25 +14706,25 @@
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -14190,25 +14781,25 @@
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:593
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14217,12 +14808,12 @@
 "%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
 "erikseen."
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1442
 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."
@@ -14230,31 +14821,31 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
-"tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Voit lähettää tämän kuvan tiedostonsiirtona tai käyttää sitä "
+"tuttavakuvakkeena tälle käyttäjälle."
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14267,11 +14858,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14279,7 +14870,7 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2267
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14290,25 +14881,25 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2563
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2565
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2566
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voitu asettaa"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ei voitu avata tiedostoa \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2715
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14354,6 +14945,26 @@
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Oletus"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin-hymiöt"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Tämän valitseminen ottaa graafiset hymiöt pois käytöstä"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "ei mitään"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Näytä tilastot"
@@ -14635,6 +15246,11 @@
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Ryhmä:"
+
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14666,34 +15282,34 @@
 msgid "_Associate Buddy"
 msgstr "_Yhdistä tuttava"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "Sähköpostia ei voitu lähettää."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "Tälle tuttavalle ei löytynyt sähköpostiosoitetta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Lähetä sähköposti"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Evolution-integraatioasetukset"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
@@ -14703,7 +15319,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Evolution-integrointi"
 
@@ -14711,8 +15327,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
@@ -15135,28 +15751,19 @@
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Käyttämäsi %s-versio on %s. Uusin versio on %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Muutosloki:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Version %s voi noutaa osoitteesta:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"Käyttämäsi %s-versio on %s. Nykyinen versio on %s. Se löytyy osoitteesta <a "
+"href=\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Muutosloki:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "Uusi versio saatavilla"
 
@@ -15166,19 +15773,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "Julkaisuilmoitus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15476,7 +16083,7 @@
 "Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten tuttavalistan "
 "telakoinnin."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Kirjauduttu ulos.</font>"
 
@@ -15486,45 +16093,93 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "XMPP-pääte"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "Käyttäjätili: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ei yhdistetty XMPP:hen</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "Lisää <iq/>-lohko."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "Lisää <presence/>-lohko."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "Lisää <message/>-lohko."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Lähetä ja vastaanota XMPP-raakalohkoja."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Reject watching by other users"
+#~ msgstr "Evää katsominen toisilta käyttäjiltä"
+
+#~ msgid "Block invites"
+#~ msgstr "Estä kutsut"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Evää paikallaolotilan pyynnöt"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteys katkesi kohteeseen %s seuraavasta syystä:\n"
+#~ "%s"
+
+#~ msgid "Alias..."
+#~ msgstr "Alias..."
+
+#~ msgid "/_Help"
+#~ msgstr "/O_hje"
+
+#~ msgid "/Help/Online _Help"
+#~ msgstr "/Ohje/O_hjeita verkossa"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Ohje/Tietoj_a"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode."
+#~ "net<BR><BR>"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän "
+#~ "viestiin tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "Version %s voi noutaa osoitteesta:<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>."
+
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Näytä/piilota poissaolevat tuttavat"
 
@@ -15683,18 +16338,6 @@
 #~ msgid "Provides options specific to Windows "
 #~ msgstr "Tarjoaa asetukset jotka liittyvät erityisesti Windows-versioon "
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Keskustelu/Lisää lin_kki..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Keskustelu/Liitä _kuva..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Keskustelu/Lisää linkki..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Keskustelu/Lisää kuva..."
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC:</FONT> #wingaim palvelimella irc.freenode."
@@ -15729,9 +16372,6 @@
 #~ msgid "Pidgin encountered errors loading the plugin."
 #~ msgstr "Liitännäistä ladattaessa tapahtui virheitä."
 
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin-käyttäjä"
-
 #~ msgid ""
 #~ "Always use AIM/ICQ proxy server for file transfers\n"
 #~ "(slower, but does not reveal your IP address)"
@@ -15941,9 +16581,6 @@
 #~ msgid "Invalid QQ Facea"
 #~ msgstr "Epäkelpo QQid"
 
-#~ msgid "Connection timeout!"
-#~ msgstr "Ei yhteyttä määräajassa"
-
 #~ msgid "User info is not updated"
 #~ msgstr "Käyttäjätietoja ei ole päivitetty"
 
@@ -16044,9 +16681,6 @@
 #~ msgid "Selection"
 #~ msgstr "Valinta"
 
-#~ msgid "Select a number"
-#~ msgstr "Valitse numero"
-
 #~ msgid "Faces"
 #~ msgstr "Kasvot"
 
--- a/po/lt.po	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/lt.po	Sat Jun 16 19:48:23 2007 +0000
@@ -1,8 +1,8 @@
 # Gaim eilučių vertimai į lietuvių kalbą
 # Copyright (C) 2004, 2005, 2006, 2007 Gaim authors
 # This file is distributed under the same license as the Gaim package.
-# Laurynas Biveinis <laurynas.biveinis@gmail.com>, 2005, 2006, 2007
-# Marius Karnauskas <marius@akl.lt>, 2005,
+# Laurynas Biveinis <laurynas.biveinis@gmail.com>, 2005, 2006, 2007.
+# Marius Karnauskas <marius@akl.lt>, 2005.
 # Gediminas Čičinskas. <gediminas@parok.lt>, 2004, 2005.
 # 
 # 
@@ -10,701 +10,22 @@
 msgstr ""
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-30 00:00-0500\n"
-"PO-Revision-Date: 2007-02-06 00:20+0100\n"
+"POT-Creation-Date: 2007-06-12 11:21+0200\n"
+"PO-Revision-Date: 2007-06-13 12:33+0200\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
 "Language-Team:\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n%"
 "10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Interneto pokalbių programa Gaim"
-
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Pokalbiai internete"
-
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Bendrauti keliais interneto pokalbių protokolais"
-
-#: ../console/gntaccount.c:119 ../console/gntblist.c:272
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1399
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1210
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
-msgid "Error"
-msgstr "Klaida"
-
-#: ../console/gntaccount.c:119
-msgid "Account was not added"
-msgstr "Paskyra nebuvo sukurta"
-
-#: ../console/gntaccount.c:120
-msgid "Screenname of an account must be non-empty."
-msgstr "Paskyros vardas negali būti tuščias"
-
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
-msgid "New mail notifications"
-msgstr "Pranešimai apie naujus laiškus"
-
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
-msgid "Remember password"
-msgstr "Prisiminti slaptažodį"
-
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
-msgid "Modify Account"
-msgstr "Redaguoti paskyrą"
-
-#: ../console/gntaccount.c:474
-msgid "New Account"
-msgstr "Nauja paskyra"
-
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
-msgid "Protocol:"
-msgstr "Protokolas:"
-
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
-msgid "Screen name:"
-msgstr "Vardas:"
-
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
-msgid "Alias:"
-msgstr "Alternatyvusis vardas:"
-
-#. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:313
-#: ../console/gntblist.c:380 ../console/gntblist.c:413
-#: ../console/gntblist.c:737 ../console/gntblist.c:906
-#: ../console/gntblist.c:997 ../console/gntblist.c:2021
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
-#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
-#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
-#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
-#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
-#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1761
-#: ../libgaim/protocols/jabber/buddy.c:1795
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:1365
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
-#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
-#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
-#: ../libgaim/protocols/oscar/oscar.c:6043
-#: ../libgaim/protocols/oscar/peer.c:1021
-#: ../libgaim/protocols/qq/buddy_info.c:484
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
-#: ../libgaim/protocols/qq/group_join.c:138
-#: ../libgaim/protocols/qq/group_join.c:359
-#: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
-#: ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:3410
-#: ../libgaim/protocols/sametime/sametime.c:3495
-#: ../libgaim/protocols/sametime/sametime.c:3665
-#: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5498
-#: ../libgaim/protocols/sametime/sametime.c:5622
-#: ../libgaim/protocols/silc/buddy.c:467
-#: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:961
-#: ../libgaim/protocols/yahoo/yahoo.c:3208
-#: ../libgaim/protocols/yahoo/yahoo.c:3217
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
-#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
-msgid "Save"
-msgstr "Įrašyti"
-
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/gtksavedstatuses.c:328
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Ar Jūs tikrai norite šalinti %s?"
-
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
-msgid "Delete Account"
-msgstr "Pašalinti paskyrą"
-
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:335
-msgid "Delete"
-msgstr "Šalinti"
-
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
-msgid "Accounts"
-msgstr "Paskyros"
-
-#: ../console/gntaccount.c:650
-msgid "You can enable/disable accounts from the following list."
-msgstr "Jūs galite aktyvuoti ir deaktyvuoti paskyras iš šio sąrašo."
-
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:313 ../console/gntblist.c:380
-#: ../console/gntblist.c:413 ../console/gntnotify.c:309
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
-#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
-#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:5497
-#: ../libgaim/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Pridėti"
-
-#: ../console/gntaccount.c:677
-msgid "Modify"
-msgstr "Keisti"
-
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s padarė %s savo bičiuliu%s%s"
-
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
-msgid "Add buddy to your list?"
-msgstr "Pridėti bičiulį į Jūsų sąrašą?"
-
-#: ../console/gntblist.c:264
-msgid "You must provide a screename for the buddy."
-msgstr "Turite duoti bičiuliui vardą."
-
-#: ../console/gntblist.c:266
-msgid "You must provide a group."
-msgstr "Turite nurodyti grupę."
-
-#: ../console/gntblist.c:268
-msgid "You must select an account."
-msgstr "Jūs privalote pasirinkti paskyrą"
-
-#: ../console/gntblist.c:272
-msgid "Error adding buddy"
-msgstr "Bičiulio pridėjimo klaida"
-
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
-msgid "Screen Name"
-msgstr "Vardas"
-
-#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
-#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1207
-msgid "Alias"
-msgstr "Sukurti alternatyvųjį vardą"
-
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
-msgid "Group"
-msgstr "Grupė"
-
-#: ../console/gntblist.c:306 ../console/gntblist.c:363
-#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
-#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
-#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
-msgid "Account"
-msgstr "Paskyra"
-
-#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
-#: ../libgaim/protocols/silc/buddy.c:736
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/buddy.c:1075
-#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3122
-msgid "Add Buddy"
-msgstr "Pridėti bičiulį"
-
-#: ../console/gntblist.c:312
-msgid "Please enter buddy information."
-msgstr "Įveskite bičiulio informaciją."
-
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
-msgid "Chats"
-msgstr "Pokalbiai"
-
-#. Extract their Name and put it in
-#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:792
-#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
-#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
-msgid "Name"
-msgstr "Vardas"
-
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
-msgid "Add Chat"
-msgstr "Pridėti pokalbių kambarį"
-
-#: ../console/gntblist.c:379
-msgid "You can edit more information from the context menu later."
-msgstr ""
-"Daugiau informacijos galite keisti vėliau naudodamiesi kontekstiniu meniu."
-
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-msgid "Error adding group"
-msgstr "Grupės sukūrimo klaida"
-
-#: ../console/gntblist.c:391
-msgid "You must give a name for the group to add."
-msgstr "Jūs turite kuriamai grupei suteikti pavadinimą."
-
-#: ../console/gntblist.c:404
-msgid "A group with the name already exists."
-msgstr "Grupė su tokiu vardu jau yra."
-
-#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
-#: ../libgaim/protocols/sametime/sametime.c:5408
-#: ../libgaim/protocols/sametime/sametime.c:5495
-msgid "Add Group"
-msgstr "Pridėti grupę"
-
-#: ../console/gntblist.c:411
-msgid "Enter the name of the group"
-msgstr "Įveskite grupės pavadinimą"
-
-#: ../console/gntblist.c:736
-msgid "Edit Chat"
-msgstr "Keisti pokalbių kambarį"
-
-#: ../console/gntblist.c:736
-msgid "Please Update the necessary fields."
-msgstr "Pataisykite būtinus laukus."
-
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
-msgid "Edit"
-msgstr "Keisti"
-
-#: ../console/gntblist.c:751
-msgid "Auto-join"
-msgstr "Automatiškai prisijungti"
-
-#  Use Environmental Settings
-#: ../console/gntblist.c:760
-msgid "Edit Settings"
-msgstr "Keisti nuostatas"
-
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Gauti informaciją"
-
-#: ../console/gntblist.c:811
-msgid "Add Buddy Pounce"
-msgstr "Sukurti reakciją į bičiulį"
-
-#  Send File button
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
-msgid "Send File"
-msgstr "Siųsti failą"
-
-#: ../console/gntblist.c:822
-msgid "View Log"
-msgstr "Žiūrėti žurnalą"
-
-#: ../console/gntblist.c:902
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "Įveskite naują „%s“ vardą"
-
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
-msgid "Rename"
-msgstr "Pervadinti"
-
-#: ../console/gntblist.c:904
-msgid "Enter empty string to reset the name."
-msgstr "Įveskite tuščią eilutę, jei norite atstatyti vardą."
-
-#: ../console/gntblist.c:977
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Šio kontakto pašalinimas taip pat pašalins ir visus bičiulius jame"
-
-#: ../console/gntblist.c:985
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Šios grupės pašalinimas taip pat pašalins ir visus bičiulius joje"
-
-#: ../console/gntblist.c:990
-#, c-format
-msgid "Are you sure you want to remove %s?"
-msgstr "Ar tikrai norite pašalinti %s?"
-
-#. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
-msgid "Confirm Remove"
-msgstr "Patvirtinkite pašalinimą"
-
-#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
-#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
-msgid "Remove"
-msgstr "Pašalinti"
-
-#. Buddy List
-#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
-msgid "Buddy List"
-msgstr "Bičiulių sąrašas"
-
-#: ../console/gntblist.c:1123
-msgid "Place tagged"
-msgstr "Vieta pažymėta"
-
-#: ../console/gntblist.c:1128
-msgid "Toggle Tag"
-msgstr "Perjungti žymę"
-
-#. General
-#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:814
-#: ../libgaim/protocols/jabber/buddy.c:1562
-#: ../libgaim/protocols/jabber/buddy.c:1744
-#: ../libgaim/protocols/jabber/jabber.c:802
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
-msgid "Nickname"
-msgstr "Vardas"
-
-#. Idle stuff
-#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
-#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:645
-#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2860
-#: ../libgaim/protocols/oscar/oscar.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:2876
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
-msgid "Idle"
-msgstr "Neveiklus"
-
-#: ../console/gntblist.c:1270
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Prisijungusių: %d\n"
-"Iš viso: %d"
-
-#: ../console/gntblist.c:1279
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Paskyra: %s (%s)"
-
-#: ../console/gntblist.c:1291
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Paskutinį kartą matytas prieš: %s"
-
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
-msgid "New..."
-msgstr "Nauja..."
-
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
-msgid "Saved..."
-msgstr "Įrašyta..."
-
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
-msgid "Plugins"
-msgstr "Papildiniai"
-
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
-msgid "_Name"
-msgstr "_Vardas"
-
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
-msgid "_Account"
-msgstr "_Paskyra"
-
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
-msgid "New Instant Message"
-msgstr "Nauja greitoji žinutė"
-
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Įveskite vardą arba alternatyvųjį vardą asmens, su kuriuo norite bendrauti."
-
-#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
-#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
-#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
-#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
-#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
-#: ../libgaim/protocols/yahoo/yahoo.c:3207
-#: ../libgaim/protocols/yahoo/yahoo.c:3216
-msgid "OK"
-msgstr "Gerai"
-
-#  Options
-#. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
-msgid "Options"
-msgstr "Parinktys"
-
-#: ../console/gntblist.c:2045
-msgid "Send IM..."
-msgstr "Rašyti žinutę..."
-
-#: ../console/gntblist.c:2049
-msgid "Toggle offline buddies"
-msgstr "Rodyti arba nerodyti atsijungusius bičiulius"
-
-#: ../console/gntblist.c:2053
-msgid "Sort by status"
-msgstr "Surikiuoti pagal būseną"
-
-#: ../console/gntblist.c:2057
-msgid "Sort alphabetically"
-msgstr "Surikiuoti abėcėliškai"
-
-#: ../console/gntblist.c:2061
-msgid "Sort by log size"
-msgstr "Surikiuoti pagal žurnalo dydį"
-
-#: ../console/gntconn.c:36
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../console/gntconn.c:39
-#, c-format
-msgid "%s disconnected."
-msgstr "%s atsijungė."
-
-#: ../console/gntconn.c:40
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s atsijungė dėl klaidos:\n"
-"%s"
-
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
-msgid "Connection Error"
-msgstr "Sujungimo klaida"
-
-#: ../console/gntconv.c:102
-msgid "No such command."
-msgstr "Tokios komandos nėra."
-
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Sintaksės klaida: Jūs įvedėte neteisingą argumentų skaičių tai komandai."
-
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
-msgid "Your command failed for an unknown reason."
-msgstr "Jūsų komanda nepavyko dėl nežinomos priežasties."
-
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
-msgid "That command only works in chats, not IMs."
-msgstr ""
-"Ta komanda veikia tik pokalbių kambariuose, o ne asmeniniuose pokalbiuose."
-
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
-msgid "That command only works in IMs, not chats."
-msgstr ""
-"Ta komanda veikia tik asmeniniuose pokalbiuose, o ne pokalbių kambariuose."
-
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
-msgid "That command doesn't work on this protocol."
-msgstr "Ta komanda neveikia šiame protokole."
-
-#: ../console/gntconv.c:130
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Komandos dar nėra palaikomos.  Žinutė nebuvo išsiųsta."
-
-#: ../console/gntconv.c:232
-#, c-format
-msgid "%s (%s -- %s)"
-msgstr "%s (%s -- %s)"
-
-#: ../console/gntconv.c:255
-#, c-format
-msgid "%s [%s]"
-msgstr "%s [%s]"
-
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
-#, c-format
-msgid ""
-"\n"
-"%s is typing..."
-msgstr ""
-"\n"
-"%s rašo..."
-
-#: ../console/gntconv.c:399
-msgid "<AUTO-REPLY> "
-msgstr "<AUTOMATINIS-ATSAKYMAS> "
-
-#. Print the list of users in the room
-#: ../console/gntconv.c:501
-msgid "List of users:\n"
-msgstr "Vartotojų sąrašas:\n"
-
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
-msgid "Supported debug options are:  version"
-msgstr "Palaikomi derinimo parametrai yra:  version"
-
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
-msgid "No such command (in this context)."
-msgstr "Šiame kontekste tokios komandos nėra."
-
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Naudokite \"/help &lt;komanda&gt;\" pagalbai apie konkrečią komandą.\n"
-"Tolimesnės komandos yra prieinamos šiame kontekste:\n"
-
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr "say &lt;žinutė&gt;:  nusiųsti žinutę įprastai, kaip ir nenaudojant šios komandos."
-
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;veiksmas&gt;:  nusiųsti IRC stiliaus veiksmą bičiuliui ar pokalbių "
-"kambariui."
-
-#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;parametras&gt;:  nusiųsti įvairią derinimo informaciją į šį "
-"pokalbį."
-
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: išvalo pokalbių žinučių langą."
-
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;komanda&gt;:  suteikia pagalbą apie konkrečią komanda."
-
-#: ../console/gntconv.c:719
-msgid "plugins: Show the plugins window."
-msgstr "plugins: parodo papildinių langą."
-
-#: ../console/gntconv.c:722
-msgid "buddylist: Show the buddylist."
-msgstr "buddylist: parodo bičiulių sąrašą."
-
-#: ../console/gntconv.c:725
-msgid "accounts: Show the accounts window."
-msgstr "accounts: parodo paskyrų langą."
-
-#: ../console/gntconv.c:728
-msgid "debugwin: Show the debug window."
-msgstr "debugwin: parodo derinimo langą."
-
-#: ../console/gntconv.c:731
-msgid "prefs: Show the preference window."
-msgstr "prefs: parodo nuostatų langą."
-
-#: ../console/gntconv.c:734
-msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: parodo išsaugotų būsenų langą."
-
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
-msgid "Debug Window"
-msgstr "Derinimo langas"
-
-#. 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.
-#.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
-msgid "Clear"
-msgstr "Išvalyti"
-
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
-msgid "Pause"
-msgstr "Pristabdyti"
-
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Laiko žymos"
-
-#: ../console/gntgaim.c:227
+#: ../finch/finch.c:229
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Daugiau informacijos suteikia `%s -h'.\n"
 
-#: ../console/gntgaim.c:229
+#: ../finch/finch.c:231
 #, c-format
 msgid ""
 "%s\n"
@@ -725,30 +46,847 @@
 "  -n, --nologin           automatiškai neprisijungti\n"
 "  -v, --version           parodyti šios programos versiją ir baigti\n"
 
-#: ../console/gntnotify.c:146
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
+#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
+#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1406
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/qq/group_join.c:324
+#: ../libpurple/protocols/silc/ops.c:1451
+msgid "Error"
+msgstr "Klaida"
+
+#: ../finch/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Paskyra nebuvo sukurta"
+
+#: ../finch/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Paskyros vardas negali būti tuščias"
+
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+msgid "New mail notifications"
+msgstr "Pranešimai apie naujus laiškus"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+msgid "Remember password"
+msgstr "Prisiminti slaptažodį"
+
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
+#: ../pidgin/gtkblist.c:3891
+msgid "Modify Account"
+msgstr "Redaguoti paskyrą"
+
+#: ../finch/gntaccount.c:474
+msgid "New Account"
+msgstr "Nauja paskyra"
+
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokolas:"
+
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
+#: ../pidgin/gtkblist.c:5293
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Vardas:"
+
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
+#: ../pidgin/gtkblist.c:5677
+msgid "Alias:"
+msgstr "Alternatyvusis vardas:"
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
+#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
+#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
+#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
+#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:969 ../libpurple/account.c:1218
+#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
+#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1768
+#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/xdata.c:338
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
+#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
+#: ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/sys_msg.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:159
+#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5477
+#: ../libpurple/protocols/sametime/sametime.c:5601
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
+#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
+#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
+#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
+#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
+#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
+#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Įrašyti"
+
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../pidgin/gtksavedstatuses.c:328
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Ar Jūs tikrai norite šalinti %s?"
+
+#: ../finch/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Pašalinti paskyrą"
+
+#. Delete button
+#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
+#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
+#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
+#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:335
+msgid "Delete"
+msgstr "Šalinti"
+
+#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+msgid "Accounts"
+msgstr "Paskyros"
+
+#: ../finch/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "Jūs galite aktyvuoti ir deaktyvuoti paskyras iš šio sąrašo."
+
+#. Add button
+#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
+#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
+#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:159
+#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/sametime/sametime.c:5476
+#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
+#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "Pridėti"
+
+#. Modify button
+#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+msgid "Modify"
+msgstr "Keisti"
+
+#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s padarė %s savo bičiuliu%s%s"
+
+#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+msgid "Add buddy to your list?"
+msgstr "Pridėti bičiulį į Jūsų sąrašą?"
+
+#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#, c-format
+msgid "%s%s%s%s wants to add %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."
+
+#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
+#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+msgid "Authorize buddy?"
+msgstr "Ar leisti?"
+
+#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
+#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+msgid "Authorize"
+msgstr "Leisti"
+
+#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
+#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+msgid "Deny"
+msgstr "Drausti"
+
+#: ../finch/gntblist.c:266
+msgid "You must provide a screename for the buddy."
+msgstr "Turite duoti bičiuliui vardą."
+
+#: ../finch/gntblist.c:268
+msgid "You must provide a group."
+msgstr "Turite nurodyti grupę."
+
+#: ../finch/gntblist.c:270
+msgid "You must select an account."
+msgstr "Jūs privalote pasirinkti paskyrą"
+
+#: ../finch/gntblist.c:274
+msgid "Error adding buddy"
+msgstr "Bičiulio pridėjimo klaida"
+
+#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
+#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+msgid "Screen Name"
+msgstr "Vardas"
+
+#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
+#: ../libpurple/protocols/msn/msn.c:1340
+#: ../libpurple/protocols/silc/chat.c:587
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Sukurti alternatyvųjį vardą"
+
+#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+msgid "Group"
+msgstr "Grupė"
+
+#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
+#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+msgid "Account"
+msgstr "Paskyra"
+
+#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
+#: ../libpurple/protocols/silc/buddy.c:736
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1174
+#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+msgid "Add Buddy"
+msgstr "Pridėti bičiulį"
+
+#: ../finch/gntblist.c:315
+msgid "Please enter buddy information."
+msgstr "Įveskite bičiulio informaciją."
+
+#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+msgid "Chats"
+msgstr "Pokalbiai"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "Vardas"
+
+#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+msgid "Add Chat"
+msgstr "Pridėti pokalbių kambarį"
+
+#: ../finch/gntblist.c:382
+msgid "You can edit more information from the context menu later."
+msgstr ""
+"Daugiau informacijos galite keisti vėliau naudodamiesi kontekstiniu meniu."
+
+#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+msgid "Error adding group"
+msgstr "Grupės sukūrimo klaida"
+
+#: ../finch/gntblist.c:394
+msgid "You must give a name for the group to add."
+msgstr "Jūs turite kuriamai grupei suteikti pavadinimą."
+
+#: ../finch/gntblist.c:407
+msgid "A group with the name already exists."
+msgstr "Grupė su tokiu vardu jau yra."
+
+#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
+#: ../libpurple/protocols/sametime/sametime.c:5387
+#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+msgid "Add Group"
+msgstr "Pridėti grupę"
+
+#: ../finch/gntblist.c:414
+msgid "Enter the name of the group"
+msgstr "Įveskite grupės pavadinimą"
+
+#: ../finch/gntblist.c:739
+msgid "Edit Chat"
+msgstr "Keisti pokalbių kambarį"
+
+#: ../finch/gntblist.c:739
+msgid "Please Update the necessary fields."
+msgstr "Pataisykite būtinus laukus."
+
+#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+msgid "Edit"
+msgstr "Keisti"
+
+#: ../finch/gntblist.c:754
+msgid "Auto-join"
+msgstr "Automatiškai prisijungti"
+
+#  Use Environmental Settings
+#: ../finch/gntblist.c:763
+msgid "Edit Settings"
+msgstr "Keisti nuostatas"
+
+#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Gauti informaciją"
+
+#: ../finch/gntblist.c:831
+msgid "Add Buddy Pounce"
+msgstr "Sukurti reakciją į bičiulį"
+
+#  Send File button
+#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#: ../pidgin/gtkconv.c:1599
+msgid "Send File"
+msgstr "Siųsti failą"
+
+#: ../finch/gntblist.c:842
+msgid "View Log"
+msgstr "Žiūrėti žurnalą"
+
+#: ../finch/gntblist.c:922
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Įveskite naują „%s“ vardą"
+
+#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+msgid "Rename"
+msgstr "Pervadinti"
+
+#: ../finch/gntblist.c:924
+msgid "Enter empty string to reset the name."
+msgstr "Įveskite tuščią eilutę, jei norite atstatyti vardą."
+
+#: ../finch/gntblist.c:997
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Šio kontakto pašalinimas taip pat pašalins ir visus bičiulius jame"
+
+#: ../finch/gntblist.c:1005
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Šios grupės pašalinimas taip pat pašalins ir visus bičiulius joje"
+
+#: ../finch/gntblist.c:1010
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Ar tikrai norite pašalinti %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1013
+msgid "Confirm Remove"
+msgstr "Patvirtinkite pašalinimą"
+
+#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+msgid "Remove"
+msgstr "Pašalinti"
+
+#. Buddy List
+#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "Bičiulių sąrašas"
+
+#: ../finch/gntblist.c:1143
+msgid "Place tagged"
+msgstr "Vieta pažymėta"
+
+#: ../finch/gntblist.c:1148
+msgid "Toggle Tag"
+msgstr "Perjungti žymę"
+
+#. General
+#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
+#: ../libpurple/protocols/gg/gg.c:2182
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:1569
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/jabber.c:817
+#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+msgid "Nickname"
+msgstr "Vardas"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:646
+#: ../libpurple/protocols/jabber/buddy.c:686
+#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2826
+#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
+#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+msgid "Idle"
+msgstr "Neveiklus"
+
+#: ../finch/gntblist.c:1290
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Prisijungusių: %d\n"
+"Iš viso: %d"
+
+#: ../finch/gntblist.c:1299
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Paskyra: %s (%s)"
+
+#: ../finch/gntblist.c:1311
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Paskutinį kartą matytas prieš: %s"
+
+#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
+#: ../pidgin/gtkstatusbox.c:1102
+msgid "New..."
+msgstr "Nauja..."
+
+#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
+#: ../pidgin/gtkstatusbox.c:1103
+msgid "Saved..."
+msgstr "Įrašyta..."
+
+#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+msgid "Plugins"
+msgstr "Papildiniai"
+
+#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+msgid "_Name"
+msgstr "_Vardas"
+
+#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+msgid "_Account"
+msgstr "_Paskyra"
+
+#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+msgid "New Instant Message"
+msgstr "Nauja greitoji žinutė"
+
+#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Įveskite vardą arba alternatyvųjį vardą asmens, su kuriuo norite bendrauti."
+
+#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:968 ../libpurple/account.c:1217
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
+#: ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
+#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:725
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "Gerai"
+
+#  Options
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+msgid "Options"
+msgstr "Parinktys"
+
+#: ../finch/gntblist.c:2073
+msgid "Send IM..."
+msgstr "Rašyti žinutę..."
+
+#: ../finch/gntblist.c:2077
+msgid "Toggle offline buddies"
+msgstr "Rodyti arba nerodyti atsijungusius bičiulius"
+
+#: ../finch/gntblist.c:2083
+msgid "Sort by status"
+msgstr "Surikiuoti pagal būseną"
+
+#: ../finch/gntblist.c:2087
+msgid "Sort alphabetically"
+msgstr "Surikiuoti abėcėliškai"
+
+#: ../finch/gntblist.c:2091
+msgid "Sort by log size"
+msgstr "Surikiuoti pagal žurnalo dydį"
+
+#: ../finch/gntconn.c:38
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../finch/gntconn.c:41
+#, c-format
+msgid "%s disconnected."
+msgstr "%s atsijungė."
+
+#: ../finch/gntconn.c:42
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s atsijungė dėl klaidos:\n"
+"%s"
+
+#: ../finch/gntconn.c:45 ../libpurple/account.c:996
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+msgid "Connection Error"
+msgstr "Sujungimo klaida"
+
+#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
+#: ../pidgin/gtkblist.c:3892
+msgid "Connect"
+msgstr "Jungtis"
+
+#: ../finch/gntconv.c:103
+msgid "No such command."
+msgstr "Tokios komandos nėra."
+
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+"Sintaksės klaida: Jūs įvedėte neteisingą argumentų skaičių tai komandai."
+
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+msgid "Your command failed for an unknown reason."
+msgstr "Jūsų komanda nepavyko dėl nežinomos priežasties."
+
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+msgid "That command only works in chats, not IMs."
+msgstr ""
+"Ta komanda veikia tik pokalbių kambariuose, o ne asmeniniuose pokalbiuose."
+
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+msgid "That command only works in IMs, not chats."
+msgstr ""
+"Ta komanda veikia tik asmeniniuose pokalbiuose, o ne pokalbių kambariuose."
+
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+msgid "That command doesn't work on this protocol."
+msgstr "Ta komanda neveikia šiame protokole."
+
+#: ../finch/gntconv.c:131
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Komandos dar nėra palaikomos.  Žinutė nebuvo išsiųsta."
+
+#: ../finch/gntconv.c:234
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:257
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s rašo..."
+
+#: ../finch/gntconv.c:403
+msgid "<AUTO-REPLY> "
+msgstr "<AUTOMATINIS-ATSAKYMAS> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:505
+msgid "List of users:\n"
+msgstr "Vartotojų sąrašas:\n"
+
+#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+msgid "Supported debug options are:  version"
+msgstr "Palaikomi derinimo parametrai yra:  version"
+
+#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+msgid "No such command (in this context)."
+msgstr "Šiame kontekste tokios komandos nėra."
+
+#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Naudokite \"/help &lt;komanda&gt;\" pagalbai apie konkrečią komandą.\n"
+"Tolimesnės komandos yra prieinamos šiame kontekste:\n"
+
+#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;žinutė&gt;:  nusiųsti žinutę įprastai, kaip ir nenaudojant šios "
+"komandos."
+
+#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;veiksmas&gt;:  nusiųsti IRC stiliaus veiksmą bičiuliui ar pokalbių "
+"kambariui."
+
+#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;parametras&gt;:  nusiųsti įvairią derinimo informaciją į šį "
+"pokalbį."
+
+#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: išvalo pokalbių žinučių langą."
+
+#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;komanda&gt;:  suteikia pagalbą apie konkrečią komanda."
+
+#: ../finch/gntconv.c:723
+msgid "plugins: Show the plugins window."
+msgstr "plugins: parodo papildinių langą."
+
+#: ../finch/gntconv.c:726
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: parodo bičiulių sąrašą."
+
+#: ../finch/gntconv.c:729
+msgid "accounts: Show the accounts window."
+msgstr "accounts: parodo paskyrų langą."
+
+#: ../finch/gntconv.c:732
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: parodo derinimo langą."
+
+#: ../finch/gntconv.c:735
+msgid "prefs: Show the preference window."
+msgstr "prefs: parodo nuostatų langą."
+
+#: ../finch/gntconv.c:738
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: parodo išsaugotų būsenų langą."
+
+#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Derinimo langas"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+msgid "Clear"
+msgstr "Išvalyti"
+
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+msgid "Pause"
+msgstr "Pristabdyti"
+
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Laiko žymos"
+
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Failų perdavimai – %d%% iš %d"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "Failų perdavimai"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "Eiga"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Failo pavadinimas"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Dydis"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "Greitis"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Liko"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
+#: ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:637
+#: ../libpurple/protocols/jabber/buddy.c:641
+#: ../libpurple/protocols/jabber/buddy.c:676
+#: ../libpurple/protocols/jabber/jabber.c:1201
+#: ../libpurple/protocols/msn/msn.c:512
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/oscar/oscar.c:802
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:2664
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
+#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+msgid "Status"
+msgstr "Būsena"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Uždaryti ši langą pasibaigus visiems failų perdavimams"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Pašalinti pabaigtus perdavimus"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Sustabdyti"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
+#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
+#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Užverti"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "Laukiama perdavimo pradžios"
+
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "Atšaukta"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "Nepavyko"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f KB/s"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "Baigta"
+
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "Perdavimas"
+
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "El. laiškai"
 
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
 msgid "You have mail!"
 msgstr "Jūs turite pašto!"
 
-#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "Iš"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Tema"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "Užverti"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -756,48 +894,48 @@
 msgstr[1] "%s (%s) turi %d naujus pranešimus."
 msgstr[2] "%s (%s) turi %d naujų pranešimų."
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Naujas paštas"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "Informacija apie %s"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "Informacija apie bičiulį"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "Tęsti"
 
 #  Info button
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
 msgid "Info"
 msgstr "Informacija"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Kalbėtis"
 
 #  join button
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "Prisijungti"
 
 #  Invite
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Pakviesti"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(nieko)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -814,314 +952,496 @@
 "Svetainė: %s\n"
 "Failo vardas: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Prieš konfigūruojant papildinį, jį reikia įkelti."
 
-#: ../console/gntplugin.c:193
+#: ../finch/gntplugin.c:193
 msgid "..."
 msgstr "..."
 
-#: ../console/gntplugin.c:194
+#: ../finch/gntplugin.c:194
 msgid "Still need to do something about this."
 msgstr "Reikia pabaigti papildinio konfigūravimą."
 
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "Šis papildinys neturi konfigūruojamų parinkčių."
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:221
 msgid "You can (un)load plugins from the following list."
 msgstr "Jūs galite įkelti ar iškelti papildinius iš šio sąrašo."
 
-#: ../console/gntplugin.c:264
+#: ../finch/gntplugin.c:264
 msgid "Configure Plugin"
 msgstr "Konfigūruoti papildinį"
 
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+msgid "Please enter a buddy to pounce."
+msgstr "Įveskite bičiulį, į kurį reaguoti"
+
+#  "New Buddy Pounce"
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "New Buddy Pounce"
+msgstr "Nauja reakcija į bičiulį"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "Edit Buddy Pounce"
+msgstr "Redaguoti reakciją į bičiulį"
+
+#  Create the "Pounce Who" frame.
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "Į kokį bičiulį reaguoti"
+
+#  Set up stuff for the account box
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
+#: ../pidgin/gtkblist.c:5657
+msgid "Account:"
+msgstr "Paskyra:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Bičiulio vardas:"
+
+#  Create the "Pounce When" frame.
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+msgid "Pounce When Buddy..."
+msgstr "Reaguoti, kai bičiulis..."
+
+#: ../finch/gntpounce.c:372
+msgid "Signs on"
+msgstr "prisijungia"
+
+#: ../finch/gntpounce.c:373
+msgid "Signs off"
+msgstr "atsijungia"
+
+#: ../finch/gntpounce.c:374
+msgid "Goes away"
+msgstr "pasitraukia"
+
+#: ../finch/gntpounce.c:375
+msgid "Returns from away"
+msgstr "sugrįžta"
+
+#: ../finch/gntpounce.c:376
+msgid "Becomes idle"
+msgstr "tampa neveiklus"
+
+#: ../finch/gntpounce.c:377
+msgid "Is no longer idle"
+msgstr "tampa veiklus"
+
+#: ../finch/gntpounce.c:378
+msgid "Starts typing"
+msgstr "pradeda rašyti"
+
+#: ../finch/gntpounce.c:379
+msgid "Pauses while typing"
+msgstr "trumpam nustoja rašyti"
+
+#: ../finch/gntpounce.c:380
+msgid "Stops typing"
+msgstr "nustoja rašyti"
+
+#: ../finch/gntpounce.c:381
+msgid "Sends a message"
+msgstr "išsiunčia žinutę"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+msgid "Action"
+msgstr "Veiksmas"
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Atidaryti pokalbių langą"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Parodyti pranešimo langą"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Nusiųsti žinutę"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Įvykdyti komandą"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Groti garsą"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Reaguoti tik tada, kai aš esu nepasiekamas"
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+msgid "Recurring"
+msgstr "Pasikartojanti reakcija"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Ar tikrai norite pašalinti reakciją į %s nuo %s?"
+
+#  "New Buddy Pounce"
+#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+msgid "Buddy Pounces"
+msgstr "Reakcijos į bičiulius"
+
+#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s pradėjo Jums rašyti (%s)"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "Pradėjęs Jums rašyti %s sustojo (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s prisijungė (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s tapo veiklus (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s sugrįžo (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s nustojo Jums rašyti (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s atsijungė (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s tapo neveiklus (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s pasitraukė. (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s atsiuntė Jums žinutę. (%s)"
+
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+msgid "Unknown pounce event. Please report this!"
+msgstr "Nežinomas reakcijos veiksmas. Prašome apie tai pranešti!"
+
+#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+msgid "From last sent message"
+msgstr "nuo paskutinės išsiųstos žinutės"
+
+#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
+#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "niekada"
+
 #  set the Show Offline Buddies option. must be done
 #  * after the treeview or faceprint gets mad. -Robot101
-#: ../console/gntprefs.c:122
+#: ../finch/gntprefs.c:159
 msgid "Show Idle Time"
 msgstr "Rodyti neveiklumo laikus"
 
 #  set the Show Offline Buddies option. must be done
 #  * after the treeview or faceprint gets mad. -Robot101
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:160
 msgid "Show Offline Buddies"
 msgstr "Rodyti neprisijungusius bičiulius"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:166
 msgid "Show Timestamps"
 msgstr "Rodyti laiko žymas"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:167
 msgid "Notify buddies when you are typing"
 msgstr "Informuoti bičiulius, kai jiems rašote"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:173
 msgid "Log format"
 msgstr "Žurnalo formatas"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:174
 msgid "Log IMs"
 msgstr "Į žurnalą rašyti asmeninius pokalbius"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:175
 msgid "Log chats"
 msgstr "Į žurnalą rašyti pokalbius kambariuose"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:176
 msgid "Log status change events"
 msgstr "Į žurnalą rašyti būsenos pasikeitimus"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Pokalbiai"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
+#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
 msgid "Logging"
 msgstr "Žurnalų vedimas"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
+#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkprefs.c:1951
 msgid "Preferences"
 msgstr "Nuostatos"
 
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:521
 msgid "Not implemented yet."
 msgstr "Funkcija dar nerealizuota."
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
+#: ../pidgin/gtkrequest.c:1559
+msgid "Save File..."
+msgstr "Įrašyti failą..."
+
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
+#: ../pidgin/gtkrequest.c:1560
+msgid "Open File..."
+msgstr "Atverti failą..."
+
+#: ../finch/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Ar Jūs tikrai norite šalinti „%s“?"
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:138
 msgid "Delete Status"
 msgstr "Pašalinti būseną"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
 msgid "Saved Statuses"
 msgstr "Išsaugotos būsenos"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:931
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:463
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
 msgid "Type"
 msgstr "Rūšis"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1227
-#: ../libgaim/protocols/jabber/jabber.c:1237
-#: ../libgaim/protocols/jabber/jabber.c:1247
-#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/jabber/jabber.c:1267
-#: ../libgaim/protocols/jabber/jabber.c:1279
-#: ../libgaim/protocols/novell/novell.c:2873
-#: ../libgaim/protocols/novell/novell.c:2976
-#: ../libgaim/protocols/novell/novell.c:2982
-#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/oscar/oscar.c:5501
-#: ../libgaim/protocols/oscar/oscar.c:5729
-#: ../libgaim/protocols/oscar/oscar.c:5741
-#: ../libgaim/protocols/oscar/oscar.c:5754
-#: ../libgaim/protocols/oscar/oscar.c:5761
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
+#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
+#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
+#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
+#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1233
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2942
+#: ../libpurple/protocols/novell/novell.c:2948
+#: ../libpurple/protocols/novell/novell.c:2954
+#: ../libpurple/protocols/oscar/oscar.c:5492
+#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5734
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/sametime/sametime.c:3287
+#: ../libpurple/protocols/sametime/sametime.c:3293
+#: ../libpurple/protocols/sametime/sametime.c:3299
+#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3470
+#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
 msgid "Message"
 msgstr "Žinutė"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
 msgid "Use"
 msgstr "Naudoti"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:291
 msgid "Invalid title"
 msgstr "Neteisingas pavadinimas"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:292
 msgid "Please enter a non-empty title for the status."
 msgstr "Įveskite netuščią būsenos pavadinimą."
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:299
 msgid "Duplicate title"
 msgstr "Pasikartojantis pavadinimas"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:300
 msgid "Please enter a different title for the status."
 msgstr "Prašome įvesti skirtingą pavadinimą šiai būsenai."
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:440
 msgid "Substatus"
 msgstr "Smulkesnė būsena"
 
-#  Set up stuff for the account box
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
-msgid "Account:"
-msgstr "Paskyra:"
-
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Būsena:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:466
 msgid "Message:"
 msgstr "Žinutė:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:515
 msgid "Edit Status"
 msgstr "Redaguoti būseną"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:674
-#: ../libgaim/protocols/jabber/jabber.c:1195
-#: ../libgaim/protocols/msn/msn.c:547
-#: ../libgaim/protocols/novell/novell.c:2870
-#: ../libgaim/protocols/oscar/oscar.c:800
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:2655
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Būsena"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:557
 msgid "Use different status for following accounts"
 msgstr "Šioms paskyroms naudoti kitą būseną"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:591
 msgid "Save & Use"
 msgstr "Išsaugoti ir naudoti"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:83
 msgid "Statuses"
 msgstr "Būsenos"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr "„Gnt“ iškarpinė"
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "Iškarpinės papildinys"
+
+#: ../finch/plugins/gntclipboard.c:152
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr "Kai „Gnt“ iškarpinės turinys pasikeičia, jis perduodamas X iškarpinei"
+
+#: ../finch/plugins/gntgf.c:209
 #, c-format
 msgid "%s just signed on"
 msgstr "%s ką tik prisijungė"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:216
 #, c-format
 msgid "%s just signed off"
 msgstr "%s atsijungė"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:224
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s atsiuntė žinutę"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:243
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s pasakė Jūsų vardą pokalbyje %s"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:245
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s parašė žinutę pokalbyje %s"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:283
 msgid "Buddy signs on/off"
 msgstr "Bičiulis pradeda arba baigia seansą"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:284
 msgid "You receive an IM"
 msgstr "Gaunate žinutę"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:285
 msgid "Someone speaks in a chat"
 msgstr "Kas nors parašo į pokalbį"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:286
 msgid "Someone says your name in a chat"
 msgstr "Kas nors pokalbyje pasako Jūsų vardą"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:314
 msgid "Notify with a toaster when"
 msgstr "Informuoti iššokančiu langeliu, kai:"
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:329
 msgid "Beep too!"
 msgstr "Taip pat ir pyptelėti!"
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:335
 msgid "Set URGENT for the terminal window."
 msgstr "Nustatyti „URGENT“ požymį terminalo langui."
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:355
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr "Iššokančių langelių papildinys, skirtas gaim-text."
-
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+msgid "Toaster plugin"
+msgstr "Iššokančių langelių papildinys"
+
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Pokalbis su %s, įvykęs %s:</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Istorijos papildinys reikalauja žurnalų vedimo"
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 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 ""
-"Žurnalų vedimas gali būti įjungtas iš meniu pasirinkus Įrankiai -> Nuostatos -> Žurnalų vedimas.\n"
+"Žurnalų vedimas gali būti įjungtas iš meniu pasirinkus Įrankiai -> Nuostatos "
+"-> Žurnalų vedimas.\n"
 "\n"
-"Žurnalų vedimo įjungimas greitosioms žinutėms ar pokalbiams kambariuose aktyvuos ir jų istoriją."
-
-#: ../console/plugins/gnthistory.c:179
+"Žurnalų vedimo įjungimas greitosioms žinutėms ar pokalbiams kambariuose "
+"aktyvuos ir jų istoriją."
+
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Parodo neseniai įrašytus pokalbius naujuose pokalbiuose."
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1129,4806 +1449,211 @@
 "Kai pradedamas naujas pokalbis, šis papildinys įterps paskutinio pokalbio "
 "tekstą su tuo pačiu pašnekovu į pokalbių langą."
 
-#: ../console/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: ieško eilutės žurnaluose."
 
-#: ../console/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "GntLastLog"
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr "Lastlog papildinys, skirtas gaim-text."
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Orientacija"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "Juostelės orientacija"
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "_Alternatyvusis vardas"
-
-#  join button
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "Prisi_jungti"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "Uždaryti kor_teles"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "_Kalbėtis"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "_Gauti informaciją"
-
-#  Invite
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "Pakv_iesti"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "_Keisti"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "_Atverti paštą"
-
-#  Pause button
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Sustabdyti"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "Seanso pradžios parinktys"
-
-#: ../gtk/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "Vietinis alternatyvusis vardas:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:554
-msgid "User Options"
-msgstr "Vartotojo parinktys"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr "Naudoti tokį vartotojo paveiksliuką šiai paskyrai:"
-
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:684
-#, c-format
-msgid "%s Options"
-msgstr "%s parinktys"
-
-#  Use Global Proxy Settings
-#  Use Global Proxy Settings
-#: ../gtk/gtkaccount.c:881
-msgid "Use GNOME Proxy Settings"
-msgstr "naudoti GNOME tarpininkų nuostatas"
-
-#  Use Global Proxy Settings
-#  Use Global Proxy Settings
-#: ../gtk/gtkaccount.c:882
-msgid "Use Global Proxy Settings"
-msgstr "naudoti visuotines tarpininkų nuostatas"
-
-#: ../gtk/gtkaccount.c:888
-msgid "No Proxy"
-msgstr "be tarpininkų"
-
-#: ../gtk/gtkaccount.c:894
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:900
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:906
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#  Use Environmental Settings
-#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "naudoti aplinkos nuostatas"
-
-#. 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.
-#: ../gtk/gtkaccount.c:951
-msgid "If you look real closely"
-msgstr "Jei pažiūrėtumėte tikrai iš arti,"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:954
-msgid "you can see the butterflies mating"
-msgstr "galėtumėte matyti besiporuojancius drugelius"
-
-#: ../gtk/gtkaccount.c:975
-msgid "Proxy Options"
-msgstr "Tarpininko parinktys"
-
-#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "Tarpininko _tipas:"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_Mazgas:"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "_Prievadas:"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "_Vartotojo vardas:"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "_Slaptažodis:"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "Pridėti paskyrą"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "_Pagrindinės nuostatos"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "Papildomos _nuostatos"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
-msgid "Register"
-msgstr "Registruotis"
-
-#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
-msgid "Enabled"
-msgstr "Įjungta"
-
-#: ../gtk/gtkaccount.c:1961
-msgid "Protocol"
-msgstr "Protokolas"
-
-#: ../gtk/gtkaccount.c:2133
-msgid ""
-"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-"<span size='larger' weight='bold'>Sveikiname pradėjus naudoti Gaim!</span>\n"
-"\n"
-"Jūs neturite nustatytų paskyrų.  Norėdami su Gaim prisijungti, paspauskite "
-"<b>„Pridėti“</b> mygtuką žemiau ir sukonfigūruokite pirmąją savo paskyrą.  "
-"Jei norite, kad Gaim prisijungtų prie daugiau paskyrų, paspauskite <b>"
-"„Pridėti“</b> daugiau kartų ir sukonfigūruokite visas paskyras.\n"
-"\n"
-"Vėliau galite sugrįžti į šį langą sukurti, keisti, ar pašalinti paskyrų per "
-"„Paskyros“ -> „Pridėti/Keisti“ meniu bičiulių sąrašo lange."
-
-#: ../gtk/gtkaccount.c:2483
-#, c-format
-msgid "%s%s%s%s wants to add %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."
-
-#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
-msgid "Authorize buddy?"
-msgstr "Ar leisti?"
-
-#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
-msgid "Authorize"
-msgstr "Leisti"
-
-#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
-msgid "Deny"
-msgstr "Drausti"
-
-#: ../gtk/gtkblist.c:709
-msgid "Join a Chat"
-msgstr "Prisijungti prie pokalbio"
-
-#: ../gtk/gtkblist.c:730
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Prašome įvesti atitinkamą informaciją apie pokalbį, prie kurio norite "
-"prisijungti\n"
-
-#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
-msgid "_Account:"
-msgstr "Pas_kyra:"
-
-#  Block button
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Blokuoti"
-
-#  Block button
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr "_Nebeblokuoti"
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "Gauti _informaciją"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "_Siųsti failą"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr "_Nauja reakcija į bičiulį"
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "Žiūrėti žurna_lą"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "Naujas alternatyvusis vardas..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "N_aujas alternatyvusis vardas..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "_Pašalinti"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "Įtraukti _bičiulį"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "Įt_raukti pokalbių kambarį"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "_Pašalinti grupę"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "P_ervadinti"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "Automatiškai prisijungti"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr "_Suskleisti"
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr "Išskl_eisti"
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "/Įrankiai/Išjungti garsus"
-
-#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Šiuo metu Jūs nesate prisijungęs su paskyra, kuri leistų įtraukti šį bičiulį."
-
-#  Buddies menu
-#. Buddies menu
-#: ../gtk/gtkblist.c:2567
-msgid "/_Buddies"
-msgstr "/_Bičiuliai"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Bičiuliai/_Nauja žinutė..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Bičiuliai/Prisijungti prie _pokalbio..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/Bičiuliai/Ga_uti vartotojo informaciją..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/Buddies/_Rodyti vartotojo žurnalus..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Bičiuliai/Rodyti _atsijungusius bičiulius"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Bičiuliai/Rodyti _tuščias grupes"
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Bičiuliai/Rodyti _informaciją apie bičiulius"
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Bičiuliai/Rodyti n_eveiklumo laikus"
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Bičiuliai/_Surikiuoti bičiulius"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Bičiuliai/Pri_dėti bičiulį..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/Bičiuliai/Pridėti pokalbių _kambarį..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/Bičiuliai/Prid_ėti grupę..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/Bičiuliai/Bai_gti"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/_Paskyros"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Accounts/Pridėti\\/Keisti"
-
-#  Tools
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/_Įrankiai"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Įrankiai/_Reakcijos į bičiulius"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/Įrankiai/_Papildiniai"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/Įrankiai/N_uostatos"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/Įrankiai/Pr_ivatumas"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/Įrankiai/_Failų perdavimas"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/Įrankiai/_Kambarių sąrašas"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/Įrankiai/Sistemos žurna_las"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/Tools/Išjungti gar_sus"
-
-#  Help
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/Pa_galba"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/Pagalba/_Žinynas internete"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/Pagalba/_Derinimo langas"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/Pagalba/_Apie"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Abonentas:</b> %s"
-
-#: ../gtk/gtkblist.c:2722
-msgid "Buddy Alias"
-msgstr "Alternatyvusis bičiulio vardas"
-
-#: ../gtk/gtkblist.c:2743
-msgid "Logged In"
-msgstr "Prisijungęs"
-
-#: ../gtk/gtkblist.c:2789
-msgid "Last Seen"
-msgstr "Paskutinį kartą matytas"
-
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1401
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
-#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
-#: ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Atsijungęs"
-
-#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "Aprašymas"
-
-#: ../gtk/gtkblist.c:2809
-msgid "Spooky"
-msgstr "Vaiduokliškas"
-
-#: ../gtk/gtkblist.c:2811
-msgid "Awesome"
-msgstr "Stulbinantis"
-
-#: ../gtk/gtkblist.c:2813
-msgid "Rockin'"
-msgstr "Pavarantis"
-
-#: ../gtk/gtkblist.c:3302
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Neveiklus %d val. %02d min. "
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "Neveiklus %d min. "
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "/Bičiuliai/Nauja žinutė..."
-
-#  Make menu items sensitive/insensitive where appropriate
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/Bičiuliai/Prisijungti prie pokalbio..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/Bičiuliai/Gauti vartotojo informaciją..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/Bičiuliai/Pridėti bičiulį..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/Bičiuliai/Pridėti pokalbių kambarį..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/Bičiuliai/Pridėti grupę..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/Įrankiai/Reakcijos į bičiulius"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/Įrankiai/Privatumas"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/Įrankiai/Kambarių sąrašas"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d neperskaityta žinutė iš %s\n"
-msgstr[1] "%d neperskaitytos žinutės iš %s\n"
-msgstr[2] "%d neperskaitytų žinučių iš %s\n"
-
-#: ../gtk/gtkblist.c:3654
-msgid "Manually"
-msgstr "rankiniu būdu"
-
-#: ../gtk/gtkblist.c:3656
-msgid "Alphabetically"
-msgstr "pagal abėcėlę"
-
-#: ../gtk/gtkblist.c:3657
-msgid "By status"
-msgstr "pagal statusą"
-
-#: ../gtk/gtkblist.c:3658
-msgid "By log size"
-msgstr "pagal žurnalo dydį"
-
-#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "%s atsijungė"
-
-#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
-msgid "Connect"
-msgstr "Jungtis"
-
-#: ../gtk/gtkblist.c:3869
-msgid "Re-enable Account"
-msgstr "Iš naujo aktyvuoti paskyrą"
-
-#: ../gtk/gtkblist.c:3890
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s atsijungė: %s</span>"
-
-#: ../gtk/gtkblist.c:4027
-msgid "<b>Username:</b>"
-msgstr "<b>Vartotojo vardas:</b>"
-
-#: ../gtk/gtkblist.c:4034
-msgid "<b>Password:</b>"
-msgstr "<b>Slaptažodis:</b>"
-
-#: ../gtk/gtkblist.c:4045
-msgid "_Login"
-msgstr "_Prisijungti"
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/Paskyros"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-"<span size='larger' weight='bold'>Sveikiname pradėjus naudoti Gaim!</span>\n"
-"\n"
-"Jūs neturite aktyvuotų paskyrų.  Aktyvuokite savo paskyras lange <b>„Paskyros“</b>, pasiekiamame per „Paskyros“ -> „Pridėti/Keisti“ meniu bičiulių sąrašo lange.  Aktyvavę paskyras, galėsite prisijungti, nustatyti savo būseną ir šnekėtis su draugais."
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Bičiuliai/Rodyti atsijungusius bičiulius"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Bičiuliai/Rodyti tuščias grupes"
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Bičiuliai/Rodyti informaciją apie bičiulius"
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/Bičiuliai/Rodyti neveiklumo laikus"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "Bičiuliai"
-
-#: ../gtk/gtkblist.c:5207
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Prašome įvesti prisijungimo vardą asmens, kurį norite įtraukti į savo "
-"bičiulių sąrašą. Papildomai galite alternatyvųjį vardą. Kur galima, "
-"alternatyvusis vardas bus rodomas vietoje prisijungimo vardo.\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupė:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr "Šis protokolas nepalaiko pokalbių kambarių."
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Šiuo metu nesate prisijungęs su jokiu pokalbių kambarius palaikančiu "
-"protokolu."
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Prašome įvesti alternatyvųjį vardą ir kitą informaciją apie pokalbių "
-"kambarį, kurį norite įtraukti į bičiulių sąrašą.\n"
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "Prašome įvesti pridedamos grupės pavadinimą."
-
-#: ../gtk/gtkblist.c:6299
-msgid "<GaimMain>/Accounts/"
-msgstr "<GaimMain>/Paskyros"
-
-#: ../gtk/gtkblist.c:6324
-msgid "_Edit Account"
-msgstr "K_eisti paskyrą..."
-
-#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr "Veiksmų nėra"
-
-#: ../gtk/gtkblist.c:6371
-msgid "_Disable"
-msgstr "_Deaktyvuoti"
-
-#: ../gtk/gtkblist.c:6383
-msgid "Enable Account"
-msgstr "Aktyvuoti paskyrą"
-
-#: ../gtk/gtkblist.c:6389
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr "<GaimMain>/Paskyros/Aktyvuoti paskyrą"
-
-#  Tools
-#: ../gtk/gtkblist.c:6438
-msgid "/Tools"
-msgstr "/Įrankiai"
-
-#  set the Show Offline Buddies option. must be done
-#  * after the treeview or faceprint gets mad. -Robot101
-#: ../gtk/gtkblist.c:6508
-msgid "/Buddies/Sort Buddies"
-msgstr "/Bičiuliai/Surikiuoti bičiulius"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"Gaim nebebandys prisijungti su šia paskyra, kol nepataisysite klaidos\n"
-"ir iš naujo neaktyvuosite paskyros."
-
-#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "Tas bičiulis nenaudoja to paties protokolo kaip šis pokalbių kambarys."
-
-#: ../gtk/gtkconv.c:786
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Šiuo metu Jūs nesate prisijungęs su jokia paskyra, kuri leistų pakviesti tą "
-"bičiulį."
-
-#: ../gtk/gtkconv.c:839
-msgid "Invite Buddy Into Chat Room"
-msgstr "Pakviesti bičiulį į pokalbių kambarį"
-
-#  Put our happy label in it.
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:869
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Prašom įvesti vartotojo, kurį norite pakviesti, vardą, kartu su neprivaloma "
-"pakvietimo žinute."
-
-#: ../gtk/gtkconv.c:890
-msgid "_Buddy:"
-msgstr "_Bičiulis:"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "Ž_inutė:"
-
-#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "Negalima atidaryti failo."
-
-#: ../gtk/gtkconv.c:973
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Pokalbis su %s</h1>\n"
-
-#: ../gtk/gtkconv.c:997
-msgid "Save Conversation"
-msgstr "Įrašyti pokalbį"
-
-#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "Paieška"
-
-#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "_Ieškoti:"
-
-#: ../gtk/gtkconv.c:1341
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Žurnalų vedimas įjungtas. Būsimos šio pokalbio žinutės bus įvestos į žurnalą."
-
-#: ../gtk/gtkconv.c:1349
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Žurnalų vedimas išjungtas. Būsimos šio pokalbio žinutės nebus įvestos į "
-"žurnalą."
-
-#: ../gtk/gtkconv.c:1617
-msgid "Un-Ignore"
-msgstr "Nebeignoruoti"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Ignore"
-msgstr "Ignoruoti"
-
-#: ../gtk/gtkconv.c:1640
-msgid "Get Away Message"
-msgstr "Gauti pasitraukimo žinutę"
-
-#: ../gtk/gtkconv.c:1663
-msgid "Last said"
-msgstr "Paskutinė žinutė"
-
-#: ../gtk/gtkconv.c:2428
-msgid "Unable to save icon file to disk."
-msgstr "Negalima įrašyti vartotojo paveiksliuko failo į diską."
-
-#: ../gtk/gtkconv.c:2498
-msgid "Save Icon"
-msgstr "Įrašyti vartotojo paveiksliuką"
-
-#: ../gtk/gtkconv.c:2547
-msgid "Animate"
-msgstr "Animuoti"
-
-#: ../gtk/gtkconv.c:2552
-msgid "Hide Icon"
-msgstr "Paslėpti vartotojo paveiksliuką"
-
-#: ../gtk/gtkconv.c:2555
-msgid "Save Icon As..."
-msgstr "Įrasyti vartotojo paveiksliuką kaip..."
-
-#: ../gtk/gtkconv.c:2559
-msgid "Set Custom Icon..."
-msgstr "Nustatyti specialų vartotojo paveiksliuką..."
-
-#: ../gtk/gtkconv.c:2566
-msgid "Remove Custom Icon"
-msgstr "Pašalinti specialų vartotojo paveiksliuką"
-
-#  Conversation menu
-#. Conversation menu
-#: ../gtk/gtkconv.c:2707
-msgid "/_Conversation"
-msgstr "/_Pokalbis"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Pokalbis/_Nauja žinutė..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/Pokalbis/_Ieškoti..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/Pokalbis/Žiūrėti žurna_lą"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/Pokalbis/Įrašyti _kaip..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Pokalbis/Iš_valyti langą"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/Pokalbis/Nusiųsti _failą..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Pokalbis/_Pridėti reakciją į bičiulį..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/Pokalbis/_Gauti informaciją"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/Pokalbis/P akviesti..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/Pokalbis/_Daugiau"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/Pokalbis/Al_ternatyvusis vardas..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/Pokalbis/_Blokuoti..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/Pokalbis/P_ridėti..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/Pokalbis/P_ašalinti..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Pokalbis/_Įterpti saitą..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Pokalbis/Įt_erpti vaizdą..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/Pokalbis/U_žverti"
-
-#  Options
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/P_arinktys"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/Parinktys/Įjungti ž_urnalų vedimą"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/Parinktys/Įjungti gar_sus"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Parinktys/Rodyt_i vartotojo paveiksliuką"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Parinktys/Rodyti forma_to taikymo priemonių juostas"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Parinktys/Rodyti laiko žy_mas"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/Pokalbis/Daugiau"
-
-#  Conversation menu
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/Pokalbis"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/Pokalbis/Rodyti žurnalą"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/Pokalbis/Siųsti failą..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Pokalbis/Pridėti reakciją į bičiulį..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/Pokalbis/Gauti informaciją"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/Pokalbis/Pakviesti..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/Pokalbis/Alternatyvusis vardas..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/Pokalbis/Blokuoti..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/Pokalbis/Pridėti..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/Pokalbis/Pašalinti..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/Pokalbis/Įterpti saitą..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/Pokalbiai/Įterpti vaizdą..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/Parinktys/Įjungti žurnalų vedimą"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/Parinktys/Įjungti garsus"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Parinktys/Rodyti formato taikymo priemonių juostas"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/Parinktys/Rodyti laiko žymas"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Rodyti vartotojo paveiksliuką"
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "Vartotojas rašo..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "Vartotojas kažką parašė, bet toliau neberašo"
-
-#  Build the Send As menu
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "_Siųsti į"
-
-#  Build the Send As menu
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "_Siųsti"
-
-#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
-msgid "Topic:"
-msgstr "Tema:"
-
-#  Setup the label telling how many people are in the room.
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4115
-msgid "0 people in room"
-msgstr "0 žmonių kambaryje"
-
-#  Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d asmuo kambaryje"
-msgstr[1] "%d asmenys kambaryje"
-msgstr[2] "%d asmenų kambaryje"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Renkamas tekstas"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "Nustota rinkti tekstą"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr "Pasakytas vardas"
-
-#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "Neperskaitytos žinutės"
-
-#: ../gtk/gtkconv.c:5876
-msgid "New Event"
-msgstr "Naujas įvykis"
-
-#: ../gtk/gtkconv.c:6997
-msgid "Confirm close"
-msgstr "Patvirtinkite uždarymą"
-
-#: ../gtk/gtkconv.c:7029
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Turite neperskaitytų žinučių. Ar tikrai norite uždaryti langą?"
-
-#: ../gtk/gtkconv.c:7564
-msgid "Close other tabs"
-msgstr "Uždaryti kitas korteles"
-
-#: ../gtk/gtkconv.c:7570
-msgid "Close all tabs"
-msgstr "Uždaryti visas korteles"
-
-#: ../gtk/gtkconv.c:7578
-msgid "Detach this tab"
-msgstr "Atskirti šią kortelę"
-
-#: ../gtk/gtkconv.c:7584
-msgid "Close this tab"
-msgstr "Uždaryti šią kortelę"
-
-#: ../gtk/gtkconv.c:7855
-msgid "Close conversation"
-msgstr "Uždaryti pokalbį"
-
-#: ../gtk/gtkconv.c:8319
-msgid "Last created window"
-msgstr "Paskutiniame sukurtame lange"
-
-#: ../gtk/gtkconv.c:8321
-msgid "Separate IM and Chat windows"
-msgstr "Atskiruose asmeninių pokalbių ir pokalbių kambarių languose"
-
-#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
-msgid "New window"
-msgstr "Naujame lange"
-
-#: ../gtk/gtkconv.c:8325
-msgid "By group"
-msgstr "Grupuoti pagal grupę"
-
-#: ../gtk/gtkconv.c:8327
-msgid "By account"
-msgstr "Grupuoti pagal paskyrą"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "Įrašyti derinimo žurnalą"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr "Priešingai"
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr "Paryškinti rastus rezultatus"
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "T_ik piktogramos"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "_Tik tekstai"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "_Piktogramos ir tekstai"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr "Filtras"
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "Spustelėkite dešinįjį pelės mygtuką kitų parinkčių rodymui."
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "Lygis "
-
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr "Pasirinkite derinimo informacijos filtravimo lygį."
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "Viskas"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "Kiti"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "Perspėjimai"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "Klaidos "
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "Lemtingos klaidos"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "pagrindinis kūrėjas"
-
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
-msgid "developer"
-msgstr "kūrėjas"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "kūrėjas ir svetainės administratorius"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "palaikymas"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "priežiūra ir kokybės kontrolė"
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "perkėlimas į win32"
-
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "prižiūrėtojas"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "libfaim prižiūrėtojas"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hakeris ir negeriantis, nes prie vairo [tingus netikėlis]"
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber kūrėjas"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "pradinis autorius"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Arabų kalba"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "Bulgarų kalba"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Bengalų kalba"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Bosnių kalba"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "Katalonų kalba"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Valenciečių-katalonų kalba"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "Čekų kalba"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Danų kalba"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "Vokiečių kalba"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr "Botijų kalba"
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "Graikų kalba"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "Australų anglų kalba"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "Kanadiečių anglų kalba"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "Britų anglų kalba"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "Ispanų kalba"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "Baskų kalba"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "Persų kalba"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "Suomių kalba"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "Prancūzų kalba"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "Galeganų kalba"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "Gudžaratų kalba"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "Hebrajų kalba"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "Hindi kalba"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "Vengrų kalba"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "Italų kalba"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "Japonų kalba"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "Gruzinų kalba"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "Korėjiečių kalba"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr "Kurdų kalba"
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "Lietuvių kalba"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "Makedoniečių kalba"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "Nepalų kalba"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "Olandų, flamandų kalba"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Norvegų kalba"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "Lenkų kalba"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "Portugalų kalba"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "Brazilų portugalų kalba"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "Rumunų kalba"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "Rusų kalba"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "Serbų kalba"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "Slovakų kalba"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "Slovėnų kalba"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "Albanų kalba"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "Švedų kalba"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "Tamilų kalba"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr "Telugu kalba"
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "Tajų kalba"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "Turkų kalba"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "Vietnamiečių kalba"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M. Thanh ir Gnome-Vi komanda"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "Supaprastinta kinų kalba"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "Tradicinė kinų kalba"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr "Amharų kalba"
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "Apie Gaim"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim yra modulinė pokalbių programa, su kuria galima bendrauti AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
-"Sametime, Bonjour, Zephyr, Gadu-Gadu ir QQ tinkluose – visuose vienu metu.  "
-"Gaim parašyta naudojanat GTK+.<br><br>Jūs galite keisti ir platinti šią "
-"programą GPL (2 ar vėlesnės versijos) sąlygomis.  GPL kopija yra faile "
-"„COPYING“, platinamame kartu su Gaim.  Gaim autorinės teisės priklauso Gaim "
-"autoriams. Faile „COPYRIGHT“ pateiktas pilnas autorių sąrašas. Mes "
-"nepateikiame jokios garantijos šiai programai.<br><br>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #wingaim kanalas serveryje irc.freenode."
-"net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #gaim kanalas serveryje irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:359
-msgid "Current Developers"
-msgstr "Dabartiniai kūrėjai"
-
-#: ../gtk/gtkdialogs.c:374
-msgid "Crazy Patch Writers"
-msgstr "Pakvaišę pataisų rašytojai"
-
-#: ../gtk/gtkdialogs.c:389
-msgid "Retired Developers"
-msgstr "Buvę kūrėjai"
-
-#: ../gtk/gtkdialogs.c:404
-msgid "Current Translators"
-msgstr "Dabartiniai vertėjai"
-
-#: ../gtk/gtkdialogs.c:424
-msgid "Past Translators"
-msgstr "Buvę vertėjai"
-
-#: ../gtk/gtkdialogs.c:442
-msgid "Debugging Information"
-msgstr "Derinimo informacija"
-
-#: ../gtk/gtkdialogs.c:816
-msgid "Get User Info"
-msgstr "Gauti vartotojo informaciją"
-
-#: ../gtk/gtkdialogs.c:818
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Įveskite vardą arba alternatyvųjį vardą asmens, kurio informaciją Jūs norite "
-"pažiūrėti."
-
-#: ../gtk/gtkdialogs.c:907
-msgid "View User Log"
-msgstr "Žiūrėti vartotojo žurnalą"
-
-#: ../gtk/gtkdialogs.c:909
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Įveskite vardą arba alternatyvųjį vardą asmens, kurio žurnalą norite "
-"pažiūrėti."
-
-#: ../gtk/gtkdialogs.c:928
-msgid "Alias Contact"
-msgstr "Alternatyvusis kontakto vardas"
-
-#: ../gtk/gtkdialogs.c:929
-msgid "Enter an alias for this contact."
-msgstr "Įveskite alternatyvųjį vardą šiam kontaktui."
-
-#: ../gtk/gtkdialogs.c:949
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Įveskite alternatyvųjį vardą vartotojui %s."
-
-#: ../gtk/gtkdialogs.c:951
-msgid "Alias Buddy"
-msgstr "Alternatyvusis bičiulio vardas"
-
-#: ../gtk/gtkdialogs.c:970
-msgid "Alias Chat"
-msgstr "Alternatyvusis pokalbių kambario vardas"
-
-#: ../gtk/gtkdialogs.c:971
-msgid "Enter an alias for this chat."
-msgstr "Įveskite alternatyvųjį vardą šiam pokalbių kambariui."
-
-#: ../gtk/gtkdialogs.c:1008
-#, 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] ""
-"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitą šio bičiulio "
-"paskyrą iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
-msgstr[1] ""
-"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitas bičiulio "
-"paskyras iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
-msgstr[2] ""
-"Jūs ruošiatės pašalinti kontaktą su %s ir turintį dar %d kitų bičiulio "
-"paskyrų iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "Pašalinti kontaktą"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "_Pašalinti kontaktą"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr "Jūs ruošiates grupę %s prijungti prie grupės %s. Ar norite tęsti?"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "Sujungti grupes"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "_Sujungti grupes"
-
-#: ../gtk/gtkdialogs.c:1105
-#, 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 ""
-"Jūs ruošiates pašalinti grupę %s ir visus jos narius iš Jūsų bičiulių "
-"sąrašo.  Ar norite tęsti?"
-
-#: ../gtk/gtkdialogs.c:1108
-msgid "Remove Group"
-msgstr "Pašalinti grupę"
-
-#: ../gtk/gtkdialogs.c:1109
-msgid "_Remove Group"
-msgstr "_Pašalinti grupę"
-
-#: ../gtk/gtkdialogs.c:1142
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Jūs ruošiates pašalinti %s iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
-
-#: ../gtk/gtkdialogs.c:1145
-msgid "Remove Buddy"
-msgstr "Pašalinti bičiulį"
-
-#: ../gtk/gtkdialogs.c:1146
-msgid "_Remove Buddy"
-msgstr "_Pašalinti bičiulį"
-
-#: ../gtk/gtkdialogs.c:1167
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "Jūs ruošiates pašalinti pokalbių kambarį %s iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
-
-#: ../gtk/gtkdialogs.c:1170
-msgid "Remove Chat"
-msgstr "Pašalinti pokalbių kambarį"
-
-#: ../gtk/gtkdialogs.c:1171
-msgid "_Remove Chat"
-msgstr "_Pašalinti pokalbių kambarį"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr ""
-"Spustelėkite dešinį pelės mygtuką, kad pamatytumėte kitas neperskaitytas "
-"žinutes...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "Keisti būseną"
-
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2851
-#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
-msgid "Available"
-msgstr "Pasiekiamas"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:226
-#: ../libgaim/protocols/jabber/buddy.c:1407
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4498
-#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3353
-#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
-msgid "Away"
-msgstr "Pasitraukęs"
-
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
-#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
-#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "Nematomas"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr "Rodyti bičiulių sąrašą"
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "Nauja žinutė..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "Išjungti garsus"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr "Mirksėti gavus naujų žinučių"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/gtkdocklet.c:567
-msgid "Quit"
-msgstr "Baigti"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "Nepradėta"
-
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:1397
-#: ../libgaim/protocols/jabber/buddy.c:1414
-#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "Nežinoma"
-
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
-msgid "Finished"
-msgstr "Baigta"
-
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
-msgid "Canceled"
-msgstr "Atšaukta"
-
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "Laukiama perdavimo pradžios"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Failų perdavimai – %d%% iš %d"
-
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "Failų perdavimai"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Gaunama kaip:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Gaunama iš:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>Siunčiama kam:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>Siunčiama kaip:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr "Jokia programa nėra sukonfigūruota atverti šio tipo failą."
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "Failo atvėrimo metu įvyko klaida."
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Programos %s paleidimo klaida: %s"
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr "Programos %s vykdymo klaida"
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr "Procesas grąžino klaidos kodą %d"
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "Eiga"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "Failo pavadinimas"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "Dydis"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "Liko"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "Failo pavadinimas:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "Vietinis failas:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "Greitis:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "Praėjo laiko:"
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "Liko laiko:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "_Uždaryti ši langą pasibaigus visiems failų perdavimams"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "_Pašalinti pabaigtus perdavimus"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "_Informacija apie perdavimą"
-
-#  Resume button
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_Tęsti"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "Nepavyko"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Įdėti kaip gryną _tekstą"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "Atstatyti fo_rmato taikymą"
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "Hipersaito spalva"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "Spalva hipersaitų vaizdavimui."
-
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr "Hipersaito paryškinimo spalva"
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Hipersaito spalva, kai virš jo yra pelės žymeklis."
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "Kopijuoti _el. pašto adresą"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "_Atverti saitą naršyklėje"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "Kopijuoti _saito adresą"
-
-#: ../gtk/gtkimhtml.c:3271
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weigth='bold'>Neatpažintas failo tipas</span>\n"
-"\n"
-"Laikyti, kad failas yra PNG tipo."
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Neatpažintas failo tipas\n"
-"\n"
-"Naudojamas numatytasis tipas PNG."
-
-#: ../gtk/gtkimhtml.c:3287
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Vaizdo įrašymo klaida</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Vaizdo įrašymo klaida\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "Įrašyti vaizdą"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "Įrašyti vai_zdą..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Pasirinkti šriftą"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Pasirinkti teksto spalvą"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Pasirinkti fono spalvą"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Aprašymas"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Prašome įvesti norimo įterpti saito URL ir aprašymą. Aprašymas nėra būtinas."
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Prašome įvesti norimo įterpti saito URL."
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Įterpti saitą"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "Įterpt_i"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Nepavyko išsaugoti vaizdo: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Įterpti vaizdą"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Šis apipavidalinimas neturi šypsenėlių."
-
-#  show everything
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Šypsokis!"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "Pusjuodis"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "Kursyvas"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "Pabraukimas"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Didesnis šrifto dydis"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Mažesnis šrifto dydis"
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Šrifto garnitūras"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Šrifto spalva"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Fono spalva"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Pašalinti formato taikymą"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Įterpti saitą"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Įterpti paveiksliuką"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Įterpti šypsenėlę"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Pokalbis kambaryje %s (%s)</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Pokalbis su %s (%s)</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Sisteminiai įvykiai įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "
-"būsenos pasikeitimus į sistemos žurnalą“."
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Skubiosios žinutės įrašomos į žurnalą, jei įjungta nuostata „Rašyti visas "
-"skubiąsias žinutes į žurnalą“."
-
-#: ../gtk/gtklog.c:338
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Pokalbiai kambariuose įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus pokalbius kambariuoe į žurnalą“.\""
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Žurnalų nerasta"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr "_Naršyti žurnalų aplanką"
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Viso žurnalo dydis:"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "Pokalbiai kambaryje %s"
-
-#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "Pokalbiai su %s"
-
-#  Window **********
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "Sistemos žurnalas"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Daugiau informacijos suteikia `%s -h'.\n"
-
-#: ../gtk/gtkmain.c:346
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Vartojimas: %s [PARINKTIS] ...\n"
-"\n"
-"  -c, --config=KATALOGAS  naudoti KATALOGAS konfigūracinių failų paieškai\n"
-"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
-"  -h, --help              parodyti šią pagalbą ir baigti\n"
-"  -n, --nologin           neprisijungti automatiškai\n"
-"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"
-"                          VARDAS nurodo paskyrą ar paskyras, atskirtas \n"
-"                          kableliais\n"
-"  -v, --version           parodyti šios programos versiją ir baigti\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim 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 gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-"Įvyko Gaim segmentacijos klaida ir pabandyta išvesti atminties išklotinę.\n"
-"Tai yra programos klaida ir atsitiko be jokios Jūsų kaltės.\n"
-"\n"
-"Jeigu Jūs galite atkartoti šią klaidą, prašome informuoti Gaim kūrėjus\n"
-"apie klaidą adresu\n"
-"%sbug.php\n"
-"\n"
-"Įsitikinkite, kad nurodote, ką darėte, kai įvyko klaida ir pridėkite \n"
-"programos steko išklotinę (angl. „backtrace“) iš atminties išklotinės \n"
-"failo.  Jeigu nežinote, kaip gauti programos steko išklotinę, perskaitykite\n"
-"instrukcijas adresu %sgdb.php.\n"
-"\n"
-"Jeigu jums reikia papildomos pagalbos, AIM\n"
-"protokolu parašykite vartotojui SeanEgn arba LSchiere.  Informacija, kaip \n"
-"pasiekti Sean ir Luke kitais protokolais, yra adresu %scontactinfo.php.\n"
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "Atidaryti visas žinutes"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Jūs gavote laišką!</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "Siuntėjas"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s turi %d naują pranešimą."
-msgstr[1] "%s turi %d naujus pranešimus."
-msgstr[2] "%s turi %d naujų pranešimų."
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
-msgid "Search Results"
-msgstr "Paieškos rezultatai"
-
-#: ../gtk/gtknotify.c:899
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "Neteisinga naršyklės komanda „%s“."
-
-#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
-#: ../gtk/gtknotify.c:1054
-msgid "Unable to open URL"
-msgstr "Negalima atverti URL"
-
-#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Programos „%s“ paleidimo klaida: %s"
-
-#: ../gtk/gtknotify.c:1055
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Pasirinkta 'Rankinė' naršyklės komanda, tačiau komanda nenustatyta."
-
-#: ../gtk/gtkplugin.c:264
-msgid "The following plugins will be unloaded."
-msgstr "Šie papildiniai bus iškelti."
-
-#: ../gtk/gtkplugin.c:283
-msgid "Multiple plugins will be unloaded."
-msgstr "Keletas papildinių bus iškelta."
-
-#: ../gtk/gtkplugin.c:285
-msgid "Unload Plugins"
-msgstr "Iškelti papildinius"
-
-#: ../gtk/gtkplugin.c:397
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Autorius:</span>\t%s\n"
-"<span weight=\"bold\">Svetainė:</span>\t\t%s\n"
-"<span weight=\"bold\">Failas:</span>\t        %s"
-
-#: ../gtk/gtkplugin.c:407
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Klaida: %s\n"
-"Patikrinkite, ar papildinio internetinėje svetainėje nėra atnaujinimo.</span>"
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "Konfigūr_uoti papildinį"
-
-#: ../gtk/gtkplugin.c:596
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Informacija apie papildinį</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "Pasirinkite failą"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "Įveskite bičiulį, į kurį reaguoti"
-
-#  "New Buddy Pounce"
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr "Nauja reakcija į bičiulį"
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr "Redaguoti reakciją į bičiulį"
-
-#  Create the "Pounce Who" frame.
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr "Į ką reaguoti"
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "_Bičiulio vardas:"
-
-#  Create the "Pounce When" frame.
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "Reaguoti, kai bičiulis..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "pr_isijungia"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "atsi_jungia"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "_pasitraukia"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "su_grįžta"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "tampa neve_iklus"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "ta_mpa veiklus"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "pradeda rašy_ti"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "trumpam nustoja raš_yti"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "nustoja raš_yti"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "i_šsiunčia žinutę"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "Veiksmas"
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "Atidaryti pokalbių la_ngą"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "_Parodyti pranešimo langą"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Nusiųsti _žinutę"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "_Įvykdyti komandą"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "_Groti garsą"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "Nar_šyti...."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "_Naršyti...."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "Pa_klausyti"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "Reaguoti tik tada, kai aš es_u nepasiekamas"
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "_Reakcija yra pasikartojanti"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Ar tikrai norite pašalinti reakciją į %s nuo %s?"
-
-#  Create the "Pounce When" frame.
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr "Reakcija į"
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "Pasikartojanti reakcija"
-
-#  "New Buddy Pounce"
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "Reakcijos į bičiulius"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s pradėjo Jums rašyti (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "Pradėjęs Jums rašyti %s sustojo (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s prisijungė (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s tapo veiklus (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s sugrįžo (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s nustojo Jums rašyti (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s atsijungė (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s tapo neveiklus (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s pasitraukė. (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s atsiuntė Jums žinutę. (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr "Nežinomas reakcijos veiksmas. Prašome apie tai pranešti!"
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr "Nepavyko išpakuoti šypsenėlių apipavidalinimo failo."
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Pasirinkite norimą naudoti šypsenėlių apipavidalinimą iš sąrašo žemiau. "
-"Nauji apipavidalinimai gali būti įdiegti nutempiant juos pele į "
-"apipavidalinimų sąrašą."
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Piktograma"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Piktograma sistemos juostelėje"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "_Rodyti piktogramą sistemos juostelėje:"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "visada"
-
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
-#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
-#: ../libgaim/plugins/autoreply.c:360
-msgid "Never"
-msgstr "niekada"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "kai yra neperskaitytų žinučių"
-
-#  IM Convo trans options
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "Pokalbių langų slėpimas"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "_Slėpti naujus pokalbius"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
-msgid "When away"
-msgstr "kai pasitraukęs"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Kortelės"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Rodyti pokalbius ir kambarius languose su kor_telėmis"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "Rodyti _uždarymo mygtuką ant kortelių"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "Tal_pinimas:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "viršuje"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "apačioje"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "kairėje"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "dešinėje"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "vertikalus kairėje"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "vertikalus dešinėje"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "Nau_ji pokalbiai:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "Gaunamas žinutes rodyti su _formatavimu"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Rodyt_i vartotojų paveiksliukus"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "Leisti bičiulių pikt_ogramų animaciją"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "I_nformuoti bičiulius, kai jiems rašote"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "_Paryškinti neteisingai parašytus žodžius"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Naudoti _tolygią slinktį"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "Mirginti _langą, kai gaunamos žinutės"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "Numatytasis formato taikymas"
-
-# Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas su protokolais kurie palaiko formato taikymą. :)
-#: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas protokoluose, palaikančiuose "
-"formato taikymą. :)"
-
-#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3701
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP adresas"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN Serveris:"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\\\"italic\\\">Pavyzdžiui: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "_Automatiškai aptikti IP adresą"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "Viešas _IP:"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "Prievadai"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "Rankiniu būdu nurodyti klauso_mų prievadų režį"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "Pirmas prievada_s:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "Paskutinis pri_evadas:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Tarpininkaujantis serveris"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "be tarpininko"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Vartotojas:"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr "SeaMonkey"
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Opera"
-msgstr "Opera"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "GNOME Default"
-msgstr "GNOME numatytasis"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../gtk/gtkprefs.c:1225
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1234
-msgid "Manual"
-msgstr "Rankinis"
-
-#: ../gtk/gtkprefs.c:1287
-msgid "Browser Selection"
-msgstr "Naršyklės išrinkimas"
-
-#: ../gtk/gtkprefs.c:1291
-msgid "_Browser:"
-msgstr "_Naršyklė:"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "_Atverti saitą kame:"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Browser default"
-msgstr "pagal naršyklės nustatymą"
-
-#: ../gtk/gtkprefs.c:1302
-msgid "Existing window"
-msgstr "esamame lange"
-
-#: ../gtk/gtkprefs.c:1304
-msgid "New tab"
-msgstr "naujoje kortelėje"
-
-#: ../gtk/gtkprefs.c:1318
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Rankinis:\n"
-"(%s žymi URL)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "Žurnalo _formatas:"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "Rašyti visus asmeninius pokalbius į žurna_lą"
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr "Raš_yti visus pokalbius kambariuose į žurnalą"
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr "Ra_šyti visus būsenos pasikeitimus į sisteminį žurnalą"
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "Garso išrinkimas"
-
-#: ../gtk/gtkprefs.c:1521
-msgid "Quietest"
-msgstr "Tyliausiai"
-
-#: ../gtk/gtkprefs.c:1523
-msgid "Quieter"
-msgstr "Tyliau"
-
-#: ../gtk/gtkprefs.c:1525
-msgid "Quiet"
-msgstr "Tyliai"
-
-#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normaliai"
-
-#: ../gtk/gtkprefs.c:1529
-msgid "Loud"
-msgstr "Garsiai"
-
-#: ../gtk/gtkprefs.c:1531
-msgid "Louder"
-msgstr "Garsiau"
-
-#: ../gtk/gtkprefs.c:1533
-msgid "Loudest"
-msgstr "Garsiausiai"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Garso grojimo būdas:"
-
-#: ../gtk/gtkprefs.c:1597
-msgid "_Method:"
-msgstr "_Būdas:"
-
-#: ../gtk/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "pyptelėjimai"
-
-#: ../gtk/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "automatinis"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "Command"
-msgstr "komanda"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "No sounds"
-msgstr "be garsų"
-
-#: ../gtk/gtkprefs.c:1613
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Garso k_omanda:\n"
-"(%s reiškia failo vardą)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Garso parinktys"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr "Groti _garsus, kai pokalbio langas yra veikiamasis"
-
-#: ../gtk/gtkprefs.c:1642
-msgid "Enable sounds:"
-msgstr "Įjungti garsus:"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "tik kai esu pasiekiamas"
-
-#: ../gtk/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "tik kai esu nepasiekiamas"
-
-#: ../gtk/gtkprefs.c:1653
-msgid "Volume:"
-msgstr "Garsumas:"
-
-#: ../gtk/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "Garsai ir veiksmai"
-
-#: ../gtk/gtkprefs.c:1732
-msgid "Play"
-msgstr "Groti"
-
-#: ../gtk/gtkprefs.c:1739
-msgid "Event"
-msgstr "Įvykis"
-
-#: ../gtk/gtkprefs.c:1758
-msgid "Test"
-msgstr "Testuoti"
-
-#: ../gtk/gtkprefs.c:1762
-msgid "Reset"
-msgstr "Atstatyti"
-
-#: ../gtk/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Pasirinkti..."
-
-#: ../gtk/gtkprefs.c:1809
-msgid "_Report idle time:"
-msgstr "_Rodyti neveiklumo laiką:"
-
-#: ../gtk/gtkprefs.c:1812
-msgid "From last sent message"
-msgstr "nuo paskutinės išsiųstos žinutės"
-
-#: ../gtk/gtkprefs.c:1814
-msgid "Based on keyboard or mouse use"
-msgstr "pagal klaviatūros ir pelės naudojimą"
-
-#: ../gtk/gtkprefs.c:1823
-msgid "_Auto-reply:"
-msgstr "_Automatinis atsakymas:"
-
-#: ../gtk/gtkprefs.c:1827
-msgid "When both away and idle"
-msgstr "ir kai pasitraukęs, ir kai neveiklus"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1833
-msgid "Auto-away"
-msgstr "Automatinis pasitraukimas"
-
-#: ../gtk/gtkprefs.c:1835
-msgid "Change status when _idle"
-msgstr "Pake_isti būseną, kai neveiklus"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "Kiek minučių turi praeiti iki būsenos keitimo:"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "Pakei_sti būseną į:"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1868
-msgid "Status at Startup"
-msgstr "Būsena programos paleidimo metu"
-
-#: ../gtk/gtkprefs.c:1870
-msgid "Use status from last _exit at startup"
-msgstr "Programos paleidimo metu nustatyti paskutinę prieš tai naudotą būseną"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "Programos paleidimo metu nustatyti būseną:"
-
-#: ../gtk/gtkprefs.c:1914
-msgid "Interface"
-msgstr "Sąsaja"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Smiley Themes"
-msgstr "Šypsenėlių apipavidalinimai"
-
-#: ../gtk/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Garsai"
-
-#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "Tinklas"
-
-#  We use the registered default browser in windows
-#: ../gtk/gtkprefs.c:1923
-msgid "Browser"
-msgstr "Naršyklė"
-
-#: ../gtk/gtkprefs.c:1927
-msgid "Status / Idle"
-msgstr "Būsenos ir neveiklumas"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Leisti visiems vartotojams susisiekti su manimi"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Leisti tik vartotojus iš mano bičiulių sąrašo"
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Leisti žemiau išvardintus vartotojus"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Blokuoti visus vartotojus"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Blokuoti žemiau išvardintus vartotojus"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Privatumas"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Privatumo nuostatų pakeitimai iš karto tampa aktyvūs"
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "Nustatyti privatumo parinktis vartotojui:"
-
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "Leisti vartotoją"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "Įveskite vartotojo, kuriam leidžiate su jumis susisiekti, vardą"
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Prašau įvesti vartotojo, kuriam norite leisti su jumis susisiekti, vardą"
-
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Leisti"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Ar leisti vartotojui %s susisiekti su Jumis?"
-
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Ar esate tikras, kad norite leisti vartotojui %s susisiekti su Jumis?"
-
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "Blokuoti vartotoją"
-
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Įveskite vartotoją, kurį blokuojate, vardą."
-
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Prašau įvesti vartotojo, kurį norite blokuoti, vardą."
-
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "Ar blokuoti vartotoją %s?"
-
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Ar esate tikras, kad norite blokuoti vartotoją %s?"
-
-#  *
-#  * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
-#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "Taip"
-
-#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
-#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-msgid "No"
-msgstr "Ne"
-
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "Vykdyti"
-
-#: ../gtk/gtkrequest.c:1469
-msgid "That file already exists"
-msgstr "Toks failas jau yra"
-
-#: ../gtk/gtkrequest.c:1470
-msgid "Would you like to overwrite it?"
-msgstr "Ar norite jį perrašyti?"
-
-#: ../gtk/gtkrequest.c:1471
-msgid "Overwrite"
-msgstr "Perrašyti"
-
-#: ../gtk/gtkrequest.c:1472
-msgid "Choose New Name"
-msgstr "Parinkti kitą vardą"
-
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
-msgid "Save File..."
-msgstr "Įrašyti failą..."
-
-#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
-msgid "Open File..."
-msgstr "Atverti failą..."
-
-#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
-msgid "Select Folder..."
-msgstr "Pasirinkite aplanką..."
-
-#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
-msgid "_Add"
-msgstr "_Pridėti"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "Kambarių sąrašas"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "_Gauti sąrašą"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "_Pridėti pokalbių kambarį"
-
-#: ../gtk/gtksavedstatuses.c:331
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Ar tikrai norite pašalinti pasirinktas įrašytas būsenas?"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
-msgid "_Use"
-msgstr "Pasi_šalinti"
-
-#: ../gtk/gtksavedstatuses.c:725
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Toks pavadinimas jau yra.  Privalote pasirinkti unikalų pavadinimą."
-
-#: ../gtk/gtksavedstatuses.c:913
-msgid "Different"
-msgstr "Skirtinga"
-
-#: ../gtk/gtksavedstatuses.c:1106
-msgid "_Title:"
-msgstr "_Pavadinimas:"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "_Būsena:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "Kai kurioms paskyroms naudoti kitokią būseną"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "I_šsaugoti ir pasišalinti"
-
-#: ../gtk/gtksavedstatuses.c:1427
-#, c-format
-msgid "Status for %s"
-msgstr "Paskyros %s būsena"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Bičiulis prisijungia"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Bičiulis atsijungia"
-
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "Gauta žinutė"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Gauta žinutė, pradedanti pokalbį"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "Išsiųsta žinutė"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Asmuo ateina į pokalbių kambarį"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Asmuo palieka pokalbių kambarį"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Jūs kalbate pokalbių kambaryje"
-
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Kiti kalba pokalbių kambaryje"
-
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Kas nors pokalbių kambaryje pasako Jūsų vardą"
-
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer klaida"
-
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "Nepavyko paleisti GStreamer."
-
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1021
-#: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2183
-#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
-#: ../libgaim/protocols/sametime/sametime.c:3742
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1621
-msgid "Connecting"
-msgstr "Jungiamasi"
-
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "Laukiama tinklo jungties"
-
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Įkeliant %s įvyko klaida: %s"
-
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "Nepavyko įkelti vaizdo"
-
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Negalima išsiųsti katalogo %s."
-
-#: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"Gaim negali išsiųsti katalogo.  Jeigu norite perduoti jame esančius failus, "
-"persiųskite juos po vieną."
-
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "Jūs atitempėte pele paveiksliuką"
-
-#: ../gtk/gtkutils.c:1441
-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 "Galite šį paveiksliuką nusiųsti kaip failą, įterpti į šią žinutę, arba naudoti kaip paveiksliuką šiam vartotojui."
-
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr "Naudoti kaip vartotojo paveiksliuką"
-
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "Nusiųsti kaip failą"
-
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "Įterpti į žinutę"
-
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Ar norite paveiksliuką naudoti kaip šio vartotojo paveiksliuką?"
-
-#: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr "Galite šį paveiksliuką nusiųsti kaip failą, įterpti į žinutę, arba naudoti kaip šio vartotojo paveiksliuką."
-
-#: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr "Galite šį paveiksliuką įterpti į žinutę arba naudoti kaip šio vartotojo paveiksliuką."
-
-#. 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
-#: ../gtk/gtkutils.c:1511
-msgid "Cannot send launcher"
-msgstr "Negalima išsiųsti paleidyklės"
-
-#: ../gtk/gtkutils.c:1511
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Jūs atitempėte pele darbastalio paleidyklę.  Greičiausiai norite siųsti ne "
-"pačią paleidyklę, o jos paleidžiamą objektą."
-
-#: ../gtk/gtkutils.c:2343
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Failas:</b> %s\n"
-"<b>Failo dydis:</b> %s\n"
-"<b>Vaizdo dydis:</b> %dx%d"
-
-#  Label
-#. Label
-#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
-#: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:618
-msgid "Buddy Icon"
-msgstr "Vartotojo paveiksliukas"
-
-#: ../gtk/gtkutils.c:2653
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-"Failas „%s“ yra per didelis %s.  Pabandykite su mažesniu paveiksliuku.\n"
-
-#: ../gtk/gtkutils.c:2655
-msgid "Icon Error"
-msgstr "Paveiksliuko klaida"
-
-#: ../gtk/gtkutils.c:2656
-msgid "Could not set icon"
-msgstr "Nepavyko nustatyti paveiksliuko"
-
-#: ../gtk/gtkutils.c:2757
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nepavyko atverti failo „%s“: %s"
-
-#: ../gtk/gtkutils.c:2806
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Paveiksliuko „%s“ nepavyko įkelti dėl nežinomos priežasties, turbūt tai yra "
-"sugadintas paveiksliuko failas"
-
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "Įrašyti failą"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "Pasirinkite spalvą"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "Rodyti statistiką"
-
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "Atsakymo tikimybė:"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "Statistikos parinktys"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr "Didžiausias atsakymo laukimo laikas:"
-
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
-msgid "minutes"
-msgstr "minutės"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr "Didžiausias paskutinio pamatymo laiko skirtumas:"
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "Slenkstis:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/cap/cap.c:931
-msgid "Contact Availability Prediction"
-msgstr "Kontaktų prieinamumo nuspėjimas"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr "Kontaktų prieinamumo nuspėjimo papildinys."
-
-#. *  summary
-#: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"Kontaktų prieinamumo papildinys parodo statistinę informaciją apie bičiulius "
-"vartotojų bičiulių sąraše."
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "bičiulis yra neveiklus"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "bičiulis yra pasitraukęs"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "bičiulis yra ilgam pasitraukęs"
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "bičiulis yra mobilus"
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "bičiulis yra atsijungęs"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Kiek taškų skiriama, kai..."
-
-#: ../gtk/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr "Bičiulis su <i>daugiausia taškų</i> turės kontakto pirmenybę.\n"
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Jeigu keli bičiuliai surinko vienodai taškų, pasirinkti paskutinį"
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Kiek taškų skiriama paskyrai..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Kontakto pirmenybė"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "Leidžia keisti reikšmes, susietas su skirtingomis bičiulių būsenomis."
-
-#. *< description
-#: ../gtk/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr "Leidžia keisti reikšmes, susietas su įvairiomis bičiulių būsenomis, naudojamas kontakto pirmenybės skaičiavimuose."
-
-#: ../gtk/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Pokalbių spalvos"
-
-#  IM Convo trans options
-#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "Nustatyti pokalbių lango spalvas"
-
-#: ../gtk/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Klaidų pranešimai"
-
-#: ../gtk/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "Paryškintos žinutės"
-
-#: ../gtk/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "Sisteminės žinutės"
-
-#: ../gtk/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Išsiųstos žinutės"
-
-#: ../gtk/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Gautos žinutės"
-
-#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Pasirinkite sąsajos elemento „%s“ spalvą"
-
-#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1532
-msgid "General"
-msgstr "Bendros parinktys"
-
-#: ../gtk/plugins/convcolors.c:301
-msgid "Ignore incoming format"
-msgstr "Ignoruoti gaunamų žinučių formato taikymą"
-
-#: ../gtk/plugins/convcolors.c:302
-msgid "Apply in Chats"
-msgstr "Taikyti pokalbių kambariuose"
-
-#: ../gtk/plugins/convcolors.c:303
-msgid "Apply in IMs"
-msgstr "Taikyti asmeniniams pokalbiams"
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Pagal pokalbių skaičių"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Pokalbių patalpinimas"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Pokalbių skaičius langui"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Talpinant pagal skaičių atskirti asmeninių pokalbių ir pokalbių kambarių langus"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
-
-#  *< name
-#  *< version
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Papildomi pokalbių talpinimo į langus nustatymai"
-
-#  *< summary
-#  *  description
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr "Apriboja pokalbių skaičių viename lange ir gali suskirstyti asmeninius pokalbius ir pokalbius kambariuose į atskirus langus"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Demonstracinis Gaim papildinys"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Pavyzdinis papildinis, kuris daro šį bei tą – skaitykite jo aprašymą."
-
-#. *  description
-#: ../gtk/plugins/gaiminc.c:96
-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 ""
-"Tai yra tikrai kietas papildinys, mokantis daug ką daryti:\n"
-"- jis Jums pasako, kas parašė programą, kai prisijungiate;\n"
-"- jis apsuka visą gaunamą tekstą\n"
-"- jis nusiunčia žinutę Jūsų bičiuliams iškart, kai jie prisijungia."
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Žymeklio spalva"
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Antrinė žymeklio spalva"
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hipersaito spalva"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView skleidiklio dydis"
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView horizontalus atskyrimo tarpas"
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Pokalbio įrašas"
-
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Pokalbio istorija"
-
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Žurnalų žiūryklė"
-
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Užklausos dialogas"
-
-#  ---------- "Notify For" ----------
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Informacinis dialogas"
-
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView įtraukos skleidikliai"
-
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "Pasirinkite spalvą"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "Pasirinkite sąsajos elemento „%s“ šriftą"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "Pasirinkite sąsajos šriftą"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
-msgstr "GTK+ sąsajos šriftas"
-
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ prieigos klavišų parinktis"
-
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Sąsajos spalvos"
-
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "Sąsajos elementų dydžiai"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Šriftai"
-
-#  Tools
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Įrankiai"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Įrašyti nuostatas į %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "Iš naujo įkelti gtkrc failus"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ apipavidalinimo parinktys"
-
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Leidžia keisti dažnai naudojamas gtkrc parinktis."
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Pelės gestų konfigūracija"
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Vidurinis pelės klavišas"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Dešinysis pelės klavišas"
-
-#  "Visual gesture display" checkbox
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Vizualus gesto pavaizdavimas"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Pelės gestai"
-
-#  *< name
-#  *< version
-#  *  summary
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Leidžia naudoti pelės gestus"
-
-#  *  description
-#. *  description
-#: ../gtk/plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\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 ""
-"Suteikia galimybę naudoti pelės gestus pokalbių kambariuose.\n"
-"Tempkite vidurinį pelės mygtuką šių veiksmų atlikimui:\n"
-"\n"
-"Tempkite žemyn ir į dešinę pokalbio užvėrimui.\n"
-"Tempkite aukštyn ir į kairę persijungimui į prieš tai buvusį pokalbį.\n"
-"Tempkite aukštyn ir į dešinę persijungimui į kitą pokalbį."
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Greitasis bendravimas"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Pasirinkite asmenį iš Jūsų adresų knygos arba sukurkite naują asmens įrašą."
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1760
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
-#: ../libgaim/protocols/qq/sys_msg.c:250
-#: ../libgaim/protocols/sametime/sametime.c:5621
-msgid "Search"
-msgstr "Ieškoti"
-
-#. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
-#: ../gtk/plugins/gevolution/assoc-buddy.c:469
-#: ../gtk/plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Naujas asmuo"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "Pasirinkti bičiulį"
-
-#  Add the label.
-#. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Pasirinkti asmenį iš Jūsų adresų knygos, prie kurio pridėti šį bičiulį, arba "
-"sukurti naują asmenį."
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "Vartotojo _duomenys"
-
-#  "Associate Buddy" button
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "_Susieti bičiulį"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1162
-msgid "None"
-msgstr "niekaip"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Negalima išsiųsti el. laiško"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr "Vykdomasis Evolution failas nerastas PATH kintamajame."
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr "Nerastas šio bičiulio el. pašto adresas."
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "Įtraukti į adresų knygą"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "Nusiųsti el. laišką"
-
-#  Configuration frame
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Evolution integracijos konfigūravimas"
-
-#  Label
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Pasirinkite visas paskyras, į kurias bičiuliai turėtų būti pridedami "
-"automatiškai."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Evolution integracija"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Suteikia integraciją su Evolution"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Prašau žemiau įvesti asmens informaciją."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Prašau žemiau įvesti bičiulio vardą ir paskyros tipą."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Paskyros tipas:"
-
-#  Optional Information section
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Nebūtina informacija:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Vardas:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Pavardė:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "El. pašto adresas:"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK signalų testas"
-
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Testas, skirtas nustatyti, ar visi sąsajos signalai veikia teisingai."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "Istorija"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Suskleisti pasitraukiant"
-
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Suskleidžia bičiulių sąrašą ir Jūsų pokalbius, kai Jūs pasitraukiate."
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Pašto tikrinimas"
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Patikrina, ar negautas naujas vietinis paštas."
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Įdeda mažą langelį į bičiulių sąrašą, kuris parodo, ar turite naujo pašto."
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Skirtukas"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Pokalbių lange nubrėžia naujas žinutes atskiriančią liniją"
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "Skirtuką piešti "
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "_asmeninių pokalbių languose"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "_pokalbių kambarių languose"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Prašoma pradėti muzikinių žinučių seansą.  Spustelėkite MM piktogramą seanso "
-"pradėjimui."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Muzikinių žinučių seansas patvirtintas."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "Muzikinės žinutės"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Komandos vykdymo metu įvyko konfliktas"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "Redaktoriaus vykdymo klaida"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "Įvyko klaida:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "Muzikinių žinučių parinktys"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "Partitūrų redaktoriaus kelias"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Vykdyti"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Muzikinių žinučių papildinys kolektyviniam muzikos kūrimui."
-
-#. *  summary
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Muzikinių žinučių papildinys leidžia keliems vartotojams vienu metu kurti tą "
-"patį muzikinį kūrinį."
-
-#  ---------- "Notify For" ----------
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:670
-msgid "Notify For"
-msgstr "Pranešti apie:"
-
-#: ../gtk/plugins/notify.c:689
-msgid "\t_Only when someone says your screen name"
-msgstr "        tik kai kas n_ors pasako Jūsų vardą"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "_veikiamuosius langus"
-
-#  ---------- "Notification Methods" ----------
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "Pranešimo būdai:"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "p_ridėti eilutę prieš lango pavadinimą:"
-
-#  Count method button
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "į_terpti naujų žinučių skaičių į lango pavadinimą"
-
-#  Count method button
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "įterpti naujų žinučių skaičių į _X sąvybę"
-
-#  Urgent method button
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą"
-
-#  IM Convo trans options
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "P_akelti pokalbių langą"
-
-#  ---------- "Notification Removals" ----------
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:767
-msgid "Notification Removal"
-msgstr "Baigti pranešimą, kai:"
-
-#  Remove on focus button
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:772
-msgid "Remove when conversation window _gains focus"
-msgstr "pokalbių _langas tampa veikiamasis"
-
-#  Remove on click button
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "spragtelėjama ant pokalbių la_ngo"
-
-#  Remove on type button
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "rašo_ma į pokalbių langą"
-
-#  Remove on message send button
-#  Remove on message send button
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "iš_siunčiama žinutė"
-
-#  Remove on conversation switch button
-#  Remove on conversation switch button
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "kai pers_ijungiama į pokalbio kortelę"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "Pranešimai apie žinutes"
-
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Siūlo keletą būdų, kaip Jums pranešti apie neperskaitytas žinutes"
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "Neapdorota įvestis"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Leidžia Jums tiesiogiai įvesti tekstinių protokolų komandas."
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Leidžia Jums siųsti neapdorotą įvesti tekstiniams protokolams (Jabber, MSN, "
-"IRC, TOC). Paspauskite 'Enter' įvedimo langelyje išsiuntimui. Stebėkite "
-"derinimo langą."
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Jūs naudojate Gaim versiją %s.  Naujausia versija yra %s.<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Atnaujinimų žurnalas:</b>\n"
-"%s<br><br>"
-
-#: ../gtk/plugins/relnot.c:80
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Jūs galite parsisiųsti versiją %s iš: <br><a href=\"http://gaim.sourceforge."
-"net/\">http://gaim.sourceforge.net</a>."
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "Pasirodė nauja versija"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Pranešimai apie išleistas naujas versijas"
-
-#  *< name
-#  *< version
-#  *  summary
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Periodiškai patikrina, ar neišleistos naujos versijos"
-
-#  *  description
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Periodiškai patikrina, ar neišleistos naujos versijos ir praneša apie tai "
-"vartotojui kartu su pakeitimų sąrašu."
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "Pakartoto žodžio pataisymas"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "Toks žodis jau yra pataisymų sąraše."
-
-#: ../gtk/plugins/spellchk.c:2180
-msgid "Text Replacements"
-msgstr "Teksto pakeitimai"
-
-#: ../gtk/plugins/spellchk.c:2203
-msgid "You type"
-msgstr "Jūs parašote"
-
-#: ../gtk/plugins/spellchk.c:2217
-msgid "You send"
-msgstr "Jūs išsiunčiate"
-
-#: ../gtk/plugins/spellchk.c:2231
-msgid "Whole words only"
-msgstr "Tik ištisi žodžiai"
-
-#: ../gtk/plugins/spellchk.c:2243
-msgid "Case sensitive"
-msgstr "Skirti mažąsias ir didžiąsias raides"
-
-#: ../gtk/plugins/spellchk.c:2269
-msgid "Add a new text replacement"
-msgstr "Sukurti naują teksto pakeitimą"
-
-#: ../gtk/plugins/spellchk.c:2285
-msgid "You _type:"
-msgstr "Jūs parašo_te:"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "Jūs iš_siunčiate:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2314
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"Tikslus didžiųjų ir mažųjų raidžių sutapimas (panaikinkite žymėjimą "
-"automatiniam apdorojimui)"
-
-#: ../gtk/plugins/spellchk.c:2316
-msgid "Only replace _whole words"
-msgstr "Keisti tik _ištisus žodžius"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "Bendrosios teksto pakeitimo parinktys"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "Leisti paskutinio žodžio pakeitimą išsiuntimo metu"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "Teksto pakeitimas"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Pakeičia tekstą išsiunčiamose žinutėse pagal vartotojo sukurtas taisykles."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Bičiulių juosta"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Horizontalus slenkantis bičiulių sąrašo variantas."
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "Rodyti laiko žymes kas"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "Laiko žymos"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "Rodo iChat stiliaus laiko žymas"
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Kas N minučių rodo iChat stiliaus laiko žymes"
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Laiko žymės formatavimo parinktys"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "Naudoti tradicinį Gaim 24 valandų laiko _formatą"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Rodyti datas..."
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "pokalbiuose:"
-
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "uždelstoms žinutėms"
-
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "uždelstoms žinutėms ir pokalbių kambariams"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Ž_urnaluose:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Žinučių laiko žymių formatai"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Parenka žinučių laiko žymių formatus."
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Šis papildinys leidžia vartotojui pasirinkti pokalbių ir žurnalų žinučių "
-"laiko žymių formatus."
-
-#: ../gtk/plugins/xmppconsole.c:665
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Atsijungė.</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/xmppconsole.c:745 ../gtk/plugins/xmppconsole.c:841
-#: ../gtk/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "XMPP pultas"
-
-#  Set up stuff for the account box
-#: ../gtk/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "Paskyra:"
-
-#: ../gtk/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Neprisijungta prie XMPP</font>"
-
-#: ../gtk/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "Įterpti <iq/> strofą."
-
-#: ../gtk/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "Įterpti <presence/> strofą."
-
-#: ../gtk/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "Įterpti <message/> strofą."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr "Siųsti ir gauti neapdorotas XMPP strofas."
-
-#. *  description
-#: ../gtk/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Nepermatomumas:"
-
-#  IM Convo trans options
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Pokalbių langai"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "Pokalb_ių langų permatotumas"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "Rodyti šliaužiklio juo_stą pokalbių lange"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Aktyvavus pokalbių langą pašalinti jo permatomumą"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Visada viršuje"
-
-#  Buddy List trans options
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Bičiulių sąrašo langas"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "_Bičiulių sąrašo lango permatomumas"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Aktyvavus bičiulių sąrašo langą pašalinti jo permatomumą"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Permatomumas"
-
-#  *< name
-#  *< version
-#  *  summary
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Kintamas permatumomas bičiulių sąrašo ir pokalbių langams."
-
-#  *  description
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Šis papildinys suteikia reguliuojamą alfa permatomumą pokalbių ir bičiulių "
-"sąrašo langams.\n"
-"\n"
-"* Pastaba: šis papildinys reikalauja Windows 2000 arba vėlesnės versijos."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ vykdymo laiko bibliotekos versija"
-
-#  Autostart
-#  Autostart
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "Paleidimas"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr "Paleisti Gaim Window_s paleidimo metu"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr "_Pritvirtinamas bičiulių langas"
-
-#  Blist On Top
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "Lai_kyti bičiulių sąrašo langą viršuje:"
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
-msgstr "tik kai pritvirtintas"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr "Gavus pokalbių žinučių _mirginti langą"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "WinGaim parinktys"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "Specifinės Windows Gaim parinktys."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr ""
-"Leidžia keisti parinktis, kurios yra specifinės Gaim Windows operacinėje "
-"sistemoje, tokias kaip bičiulių sąrašo lango pritvirtinimas."
-
-#: ../libgaim/account.c:769
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "„Lastlog“ papildinys."
+
+#: ../libpurple/account.c:777
 msgid "accounts"
 msgstr "paskyros"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:923
 msgid "Password is required to sign on."
 msgstr "Prisijungimui būtinas slaptažoidis."
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Įveskite %s (%s) slaptažodį"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:955
 msgid "Enter Password"
 msgstr "Įveskite slaptažodį"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:960
 msgid "Save password"
 msgstr "Išsaugoti slaptažodį"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:994 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Trūksta %s protokolo papildinio"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1317
+#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "New passwords do not match."
 msgstr "Nauji slaptažodžiai nesutampa."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1163
 msgid "Fill out all fields completely."
 msgstr "Pilnai užpildykite visus laukus."
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1186
 msgid "Original password"
 msgstr "Pradinis slaptažodis"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1193
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1200
 msgid "New password (again)"
 msgstr "Naujas slaptažodis (vėl)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1206
 #, c-format
 msgid "Change password for %s"
 msgstr "Keisti %s slaptažodį"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1214
 msgid "Please enter your current password and your new password."
 msgstr "Prašome įvesti Jūsų pradinį slaptažodį ir Jūsų naują slaptažodį."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1244
 #, c-format
 msgid "Change user information for %s"
 msgstr "Pakeisti vartotojo %s informaciją"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Nustatyti vartotojo informaciją"
 
-#: ../libgaim/blist.c:548
+#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
+#: ../libpurple/protocols/jabber/buddy.c:641
+#: ../libpurple/protocols/jabber/buddy.c:1404
+#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Nežinoma"
+
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
+#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Bičiuliai"
+
+#: ../libpurple/blist.c:550
 msgid "buddy list"
 msgstr "bičiulių sąrašas"
 
-#: ../libgaim/blist.c:1919
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d bičiulis iš %s grupės nebuvo pašalintas, nes grupė priskirta paskyrai, "
-"kuri yra neaktyvi arba su ja neprisijungta.  Bičiulis ir grupė nebuvo "
-"pašalinti.\n"
-msgstr[1] ""
-"%d bičiuliai iš %s grupės nebuvo pašalinti, nes grupė priskirta paskyrai, "
-"kuri yra neaktyvi arba su ja neprisijungta.  Bičiuliai ir grupė nebuvo "
-"pašalinti.\n"
-msgstr[2] ""
-"%d bičiulių iš %s grupės nebuvo pašalinta, nes grupė priskirta paskyrai, "
-"kuri yra neaktyvi arba su ja neprisijungta.  Bičiuliai ir grupė nebuvo "
-"pašalinti.\n"
-
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "Grupė nepašalinta"
-
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registracijos klaida"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s prisijungė"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s atsijungė"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Nežinoma klaida"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "Negalima išsiųsti žinutės: ji per ilga."
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Negalima išsiųsti žinutės vartotojui %s."
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr "Žinutė per ilga."
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr "Negalima išsiųsti žinutės."
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1162
 msgid "Send Message"
 msgstr "Nusiųsti žinutę"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1163
 msgid "_Send Message"
 msgstr "Nu_siųsti žinutę"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
 msgstr "%s atėjo į kambarį."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] atėjo į kambarį."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
 msgstr "Dabar esate žinomas kaip %s"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s dabar yra žinomas kaip %s"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1767
 #, c-format
 msgid "%s left the room."
 msgstr "%s paliko kambarį."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s paliko kambarį (%s)."
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Be vardo"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nepavyko gauti jungties: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Nepavyko gauti vardo: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Nepavyko gauti serverio pavadinimo: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Be vardo"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "Negalima sukurti naujo DNS adresų keitiklio proceso\n"
 
-#: ../libgaim/dnsquery.c:496
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr "Nepavyko išsiųsti užklausos DNS adresų keitiklio procesui\n"
 
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -5937,13 +1662,13 @@
 "Klaida keičiant DNS adresą %s\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Klaida keičiant DNS adresą %s: %d"
 
-#: ../libgaim/dnsquery.c:554
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -5952,20 +1677,20 @@
 "Skaitymo iš DNS adresų keitiklio proceso klaida:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:558
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr "Failo pabaiga skaitymo iš DNS adresų keitiklio proceso metu"
 
-#: ../libgaim/dnsquery.c:735
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Nepavyko sukurti gijos: %s"
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"
 
-#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5974,7 +1699,7 @@
 "%s skaitymo klaida:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5983,7 +1708,7 @@
 "%s rašymo klaida:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5992,39 +1717,39 @@
 "%s prieigos klaida:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:248
 msgid "Directory is not writable."
 msgstr "Į katalogą negalima rašyti."
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
 msgstr "Negalima siųsti 0 baitų dydžio failo."
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:273
 msgid "Cannot send a directory."
 msgstr "Negalima siųsti katalogo."
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:282
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nėra paprastas failas, todėl nebuvo pakeistas.\n"
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:340
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s nori Jums atsiųsti %s (%s)"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s nori Jums atsiųsti failą"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:388
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Ar priimti perduodamą failą iš %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:392
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -6035,133 +1760,133 @@
 "Nutolęs mazgas: %s\n"
 "Nutolęs prievadas: %d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:425
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s siūlo atsiųsti failą %s"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:477
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s nėra teisingas failo vardas.\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:498
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Siūloma nusiųsti %s bičiuliui %s"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:510
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Pradedamas %s gavimas iš %s"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:664
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Failo %s perdavimas baigtas"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:667
 msgid "File transfer complete"
 msgstr "Failo perdavimas baigtas"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1084
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Jūs nutraukėte %s perdavimą"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1089
 msgid "File transfer cancelled"
 msgstr "Failo perdavimas nutrauktas"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1147
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s nutraukė %s perdavimą"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1152
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s nutraukė failo perdavimą"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1209
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Įvyko failo perdavimo bičiuliui %s klaida."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1211
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Įvyko failo gavimo iš %s klaida."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Vykdyti komandą terminale"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Komanda „aim“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Komanda „gg“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Komanda „icq“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Komanda „irc“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Komanda „msnim“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Komanda „sip“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Komanda „xmpp“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Komanda „ysmgr“ universaliųjų adresų apdorojimui, jei aktyvuota."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Komanda „aim“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Komanda „aim“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Komanda „icq“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Komanda „irc“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Komanda „msnim“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Komanda „sip“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Komanda „xmpp“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Komanda „ysmgr“ universaliųjų adresų apdorojimui"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -6169,7 +1894,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „aim“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -6177,7 +1902,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „gg“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -6185,7 +1910,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „icq“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -6193,7 +1918,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „irc“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -6201,7 +1926,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „msnim“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -6209,7 +1934,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „sip“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -6217,7 +1942,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „xmpp“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -6225,7 +1950,7 @@
 "„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „ysmgr“ "
 "universaliuosius adresus."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -6233,65 +1958,65 @@
 "„True“, jeigu komanda, turinti apdoroti šio tipo universaliuosius adresus, "
 "turi būti leidžiama terminale."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „aim“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „gg“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „icq“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „irc“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „msnim“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „sip“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „xmpp“ universaliuosius adresus"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Ar nurodytoji komanda turėtų apdoroti „ysmgr“ universaliuosius adresus"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Žurnalų tvarkytuvė neturi skaitymo funkcijos</font></"
 "b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "Grynasis tekstas"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Senas Gaim formatas"
-
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr "Senasis plokščias formatas"
+
+#: ../libpurple/log.c:732
 msgid "Logging of this conversation failed."
 msgstr "Nepavyko šio pokalbio įrašyti į žurnalą."
 
-#: ../libgaim/log.c:1041
+#: ../libpurple/log.c:1175
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
+#: ../libpurple/log.c:1251
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6300,7 +2025,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATINIS "
 "ATSAKYMAS&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6309,47 +2034,44 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATINIS "
 "ATSAKYMAS&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Negalima rasti žurnalų kelio!</b></font>"
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Negalima perskaityti failo: %s</b></font>"
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATINIS-ATSAKYMAS>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "Nežinoma klaida"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Jūs naudojatės %s, bet šiam papildiniui reikia %s."
 
-#: ../libgaim/plugin.c:434
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr "Šis papildinys nenustatė ID"
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Neatitinka papildinio kontrolinis skaičius %d (turėtų būti %d)"
 
-#: ../libgaim/plugin.c:451
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI versija %d.%d.x neatitinka (turėtų būti %d.%d.x)"
 
-#: ../libgaim/plugin.c:468
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "Papildinys nerealizuoja visų reikalaujamų funkcijų"
 
-#: ../libgaim/plugin.c:533
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -6358,90 +2080,89 @@
 "Reikalautas papildinys %s nerastas. Prašome įdiegti šį papildinį ir bandyti "
 "iš naujo."
 
-#: ../libgaim/plugin.c:538
-msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim papildinio įkėlimo metu įvyko klaidų."
-
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Papildinio įkelti nepavyko"
+
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Reikalauto papildinio %s nepavyko įkelti."
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim negalėjo įkelti Jūsų nurodyto papildinio."
-
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Nepavyko įkelti Jūsų nurodyto papildinio."
+
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Nepavyko iškelti priklausomo papildinio %s."
 
-#: ../libgaim/plugin.c:669
-msgid "Gaim encountered errors unloading the plugin."
-msgstr "Gaim papildinio iškėlimo metu įvyko klaidų."
-
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "Papildinio iškėlimo metu įvyko klaidų."
+
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Automatinis priėmimas"
 
-#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Automatiškai priima failų siuntimus iš pasirinktų vartotojų."
 
-#: ../libgaim/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Automatiškai priimtas failo „%s“ siuntimas iš „%s“ baigtas."
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Automatinis priėmimas baigtas"
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Kai gaunamas failo perdavimo prašymas iš %s"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Nustatyti automatinį prėmimą"
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
 msgid "_Save"
 msgstr "_Įrašyti"
 
-#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
-#: ../libgaim/protocols/oscar/oscar.c:2234
-#: ../libgaim/protocols/oscar/oscar.c:2280
-#: ../libgaim/protocols/oscar/oscar.c:5838
-#: ../libgaim/protocols/oscar/oscar.c:5890
-#: ../libgaim/protocols/oscar/oscar.c:6068
-#: ../libgaim/protocols/oscar/oscar.c:6124
-#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
+#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
+#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
+#: ../libpurple/request.h:1360
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:166
 msgid "Ask"
 msgstr "Paklausti"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:167
 msgid "Auto Accept"
 msgstr "Automatiškai priimti"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Auto Reject"
 msgstr "Automatiškai atmesti"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Autoaccept File Transfers..."
 msgstr "Automatiškai priimti failų perdavimus..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:211
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -6449,11 +2170,11 @@
 "Kelias, kuriame išsaugoti failus\n"
 "(Nurodykite pilną kelią)"
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:216
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatiškai atmesti iš vartotojų, nesančių bičiulių sąraše"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:220
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -6462,15 +2183,15 @@
 "perdavimas\n"
 "(tik jei nevyko pokalbis su siuntėju)"
 
-#: ../libgaim/plugins/autoreply.c:23
+#: ../libpurple/plugins/autoreply.c:23
 msgid "Autoreply"
 msgstr "Automatinis atsakymas"
 
-#: ../libgaim/plugins/autoreply.c:25
+#: ../libpurple/plugins/autoreply.c:25
 msgid "Autoreply for all the protocols"
 msgstr "Automatinis atsakymas visiems pokalbių protokolams"
 
-#: ../libgaim/plugins/autoreply.c:26
+#: ../libpurple/plugins/autoreply.c:26
 msgid ""
 "This plugin lets you set autoreply message for any protocol. You can set the "
 "global autoreply message from the Plugin-options dialog. To set some "
@@ -6486,94 +2207,96 @@
 "nueikite į kortelę „Papildomos nuostatos“ paskyrų redagavimo lange."
 
 #. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
+#: ../libpurple/plugins/autoreply.c:218
 #, c-format
 msgid "Set autoreply message for %s"
 msgstr "Nustatyti automatinio atsakymo žinutę bičiuliui %s"
 
-#: ../libgaim/plugins/autoreply.c:220
+#: ../libpurple/plugins/autoreply.c:220
 msgid "Set Autoreply Message"
 msgstr "Nustatyti automatinio atsakymo žinutę"
 
-#: ../libgaim/plugins/autoreply.c:221
+#: ../libpurple/plugins/autoreply.c:221
 msgid ""
 "The following message will be sent to the buddy when the buddy sends you a "
 "message and autoreply is enabled."
-msgstr "Ši žinutė bus nusiųsta bičiuliui, kai jis atsiunčia jums žinutę ir yra įjungtas automatinis atsakymas."
-
-#: ../libgaim/plugins/autoreply.c:238
+msgstr ""
+"Ši žinutė bus nusiųsta bičiuliui, kai jis atsiunčia jums žinutę ir yra "
+"įjungtas automatinis atsakymas."
+
+#: ../libpurple/plugins/autoreply.c:238
 msgid "Set _Autoreply Message"
 msgstr "Nustatyti _automatinio atsakymo žinutę"
 
-#: ../libgaim/plugins/autoreply.c:249
+#: ../libpurple/plugins/autoreply.c:249
 msgid "Autoreply message"
 msgstr "Automatinio atsakymo žinutė"
 
-#: ../libgaim/plugins/autoreply.c:336
+#: ../libpurple/plugins/autoreply.c:336
 msgid "Send autoreply messages when"
 msgstr "Siųsti automatinio atsakymo žinutes:"
 
-#: ../libgaim/plugins/autoreply.c:340
+#: ../libpurple/plugins/autoreply.c:340
 msgid "When my account is _away"
 msgstr "k_ai esu pasitraukęs"
 
-#: ../libgaim/plugins/autoreply.c:344
+#: ../libpurple/plugins/autoreply.c:344
 msgid "When my account is _idle"
 msgstr "ka_i esu neveiklus"
 
-#: ../libgaim/plugins/autoreply.c:348
+#: ../libpurple/plugins/autoreply.c:348
 msgid "_Default reply"
 msgstr "_numatytasis atsakymas"
 
-#: ../libgaim/plugins/autoreply.c:354
+#: ../libpurple/plugins/autoreply.c:354
 msgid "Status message"
 msgstr "Būsenos žinutė"
 
-#: ../libgaim/plugins/autoreply.c:358
+#: ../libpurple/plugins/autoreply.c:358
 msgid "Autoreply with status message"
 msgstr "Automatinis atsakymas su būsenos žinute: "
 
-#: ../libgaim/plugins/autoreply.c:362
+#: ../libpurple/plugins/autoreply.c:362
 msgid "Always when there is a status message"
 msgstr "visada, kai yra būsenos žinutė"
 
-#: ../libgaim/plugins/autoreply.c:364
+#: ../libpurple/plugins/autoreply.c:364
 msgid "Only when there's no autoreply message"
 msgstr "tik kai nėra automatinio atsakymo žinutės"
 
-#: ../libgaim/plugins/autoreply.c:369
+#: ../libpurple/plugins/autoreply.c:369
 msgid "Delay between autoreplies"
 msgstr "Užlaikymas tarp automatinių atsakymų"
 
-#: ../libgaim/plugins/autoreply.c:373
+#: ../libpurple/plugins/autoreply.c:373
 msgid "_Minimum delay (mins)"
 msgstr "_Minimalus užlaikymas (minutėmis)"
 
-#: ../libgaim/plugins/autoreply.c:377
+#: ../libpurple/plugins/autoreply.c:377
 msgid "Times to send autoreplies"
 msgstr "Kiek kartų siųsti automatinius atsakymus"
 
-#: ../libgaim/plugins/autoreply.c:381
+#: ../libpurple/plugins/autoreply.c:381
 msgid "Ma_ximum count"
 msgstr "Ma_ksimalus kartų skaičius"
 
-#: ../libgaim/plugins/autoreply.c:428
+#: ../libpurple/plugins/autoreply.c:428
 msgid ""
 "I am currently not available. Please leave your message, and I will get back "
 "to you as soon as possible."
 msgstr ""
 "Manęs šiuo metu nėra.  Palik savo žinutę ir aš atsakysiu, kai tik galėsiu."
 
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Notes"
 msgstr "Pastabos"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Įveskite savo pastabas žemiau..."
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:61
 msgid "Edit Notes..."
 msgstr "Redaguoti pastabas..."
 
@@ -6584,20 +2307,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Pastabos apie bičiulius"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr "Saugo pastabas apie konkrečius bičiulius."
 
 #. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Siūlo galimybę saugoti pastabas apie bičiulius iš Jūsų bičiulių sąrašo."
+msgstr ""
+"Siūlo galimybę saugoti pastabas apie bičiulius iš Jūsų bičiulių sąrašo."
 
 #. *< type
 #. *< ui_requirement
@@ -6605,7 +2329,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Šifrų testas"
 
@@ -6613,9 +2337,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Testuoja su Gaim pateikiamus šifrus."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Testuoja su „libpurple“ pateikiamus šifrus."
 
 #. *< type
 #. *< ui_requirement
@@ -6623,7 +2347,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus papildinio pavyzdys"
 
@@ -6631,7 +2355,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus papildinio pavyzdys"
 
@@ -6648,9 +2373,9 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim valdymas komandomis iš failo"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Valdymas failu"
 
 #  *< name
 #  *< version
@@ -6664,50 +2389,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Leidžia valdyti Gaim komandomis, surašytomis faile."
-
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "Leidžia valdyti programą faile surašytomis komandomis."
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
 msgid "Minutes"
 msgstr "Minutės"
 
 #. 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.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
+#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "Neveiklumo meistras"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "Nustatyti abonento neveiklumo laiką"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
 msgid "_Set"
 msgstr "_Nustatyti"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Nėra neveiklių paskyrų."
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "Panaikinti abonento neveiklumo laiko nustatymą"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:202
 msgid "_Unset"
 msgstr "_Panaikinti"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "Nustatyti neveiklumo laiką visoms paskyroms"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Panaikinti neveiklumo laiko nustatymą visoms paskyroms"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Leidžia Jums rankiniu būdu nustatyti Jūsų neveiklumo laiką"
 
@@ -6717,19 +2442,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Testinis IPC klientas"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Patikrina papildinių IPC palaikymą klientams."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
+#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -6743,118 +2468,160 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Testinis IPC serveris"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Patikrina papildinių IPC palaikymą serveriams."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Patikrina papildinių IPC palaikymą serveriams. Priregistruoja IPC komandas."
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "Prisijungimų ir atsijungimų slėpimo parinktys"
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "Mažiausias kambario dydis"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr "Vartotojo neveiklumo laukimo laikas (minutėmis)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:264
+msgid "Join/Part Hiding"
+msgstr "Prisijungimų ir atsijungimų slėpimas"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:267
+msgid "Hides extraneous join/part messages."
+msgstr "Slepia šalutines prisijungimų ir atsijungimų žinutes."
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:269
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr "Šis papildinys paslepia prisijungimų ir atsijungimų žinutes dideliuose kambariuose, išskyrus tų naudotojų, kurie aktyviai dalyvauja pokalbyje."
+
 #. 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.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "Vartotojas atsijungęs."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Nusiųstas automatinis atsakymas:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s atsijungė."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "Viena ar daugiau žinučių galėjo būti nepristatytos gavėjui."
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Jūs buvote atjungtas nuo serverio."
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 "Šiuo metu esate atsijungęs, todėl negausite žinučių, kol neprisijungsite."
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Žinutė neišsiųsta, nes viršytas jos didžiausias leistinas ilgis"
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "Žinutė nebuvo išsiųsta."
 
 #. 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.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Bendros žurnalų skaitymo parinktys"
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Greitas dydžio apskaičiavimas"
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr "Naudoti vardų euristiką"
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Žurnalų katalogas"
 
@@ -6864,19 +2631,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "Žurnalų skaityklė"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Žurnalų žiūryklėje parodo ir kitų pokalbių programų žurnalus."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2134
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6891,12 +2658,12 @@
 "PERSPĖJIMAS: šis papildinys yra vis dar bandomasis ir gali dažnai lūžti.  "
 "Naudokite jį savo rizika!"
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:211
 msgid "Mono Plugin Loader"
 msgstr "Mono papildinių paleidyklė"
 
-#: ../libgaim/plugins/mono/loader/mono.c:215
-#: ../libgaim/plugins/mono/loader/mono.c:216
+#: ../libpurple/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:214
 msgid "Loads .NET plugins with Mono."
 msgstr "Su Mono įkelia .NET papildinius."
 
@@ -6909,18 +2676,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Nauja eilutė"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Prieš rodomą žinutę įterpia naują eilutę"
 
 #. *  summary
-#: ../libgaim/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -6928,16 +2695,16 @@
 "Įterpia naujos eilutės simbolį prieš žinutę, kad jos tekstas būtų po "
 "autoriaus vardu pokalbių lange."
 
-#: ../libgaim/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Atjungtų žinučių imitavimas"
 
-#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Išsaugo žinutes, išsiųstas atsijungusiems bičiuliams, kaip reakcijas į juos."
 
-#: ../libgaim/plugins/offlinemsg.c:95
+#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -6945,7 +2712,7 @@
 "Likusios žinutės bus išsaugotos kaip reakcija į bičiulį.  Galite keisti arba "
 "ištrinti šią reakciją dialoge „Reakcijos į bičiulius“."
 
-#: ../libgaim/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -6954,19 +2721,41 @@
 "„%s“ šiuo metu yra atsijungęs.  Ar norite išsaugoti likusias žinutes kaip "
 "reakciją į bičiulį ir automatiškai jas išsiųsti, kai „%s“ vėl prisijungs?"
 
-#: ../libgaim/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Atjungta žinutė"
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Galite keisti arba ištrinti reakciją dialoge „Reakcijos į bičiulius“."
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#  *
+#  * A wrapper for gaim_request_action() that uses Yes and No buttons.
+#: ../libpurple/plugins/offlinemsg.c:159
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:313
+#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Taip"
+
+#: ../libpurple/plugins/offlinemsg.c:160
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Ne"
+
+#: ../libpurple/plugins/offlinemsg.c:187
 msgid "Save offline messages in pounce"
 msgstr "Išsaugoti atjungtas žinutes reakcijoje"
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:191
 msgid "Do not ask. Always save in pounce."
 msgstr "Neklausti. Visada išsaugoti reakcijoje."
 
@@ -6976,26 +2765,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:588
 msgid "Perl Plugin Loader"
 msgstr "Perl papildinių paleidyklė"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
 msgstr "Suteikia galimybę įkelti Perl papildinius."
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr "Aiškiaregystė"
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr "Išankstinis įeinančių žinučių numatymas"
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -7004,23 +2793,23 @@
 "žinutę.  Ši funkcija veikia AIM, ICQ, Jabber, Sametime ir Yahoo! "
 "protokoluose."
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr "Jaučiate sutrikdymą jėgoje..."
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "Įjungti tik vartotojams iš bičiulių sąrašo"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "Išjungti, kai aš pasitraukęs"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "Rodyti informacinį pranešimą pokalbyje"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:99
 msgid "Raise psychic conversations"
 msgstr "Pakelti nujaučiamų pokalbių langus"
 
@@ -7037,7 +2826,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Signalų testas"
 
@@ -7049,7 +2838,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Testas, skirtas nustatyti, ar visi signalai veikia teisingai."
 
@@ -7066,7 +2856,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Paprastas papildinys"
 
@@ -7078,7 +2868,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Patikrina, ar dauguma dalykų veikia"
 
@@ -7088,7 +2878,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL protokolo palaikymas"
 
@@ -7096,7 +2886,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Suteikia apvalkalą SSL palaikymo bibliotekoms"
 
@@ -7106,7 +2896,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
 msgid "GNUTLS"
 msgstr "GNUTLS biblioteka"
 
@@ -7118,8 +2908,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS pagalba suteikia SSL palaikymą."
 
@@ -7129,7 +2919,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:409
 msgid "NSS"
 msgstr "NSS"
 
@@ -7137,48 +2927,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:412
+#: ../libpurple/plugins/ssl/ssl-nss.c:414
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mozilla NSS pagalba suteikia SSL palaikymą."
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s sugrįžo."
 
-#: ../libgaim/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s pasitraukė."
 
-#: ../libgaim/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s tapo neveiklus."
 
-#: ../libgaim/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s tapo veiklus."
 
-#: ../libgaim/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s prisijungė."
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Informuoti, kai"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "bičiulis išein_a"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "b_ičiulis tampa neveiklus"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Bičiulis pradeda arba baigia seansą"
 
@@ -7195,7 +2986,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Pranešimai apie bičiulių būsenas"
 
@@ -7207,7 +2998,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:145
+#: ../libpurple/plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -7215,15 +3007,15 @@
 "Pokalbių lange praneša apie bičiulio pasitraukimą, grįžimą, tapimą veikliu "
 "ar neveikliu."
 
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/tcl/tcl.c:415
 msgid "Tcl Plugin Loader"
 msgstr "Tcl papildinių paleidyklė"
 
-#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
 msgid "Provides support for loading Tcl plugins"
 msgstr "Suteikia galimybę įkelti Tcl papildinius"
 
-#: ../libgaim/plugins/tcl/tcl.c:481
+#: ../libpurple/plugins/tcl/tcl.c:483
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -7232,16 +3024,35 @@
 "įdiekite „ActiveTCL“ iš http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections\n"
 msgstr ""
 "Nepavyko sukurti klausymo prievado įeinančioms greitųjų žinučių jungtims\n"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nepavyko prisijungti su vietiniu mDNS serveriu.  Ar jis paleistas?"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
+#: ../libpurple/protocols/irc/msgs.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1414
+#: ../libpurple/protocols/novell/novell.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:4520
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
+#: ../libpurple/protocols/yahoo/yahoo.c:3373
+#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
+#: ../pidgin/gtkstatusbox.c:1090
+msgid "Away"
+msgstr "Pasitraukęs"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7252,83 +3063,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolo papildinys"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:474
-#: ../libgaim/protocols/bonjour/bonjour.c:482
-#: ../libgaim/protocols/bonjour/bonjour.c:540
-#: ../libgaim/protocols/silc/silc.c:300
-msgid "Gaim User"
-msgstr "Gaim vartotojas"
+#: ../libpurple/protocols/bonjour/bonjour.c:463
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:528
+msgid "Purple Person"
+msgstr "(nežinomas vardas)"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/silc/silc.c:925
 msgid "Hostname"
 msgstr "Mazgo vardas"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:822
 msgid "First name"
 msgstr "Tikrasis vardas"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/gg/gg.c:617
+#: ../libpurple/protocols/jabber/jabber.c:827
 msgid "Last name"
 msgstr "Pavardė"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:797
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/gg/gg.c:468
+#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:929
 msgid "E-mail"
 msgstr "El. paštas"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:580
 msgid "AIM Account"
 msgstr "AIM paskyra"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:583
 msgid "Jabber Account"
 msgstr "Jabber paskyra"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s uždarė pokalbio langą."
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Nepavyko atidaryti prievado"
 
-#: ../libgaim/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Nepavyko nustatyti jungties parinkčių"
 
-#: ../libgaim/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "Nepavyko susieti jungties su prievadu"
 
-#: ../libgaim/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "Nepavyko nustatyti jungties klausymuisi"
 
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Negalima išsiųsti žinutės ir pradėti pokalbio."
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "Neteisingi tarpininko nustatymai"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7336,306 +3150,333 @@
 "Jūsų pasirinktam tarpininko tipui neteisingai nurodytas mazgo vardas arba "
 "prievado numeris."
 
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Žymės klaida"
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Nepavyko gauti žymės.\n"
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Išsaugoti bičiulių sąrašą..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Jūsų bičiulių sąrašas tuščias, todėl į failą nieko nebuvo įrašyta."
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Negalima atverti failo"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Bičiulių sąrašas sėkmingai išsaugotas!"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Nepavyko įkelti bičiulių sąrašo"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Įkelti bičiulių sąrašą..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Bičiulių sąrašas sėkmingai įkeltas!"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Išsaugoti bičiulių sąrašą..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Užpildykite registracijos formos laukus."
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Slaptažodžiai nesutampa."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Nepavyko registruoti naujos paskyros, nes įvyko klaida.\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Užregistruotas naujas Gadu-Gadu abonentas"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Registracija sėkmingai užbaigta!"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:786
-#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
+#: ../libpurple/protocols/jabber/jabber.c:801
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Pakartotas slaptažodis"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Įveskite dabartinę žymę"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Dabartinė žymė"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registruoti naują Gadu-Gadu abonentą"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Prašome užpildyti tolimesnius laukus"
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
-#: ../libgaim/protocols/oscar/oscar.c:3764
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
+#: ../libpurple/protocols/gg/gg.c:1113
+#: ../libpurple/protocols/jabber/jabber.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Miestas"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Gimimo metai"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Lytis"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Vyras ar moteris"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Vyras"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:643
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Moteris"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Šiuo metu prisijungęs"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Ieškoti bičiulių"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Prašome žemiau įvesti, pagal ką ieškosite"
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Užpildykite laukus."
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Jūsų dabartinis slaptažodis skiriasi nuo nurodytojo."
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Slaptažodis nepakeistas, įvyko klaida.\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Pakeisti Gadu-Gadu paskyros slaptažodį"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Slaptažodis buvo sėkmingai pakeistas!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Prašome įvesti Jūsų dabartinį slaptažodį ir Jūsų naują UIN slaptažodį:"
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Pakeisti Gadu-Gadu slaptažodį"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Pasirinkite pokalbių kambarį bičiuliui %s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Įtraukti į pokalbių kambarį..."
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/gg/gg.c:993
+#: ../libpurple/protocols/jabber/buddy.c:1408
+#: ../libpurple/protocols/novell/novell.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+msgid "Offline"
+msgstr "Atsijungęs"
+
+#: ../libpurple/protocols/gg/gg.c:996
+#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2817
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+msgid "Available"
+msgstr "Pasiekiamas"
+
+#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
+#: ../libpurple/protocols/oscar/oscar.c:2663
+#: ../libpurple/protocols/oscar/oscar.c:3701
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1558
-#: ../libgaim/protocols/jabber/buddy.c:1734
-#: ../libgaim/protocols/oscar/oscar.c:3704
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
+#: ../libpurple/protocols/jabber/buddy.c:1565
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Vardas"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "Gimimo metai"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/oscar/oscar.c:3913
 msgid "Unable to display the search results."
 msgstr "Negalima parodyti paieškos rezultatų."
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr "Viešasis Gadu-Gadu katalogas"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "Paieškos rezultatai"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1202
 msgid "No matching users found"
 msgstr "Ieškotų vartotojų nerasta"
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr "Vartotojų, tenkinančių paieškos kriterijus, nėra."
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
 msgstr "Nepavyko skaityti iš jungties"
 
 #  Buddy List trans options
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr "Bičiulių sąrašas atsisiųstas"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr "Jūsų bičiulių sąrašas atsisiųstas iš serverio."
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr "Bičiulių sąrašas nusiųstas į serverį"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
 msgstr "Jūsų bičiulių sąrašas išsaugotas serveryje."
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
 #  Block button
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
 msgid "Blocked"
 msgstr "Blokuotas"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1631
 msgid "Add to chat"
 msgstr "Įtraukti į pokalbių kambarį"
 
 #  Block button
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1640
 msgid "Unblock"
 msgstr "Nebeblokuoti"
 
 #  Block button
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Block"
 msgstr "Blokuoti"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Chat _name:"
 msgstr "Ka_nalo pavadinimas:"
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1901
 msgid "Chat error"
 msgstr "Pokalbių kambario klaida"
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1902
 msgid "This chat name is already in use"
 msgstr "Toks pokalbių kambario vardas jau yra vartojamas"
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1985
 msgid "Not connected to the server."
 msgstr "Neprisijungta prie serverio."
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2008
 msgid "Find buddies..."
 msgstr "Ieškoti bičiulių..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2014
 msgid "Change password..."
 msgstr "Pakeisti slaptažodį..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2020
 msgid "Upload buddylist to Server"
 msgstr "Nusiųsti bičiulių sąrašą į serverį"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Download buddylist from Server"
 msgstr "Atsisiųsti bičiulių sąrašą iš serverio"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Delete buddylist from Server"
 msgstr "Ištrinti bičiulių sąrašą iš serverio"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Save buddylist to file..."
 msgstr "Įšsaugoti bičiulių sąrašą faile..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Load buddylist from file..."
 msgstr "Įkelti bičiulių sąrašą iš failo..."
 
@@ -7650,122 +3491,147 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolo papildinys"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Populiarus lenkiškas bendravimo tinklas"
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu vartotojas"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1575
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nežinoma komanda: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1283
 #, c-format
 msgid "current topic is: %s"
 msgstr "dabartinė tema yra: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1287
 msgid "No topic is set"
 msgstr "Temos nėra"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Failo perdavimas nepavyko"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr "Gaim negalėjo atverti prievado klausymui."
-
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "Nepavyko atverti prievado klausymui."
+
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "MOTD pavaizdavimo klaida"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Nėra MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Nėra su šia jungtimi susieto MOTD."
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
 msgid "Server has disconnected"
 msgstr "Serveris atsijungė"
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Žiūrėti MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanalas:"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Sla_ptažodis:"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC vardai negali turėti matomų tarpų"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
-#: ../libgaim/protocols/jabber/jabber.c:927
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2183
+#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3721
+#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/yahoo/yahoo.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+msgid "Connecting"
+msgstr "Jungiamasi"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "Nėra SSL palaikymo"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "Nepavyko sukurti jungties"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1265
 msgid "Couldn't connect to host"
 msgstr "Nepavyko prisijungti prie mazgo"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Prisijungimas nepavyko"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL pasisveikinimas nepavyko"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:759
+#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Vartotojai"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:762
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Tema"
 
@@ -7786,207 +3652,215 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:893
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolo papildinys"
 
 #  *  summary
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:894
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Mažiau knisantis IRC protokolo papildinys"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1984
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/jabber.c:1994
+#: ../libpurple/protocols/msn/msn.c:2099
+#: ../libpurple/protocols/oscar/oscar.c:6621
+#: ../libpurple/protocols/qq/qq.c:746
+#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Serveris"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
+#: ../libpurple/protocols/oscar/oscar.c:6624
+#: ../libpurple/protocols/qq/qq.c:749
+#: ../libpurple/protocols/sametime/sametime.c:5711
+#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Prievadas"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:919
 msgid "Encodings"
 msgstr "Koduotės"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:782
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/jabber/jabber.c:797
+#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:923
 msgid "Username"
 msgstr "Vartotojo vardas"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
+#: ../libpurple/protocols/silc/silc.c:927
 msgid "Real name"
 msgstr "Tikras vardas"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Use SSL"
 msgstr "Naudoti SSL"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:180
 msgid "Bad mode"
 msgstr "Bloga būsena"
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:191
 #, c-format
 msgid "You are banned from %s."
 msgstr "Jums uždrausta prisijungti prie kanalo %s."
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Banned"
 msgstr "Uždrausta prisijungti prie kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:209
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 "Negalima uždrausti %s prisijungti prie kanalo, nes draudimų sąrašas pilnas"
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:290
 msgid " <i>(ircop)</i>"
 msgstr "<i>(IRC operatorius)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:291
 msgid " <i>(identified)</i>"
 msgstr "<i>(identifikavęsis)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Vardas"
 
-#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Kanaluose"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:323
 msgid "Idle for"
 msgstr "Neveiklus jau"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:326
 msgid "Online since"
 msgstr "Prisijungęs nuo"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Aprašantis būdvardis:</b>"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "Glorious"
 msgstr "Šlovingas"
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:406
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s pakeitė temą į: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ištrynė temą."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:416
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanalo %s tema: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:434
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Nežinomas pranešimas „%s“"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:435
 msgid "Unknown message"
 msgstr "Nežinoma pranešimas"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim nusiuntė pranešimą, kurio IRC serveris nesuprato."
-
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:435
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC serveris gavo nesuprantamą pranešimą."
+
+#: ../libpurple/protocols/irc/msgs.c:456
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Vartotojai, esantys %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:553
 msgid "Time Response"
 msgstr "Laiko atsakas"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:554
 msgid "The IRC server's local time is:"
 msgstr "IRC serverio vietinis laikas yra:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:565
 msgid "No such channel"
 msgstr "Tokio kanalo nėra"
 
 #  does this happen?
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "no such channel"
 msgstr "tokio kanalo nėra"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "User is not logged in"
 msgstr "Vartotojas neprisijungęs"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such nick or channel"
 msgstr "Nėra tokio vardo ar kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:604
 msgid "Could not send"
 msgstr "Nepavyko išsiųsti"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:660
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Prisijungimui prie %s būtinas pakvietimas."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:661
 msgid "Invitation only"
 msgstr "Tik su pakvietimais"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:773
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Tave išspyrė %s: %s"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Išspyrė %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Būseną (%s %s) nustatė %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
 msgid "Invalid nickname"
 msgstr "Neteisingas vardas"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:888
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7994,7 +3868,7 @@
 "Serveris atmetė Jūsų pasirinktą vardą.  Greičiausiai jame yra neleistinų "
 "simbolių."
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:893
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -8002,51 +3876,52 @@
 "Serveris atmetė Jūsų pasirinktą abonento vardą.  Greičiausiai jame yra "
 "neleistinų simbolių."
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Cannot change nick"
 msgstr "Negalima pakeisti vardo"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Could not change nick"
 msgstr "Vardo pakeisti nepavyko"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:953
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Jūs palikote kanalą%s%s"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:995
 msgid "Error: invalid PONG from server"
 msgstr "Klaida: neteisingas PONG iš serverio"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:997
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Atsakymas į skimbtelėjimą -- delsa: %lu sek."
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Nepavyko prisijungti prie %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nepavyko prisijungti prie kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1113
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Vardas ar kanalas yra laikinai neprieinamas."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1125
 #, c-format
 msgid "Wallops from %s"
 msgstr "Žinutė (wallops) iš %s"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:118
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;veiksmas&gt;:  atlieka veiksmą."
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:119
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -8054,11 +3929,11 @@
 "away [žinutė]:  nustato pasitraukimp žinutę. Jei žinutė nenurodyta, grįžta "
 "iš pasitraukimo."
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:120
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: nusiunčia chanserv komandą"
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:121
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -8066,7 +3941,7 @@
 "deop &lt;vardas1&gt; [vardas2] ...:  pašalina nurodyto vardo(-ų) "
 "operatoriaus statusą. Tam Jūs turite būti kanalo operatorius."
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -8076,7 +3951,7 @@
 "kalbėjimo teisę, taip užkertant kelią jam kalbėti, jei kanalas yra "
 "prižiūrimas (+m). Tam Jūs turite būti kanalo operatorius."
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -8084,7 +3959,7 @@
 "invite &lt;vardas&gt; [room]:  pakviesti vartotoją su nurodytu vardu į "
 "nurodytą arba dabartinį kanalą."
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -8093,7 +3968,7 @@
 "prie vieno ar daugiau kanalų, papildomai kiekvienam iš jų nurodant po raktą, "
 "jei reikia."
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -8102,7 +3977,7 @@
 "prisijungti prie vieno ar daugiau kanalų, papildomai kiekvienam iš jų "
 "nurodant po raktą, jei reikia."
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -8110,7 +3985,7 @@
 "kick &lt;vardas&gt; [pranešimas]:  išspirti vartotoją su nurodytu vardu iš "
 "kanalo. Tam Jūs turite būti kanalo operatorius."
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -8118,15 +3993,15 @@
 "list:  parodyti tinklo kanalų sąrašą. <i>Dėmesio, kai kurie serveriai gali "
 "Jus už tai atjungti.</i>"
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:128
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;veiksmas&gt;:  įvykdyti veiksmą."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:129
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: nusiunčia memoserv komandą"
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -8134,7 +4009,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vardas|kanalas&gt;:  nustatyti arba "
 "atšaukti kanalo arba vartotojo būseną."
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -8142,20 +4017,20 @@
 "msg &lt;vardas&gt; &lt;žinutė&gt;:  siunčia privačią žinutę vartotojui su "
 "nurodytu vardu.  Rašyti į kanalą su šia komanda negalima."
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanalas]:  parodo šiuo metu kanale esančių vartotojų sąrašą."
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/jabber/jabber.c:1798
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;naujas slapyvardis&gt;:  pakeičia Jūsų vardą"
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:134
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: nusiunčia nickserv komandą"
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -8163,7 +4038,7 @@
 "op &lt;vardas1&gt; [vardas2] ...:  suteikia kanalo operatoriaus statusą "
 "nurodytam vardui(-ams).  Tam Jūs turite būti kanalo operatorius."
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -8171,11 +4046,11 @@
 "operwall &lt;žinutė&gt;:  jei nežinote, kas tai yra, tai greičiausiai ir "
 "negalite šios komandos naudoti."
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: nusiunčia operserv komandą"
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -8183,7 +4058,7 @@
 "part [kanalas] [žinutė]:  išeiti iš dabartinio ar nurodyto kanalo, "
 "neprivalomai nurodant išėjimo žinutę."
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -8191,7 +4066,7 @@
 "ping [vardas]:  nustato, kokia yra vartotojo (arba serverio, jei slapyvardis "
 "nenurodytas) delsa."
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -8199,16 +4074,16 @@
 "query &lt;vardas&gt; &lt;žinutė&gt;: siunčia privačią žinutę vartotojui su "
 "nurodytu vardu.  Rašyti į kanalą su šia komanda negalima."
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [žinutė]:  atsijungia nuo serverio su papildoma neprivaloma žinute."
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  siunčia komandą serveriui be papildomo apdorojimo."
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -8216,24 +4091,24 @@
 "remove &lt;vardas&gt; [žinutė]:  pašalinti vartotoją su nurodytu vardu iš "
 "kanalo. Tam Jūs turite būti kanalo operatorius."
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time:  parodyti dabartinį vietinį IRC serverio laiko."
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nauja tema]:  pažiurėti arba pakeisti kanalo antraštę."
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  keisti arba atstatyti vartotojo būseną."
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [vardas]: nusiųsti vartotojui CTCP VERSION užklausą"
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -8241,7 +4116,7 @@
 "voice &lt;vardas1&gt; [vardas2] ...: suteikti vartotojui(-ams) kalbėjimo "
 "teisę.  Tam Jūs turite būti kanalo operatorius."
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:149
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -8249,57 +4124,58 @@
 "wallops &lt;žinutė&gt;:  jei nežinote, kas tai yra, tai greičiausiai ir "
 "negalite šios komandos naudoti."
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [serveris] &lt;vardas&gt;:  gauti informaciją apie vartotoją."
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:444
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Atsakymo laikas iš %s: %lu sek."
 
 # Būna poroje su „PING“. Nelabai aišku, kaip versti
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "PONG"
 msgstr "PONG"
 
 # CTCP yra akronimas, PING neišversta.
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "CTCP PING reply"
 msgstr "CTCP PING atsakas"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:556
+#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Atjungta."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:51
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Serveris reikalauja TLS/SSL prisijungimui.  Nėra TLS/SSL palaikymo."
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Serveris reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenų "
 "sraute"
 
-#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libpurple/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "Serveris negalėjo nustatyti Jūsų tapatybės be slaptažodžio"
 
-#: ../libgaim/protocols/jabber/auth.c:235
-#: ../libgaim/protocols/jabber/auth.c:236
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:232
+#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/protocols/jabber/auth.c:407
+#: ../libpurple/protocols/jabber/auth.c:408
+#: ../libpurple/protocols/jabber/auth.c:489
+#: ../libpurple/protocols/jabber/auth.c:490
 msgid "Plaintext Authentication"
 msgstr "Tapatybės nustatymas grynu tekstu"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:234
+#: ../libpurple/protocols/jabber/auth.c:409
+#: ../libpurple/protocols/jabber/auth.c:491
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -8307,197 +4183,208 @@
 "Šis serveris reikalauja tapatybės nustatymo grynu tekstu nekoduojamame "
 "duomenų kanale.  Ar leisti tai ir tęsti tapatybės nustatymą?"
 
-#: ../libgaim/protocols/jabber/auth.c:243
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:240
+#: ../libpurple/protocols/jabber/auth.c:417
+#: ../libpurple/protocols/jabber/auth.c:499
 msgid "Server does not use any supported authentication method"
 msgstr "Serveris nenaudoja jokio Gaim palaikomo tapatybės nustatymo metodo"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:330
+#: ../libpurple/protocols/jabber/auth.c:452
+#: ../libpurple/protocols/jabber/auth.c:620
+#: ../libpurple/protocols/jabber/auth.c:754
+#: ../libpurple/protocols/jabber/auth.c:779
+#: ../libpurple/protocols/jabber/auth.c:798
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Neteisingas atsakas iš serverio."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:641
 msgid "Invalid challenge from server"
 msgstr "Neteisingas serverio iššūkis"
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "SASL error"
 msgstr "SASL klaida"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:783
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:790
+#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:796
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Pavardė"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:807
 msgid "Given Name"
 msgstr "Vardas"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:857
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:859
 msgid "Street Address"
 msgstr "Adresas"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:855
 msgid "Extended Address"
 msgstr "Išplėstas adresas"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:863
 msgid "Locality"
 msgstr "Vietovė"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:867
 msgid "Region"
 msgstr "Regionas"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:871
 msgid "Postal Code"
 msgstr "Pašto indeksas"
 
 #  Country
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:869
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:876
+#: ../libpurple/protocols/silc/silc.c:933
 msgid "Country"
 msgstr "Šalis"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:880
-#: ../libgaim/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:906
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "El. paštas"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:928
 msgid "Organization Name"
 msgstr "Organizacijos pavadinimas"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:932
 msgid "Organization Unit"
 msgstr "Organizacijos padalinys"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:941
 msgid "Role"
 msgstr "Pareigos"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:824
+#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/oscar/oscar.c:3751
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:944
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Aprašymas"
+
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Redaguoti Jabber vCard vizitinę kortelę"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
-msgstr "Visi tolimesni įrašai yra neprivalomi.  Įveskite tik tą informaciją, kurią norite viešinti."
-
-#: ../libgaim/protocols/jabber/buddy.c:652
-#: ../libgaim/protocols/jabber/buddy.c:691
+msgstr ""
+"Visi tolimesni įrašai yra neprivalomi.  Įveskite tik tą informaciją, kurią "
+"norite viešinti."
+
+#: ../libpurple/protocols/jabber/buddy.c:654
+#: ../libpurple/protocols/jabber/buddy.c:695
 msgid "Client"
 msgstr "Klientas"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:658
+#: ../libpurple/protocols/jabber/buddy.c:699
 msgid "Operating System"
 msgstr "Operacinė sistema"
 
-#: ../libgaim/protocols/jabber/buddy.c:666
-#: ../libgaim/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/buddy.c:668
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource"
 msgstr "Išteklius"
 
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1226
-#: ../libgaim/protocols/jabber/jabber.c:1236
-#: ../libgaim/protocols/jabber/jabber.c:1246
-#: ../libgaim/protocols/jabber/jabber.c:1256
-#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/buddy.c:670
+#: ../libpurple/protocols/jabber/jabber.c:1232
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
 msgid "Priority"
 msgstr "Prioritetas"
 
-#: ../libgaim/protocols/jabber/buddy.c:804
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Antras vardas"
 
-#: ../libgaim/protocols/jabber/buddy.c:837
-#: ../libgaim/protocols/jabber/jabber.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3763
-#: ../libgaim/protocols/oscar/oscar.c:3776
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adresas"
 
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:851
 msgid "P.O. Box"
 msgstr "Abonentinė pašto dėžutė"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Photo"
 msgstr "Nuotrauka"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Logo"
 msgstr "Logotipas"
 
-#: ../libgaim/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1351
 msgid "Un-hide From"
 msgstr "Nustoti slėpti nuo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1348
+#: ../libpurple/protocols/jabber/buddy.c:1355
 msgid "Temporarily Hide From"
 msgstr "Laikinai paslėpti nuo"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1356
+#: ../libpurple/protocols/jabber/buddy.c:1363
 msgid "Cancel Presence Notification"
 msgstr "Nutraukti informavimą apie buvimą"
 
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1370
 msgid "(Re-)Request authorization"
 msgstr "Pareikalauti (iš naujo) prieigos teisės"
 
@@ -8507,43 +4394,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1372
+#: ../libpurple/protocols/jabber/buddy.c:1379
 msgid "Unsubscribe"
 msgstr "Išsiregistruoti"
 
-#: ../libgaim/protocols/jabber/buddy.c:1405
-#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/buddy.c:1412
+#: ../libpurple/protocols/jabber/jabber.c:1241
 msgid "Chatty"
 msgstr "Plepiai nusiteikęs"
 
-#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
 msgid "Extended Away"
 msgstr "Ilgam pasitraukęs"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1265
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5760
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1418
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Netrukdyti"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libpurple/protocols/jabber/buddy.c:1563
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1560
-#: ../libgaim/protocols/jabber/buddy.c:1739
-#: ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libpurple/protocols/jabber/buddy.c:1567
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "Last Name"
 msgstr "Pavardė"
 
-#: ../libgaim/protocols/jabber/buddy.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:1599
 msgid "The following are the results of your search"
 msgstr "Toliau yra Jūsų paieškos rezultatai"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1667
+#: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -8551,562 +4438,588 @@
 "Ieškokite kontakto įvesdami paieškos požymius pateiktuose laukuose.  "
 "Pastaba: kiekvienas laukas palaiko pakaitos simbolius (%)"
 
-#: ../libgaim/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid "Directory Query Failed"
 msgstr "Katalogo užklausa nepavyko"
 
-#: ../libgaim/protocols/jabber/buddy.c:1688
+#: ../libpurple/protocols/jabber/buddy.c:1695
 msgid "Could not query the directory server."
 msgstr "Nepavyko užklausti katalogo serverio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libpurple/protocols/jabber/buddy.c:1729
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Serverio instrukcijos: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1736
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Užpildykite vieną ar daugiau laukų Jabber vartotojų paieškai."
 
-#: ../libgaim/protocols/jabber/buddy.c:1749
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3708
-#: ../libgaim/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
-#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libpurple/protocols/jabber/buddy.c:1765
+#: ../libpurple/protocols/jabber/buddy.c:1766
 msgid "Search for Jabber users"
 msgstr "Ieškoti Jabber vartotojų"
 
-#: ../libgaim/protocols/jabber/buddy.c:1773
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/sys_msg.c:162
+#: ../libpurple/protocols/qq/sys_msg.c:232
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Ieškoti"
+
+#: ../libpurple/protocols/jabber/buddy.c:1780
 msgid "Invalid Directory"
 msgstr "Neteisingas katalogas"
 
-#: ../libgaim/protocols/jabber/buddy.c:1790
+#: ../libpurple/protocols/jabber/buddy.c:1797
 msgid "Enter a User Directory"
 msgstr "Įveskite vartotojų katalogą"
 
-#: ../libgaim/protocols/jabber/buddy.c:1791
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Select a user directory to search"
 msgstr "Pasirinkite vartotojų katalogą paieškai"
 
-#: ../libgaim/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1801
 msgid "Search Directory"
 msgstr "Paieškos katalogas"
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5228
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Kamba_rys:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "Ra_nkenėlė:"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s yra neteisingas kambario pavadinimas"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Neteisingas kambario pavadinimas"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s yra neteisingas serverio pavadinimas"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Neteisingas serverio pavadinimas"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s yra neteisinga kambario rankenėlė"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Neteisinga kambario rankenėlė"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Konfigūracijos klaida"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:407
+#: ../libpurple/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "Negalima konfigūruoti"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "Kambario konfigūracijos klaida"
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "Šis kambarys neturi konfigūravimo galimybės"
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:472
+#: ../libpurple/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "Registracijos klaida"
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Ne MUC kambariuose vardo keitimas nėra palaikomas"
 
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:680
+#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Kambarių sąrašo gavimo klaida"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Neteisingas serveris"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Įveskite konferencijų serverį"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Pasirinkite konferencijų serverį užklausai"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Rasti kambarius"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "Seanso inicializacijos klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:294
-#: ../libgaim/protocols/jabber/jabber.c:322
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Rašymo klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:390
-#: ../libgaim/protocols/jabber/jabber.c:427
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Skaitymo klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:504
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr "Negalima sukurti jungties"
 
-#: ../libgaim/protocols/jabber/jabber.c:552
-#: ../libgaim/protocols/jabber/jabber.c:895
+#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Neteisingas Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s registracija sėkminga"
 
-#: ../libgaim/protocols/jabber/jabber.c:625
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:641
 msgid "Registration Successful"
 msgstr "Sėkminga registracija"
 
-#: ../libgaim/protocols/jabber/jabber.c:632
-#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Unknown Error"
 msgstr "Nežinoma klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:634
-#: ../libgaim/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:650
 msgid "Registration Failed"
 msgstr "Registracija nepavyko"
 
-#: ../libgaim/protocols/jabber/jabber.c:750
-#: ../libgaim/protocols/jabber/jabber.c:751
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:766
 msgid "Already Registered"
 msgstr "Jau registruota"
 
-#: ../libgaim/protocols/jabber/jabber.c:827
-#: ../libgaim/protocols/oscar/oscar.c:3765
-#: ../libgaim/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "State"
 msgstr "Valstija"
 
-#: ../libgaim/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/jabber/jabber.c:847
 msgid "Postal code"
 msgstr "Pašto indeksas"
 
-#: ../libgaim/protocols/jabber/jabber.c:837
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefonas"
 
-#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:862
 msgid "Date"
 msgstr "Data"
 
-#: ../libgaim/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:870
 msgid "Please fill out the information below to register your new account."
 msgstr "Jūsų naujo abonento registravimui prašome įvesti informaciją žemiau."
 
-#: ../libgaim/protocols/jabber/jabber.c:858
-#: ../libgaim/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:874
 msgid "Register New Jabber Account"
 msgstr "Registruoti naują Jabber abonentą"
 
-#: ../libgaim/protocols/jabber/jabber.c:1025
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+msgid "Register"
+msgstr "Registruotis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Initializing Stream"
 msgstr "Inicializuojamas duomenų srautas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Nustatoma tapatybė"
 
-#: ../libgaim/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Re-initializing Stream"
 msgstr "Iš naujo inicializuojamas duomenų srautas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1109
-#: ../libgaim/protocols/jabber/jabber.c:1479
-#: ../libgaim/protocols/jabber/jabber.c:1520
-#: ../libgaim/protocols/jabber/jabber.c:1554
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/jabber/jabber.c:1115
+#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:5540
 msgid "Not Authorized"
 msgstr "Prieiga nesuteikta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1157
 msgid "Both"
 msgstr "abipusė"
 
-#: ../libgaim/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "patvirtinta Jūsų, laukiama bičiulio patvirtinimo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "bičiulio patvirtinta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1160
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "Jokia (laukiama patvirtinimo iš bičiulio)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "niekaip"
+
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
 msgstr "Registracija"
 
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libpurple/protocols/jabber/jabber.c:1301
 msgid "Password Changed"
 msgstr "Slaptažodis pakeistas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Your password has been changed."
 msgstr "Jūsų slaptažodis pakeistas."
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1307
 msgid "Error changing password"
 msgstr "Slaptažodžio keitimo klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/jabber/jabber.c:1363
 msgid "Password (again)"
 msgstr "Pakartotas slaptažodis"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Change Jabber Password"
 msgstr "Pakeisti Jabber slaptažodį"
 
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
 msgstr "Prašome įvesti Jūsų naują slaptažodį"
 
-#: ../libgaim/protocols/jabber/jabber.c:1373
-#: ../libgaim/protocols/oscar/oscar.c:6355
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/silc/silc.c:1013
 msgid "Set User Info..."
 msgstr "Nustatyti vartotojo informaciją..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6366
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/silc/silc.c:1009
 msgid "Change Password..."
 msgstr "Pakeisti slaptažodį..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1389
 msgid "Search for Users..."
 msgstr "Ieškoti vartotojų..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1467
 msgid "Bad Request"
 msgstr "Bloga užklausa"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Conflict"
 msgstr "Konfliktas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1463
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Feature Not Implemented"
 msgstr "Funkcija neįgyvendinta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "Uždrausta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Gone"
 msgstr "Dingo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Internal Server Error"
 msgstr "Vidinė serverio klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Item Not Found"
 msgstr "Nerastas elementas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Malformed Jabber ID"
 msgstr "Neteisingai suformuotas Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
 msgstr "Nepriimtina"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Allowed"
 msgstr "Neleistina"
 
-#: ../libgaim/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Payment Required"
 msgstr "Reikalingas apmokėjimas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Recipient Unavailable"
 msgstr "Gavėjas neprieinamas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Registration Required"
 msgstr "Rekalinga registracija"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Remote Server Not Found"
 msgstr "Nuotolinis serveris nerastas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "Remote Server Timeout"
 msgstr "Nuotolinio serverio laukimo laikas baigėsi"
 
-#: ../libgaim/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Server Overloaded"
 msgstr "Serveris perkrautas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Service Unavailable"
 msgstr "Paslauga neteikiama"
 
-#: ../libgaim/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Subscription Required"
 msgstr "Reikalinga registracija"
 
-#: ../libgaim/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Unexpected Request"
 msgstr "Nelaukta užklausa"
 
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Authorization Aborted"
 msgstr "Prieigos suteikimas nutrauktas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Incorrect encoding in authorization"
 msgstr "Neteisinga koduotė prieigos suteikime"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "Invalid authzid"
 msgstr "Neteisingas prieigos suteikimo identifikatorius"
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Invalid Authorization Mechanism"
 msgstr "Neteisingas prieigos suteikimo mechanizmas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization mechanism too weak"
 msgstr "Prieigos suteikimo mechanizmas per silpnas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Temporary Authentication Failure"
 msgstr "Laikina prieigos suteikimo nesekmė"
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Authentication Failure"
 msgstr "Prieigos suteikimo nesekmė"
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Bad Format"
 msgstr "Blogas formatas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Bad Namespace Prefix"
 msgstr "Blogas vardų erdvės priešdėlis"
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Resource Conflict"
 msgstr "Išteklių konfliktas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Jungties laukimo laikas baigėsi"
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Host Gone"
 msgstr "Dingo mazgas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Unknown"
 msgstr "Nežinomas mazgas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Improper Addressing"
 msgstr "Neteisingas adresavimas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Invalid ID"
 msgstr "Neteisingas ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Invalid Namespace"
 msgstr "Neteisinga vardų erdvė"
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Invalid XML"
 msgstr "Neteisingas XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Non-matching Hosts"
 msgstr "Neatitinkantys mazgai"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Policy Violation"
 msgstr "Taisyklių pažeidimas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Remote Connection Failed"
 msgstr "Nuotolinė jungtis nepavyko"
 
-#: ../libgaim/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Resource Constraint"
 msgstr "Išteklių apribojimas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Restricted XML"
 msgstr "Apribotas XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "See Other Host"
 msgstr "Aplankykite kitą mazgą"
 
-#: ../libgaim/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "System Shutdown"
 msgstr "Sistemos sustabdymas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Undefined Condition"
 msgstr "Neapibrėžta salyga"
 
-#: ../libgaim/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "Unsupported Encoding"
 msgstr "Nepalaikoma koduotė"
 
-#: ../libgaim/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Stanza Type"
 msgstr "Nepalaikomas posmo tipas"
 
-#: ../libgaim/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Version"
 msgstr "Nepalaikoma versija"
 
-#: ../libgaim/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "XML Not Well Formed"
 msgstr "Neteisingai suformuotas XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Stream Error"
 msgstr "Duomenų srauto klaida"
 
-#: ../libgaim/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1655
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Negalima uždrausti vartotojui %s prisijungti prie kanalo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1675
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Nežinomas statusas: „%s“"
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1680
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Vartotojui %s negalima priskirti statuso „%s“"
 
-#: ../libgaim/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1699
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Nežinomas vaidmuo: „%s“"
 
 #  Data is assumed to be the destination sn
-#: ../libgaim/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Nepavyko nustatyti vaidmens „%s“ vartotojui: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/jabber/jabber.c:1759
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Negalima išspirti vartotojo %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1790
 msgid "config:  Configure a chat room."
 msgstr "config:  konfigūruoti pokalbių kambarį."
 
-#: ../libgaim/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1794
 msgid "configure:  Configure a chat room."
 msgstr "configure:  konfigūruoti pokalbių kambarį."
 
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/jabber/jabber.c:1803
 msgid "part [room]:  Leave the room."
 msgstr "part [kambarys]:  palikti kambarį."
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1808
 msgid "register:  Register with a chat room."
 msgstr "register:  prisiregistruoti pokalbių kambaryje."
 
-#: ../libgaim/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nauja tema]:  žiūrėti arba pakeisti temą."
 
-#: ../libgaim/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1820
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;vartotojas&gt; [kambarys]:  uždrausti vartotojui ateiti į kambarį."
 
-#: ../libgaim/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -9114,7 +5027,7 @@
 "affilliate &lt;vartotojas;&gt; &lt;owner|admin|member|outcast|none&gt;:  "
 "nustatyti vartotojo statusą kambaryje."
 
-#: ../libgaim/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1832
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -9122,21 +5035,21 @@
 "role &lt;vartotojas&gt; &lt;moderator|participant|visitor|none&gt;: "
 "nustatyti vartotojo vaidmenį kambaryje."
 
-#: ../libgaim/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1838
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;vartotojas&gt; [žinutė]:  pakviesti vartotoją į kambarį."
 
-#: ../libgaim/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1844
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;kambarys&gt; [server]:  prisijungti prie pokalbių kambario "
 "nurodytame serveryje."
 
-#: ../libgaim/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1850
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;vartotojas&gt; [room]:  išspirti vartotoją iš kambario."
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -9153,73 +5066,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1962
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokolo papildinys"
 
-#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
 msgstr "Priverstinai naudoti seną 5223 prievado SSL"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Leisti tapatybės nustatymą grynu tekstu nekoduojamame duomenų sraute"
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/jabber.c:2010
+#: ../libpurple/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "Jungties prievadas"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2004
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2014
+#: ../libpurple/protocols/silc/silc.c:1846
 msgid "Connect server"
 msgstr "Prisijungimo serveris"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "Žinutė nuo %s"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s pakeitė temą į: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Žinutės pristatymas gavėjui %s nepavyko: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Jabber pranešimo klaida"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kodas %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "XML sintaksinės analizės klaida"
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:282
 msgid "Unknown Error in presence"
 msgstr "Nežinoma būsenos klaida"
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:357
 msgid "Create New Room"
 msgstr "Sukurti naują kambarį"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:358
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -9227,319 +5140,322 @@
 "Jūs kuriate naują kambarį.  Ar norėtumėte jį sukonfigūruoti, ar priimti "
 "numatytąsias nuostatas?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Konfigūruoti kambarį"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:363
 msgid "_Accept Defaults"
 msgstr "_Priimti numatytąsias nuostatas"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error in chat %s"
 msgstr "Klaida pokalbyje %s"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:404
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Prisijungimo prie pokalbio %s klaida"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Negalima siųsti failo vartotojui %s, nes jo kliento programa nepalaiko failų "
 "perdavimo"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Failo siuntimas nepavyko"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Bičiulių sąrašo suvienodinimo nesklandumai pas vartotoją %s (%s)"
-
-#: ../libgaim/protocols/msn/dialog.c:116
+msgstr "Bičiulių sąrašo suvienodinimo klaida vartotojui %s (%s)"
+
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"Vietiniame sąraše %s yra \"%s\" grupėje, bet ne serverio sąraše. Ar norite "
-"įtraukti šį bičiulį į serverio sąrašą?"
-
-#: ../libgaim/protocols/msn/dialog.c:124
+"Vietiniame sąraše bičiulis %s yra \"%s\" grupėje, bet serverio sąraše jo "
+"nėra. Ar norite įtraukti šį bičiulį į serverio sąrašą?"
+
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s yra vietiniame, bet ne serverio, sąraše.  Ar norite įtraukti šį bičiulį į "
-"vietinį sąrašą?"
-
-#: ../libgaim/protocols/msn/error.c:35
+"Bičiulis %s yra vietiniame sąraše, tačiau jo nėra serverio sąraše.  Ar "
+"norite įtraukti šį bičiulį į serverio sąrašą?"
+
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr "Negalima išanalizuoti pranešimo"
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksės klaida (greičiausiai Gaim riktas)"
 
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Neteisingas el. pašto adresas"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Vartotojas neegzistuoja"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Trūksta viso srities vardo"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Jau prisijungęs"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Neteisingas vartotojo vardas"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Neteisingas patogusis vardas"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Sąrašas pilnas"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Jau yra ten"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Sąraše nėra"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "Vartotojas atsijungęs"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Jau yra būsenoje"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "Jau yra priešingame sąraše"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Per daug grupių"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Neteisinga grupė"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Vartotojo nėra grupėje"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Grupės pavadinimas per ilgas"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Negalima pašalinti nulinės grupės"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Bandyta įtraukti vartotoją į neegzistuojančią grupę"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "Komutatoriaus klaida"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "Nepavyko perduoti informavimo"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Trūksta reikalingų laukų"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Per daug pataikymų į FND"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Neprisijungęs"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Tarnyba laikinai neprieinama"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Duomenų bazės serverio klaida"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Komanda išjungta"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "Failo operacijos klaida"
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "Atminties paskyrimo klaida"
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Serveriui nusiųsta bloga CHL reikšmė"
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Serveris užimtas"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "Serveris neprieinamas"
 
 # Kaip išversti „peer“?
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr "Kitų vartotojų informavimo serveris neprieinamas"
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Prisijungimo prie duomenų bazės klaida"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "Serveris išjungiamas (palikite laivą)"
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Jungties kūrimo klaida"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametrai yra nežinomi arba neleistini"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Negalima rašyti"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Seanso perkrova"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Vartotojas yra per daug aktyvus"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Per daug seansų"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Microsoft .NET pasas nepatikrintas"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr "Blogas draugų failas"
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Netikėta"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Patogusis vardas keičiasi per dažnai"
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "Serveris per daug užimtas"
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "Nepavyko nustatyti tapatybę"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "Atsijungus neleidžiama"
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "Nauji vartotojai nepriimami"
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Vaikiškas Microsoft .NET pasas be tėvų sutikimo"
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Microsoft .NET paso paskyra dar nepatikrinta"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Blogas bilietas"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Nežinomas klaidos kodas %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN klaida: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr "Jūs ką tik išsiuntėte bakstelėjimą!"
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr "Jūsų naujas patogusis MSN vardas yra per ilgas"
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr "Nustatyti Jūsų patogųjį vardą."
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tai yra vardas, kuriuo Jus matys kiti MSN bičiuliai."
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:262
 msgid "Set your home phone number."
 msgstr "Nustatyti Jūsų namų telefono numerį."
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:277
 msgid "Set your work phone number."
 msgstr "Nustatyti Jūsų darbo telefono numerį."
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "Set your mobile phone number."
 msgstr "Nustatyti Jūsų mobilaus telefono numerį."
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Allow MSN Mobile pages?"
 msgstr "Ar leisti mobiliąsias MSN žinutes?"
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:306
 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?"
@@ -9547,306 +5463,318 @@
 "Ar Jūs norite leisti ar neleisti asmenims Jūsų bičiulių sąraše siųsti Jums "
 "mobiliąsias MSN žinutes į Jūsų mobilųjį telefoną ar kitą mobilųjį įrenginį?"
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Allow"
 msgstr "Leisti"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:311
 msgid "Disallow"
 msgstr "Neleisti"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "This Hotmail account may not be active."
 msgstr "Ši Hotmail paskyra gali būti neaktyvi."
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Send a mobile message."
 msgstr "Nusiųsti mobiliąją žinutę"
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:355
 msgid "Page"
 msgstr "Siųsti"
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:518
 msgid "Has you"
 msgstr "Turi Jus"
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2876
+#: ../libpurple/protocols/yahoo/yahoo.c:3480
 msgid "Be Right Back"
 msgstr "tuoj pat grįš"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2823
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
 msgid "Busy"
 msgstr "užimtas"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:556
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "On the Phone"
 msgstr "kalba telefonu"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3501
 msgid "Out to Lunch"
 msgstr "išėjęs papietauti"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:588
 msgid "Set Friendly Name..."
 msgstr "Nustatyti patogųjį vardą..."
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:593
 msgid "Set Home Phone Number..."
 msgstr "Nustatyti namų telefono numerį..."
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:597
 msgid "Set Work Phone Number..."
 msgstr "Nustatyti darbo telefono numerį..."
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:601
 msgid "Set Mobile Phone Number..."
 msgstr "Nustatyti mobilaus telefono numerį..."
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:607
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Leisti arba neleisti mobiliuosius įrenginius..."
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Leisti arba neleisti mobiliąsias žinutes..."
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:622
 msgid "Open Hotmail Inbox"
 msgstr "Atidaryti Hotmail pašto dėžutę"
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:646
 msgid "Send to Mobile"
 msgstr "Siųsti į mobilų įrenginį"
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:656
+#: ../libpurple/protocols/novell/novell.c:3409
 msgid "Initiate _Chat"
 msgstr "_Pradėti pokalbį"
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"SSL palaikymas yra būtinas MSN protokolui. Prašome įdiegti palaikomą SSL "
-"biblioteką. Daugiau informacijos yra http://gaim.sf.net/faq-ssl.php"
-
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:694
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "MSN protokolui SSL palaikymas yra būtinas.  Prašome įdiegti palaikomą SSL biblioteką."
+
+#: ../libpurple/protocols/msn/msn.c:719
 msgid "Failed to connect to server."
 msgstr "Nepavyko prisijungti prie serverio."
 
-#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Profilio gavimo klaida"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
-#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "Bendros parinktys"
+
+#: ../libpurple/protocols/msn/msn.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Amžius"
 
-#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Profesija"
 
-#: ../libgaim/protocols/msn/msn.c:1542
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1214
 msgid "Location"
 msgstr "Vietovė"
 
-#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
-#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
+#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
 msgid "Hobbies and Interests"
 msgstr "Hobi ir interesai"
 
-#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
-#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
-#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
 msgid "A Little About Me"
 msgstr "Truputį apie mane"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1548
 msgid "Social"
 msgstr "Draugijai"
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Šeimyninė padėtis"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1551
 msgid "Interests"
 msgstr "Pomėgiai"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1552
 msgid "Pets"
 msgstr "Naminiai gyvūnai"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1553
 msgid "Hometown"
 msgstr "Gimtasis miestas"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1554
 msgid "Places Lived"
 msgstr "Kur gyveno"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1555
 msgid "Fashion"
 msgstr "Mada"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1556
 msgid "Humor"
 msgstr "Humoras"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1557
 msgid "Music"
 msgstr "Muzika"
 
-#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
-#: ../libgaim/protocols/msn/msn.c:1767
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Mėgstamiausia citata"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Contact Info"
 msgstr "Kontaktinė informacija"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Personal"
 msgstr "Asmeninė"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1579
 msgid "Significant Other"
 msgstr "Antra pusė"
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1580
 msgid "Home Phone"
 msgstr "Namų telefonas"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1581
 msgid "Home Phone 2"
 msgstr "Antras namų telefonas"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1582
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Home Address"
 msgstr "Namų adresas"
 
 # Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1583
 msgid "Personal Mobile"
 msgstr "Asmeninis mobilusis telefonas"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1584
 msgid "Home Fax"
 msgstr "Namų faksas"
 
 # Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1585
 msgid "Personal E-Mail"
 msgstr "Asmeninis el. pašto adresas"
 
 # Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Personal IM"
 msgstr "Asmeninis skubiųjų žinučių kontaktas"
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Anniversary"
 msgstr "Sukaktis"
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Work"
 msgstr "Darbas"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Pareigos"
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Company"
 msgstr "Kompanija"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Skyrius"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1609
 msgid "Profession"
 msgstr "Profesija"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1610
 msgid "Work Phone"
 msgstr "Darbo telefonas"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1611
 msgid "Work Phone 2"
 msgstr "Antras darbo telefonas"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/msn/msn.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Address"
 msgstr "Darbo adresas"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1613
 msgid "Work Mobile"
 msgstr "Darbo mobilusis telefonas"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1614
 msgid "Work Pager"
 msgstr "Darbo pranešimų gaviklis"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work Fax"
 msgstr "Darbo faksas"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Work E-Mail"
 msgstr "Darbo el. pašto adresas"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1617
 msgid "Work IM"
 msgstr "Darbo skubiųjų žinučių kontaktas"
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1618
 msgid "Start Date"
 msgstr "Pradžios data"
 
-#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
-#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
 msgid "Favorite Things"
 msgstr "Mėgstu"
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Last Updated"
 msgstr "Paskutinį kartą atnaujinta"
 
-#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Namų puslapis"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "The user has not created a public profile."
 msgstr "Šis vartotojas nesukūrė viešo profilio."
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1786
 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 "
@@ -9855,16 +5783,14 @@
 "MSN nerado vartotojo profilio. Tai reiškia, kad arba tokio vartotojo nėra, "
 "arba kad vartotojas yra, bet neturi sukūręs viešo profilio."
 
-#: ../libgaim/protocols/msn/msn.c:1812
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-"Gaim negalėjo rasti jokios informacijos vartotojo profilyje. Greičiausiai "
-"vartotojas neegzistuoja."
-
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1790
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr "Nepavyko rasti jokios informacijos vartotojo profilyje. Greičiausiai toks vartotojas neegzistuoja."
+
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profilio URL"
 
@@ -9878,97 +5804,97 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolo papildinys"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2108
 msgid "Use HTTP Method"
 msgstr "Naudoti HTTP metodą"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2113
 msgid "Show custom smileys"
 msgstr "Rodyti nestandartines šypsenėles"
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2121
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: bakstelėti vartotojui, kad atkreipti jo dėmesį"
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Negalima prisijungti"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s nėra teisinga grupė"
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Nežinoma klaida."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s. Vartotojas %s (%s)."
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Negalima pridėti vartotojo paskyroje %s (%s)"
 
 #  Data is assumed to be the destination sn
-#: ../libgaim/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Negalima leisti vartotojo paskyroje %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Negalima pridėti %s, nes Jūsų bičiulių sąrašas pilnas."
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s nėra teisinga Microsoft .NET paso paskyra"
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Tarnyba laikinai neprieinama"
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Negalima pervadinti grupės"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Negalima pašalinti grupės"
 
-#: ../libgaim/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -10000,15 +5926,15 @@
 "\n"
 "Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."
 
-#: ../libgaim/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Rašymo klaida"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Skaitymo klaida"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -10017,214 +5943,210 @@
 "Jungties klaida su severiu %s:\n"
 "%s"
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Mūsų protokolo serveris nepalaiko."
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "HTTP sintaksinės analizės klaida."
 
-#: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3467
-#: ../libgaim/protocols/yahoo/yahoo.c:191
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:201
 msgid "You have signed on from another location."
 msgstr "Jūs prisijungėte iš kitur."
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serveriai yra laikinai neprieinami. Prašome palaukti ir pabandyti iš "
 "naujo."
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN serveriai yra laikinai išjungiami."
 
 #  Data is assumed to be the destination sn
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Negalima patikrinti tapatybės: %s"
 
-#: ../libgaim/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Jūsų MSN bičiulių sąrašas yra laikinai neprieinamas. Prašome palaukti ir "
 "pabandyti iš naujo."
 
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Pasisveikinimas"
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr "Perdavimas"
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Pradedamas tapatybės nustatymas"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Gaunamas slapukas"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Siunčiamas slapukas"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Gaunamas bičiulių sąrašas"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Pasitraukęs nuo kompiuterio"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Kalba telefonu"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Išėjęs papietauti"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Žinutė galėjo būti neišsiųsta, nes baigėsi laukimo laikas:"
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Žinutės negalima išsiųsti esant nematomu:"
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Žinutė neišsiųsta, nes vartotojas atsijungęs:"
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Žinutė neišsiųsta, nes įvyko jungties klaida:"
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Žinutė neišsiųsta, nes bandyta išsiųsti per greitai:"
 
-#: ../libgaim/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Žinutė neišsiųsta, nes įvyko komutatoriaus klaida:"
 
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Žinutė neišsiųsta, nes įvyko nežinoma klaida:"
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s nori bakstelėjo Jums!"
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Vartotojas %s įtraukė Jus į savo bičiulių sąrašo."
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "Vartotojas %s pašalino Jus iš savo bičiulių sąrašo."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Negalima pridėti \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "Nurodytas neteisingas vardas."
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr "Neperduoti reikalingi parametrai"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr "Negalima rašyti į tinklą"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr "Negalima skaityti iš tinklo"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr "Komunikacijos su serveriu klaida"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
 msgstr "Konferencija nerasta"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
 msgstr "Konferencija neegzistuoja"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
 msgstr "Aplankas su tokiu vardu jau yra"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr "Nepalaikoma"
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
 msgstr "Slaptažodžio galiojimo laikas pasibaigė"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Neteisingas slaptažodis"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
 msgstr "Vartotojas nerastas"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
 msgstr "Neveiksni paskyra"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
 msgstr "Serveris negalėjo kreiptis į katalogą"
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr "Jūsų sistemos administratorius išjungė šią operaciją"
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr "Serveris neprieinamas; pabandykite vėliau vėl"
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Negalima pridėti kontakto į tą patį katalogą du kartus"
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr "Negalima pridėti savęs"
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr "Pagrindinis archyvas yra blogai sukonfigūruotas"
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
 msgstr "Neteisingas vardas ar slaptažodis"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Nepavyko atpažinti mazgo, iš kurio prisijungęs vartotojas šiuo vardu"
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -10232,31 +6154,31 @@
 "Jūsų paskyra padaryta neveiksnia dėl per daug kartų neteisingai įvesto "
 "slaptažodžio"
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Negalite du kartus įtraukti to paties asmens į pokalbį"
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Jūs pasiekėte savo leistinų kontaktų skaičiaus ribą."
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr "Jūs įvedėte neteisingą vartotojo vardą"
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
 msgstr "Katalogo atnaujinimo metu įvyko klaida"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr "Nesuderinama protokolo versija"
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
 msgstr "Vartotojas Jus užblokavo"
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -10264,54 +6186,54 @@
 "Ši laikinoji versija neleidžia daugiau kaip dešimčiai vartotojų prisijungti "
 "tuo pačiu metu"
 
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1967
 msgid "The user is either offline or you are blocked"
 msgstr "Vartotojas yra atsijungęs arba Jūs esate užblokuotas"
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1970
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Nežinoma klaida: 0x%X"
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Prisijungimas nepavyko (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Neįmanoma išsiųsti pranešimo. Nepavyko gauti vartotojo detalių (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Negalima pridėti %s į Jūsų bičiulių sąrašą (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libgaim/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Negalima išsiųsti žinutės (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:493
-#: ../libgaim/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Negalima pakviesti vartotojo (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Negalima išsiųsti žinutės vartotojui %s. Nepavyko sukurti konferencijos (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Nepavyko išsiųsti žinutės. Nepavyko sukurti konferencijos (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -10320,7 +6242,7 @@
 "Nepavyko perkelti vartotojo %s į aplanką %s serverio sąraše. Aplanko kūrimo "
 "klaida (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -10329,107 +6251,107 @@
 "Nepavyko įtraukti vartotojo %s į Jūsų bičiulių sąrašą. Aplanko kūrimo "
 "serverio sąraše klaida (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Nepavyko gauti detalių apie vartotoją %s (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Nepavyko įtraukti vartotojo į privatumo sąrašą (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Nepavyko įtraukti %s į draudimo sąrašą (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Nepavyko įtraukti %s į leidimo sąrašą (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Nepavyko pašalinti %s iš privatumo sąrašo (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nepavyko pakeisti privatumo nuostatų serveryje (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Nepavyko sukurti konferencijos (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr "Komunikacijos su serveriu klaida. Jungtis uždaroma."
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonas"
 
 # Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Asmens pavadinimas"
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1505
+#: ../libpurple/protocols/sametime/sametime.c:4121
 msgid "User ID"
 msgstr "Vartotojo ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Pilnas vardas"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konferencija %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr "Neįmanoma sukurti SSL jungties prie serverio."
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "Nustatoma tapatybė..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr "Nepavyko prisijungti prie serverio."
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Laukiama atsako..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s pakviestas į šį pokalbį"
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
 msgstr "Kvietimas į pokalbį"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -10440,16 +6362,16 @@
 "\n"
 "Išsiųstas: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1904
 msgid "Would you like to join the conversation?"
 msgstr "Ar norite prisijungti prie pokalbio?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Jūs buvote atjungtas, kadangi prisijungėte kitoje darbo vietoje."
 
-#: ../libgaim/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -10457,10 +6379,10 @@
 "Atrodo, kad %s yra atsijungęs ir negavo žinutės, kurią ką tik išsiuntėte."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -10468,11 +6390,11 @@
 "Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "
 "norite prisijungti, adresą."
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr "Klaida. SSL palaikymas neįdiegtas."
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ši konferencija uždaryta. Daugiau žinučių siųsti negalima."
 
@@ -10486,33 +6408,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3514
+#: ../libpurple/protocols/novell/novell.c:3516
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger protokolo papildinys"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3535
 msgid "Server address"
 msgstr "Serverio adresas"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3539
 msgid "Server port"
 msgstr "Serverio prievadas"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2287
+#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "Serveris uždarė jungtį."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -10521,13 +6443,14 @@
 "Dingo jungtis su serveriu:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "Jungtimi su serveriu gauti neteisingi duomenys."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -10557,19 +6480,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:112
+#: ../libpurple/protocols/oscar/libaim.c:114
 msgid "AIM Protocol Plugin"
 msgstr "AIM protokolo papildinys"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Visada naudoti AIM/ICQ tarpininką serverį failui perdavimui\n"
-"(lėčiau, bet neatskleidžia Jūsų IP adreso)"
-
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -10589,153 +6504,145 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:112
+#: ../libpurple/protocols/oscar/libicq.c:114
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ protokolo papildinys"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:135
+#: ../libpurple/protocols/yahoo/yahoo.c:4069
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Failų perdavimui visada naudoti ICQ tarpininkaujantį serverį\n"
-"(lėčiau, bet neatskleidžia Jūsų IP adreso)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Nutolęs vartotojas uždarė jungtį."
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Nutolęs vartotojas atmetė Jūsų prašymą."
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Prarastas ryšys su nutolusiu vartotoju:<br>%s"
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Gauti neteisingi duomenys ryšiu su nutolusiu vartotoju."
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Nepavyko sukurti jungties su nutolusiu vartotoju."
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Sukurtas tiesioginis pokalbių ryšis"
 
-#: ../libgaim/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 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."
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Neteisinga klaida"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Neteisingas SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Sparta į mazgą"
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Sparta į klientą"
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "Tarnyba neprieinama"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Tarnyba neaprašyta"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "SNAC pasenęs"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "Nepalaikoma mazgo"
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "Nepalaikoma kliento"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "Atsisakyta kliento"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "Atsakas per didelis"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "Prarasti atsakai"
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Užklausa negalima"
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "Neteisingas SNAC turinys"
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Nepakankamos teisės"
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "Yra vietiniame leidimo ar draudimo sąraše"
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "Siuntėjas per daug piktybiškas"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "Gavėjas per daug piktybiškas"
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "Vartotojas laikinai neprieinamas"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Nėra atitikmens"
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "Sąrašo perpildymas"
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "Nevienareikšmė užklausa"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "Eilė pilna"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "Negalima prisijungus per AOL"
 
-#: ../libgaim/protocols/oscar/oscar.c:327
+#: ../libpurple/protocols/oscar/oscar.c:329
 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 "
@@ -10747,7 +6654,7 @@
 "koduotę jis naudoja, galite ją nurodyti papildomose AIM/ICQ paskyros "
 "nuostatose."
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:438
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -10756,125 +6663,146 @@
 "(Šio pranešimo gavimo metu įvyko klaida.  Arba Jūs ir %s esate pasirinkę "
 "skirtingas koduotes, arba %s naudoja kliento programą su riktais.)"
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#  Label
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
+#: ../pidgin/gtkutils.c:2357
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Vartotojo paveiksliukas"
+
+#: ../libpurple/protocols/oscar/oscar.c:623
 msgid "Voice"
 msgstr "Balsas"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:626
 msgid "AIM Direct IM"
 msgstr "AIM tiesioginės greitosios žinutės"
 
-#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Pokalbis"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:632
+#: ../libpurple/protocols/oscar/oscar.c:5955
 msgid "Get File"
 msgstr "Gauti failai"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:639
 msgid "Games"
 msgstr "Žaidimai"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Add-Ins"
 msgstr "Papildiniai"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Send Buddy List"
 msgstr "Nusiųsti bičiulių sąrašą"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "ICQ Direct Connect"
 msgstr "ICQ tiesioginė jungtis"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:651
 msgid "AP User"
 msgstr "AP vartotojas"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:654
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Nihilist"
 msgstr "Nihilistas"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "ICQ Server Relay"
 msgstr "Perdavimas per ICQ serverį"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Old ICQ UTF8"
 msgstr "Senas ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "Trillian Encryption"
 msgstr "Trillian užkodavimas"
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Security Enabled"
 msgstr "Su saugumu"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "Video Chat"
 msgstr "Vaizdinis pokalbis"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Live Video"
 msgstr "Tiesioginis vaizdas"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Prieinamas pokalbiui"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:710
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Neprieinamas"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:712
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Užimtas"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:716
 msgid "Web Aware"
 msgstr "Žinantis apie žiniatinklį"
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+msgid "Invisible"
+msgstr "Nematomas"
+
+#: ../libpurple/protocols/oscar/oscar.c:720
 msgid "Online"
 msgstr "Prisijungęs"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:819
+#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP adresas"
+
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:2854
 msgid "Warning Level"
 msgstr "Perspėjimo lygis"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:836
 msgid "Buddy Comment"
 msgstr "Bičiulio komentaras"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:976
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10883,7 +6811,7 @@
 "Nepavyko prisijungti prie tapatybės nustatymo serverio:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:984
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10892,20 +6820,20 @@
 "Nepavyko prisijungti prie BOS serverio:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1024
 msgid "Screen name sent"
 msgstr "Vardas nusiųstas"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1029
 msgid "Connection established, cookie sent"
 msgstr "Jungtis nustatyta, nusiųstas slapukas"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1058
 msgid "Finalizing connection"
 msgstr "Pabaigiama jungtis"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1242
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10916,28 +6844,28 @@
 "Vardai turi arba prasidėti raide ir turėti tik raides, skaitmenis ir tarpus, "
 "arba turėti tik skaitmenis."
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/yahoo/yahoo.c:1929
 msgid "Invalid screen name."
 msgstr "Neteisingas vardas."
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1035
+#: ../libpurple/protocols/yahoo/yahoo.c:1947
 msgid "Incorrect password."
 msgstr "Neteisingas slaptažodis."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "Jūsų abonentas šiuo metu suspenduotas."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL IM tarnyba laikinai neprieinama"
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1348
 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."
@@ -10946,47 +6874,46 @@
 "ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar "
 "ilgiau."
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Jūsų naudojama kliento programos versija yra per sena. Prašome atnaujinti "
 "svetainėje %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1388
 msgid "Could Not Connect"
 msgstr "Nepavyko prisijungti"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1393
 msgid "Received authorization"
 msgstr "Gauta prieigos teisė"
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1416
 msgid "The SecurID key entered is invalid."
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1430
 msgid "Enter SecurID"
 msgstr "Įveskite SecurID"
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1431
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Įveskite 6 skaitmenų skaičių iš skaitmeninio displėjaus."
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libgaim/protocols/oscar/oscar.c:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5837
-#: ../libgaim/protocols/oscar/oscar.c:6067
-#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
 msgid "_OK"
 msgstr "_Gerai"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1471
+#: ../libpurple/protocols/oscar/oscar.c:1514
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10995,55 +6922,55 @@
 "Jus netrukus gali atjungti.  Galbūt norėsite naudoti TOC protokolą, kol tai "
 "nebus pataisyta.  Pasižiūrėkite %s, ar nėra atnaujinimų."
 
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim nepavyko gauti teisingos AIM prisijungimo maišos."
-
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1474
+#: ../libpurple/protocols/oscar/oscar.c:1517
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nepavyko gauti teisingos AIM prisijungimo maišos."
+
+#: ../libpurple/protocols/oscar/oscar.c:1603
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Jus netrukus gali atjungti.  Patikrinkite %s, ar nėra atnaujinimų."
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim nepavyko gauti teisingos prisijungimo maišos."
-
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1606
+msgid "Unable to get a valid login hash."
+msgstr "Nepavyko gauti teisingos prisijungimo maišos."
+
+#: ../libpurple/protocols/oscar/oscar.c:1632
 msgid "Password sent"
 msgstr "Išsiųstas slaptažodis"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1688
 msgid "Unable to initialize connection"
 msgstr "Nepavyko sukurti jungties"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2212
 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šą."
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Prieigos teisės prašymo žinutė:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Prašau suteikti man prieigos teisę!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2271
-#: ../libgaim/protocols/oscar/oscar.c:2278
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#: ../libgaim/protocols/oscar/oscar.c:5197
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "No reason given."
 msgstr "Nenurodyta priežastis."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2286
 msgid "Authorization Denied Message:"
 msgstr "Prieigos teisės nesuteikimo žinutė:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -11054,17 +6981,17 @@
 "šios priežasties:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2414
 msgid "ICQ authorization denied."
 msgstr "ICQ prieigos teisė nesuteikta."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Vartotojas %u suteikė Jums teisę įtraukti jį į Jūsų bičiulių sąrašą."
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -11077,7 +7004,7 @@
 "Nuo: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2437
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -11090,7 +7017,7 @@
 "Nuo: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2445
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -11103,20 +7030,24 @@
 "Laiškas yra:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2466
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ vartotojas %u atsiuntė bičiulio adresą: %s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ar norite įtraukti šį bičiulį į Jūsų bičiulių sąrašą?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Pridėti"
+
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "_Decline"
 msgstr "_Atsisakyti"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2560
 #, 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."
@@ -11124,7 +7055,7 @@
 msgstr[1] "Jūs praleidote %hu neteisingus pranešimus nuo vartotojo %s."
 msgstr[2] "Jūs praleidote %hu neteisingų pranešimų nuo vartotojo %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2569
 #, 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."
@@ -11132,7 +7063,7 @@
 msgstr[1] "Jūs praleidote %hu per ilgus pranešimus nuo vartotojo %s."
 msgstr[2] "Jūs praleidote %hu per ilgų pranešimų nuo vartotojo %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2578
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -11145,7 +7076,7 @@
 msgstr[2] ""
 "Jūs praleidote %hu pranešimų nuo vartotojo %s, kadangi viršyta spartos riba."
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2587
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -11159,7 +7090,7 @@
 "Jūs praleidote %hu pranešimų nuo vartotojo %s, kadangi jis yra per daug "
 "pyktybiškas."
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -11173,7 +7104,7 @@
 "Jūs praleidote %hu pranešimų nuo vartotojo %s, kadangi Jūs esate per daug "
 "pyktybiškas."
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, 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."
@@ -11184,69 +7115,64 @@
 msgstr[2] ""
 "Jūs praleidote %hu pranešimų nuo vartotojo %s dėl nežinomos priežasties."
 
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC klaida: %s\n"
-
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2760
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Negalima išsiųsti žinutės: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2758
-#: ../libgaim/protocols/oscar/oscar.c:2763
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2765
+#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2831
 msgid "Unknown reason."
 msgstr "Nežinoma priežastis."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Negalima išsiųsti žinutės vartotojui %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2827
 #, c-format
 msgid "User information not available: %s"
 msgstr "Vartotojo informacija neprieinama: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2830
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Vartotojo %s informacija neprieinama"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2859
 msgid "Online Since"
 msgstr "Prisijungęs nuo"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Narys nuo"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2869
 msgid "Capabilities"
 msgstr "Sugebėjimai"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Available Message"
 msgstr "Prieinamumo žinutė:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2913
 msgid "Profile"
 msgstr "Profilis"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2990
 msgid "Your AIM connection may be lost."
 msgstr "Jūsų AIM jungtis gali būti prarasta."
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3177
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -11254,11 +7180,11 @@
 "[Negalima pavaizduoti žinutės nuo šio vartotojo, kadangi joje yra neteisingų "
 "simbolių.]"
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3398
 msgid "Rate limiting error."
 msgstr "Spartos ribojimo klaida."
 
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3399
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -11266,55 +7192,56 @@
 "Paskutinis Jūsų bandytas veiksmas negalėjo būti įvykdytas, nes Jūs viršyjate "
 "spartos ribą. Prašome palaukti 10 sekundžių ir bandyti iš naujo."
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3471
 msgid "You have been signed off for an unknown reason."
 msgstr "Jūs buvote atjungtas dėl nežinomos priežasties."
 
-#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Jūs buvote atjungtas nuo pokalbių kambario %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3723
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: ../libgaim/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Personal Web Page"
 msgstr "Asmeninė svetainė"
 
-#: ../libgaim/protocols/oscar/oscar.c:3758
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Papildoma informacija"
 
-#: ../libgaim/protocols/oscar/oscar.c:3766
-#: ../libgaim/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Zip Code"
 msgstr "Pašto kodas"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Division"
 msgstr "Skyrius"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Position"
 msgstr "Pareigos"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Web Page"
 msgstr "Svetainė"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Work Information"
 msgstr "Darbovietės informacija"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Pop-Up Message"
 msgstr "Iššokanti žinutė"
 
-#: ../libgaim/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3919
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -11322,29 +7249,29 @@
 msgstr[1] "Tolimesni vardai yra susieti su %s"
 msgstr[2] "Tolimesni vardai yra susieti su %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Screen name"
 msgstr "Vardas"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Pagal el. pašto adresą %s jokių rezultatų nerasta"
 
-#: ../libgaim/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3971
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Jūs turėtumėte gauti el. laišką, prašantį patvirtinti %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3946
+#: ../libpurple/protocols/oscar/oscar.c:3973
 msgid "Account Confirmation Requested"
 msgstr "Paprašyta abonento patvirtinimo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3977
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Error Changing Account Info"
 msgstr "Abonento informacijos keitimo klaida"
 
-#: ../libgaim/protocols/oscar/oscar.c:3980
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -11353,14 +7280,14 @@
 "Klaida 0x%04x: neįmanoma taikyti formato vardui, nes paprašytasis vardas "
 "skiriasi nuo pirminio."
 
-#: ../libgaim/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Klaida 0x%04x: neįmanoma taikyti formato vardui, nes paprašytasis vardas yra "
 "neteisingas."
 
-#: ../libgaim/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -11369,7 +7296,7 @@
 "Klaida 0x%04x: neįmanoma taikyti formato vardui, nes paprašytasis vardas yra "
 "per ilgas."
 
-#: ../libgaim/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -11378,7 +7305,7 @@
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi šiuo metu laukia "
 "užklausa šiam vardui."
 
-#: ../libgaim/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -11387,7 +7314,7 @@
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
 "turi per daug su juo susietų vardų."
 
-#: ../libgaim/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -11396,42 +7323,32 @@
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
 "yra neteisingas."
 
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Klaida 0x%04x: nežinoma klaida."
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"Jūsų vardui šiuo metu yra taip pritaikytas formatas:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
-msgid "Account Info"
-msgstr "Abonento informacija"
-
-#: ../libgaim/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Vartotojo %s el. pašto adresas yra %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4189
+#: ../libpurple/protocols/oscar/oscar.c:4037
+msgid "Account Info"
+msgstr "Abonento informacija"
+
+#: ../libpurple/protocols/oscar/oscar.c:4210
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Jūsų IM vaizdas negalėjo būti išsiųstas. IM vaizdų siuntimui jūs turite būti "
 "tiesiogiai prisijungęs."
 
-#: ../libgaim/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4462
 msgid "Unable to set AIM profile."
 msgstr "Negalima nustatyti AIM profilio."
 
-#: ../libgaim/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4463
 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 "
@@ -11441,48 +7358,39 @@
 "procedūrai.  Jūsų profilis lieka nenustatytas.  Pabandykite jį nustatyti dar "
 "kartą, kai būsite galutinai prisijungęs."
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+#: ../libpurple/protocols/oscar/oscar.c:4477
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated it for you."
-msgstr[0] ""
-"Viršytas maksimalus %d baito profilio ilgis. Gaim sutrumpino profilį."
-msgstr[1] ""
-"Viršytas maksimalus %d baitų profilio ilgis. Gaim sutrumpino profilį."
-msgstr[2] ""
-"Viršytas maksimalus %d baitų profilio ilgis. Gaim sutrumpino profilį."
-
-#: ../libgaim/protocols/oscar/oscar.c:4461
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated it for you."
+msgstr[0] "Viršytas maksimalus %d baito profilio ilgis, todėl profilis buvo sutrumpintas."
+msgstr[1] "Viršytas maksimalus %d baitų profilio ilgis, todėl profilis buvo sutrumpintas."
+msgstr[2] "Viršytas maksimalus %d baitų profilio ilgis, todėl profilis buvo sutrumpintas."
+
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Profile too long."
 msgstr "Profilis per ilgas."
 
-#: ../libgaim/protocols/oscar/oscar.c:4505
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4527
+#, 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.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Viršytas maksimalus %d baito pasitraukimo žinutės ilgis.  Gaim sutrumpino "
-"žinutę."
-msgstr[1] ""
-"Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis.  Gaim sutrumpino "
-"žinutę."
-msgstr[2] ""
-"Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis.  Gaim sutrumpino "
-"žinutę."
-
-#: ../libgaim/protocols/oscar/oscar.c:4510
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "Viršytas maksimalus %d baito pasitraukimo žinutės ilgis, todėl žinutė buvo sutrumpinta."
+msgstr[1] "Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis, todėl žinutė buvo sutrumpinta."
+msgstr[2] "Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis, todėl žinutė buvo sutrumpinta."
+
+#: ../libpurple/protocols/oscar/oscar.c:4532
 msgid "Away message too long."
 msgstr "Pasitraukimo žinutė per ilga."
 
-#: ../libgaim/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:4601
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -11493,36 +7401,32 @@
 "prasidėti raide ir turėti tik raides, skaitmenis ir tarpus, arba turėti tik "
 "skaitmenis."
 
-#: ../libgaim/protocols/oscar/oscar.c:4581
-#: ../libgaim/protocols/oscar/oscar.c:5004
-#: ../libgaim/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5042
 msgid "Unable To Add"
 msgstr "Negalima pridėti"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid "Unable To Retrieve Buddy List"
 msgstr "Negalima gauti bičiulių sąrašo"
 
-#: ../libgaim/protocols/oscar/oscar.c:4686
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim laikinai negalėjo gauti Jūsų bičiulių sąrašo iš AIM serverių.  Jūsų "
-"bičiulių sąrašas nėra prarastas ir greičiausiai taps prieinamas per keletą "
-"valandų."
-
-#: ../libgaim/protocols/oscar/oscar.c:4890
-#: ../libgaim/protocols/oscar/oscar.c:4891
-#: ../libgaim/protocols/oscar/oscar.c:4896
-#: ../libgaim/protocols/oscar/oscar.c:5072
-#: ../libgaim/protocols/oscar/oscar.c:5073
-#: ../libgaim/protocols/oscar/oscar.c:5078
+#: ../libpurple/protocols/oscar/oscar.c:4708
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr "AIM serveriai laikinai negalėjo išsiųsti Jūsų bičiulių sąrašo.  Jis nėra prarastas ir greičiausiai taps prieinamas per kelias valandas."
+
+#: ../libpurple/protocols/oscar/oscar.c:4913
+#: ../libpurple/protocols/oscar/oscar.c:4914
+#: ../libpurple/protocols/oscar/oscar.c:4919
+#: ../libpurple/protocols/oscar/oscar.c:5096
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5102
 msgid "Orphans"
 msgstr "Našlaičiai"
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -11531,12 +7435,12 @@
 "Nepavyko pridėti bičiulio %s, nes Jūs turite per daug bičiulių savo bičiulių "
 "sąraše.  Prašome vieną pašalinti ir bandyti iš naujo."
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
 msgid "(no name)"
 msgstr "(nėra vardo)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5040
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -11547,7 +7451,7 @@
 "pasitaiko dėl to, kad Jūs turite didžiausią leistiną bičiulių skaičių savo "
 "bičiulių sąraše."
 
-#: ../libgaim/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5133
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -11556,23 +7460,23 @@
 "Vartotojas %s suteikė Jums teisę pridėti jus į savo bičiulių sąrašą.  Ar "
 "norite pridėti jį?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
 msgstr "Suteikta prieigos teisė"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5217
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Vartotojas %s patenkino Jūsų prašymą įtrauktį jį į Jūsų bičiulių sarašą."
 
-#: ../libgaim/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5218
 msgid "Authorization Granted"
 msgstr "Suteikta prieigos teisė"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -11583,48 +7487,53 @@
 "šios priežasties:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5222
 msgid "Authorization Denied"
 msgstr "Nesuteikta prieigos teisė"
 
-#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Kom_utatorius:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5298
 msgid "Invalid chat name specified."
 msgstr "Nurodytas neteisingas pokalbių kambario vardas."
 
-#: ../libgaim/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5368
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Jūsų IM vaizdas nebuvo nusiųstas. Jūs negalite siųsti IM vaizdų AIM "
 "pokalbiuose."
 
-#: ../libgaim/protocols/oscar/oscar.c:5516
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Away Message"
 msgstr "Pasitraukimo žinutė"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(gaunama)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5722
+msgid "iTunes Music Store Link"
+msgstr "Muzikos parduotuvės „iTunes“ nuoroda"
+
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Bičiulio komentaras apie %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Bičiulio komentaras:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5877
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Jūs pasirinkote sukurti tiesioginį ryšį su %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -11632,71 +7541,67 @@
 "Kadangi tai atskleidžia Jūsų IP adresą, tai gali būti pavojus saugumui.  Ar "
 "norite tęsti?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "C_onnect"
 msgstr "_Jungtis"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get AIM Info"
 msgstr "Gauti AIM informaciją"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5926
 msgid "Edit Buddy Comment"
 msgstr "Redaguoti bičiulio komentarą"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Get Status Msg"
 msgstr "Gauti būsenos pranešimą"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libpurple/protocols/oscar/oscar.c:5947
 msgid "Direct IM"
 msgstr "Tiesioginis ryšys"
 
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5969
 msgid "Re-request Authorization"
 msgstr "Iš naujo paprašyti prieigos teisės"
 
-#: ../libgaim/protocols/oscar/oscar.c:6032
+#: ../libpurple/protocols/oscar/oscar.c:6028
 msgid "Require authorization"
 msgstr "Būtina prieigos teisė"
 
-#: ../libgaim/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "Pasiekiamas per žiniatinklį (angl. web aware).  Parinkties aktyvavimas gali "
 "tapti šlamšto gavimo priežastimi!"
 
-#: ../libgaim/protocols/oscar/oscar.c:6040
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "ICQ Privacy Options"
 msgstr "ICQ privatumo parinktys"
 
-#: ../libgaim/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6053
 msgid "The new formatting is invalid."
 msgstr "Nauja formato informacija yra neteisinga."
 
-#: ../libgaim/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6054
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Vardo formato informacija gali pakeisti tik keitimą didžiosiomis raidėmis ir "
 "matomus tarpus."
 
-#: ../libgaim/protocols/oscar/oscar.c:6065
-msgid "New screen name formatting:"
-msgstr "Nauja vardo formato informacija:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6121
+#: ../libpurple/protocols/oscar/oscar.c:6107
 msgid "Change Address To:"
 msgstr "Pakeisti adresą į:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6152
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>jūs nelaukiate prieigos suteikimo</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6169
+#: ../libpurple/protocols/oscar/oscar.c:6155
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Jūs laukiate prieigos suteikimo iš šių bičiulių"
 
-#: ../libgaim/protocols/oscar/oscar.c:6170
+#: ../libpurple/protocols/oscar/oscar.c:6156
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11705,96 +7610,100 @@
 "spragtelėdamas dešiniuoju klavišu ant jų ir pasirinkdamas „Iš naujo "
 "paprašyti prieigos teisės“."
 
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6173
 msgid "Find Buddy by E-Mail"
 msgstr "Surasti bičiulį pagal el. pašto adresą"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6174
 msgid "Search for a buddy by e-mail address"
 msgstr "Ieškoti bičiulio pagal el. pašto adresą"
 
-#: ../libgaim/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6175
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Įveskite bičiulio, kurio ieškote, el. pašto adresą."
 
-#: ../libgaim/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6178
 msgid "_Search"
 msgstr "_Ieškoti"
 
-#: ../libgaim/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
 msgstr "Nustatyti vartotojo informaciją (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
 msgstr "Pakeisti slaptažodį (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigūruoti IM persiuntimą (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set Privacy Options..."
 msgstr "Nustatyti privatumo parinktis..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6393
-msgid "Format Screen Name..."
-msgstr "Vardo formatavimo informacija..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Patvirtinti abonentą"
 
-#: ../libgaim/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Parodyti šiuo metu registruotą el. pašto adresą"
 
-#: ../libgaim/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Pakeisti šiuo metu registruotą el. pašto adresą..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6412
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Parodyti bičiulius, laukiančius prieigos suteikimo"
 
-#: ../libgaim/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Ieškoti bičiulio pagal el. pašto adresą..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "Ieškoti bičiulio pagal informaciją"
 
-#: ../libgaim/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Use recent buddies group"
 msgstr "Naudoti paskutinių bičiulių grupę"
 
-#: ../libgaim/protocols/oscar/oscar.c:6494
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Show how long you have been idle"
 msgstr "Rodyti, kiek laiko buvote neveiklus"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6628
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Failų perdavimui visada naudoti ICQ tarpininkaujantį serverį\n"
+"(lėčiau, bet neatskleidžia Jūsų IP adreso)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Prašoma %s prisijungti prie mūsų tiesioginiu ryšiu adresu %s:%hu."
 
-#: ../libgaim/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Bandoma prisijungti prie %s:%hu."
 
-#: ../libgaim/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "Bandoma jungtis per tarpininką serverį."
 
-#: ../libgaim/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ką tik paprašė tiesiogiai prisijungti prie %s"
 
-#: ../libgaim/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 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 "
@@ -11804,396 +7713,395 @@
 "vaizdams.  Kadangi Jūsų IP adresas bus atskleistas, tai gali būti privatumo "
 "rizika."
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1020
 msgid "_Connect"
 msgstr "_Jungtis"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Pagrindinė informacija"
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Asmeninis prisistatymas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ numeris"
 
 #  Country
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Šalis ar regionas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provincija ar valstija"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Kinų horoskopo ženklas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Zodiako ženklas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Kraujo grupė"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Koledžas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "El. paštas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Pašto kodas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobilus telefonas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Vandenis"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Žuvys"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Avinas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Jautis"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Dvyniai"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Vėžys"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Liūtas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Mergelė"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Svarstyklės"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpionas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Šaulys"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Ožiaragis"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Žiurkė"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Jautis"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigras"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Triušis"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drakonas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Gyvatė"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Arklys"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Ožys"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Beždžionė"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Gaidys"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Šuo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Kiaulė"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Kitas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Keisti savo informaciją"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Atnaujinti savo informaciją"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:506
 msgid "Your information has been updated"
 msgstr "Jūsų informacija atnaujinta"
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
-msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
-msgstr ""
-"Jūs bandote nustatyti specialų veiduką.  Gaim šiuo metu leidžia naudotis tik "
-"standartiniais veidukais.  Pasirinkite paveiksliuką iš "
-
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:565
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+msgstr "Specialių veidukų nustatymas šiuo metu nėra palaikomas.  Prašome pasirinkti paveiksliuką iš "
+
+#: ../libpurple/protocols/qq/buddy_info.c:582
+#: ../libpurple/protocols/qq/buddy_info.c:595
 msgid "Invalid QQ Face"
 msgstr "Negalima QQ veidukas"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Atmetėte iš %d gautą prašymą"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Įveskite savo priežastį:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:210
 msgid "Reject request"
 msgstr "Atmesti prašymą"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#: ../libpurple/protocols/qq/buddy_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:139
 msgid "Sorry, you are not my type..."
 msgstr "Atleisk, tu nesi iš man patinkančių..."
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:136
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_opt.c:125
+#: ../libpurple/protocols/qq/sys_msg.c:85
+#: ../libpurple/protocols/qq/sys_msg.c:228
 msgid "Reject"
 msgstr "Atmesti"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:272
 msgid "Add buddy with auth request fails"
 msgstr "Bičiulio pridėjimo su prieigos patvirtinimu užklausa nepavyko"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:303
 msgid "You have successfully removed a buddy"
 msgstr "Jūs sėkmingai pašalinote bičiulį"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:331
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Jūs sėkmingai pašalinote save iš bičiulio"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:395
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Vartotojui %d reikia patvirtinti prieigą"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Įveskite prašymą čia"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Ar draugausi su manimi?"
 
 #  Build the Send As menu
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/buddy_opt.c:399
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Send"
 msgstr "Siųsti"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Jūs įtraukėte %d į bičiulių sąrašą"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:503
 msgid "QQid Error"
 msgstr "QQid klaida"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:504
 msgid "Invalid QQid"
 msgstr "Neteisingas QQid"
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Grupės ID"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Kūrėjas"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Grupės aprašymas"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Patvirtinti prieigos teisę"
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libgaim/protocols/qq/group.c:120
+#: ../libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr "Įveskite išorinį grupės idenfikacinį numerį"
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Galite ieškoti tik pastovių QQ grupių\n"
 
-#: ../libgaim/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:122
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Vartotojas %d prašo būti prijungtas prie grupės %d"
 
-#: ../libgaim/protocols/qq/group_im.c:123
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:123
+#: ../libpurple/protocols/qq/group_im.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:180
 #, c-format
 msgid "Reason: %s"
 msgstr "Priežastis: %s"
 
-#: ../libgaim/protocols/qq/group_im.c:130
-#: ../libgaim/protocols/qq/group_im.c:174
-#: ../libgaim/protocols/qq/group_im.c:214
-#: ../libgaim/protocols/qq/group_im.c:249
-#: ../libgaim/protocols/qq/group_im.c:283
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:130
+#: ../libpurple/protocols/qq/group_im.c:174
+#: ../libpurple/protocols/qq/group_im.c:214
+#: ../libpurple/protocols/qq/group_im.c:249
+#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:355
+#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:386
 msgid "QQ Qun Operation"
 msgstr "Operacija su QQ pokalbių kambariu"
 
-#: ../libgaim/protocols/qq/group_im.c:133
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:87
+#: ../libpurple/protocols/qq/sys_msg.c:230
 msgid "Approve"
 msgstr "Patvirtinti"
 
-#: ../libgaim/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:171
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Jūsų prašymas tapti grupės %d nariu buvo atmestas administratoriaus %d"
 
-#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:212
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 "Jūsų prašymas tapti grupės %d nariu buvo patvirtintas administratoriaus %d"
 
-#: ../libgaim/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:248
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Jūs [%d] palikote grupę „%d“"
 
-#: ../libgaim/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:282
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Jus [%d] pridėjo į grupę „%d“"
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:283
 msgid "This group has been added to your buddy list"
 msgstr "Ši grupė buvo įtraukta į Jūsų bičiulių sąrašą"
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "Nesu narys"
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Esu narys"
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Prašau būti priimtas"
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Esu administratorius"
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Nežinoma būsena"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr "Ši grupė neleidžia kitiems prie jos prisijungti"
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:229
 msgid "You have successfully exited the group"
 msgstr "Sėkmingai palikote grupę"
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:253
 msgid "QQ Group Auth"
 msgstr "QQ grupės prieiga"
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:254
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Jūsų prieigos suteikimo operacija patvirtinta QQ serverio"
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:325
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Įvedėte grupės identifikacinį numerį, nesantį priimtiname intervale"
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:356
 msgid "Are you sure to exit this Qun?"
 msgstr "Ar tikrai norite išeiti iš šio pokalbių kambario?"
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -12201,172 +8109,174 @@
 "Jeigu esate grupės sukūrėjas, ši operacija galiausiai pašalins šį pokalbių "
 "kambarį."
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:361
 msgid "Go ahead"
 msgstr "Tęsti"
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kodas [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr "Operacijos su grupe klaida"
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:84
 msgid "Do you wanna approve the request?"
 msgstr "Ar norite patvirtinti šį prašymą?"
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:230
 msgid "You have successfully modify Qun member"
 msgstr "Jūs sėkmingai pakeitėte pokalbių kambario dalyvio informaciją"
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:300
 msgid "You have successfully modify Qun information"
 msgstr "Jūs sėkmingai pakeitėte pokalbių kambario informaciją"
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:387
 msgid "You have successfully created a Qun"
 msgstr "Jūs sėkmingai sukūrėte pokalbių kambarį"
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:389
 msgid "Would you like to set up the Qun details now?"
 msgstr "Ar norite sutvarkyti šio pokalbių kambario detales dabar?"
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "Setup"
 msgstr "Nustatyti"
 
 #  Window **********
-#: ../libgaim/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:423
 msgid "System Message"
 msgstr "Sistemos pranešimas"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:567
 msgid "Server ACK"
 msgstr "Serverio patvirtinimas"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:567
 msgid "Send IM fail\n"
 msgstr "Žinutės siuntimas nepavyko\n"
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr "Jungties palaikymo klaida, jungtis greičiausiai nutrūko!"
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr "Prisijungimo užklausos žymos klaida!"
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Nepavyko prisijungti, patikrinkite derinimo žurnalą"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2375
+#: ../libpurple/protocols/yahoo/yahoo.c:2403
+#: ../libpurple/protocols/yahoo/yahoo.c:2510
+#: ../libpurple/protocols/yahoo/yahoo.c:2531
+#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Nepavyko prisijungti."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Nežinomas: %d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "%s Adresas"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Lygis"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: pasiekiamas"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: pasitraukęs"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: nematomas"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: atsijungęs"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "Neteisingas vardas"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Dabar prisijungę</b>: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Paskutinis atnaujinimas</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Jungties režimas</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Serverio IP adresas</b>: %s: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mano viešasis IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Prisijungimo laikas</b>: %s\n"
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Paskutinio prisijungimo IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Paskutinio prisijungimo laikas</b>: %s\n"
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:456
 msgid "Login Information"
 msgstr "Prisijungimo informacija"
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "Keisti mano informaciją"
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Pakeisti slaptažodį"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr "Rodyti prisijungimo informaciją"
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr "Palikti šį QQ pokalbių kambarį"
 
@@ -12389,274 +8299,274 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokolo    papildinys"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:740
 msgid "Login in TCP"
 msgstr "Prisijungti naudojant TCP protokolą"
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:743
 msgid "Login Hidden"
 msgstr "Prisijungti nematomu"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr "Rašymo į jungtį klaida"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Prisijungimas atmestas"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Jungties klaida"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Nepavyko skaityti iš jungties"
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d atmetė failą %s"
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "Failo siuntimas"
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d nutraukė %s perdavimą"
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "Prisijungimas prarastas"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr "Prisijungti nepavyko, negauta jokio atsako"
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:103
 msgid "Do you wanna add this buddy?"
 msgstr "Ar norite įtraukti šį bičiulį į Jūsų bičiulių sąrašą?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr "Jus prisidėjo %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:158
 msgid "Would like to add him?"
 msgstr "Ar norite jį pridėti?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:164
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s prisidėjo Jus [%s]"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Vartotojas %s atmetė Jūsų prašymą"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr "Vartotojas %s patvirtino Jūsų prašymą"
 
-#: ../libgaim/protocols/qq/sys_msg.c:222
+#: ../libpurple/protocols/qq/sys_msg.c:222
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s nori prisidėti Jus [%s] kaip draugą"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "Žinutė: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "Vartotojo %s nėra Jūsų bičiulių sąraše"
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Would you like to add him?"
 msgstr "Ar norite jį prisidėti?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Jungtis uždaryta (rašoma)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupės pavadinimas:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>„Notes“ grupės identifikatorius:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informacija apie grupę %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "„Notes“ adresų knygos informacija"
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Pakviesti grupę į konferenciją..."
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Gauti „Notes“ adresų knygos informaciją"
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Siunčiamas pasisveikinimas"
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Laukiama pasisveikinimo patvirtinimo"
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Pasisveikinimas patvirtintas, siunčiama prisijungimo informacija"
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Laukiama prisijungimo patvirtinimo"
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Prisijungimas nukreiptas kitur"
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Jungiamasi"
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Prisijungimas patvirtintas"
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Paleidžiami servisai"
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: ../libgaim/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "„Sametime“ administratoriaus skelbimas serveryje %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "„Sametime“ administratoriaus skelbimas"
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Jungtis atidaryta iš naujo"
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Skaitymo iš jungties klaida: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3724
 msgid "Unable to connect to host"
 msgstr "Nepavyko prisijungti prie mazgo"
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Abonento %s skelbimas"
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Konferencija uždaryta"
 
 #  Data is assumed to be the destination sn
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Negalima išsiųsti žinutės: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2960
 msgid "Place Closed"
 msgstr "Vieta uždaryta"
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "Mikrofonas"
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "Garsiakalbiai"
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Failų perdavimas"
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4144
 msgid "Supports"
 msgstr "Palaiko"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4118
 msgid "External User"
 msgstr "Išorinis vartotoajs"
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "Sukurti konferenciją su vartotoju"
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "Įveskite naujos konferencijos temą ir pakvietimo žinutę vartotojui %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "Nauja konferencija"
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "Sukurti"
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Esamos konferencijos"
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Sukurti naują konferenciją..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Pakviesti vartotoją į konferenciją"
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12667,23 +8577,27 @@
 "Pasirinkite „Sukurti naują konferenciją“, jei norite sukurti naują "
 "konfereciją ir į ją pakviesti šį vartotoją."
 
-#: ../libgaim/protocols/sametime/sametime.c:3492
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Pakviesti į konferenciją"
 
-#: ../libgaim/protocols/sametime/sametime.c:3582
+#: ../libpurple/protocols/sametime/sametime.c:3561
 msgid "Invite to Conference..."
 msgstr "Pakviesti į konferenciją..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3566
 msgid "Send TEST Announcement"
 msgstr "Nusiųsti „TEST“ skelbimą"
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+msgid "Topic:"
+msgstr "Tema:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server specified"
 msgstr "Nenurodytas „Sametime“ bendruomenės serveris"
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3635
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -12692,38 +8606,38 @@
 "Nenustatytas mazgo vardas ar IP adresas „Meanwhile“ paskyrai %s.  Įveskite "
 "vieną iš jų žemiau, jei norite pradėti seansą."
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3640
 msgid "Meanwhile Connection Setup"
 msgstr "„Meanwhile“ jungties sąranka"
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "No Sametime Community Server Specified"
 msgstr "Nenurodytas „Sametime“ bendruomenės serveris"
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4134
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Nežinomas (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4136
 msgid "Last Known Client"
 msgstr "Paskutinis žinomas klientas"
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4300
+#: ../libpurple/protocols/sametime/sametime.c:5495
 msgid "User Name"
 msgstr "Vartotojo vardas"
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4303
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Sametime ID"
 msgstr "„Sametime“ identifikatorius"
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4327
 msgid "An ambiguous user ID was entered"
 msgstr "Įvestas nevienareikšmiškas vartotojo identifikatorius"
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4328
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12733,15 +8647,15 @@
 "Pasirinkite norimą vartotoją iš žemiau esančio sąrašo, kuris bus įtrauktas į "
 "bičiulių sąrašą."
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4333
 msgid "Select User"
 msgstr "Pasirinkite vartotoją"
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4417
 msgid "Unable to add user: user not found"
 msgstr "Negalima pridėti vartotojo: jis nerastas"
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4419
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -12750,11 +8664,11 @@
 "Identifikatorius „%s“ neatitiko jokių vartotojų Jūsų „Sametime“ "
 "bendruomenėje.  Šis įrašas pašalintas iš Jūsų bičiulių sąrašo."
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4424
 msgid "Unable to add user"
 msgstr "Nepavyko pridėti vartotojo"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5010
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12763,63 +8677,63 @@
 "Failo %s skaitymo klaida:\n"
 "%s\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5145
 msgid "Remotely Stored Buddy List"
 msgstr "Nutolusiai saugomas bičiulių sąrašas"
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5150
 msgid "Buddy List Storage Mode"
 msgstr "Bičiulių sąrašo saugojimo būdas"
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5153
 msgid "Local Buddy List Only"
 msgstr "Tik vietinis bičiulių sąrašas"
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Merge List from Server"
 msgstr "Prijungti sąrašą iš serverio"
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge and Save List to Server"
 msgstr "Prijungti ir išsaugoti sąrašą serveryje"
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Synchronize List with Server"
 msgstr "Suvienodinti sąrašą su serveriu"
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5208
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importuoti „Sametime“ sąrašą paskyrai %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5247
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Eksportuoti „Sametime“ sąrašą paskyrai %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5300
 msgid "Unable to add group: group exists"
 msgstr "Nepavyko pridėti grupės: ji jau yra"
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Grupė pavadinimu „%s“ jau yra Jūsų bičiulių sąraše."
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5433
 msgid "Unable to add group"
 msgstr "Nepavyko pridėti grupės"
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Possible Matches"
 msgstr "Galimi variantai"
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5379
 msgid "Notes Address Book group results"
 msgstr "Grupės iš „Notes“ adresų knygos"
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5380
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12830,15 +8744,15 @@
 "adresų knygos grupių. Pasirinkite iš žemiau esančio sąrašo grupę, kurią "
 "norite įtraukti į savo bičiulių sąrašą."
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5385
 msgid "Select Notes Address Book"
 msgstr "Pasirinkite „Notes“ adresų knygos grupę"
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Unable to add group: group not found"
 msgstr "Negalima pridėti grupės: ji nerasta"
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5429
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -12847,11 +8761,11 @@
 "Identifikatorius „%s“ neatitiko jokių „Notes“ adresų knygos grupių Jūsų "
 "„Sametime“ bendruomenėje."
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5470
 msgid "Notes Address Book Group"
 msgstr "„Notes“ adresų knygos grupė"
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5471
 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."
@@ -12859,12 +8773,12 @@
 "Įveskite „Notes“ adresų knygos grupės pavadinimą žemiau esančiame lauke, kad "
 "pridėtumėte grupę ir jos narius į savo bičiulių sąrašą."
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5519
 #, c-format
 msgid "Search results for '%s'"
 msgstr "„%s“ paieškos rezultatai"
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5520
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12875,26 +8789,30 @@
 "Galite įtraukti šiuos vartotojus į savo bičiulių sąrašą arba nusiųsti jiems "
 "žinutes žemiau esančių mygtukų pagalba."
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "Paieškos rezultatai"
+
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "No matches"
 msgstr "Nėra atitikimų"
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5553
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Identifikatorius „%s“ neatitiko jokių vartotojų Jūsų „Sametime“ "
 "bendruomenėje."
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No Matches"
 msgstr "Nėra atitikimų"
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5594
 msgid "Search for a user"
 msgstr "Ieškoti vartotojo"
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5595
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -12902,83 +8820,90 @@
 "Įveskite vardą ar identifikatoriaus dalį žemiau esančiame lauke, kad "
 "ieškotumėte atitinkančių vartotojų Jūsų „Sametime“ bendruomenėje."
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5598
 msgid "User Search"
 msgstr "Vartotojų paieška"
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "Import Sametime List..."
 msgstr "Importuoti „Sametime“ sąrašą..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "Export Sametime List..."
 msgstr "Eksportuoti „Sametime“ sąrašą..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "Add Notes Address Book Group..."
 msgstr "Pridėti „Notes“ adresų knygos grupę..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "User Search..."
 msgstr "Ieškoti vartotojų..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5719
 msgid "Force login (ignore server redirects)"
 msgstr "Jungtis priverstinai (ignoruoti serverio nukreipimus kitur)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5729
 msgid "Hide client identity"
 msgstr "Slėpti kliento tapatybę"
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:420
+#: ../libpurple/protocols/silc/buddy.c:545
+#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Vartotojo %s nėra tinkle"
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Susitarimas dėl raktų"
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Nepavyko susitarti dėl raktų"
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Susitarimo dėl raktų metu įvyko klaida"
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Susitarimas dėl raktų nepavyko"
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Baigėsi susitarimo dėl raktų laukimo laikas"
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Susitarimas dėl raktų buvo nutrauktas"
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Susitarimas dėl raktų jau pradėtas"
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Negalima susitarti dėl raktų su savimi pačiu"
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Nuotolinio vartotojo nebėra tinkle"
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -12986,7 +8911,7 @@
 msgstr ""
 "Susitarimo dėl raktų prašymas gautas iš vartotojo %s. Ar norite susitarti?"
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12997,60 +8922,69 @@
 "nuotoliniame mazge: %s\n"
 "nuotoliniame prievade: %d"
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Susitarymo dėl raktų prašymas"
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:387
+#: ../libpurple/protocols/silc/buddy.c:422
+#: ../libpurple/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "IM su slaptažodžiu"
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Negalima nustatyti IM rakto"
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Nustatyti IM slaptažodį"
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:512
+#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Gauti viešąjį raktą"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Negalima gauti viešojo rakto"
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:634
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Rodyti viešąjį raktą"
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Nepavyko įkelti viešojo rakto"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Vartotojo informacija"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Nepavyko gauti vartotojo informacijos"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Bičiulis %s nėra patikimas"
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:737
 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."
@@ -13059,16 +8993,16 @@
 "rakto.  Tam jūs galite naudoti „Gauti viešąjį raktą\"."
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Atverti..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Bičiulio %s nėra tinkle"
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -13076,15 +9010,15 @@
 "Norėdami pridėti bičiulį, privalote importuoti jo viešąjį raktą.  Tam "
 "paspauskite „Importuoti...“."
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Pasirinkite teisingą vartotoją"
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1177
 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."
@@ -13093,7 +9027,7 @@
 "Pasirinkite teisingą vartotoją iš sąrašo, kuris bus įtrauktas į bičiulių "
 "sąrašą."
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -13101,213 +9035,238 @@
 "Rastas daugiau nei vienas vartotojas su tokiu pačiu vardu.  Pasirinkite "
 "teisingą vartotoją iš sąrašo, kuris bus įtrauktas į bičiulių sąrašą."
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Atskirtas"
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Nelinkęs"
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Pažadink mane"
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktyvus"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robotas"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Laimingas"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Liūdnas"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Piktas"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Pavydus"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Susigėdęs"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Nenugalimas"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Įsimylėjęs"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Mieguistas"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Nuobuodžiaujantis"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Susijaudinęs"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Neramus"
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Vartotojo būsenos"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Nuotaika"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Labiausiai mėgstamas kontaktas"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Labiausiai mėgstama kalba"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Įrenginys"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Laiko juosta"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografinė vietovė"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Atstatyti IM raktą"
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "Pokalbiai su raktų apsikeitimu"
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Pokalbiai su slaptažodžiu"
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Gauti viešąjį raktą..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Išmesti vartotoją"
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1670
+#: ../libpurple/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Piešti ant lentos"
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "Sla_ptafrazė:"
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanalas %s tinkle neegzistuoja"
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Kanalo informacija"
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Nepavyko gauti kanalo informacijos"
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanalo pavadinimas:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Vartotojų skaičius:</b> %d"
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanalo įkūrėjas:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanalo šifras:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanalo HMAC:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanalo tema:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanalo būsenos:</b> "
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Įkūrėjo rakto kontrolinis kodas:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Įkūrėjo rakto žodinis kontrolinis kodas:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Pridėti kanalo viešąjį raktą"
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Atverti viešąjį raktą..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Kanalo slaptafrazė"
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Kanalo viešųjų raktų sąrašas"
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -13321,102 +9280,106 @@
 "norint prisijungti prie kanalo.  Jei kanalo viešieji raktai yra nustatyti, "
 "gali prisijungti tik vartotojai, kurių viešieji raktai yra priskirti."
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:421
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:459
+#: ../libpurple/protocols/silc/chat.c:460
+#: ../libpurple/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Tapatybės nustatymas kanale"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Įdėti / Pašalinti"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Grupės pavadinimas"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:582
+#: ../libpurple/protocols/silc/ops.c:1909
+#: ../libpurple/protocols/silc/silc.c:938
 msgid "Passphrase"
 msgstr "Slaptafrazė"
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Prašom įvesti kanalo %s privačios grupės pavadinimą ir slaptafrazę."
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Pridėti kanalo privačią grupę"
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Vartotojų skaičiaus riba"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Nustatyti kanalo vartotojų skaičiaus ribą.  Nulio reikšmė pašalina ribą."
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Pakvietimų sąrašas"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Draudimų sąrašas"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Pridėti privačią grupę"
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Atšaukti pastovumą"
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Nustatyti pastovumą"
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Nustatyti vartotojų skaičiaus ribą"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Atšaukti temos apribojimą"
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Nustatyti temos apribojimą"
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Atšaukti kanalo privatumą"
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Nustatyti kanalo privatumą"
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Atšaukti kanalo slaptumą"
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Nustatyti kanalo slaptumą"
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Jūs esate <i>%s</i> kanalo įkūrėjas"
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanalo <i>%s</i> įkūrėjas yra <i>%s</i>"
 
-#: ../libgaim/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -13424,217 +9387,227 @@
 "Jūs turite prisijungti prie kanalo %s, kad galėtumėte prisijungti prie "
 "privačios grupės"
 
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Prisijungti prie privačios grupės"
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Negalima prisijungti prie privačios grupės"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1294
+#: ../libpurple/protocols/silc/silc.c:1146
 msgid "Call Command"
 msgstr "Komandos iškvietimas"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1294
+#: ../libpurple/protocols/silc/silc.c:1146
 msgid "Cannot call command"
 msgstr "Negalima iškviesti komandos"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1295
+#: ../libpurple/protocols/silc/silc.c:1147
 msgid "Unknown command"
 msgstr "Nežinoma komanda"
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Saugus failų perdavimas"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Failų perdavimo klaida"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Neduotas leidimas"
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Raktų sutikimas nepavyko"
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Failų perdavimo seansas neegzistuoja"
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nėra aktyvaus failų perdavimo seanso"
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Failo perdavimas jau pradėtas"
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Nepavyko atlikti raktų sutarimo failų perdavimui"
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Nepavyko pradėti failų perdavimo"
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Negalima išsiųsti failo"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s pakeitė kanalo <I>%s</I> temą į: %s"
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> pakeitė kanalo <I>%s</I> būsenas į: %s"
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</s> pašalino visus kanalo <i>%s</i> būsenas"
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> pakeitė vartotojo <I>%s</I> būsenas į: %s"
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<i>%s</i> pašalino visas vartotojo <i>%s</i> būsenas"
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Iš <i>%s</i> Jus išspyrė <i>%s</i> (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Jus išmetė %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Išmestas vartotojo %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Serverio atjungimas"
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Gimtadienis"
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Vaidmuo darbe"
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:931
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Padalinys"
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Pastabos"
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Prisijungti prie pokalbių kambario"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Tikras vardas"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Būsenos tekstas"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Viešojo rakto kontrolinis kodas"
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Viešojo rakto žodinis kontrolinis kodas"
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Daugiau..."
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:997
 msgid "Detach From Server"
 msgstr "Atsiskirti nuo serverio"
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "Atsiskirti negalima"
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Negalima nustatyti temos"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Vardo pakeisti nepavyko"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Kambarių sąrašas"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nepavyko gauti kambarių sąrašo"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "Joks viešasis raktas nebuvo gautas"
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Serverio informacija"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nepavyko gauti informacijos apie serverį"
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serverio statistika"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nepavyko gauti serverio statistikos"
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "Nėra prieinamos serverio statistikos"
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -13669,104 +9642,106 @@
 "Iš viso serverio operatorių: %d\n"
 "Iš viso maršruto parinktuvų operatorių: %d\n"
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "Tinklo statistika"
 
-#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr "Skimbtelėti"
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr "Nepavyko skimbtelėti"
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Atsakas į skimbtelėjimą gautas iš serverio"
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "Nepavyko išmesti vartotojo"
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "Jungimosi į SILC serverį klaida"
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr "Apsikeitimas raktais nepavyko"
 
-#: ../libgaim/protocols/silc/ops.c:1723
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Atskirto seanso pratęsimas nepavyko. Paspauskite „Jungtis iš naujo\", kad "
 "sukurtumėtę naują jungtį."
 
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "Atjungtas serverio"
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "Pratęsiamas seansas"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Jungties tapatybės nustatymas"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "Tikrinamas serverio viešasis raktas"
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1910
 msgid "Passphrase required"
 msgstr "Reikalinga slaptafrazė"
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Nesėkmė: versijų neatitikimas, atnaujinkite savo klientą"
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Nesekmė: nuotolinis mazgas nepasitiki arba nepalaiko Jūsų viešojo rakto"
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomos KE grupės"
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo šifro"
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo PKCS"
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomos maišos funkcijos"
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1957
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo HMAC"
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1959
 msgid "Failure: Incorrect signature"
 msgstr "Nesekmė: neteisingas parašas"
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
 msgstr "Nesekmė: neteisingas slapukas"
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
 msgstr "Nesekmė: tapatybės nustatymas nepavyko"
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -13775,13 +9750,13 @@
 "Gautas vartotojo %s viešasis raktas.  Jūsų vietinė kopija nesutampa su šiuo "
 "raktu.  Ar vis tiek norite priimti šį viešąjį raktą?"
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 "Gautas vartotojo %s viešasis raktas.  Ar norite priimti šį viešąjį raktą?"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13794,65 +9769,73 @@
 "%s\n"
 "%s\n"
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Patikrinti viešąjį raktą"
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Peržiūrėti..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Nepalaikomas viešojo rakto tipas"
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "Jungties klaida"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr "Nepavyko inicijuoti SILC kliento jungties"
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr "Apsikeičiama raktais"
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "Trūksta atminties"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr "Vardenis Pavardenis"
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Nepavyko inicijuoti SILC protokolo"
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Negalima surasti ar atverti ~/.silc katalogo"
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Jungiamasi prie SILC serverio"
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Nepavyko įkelti SILC raktų poros: %s"
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr "Nepavyko sukurti jungties."
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr "Jūsų dabartinė nuotaika"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+msgid "Normal"
+msgstr "Normaliai"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr "Įsimylėjęs"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13860,44 +9843,47 @@
 "\n"
 "Jūsų labiausiai mėgstami kontaktavimo būdai"
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr "Kontaktas vaizdo konferencijoms"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "Jūsų dabartinė būsena"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr "Tiesioginės tarnybos"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr "Leisti kitiems pamatyti, kokiomis tarnybomis Jūs naudojatės"
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr "Leisti kitiems pamatyti, kokiu kompiuteriu Jūs naudojatės"
 
 # „vCard“ yra tikrinis žodis
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr "Jūsų vCard failas"
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr "Vartotojo prisijungimo būsenos atributai"
 
-#: ../libgaim/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/silc.c:739
 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 "
@@ -13907,169 +9893,173 @@
 "informaciją ir Jūsų asmeninę informaciją.  Prašome užpildyti informaciją, "
 "kurią matys kiti vartotojai apie Jus."
 
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:1424
 msgid "Message of the Day"
 msgstr "Dienos žinutė"
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:779
 msgid "No Message of the Day available"
 msgstr "Dienos žinutės nėra"
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:1419
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nėra susietos su šia jungtimi dienos žinutės"
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:947
 msgid "Create New SILC Key Pair"
 msgstr "Kuriama nauja SILC raktų pora..."
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:831
 msgid "Passphrases do not match"
 msgstr "Slaptafrazės nesutampa"
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:875
 msgid "Key Pair Generation failed"
 msgstr "Raktų poros sukūrimas nepavyko"
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:914
 msgid "Key length"
 msgstr "Rakto ilgis"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:916
 msgid "Public key file"
 msgstr "Viešojo rakto failas"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:918
 msgid "Private key file"
 msgstr "Privataus rakto failas"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:941
 msgid "Passphrase (retype)"
 msgstr "Slaptafrazė (pakartoti)"
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Generate Key Pair"
 msgstr "Sukurti raktų porą"
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:992
 msgid "Online Status"
 msgstr "Prisijungimo būsena"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1001
 msgid "View Message of the Day"
 msgstr "Žiūrėti dienos žinutę"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1005
 msgid "Create SILC Key Pair..."
 msgstr "Sukurti SILC raktų porą..."
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1104
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Vartotojo <i>%s</i> nėra tinkle"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1295
 msgid "Topic too long"
 msgstr "Tema per ilga"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1376
 msgid "You must specify a nick"
 msgstr "Jūs privalote nurodyti vardą"
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1478
 #, c-format
 msgid "channel %s not found"
 msgstr "kanalas %s nerastas"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1483
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Kanalo %s būsenos: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "kanalas %s neturi būsenų"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1498
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nepavyko nustatyti %s kanalo būsenų"
 
-#: ../libgaim/protocols/silc/silc.c:1534
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Nežinoma komanda: %s (gali būti Gaim riktas)"
-
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1528
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Nežinoma komanda: %s, (gali būti programos riktas)"
+
+#: ../libpurple/protocols/silc/silc.c:1591
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanalas]:  palikti kanalą"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1595
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]  palikti kanalą"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1599
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [nauja tema]:  rodyti arba pakeisti temą"
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1604
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;kanalas&gt; [slaptažodis]:  prisijungti prie pokalbių kanalo šiame "
 "tinkle"
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1608
 msgid "list:  List channels on this network"
 msgstr "list:  parodyti šio tinklo kanalų sąrašą"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1612
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;vardas&gt;  rodyti informaciją apie vartotoją"
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;vardas&gt; &lt;žinutė&gt;:  vartotojui nusiųsti privačią žinutę"
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1620
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;vardas&gt; [žinutė]:  vartotojui nusiųsti privačią žinutę"
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1624
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  rodyti serverio dienos žinutę"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1628
 msgid "detach:  Detach this session"
 msgstr "detach:  atskirti šią sesiją"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1632
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [žinutė]:  atsijungti nuo serverio su papildoma neprivaloma žinute"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1636
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komanda&gt;  iškviesti bet kokią SILC kliento komandą"
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1642
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;vardas&gt; [-viešasis raktas|&lt;priežastis&gt;]:  išmesti vartotoją"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1646
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;naujas-vardas&gt;:  pakeisti Jūsų vardą"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1650
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;slapyvardis&gt;:  rodyti informaciją apie vartotoją"
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1654
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -14077,7 +10067,7 @@
 "cmode &lt;kanalas&gt; [+|-&lt;būsenos&gt;] [argumentai]:  keisti arba rodyti "
 "kanalo būsenas"
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1658
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -14085,17 +10075,17 @@
 "cumode &lt;kanalas&gt; +|-&lt;būsenos&gr; &lt;slapyvardis&gt;:  keisti "
 "vartotojo būsenas kanale"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1662
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;vartotojo-būsenos&gt;:  nustatyti Jūsų būsenas tinkle"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1666
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;slapyvardis&gt; [-viešasis raktas]:  gauti serverio operatoriaus "
 "privilegijas"
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1670
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -14103,40 +10093,40 @@
 "invite &lt;kanalas&gt; [-|+]&lt;slapyvardis&gt;:  pakviesti vartotoją arba "
 "įterpti/pašalinti iš kanalo pakvietimų sąrašo"
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1674
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanalas&gt; &lt;slapyvardis&gt; [komentaras]:  išspirti vartotoją "
 "iš kanalog"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1678
 msgid "info [server]:  View server administrative details"
 msgstr "info [serveris]:  rodyti serverio administracines detales"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1682
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;kanalas&gt; +|-&lt;slapyvardis&gt;]:  uždrausti vartotojui "
 "prisijungti prie kanalo"
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1686
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nick|server&gt;:  gauti vartotojo arba serverio viešąjį raktą"
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1690
 msgid "stats:  View server and network statistics"
 msgstr "stats:  rodyti serverio ir tinklo statistiką"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1694
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  skimbtelėti serveriui"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1699
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanalas&gt;:  rodyti vartotojus kanale"
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1703
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -14163,112 +10153,117 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1814
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolo papildinys"
 
 #  *  description
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1816
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "SILC papildinys"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+msgid "Network"
+msgstr "Tinklas"
+
+#: ../libpurple/protocols/silc/silc.c:1853
 msgid "Public Key file"
 msgstr "Viešojo rakto failas"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1857
 msgid "Private Key file"
 msgstr "Privataus rakto failas"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1867
 msgid "Cipher"
 msgstr "Šifras"
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1880
 msgid "Public key authentication"
 msgstr "Tapatybės nustatymas viešuoju raktu"
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1883
 msgid "Reject watching by other users"
 msgstr "Atmesti kitų vartotojų vykdomą stebėjimą"
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1886
 msgid "Block invites"
 msgstr "Blokuoti kvietimus"
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1889
 msgid "Block IMs without Key Exchange"
 msgstr "Blokuoti greitąsias žinutes be raktų apsikeitimo"
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1892
 msgid "Reject online status attribute requests"
 msgstr "Atmesti prisijungimo būsenos atributų užklausas"
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "Blokuoti rašymo ant lentos žinutes"
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "Automatiškai atidaryti rašymo lentą"
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "Skaitmeniškai pasirašyti ir patikrinti visas greitąsias žinutes"
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Kuriama SILC raktų pora..."
 
 #. 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)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Asmenvardis: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Vartotojo vardas: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "El. paštas: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Mazgo vardas:   %s\n"
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizacija: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Šalis: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmas:  \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Rakto ilgis, bitais: \t%d\n"
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -14278,7 +10273,7 @@
 "Viešojo rakto kontrolinė suma:\n"
 "%s\n"
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -14287,36 +10282,37 @@
 "Viešojo rakto žodinė kontrolinė suma:\n"
 "%s"
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Viešojo rakto informacija"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr "Žinutės į pranešimų gaviklį"
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:561
 msgid "Video Conferencing"
 msgstr "Vaizdo konferencija"
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "Kompiuteris"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "Terminalas"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "„%s“ atsiuntė rašymo ant lentos žinutę. Ar norite atidaryti lentą?"
 
-#: ../libgaim/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -14325,36 +10321,36 @@
 "„%s“ atsiuntė rašymo ant lentos žinutę kanale „%s“. Ar norite atidaryti "
 "lentą?"
 
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Lenta"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libgaim/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Nepavyko rašyti"
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "Nepavyko prisijungti"
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1516
+#: ../libpurple/protocols/simple/simple.c:1558
+#: ../libpurple/protocols/simple/simple.c:1571
+#: ../libpurple/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr "Nepavyko sukurti jungties klausymuisi"
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "Nepavyko nustatyti mazgo IP adreso"
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not resolve hostname"
 msgstr "Nepavyko nustatyti mazgo IP adreso"
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP vartotojų vardai negali turėti matomų tarpų ar „@“ simbolių"
 
@@ -14376,7 +10372,7 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolo papildinys"
 
@@ -14391,153 +10387,153 @@
 #  *< version
 #  *  summary
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolo papildinys"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Skelbti būseną (pastaba: bet kas galės Jus stebėti)"
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1845
 msgid "Use UDP"
 msgstr "Naudoti UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "Be tarpininko"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "Tarpininkas"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr "Vartotojas prieigos teisės tikrinimui"
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr "Sritis prieigos teisės tikrinimui"
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Ieškoma %s"
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Prisijungimas prie %s nepavyko"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Prisijungiama: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Negalima rašyti failo %s."
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Negalima skaityti failo %s."
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Žinutė per ilga, paskutiniai %s bitai nukąsti."
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nėra šiuo metu prisijungęs"
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Vartotojo %s perspėjimas neleidžiamas"
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Žinutė prarasta, Jūs viršijote maksimalią serverio greičio ribą"
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Pokalbis %s nepasiekiamas"
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Žinutes gavėjui %s Jūs siunčiate per greitai."
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Jūs praleidote žinutę iš %s, nes ji buvo išsiųsta per didelė"
 
-#: ../libgaim/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Jūs praleidote žinutę iš %s, nes ji buvo išsiųsta per greitai."
 
-#: ../libgaim/protocols/toc/toc.c:518
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Nesekmė."
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Per daug atitikimų."
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Reikia labiau apibrėžti."
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogo tarnyba laikinai neprieinama."
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "El. pašto adresų paieška apribota."
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Ignoruotas bazinis žodis"
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Nėra bazinių žodžių"
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Vartotojas neturi katalogo informacijos"
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Nepalaikoma šalis."
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Nežinoma nesekmė: %s."
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Neteisingas vardas arba slaptažodis"
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Paslauga laikinai nepasiekiama"
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Jūsų perspėjimo lygis šiuo metu yra per aukštas, kad galėtumėte prisijungti."
 
-#: ../libgaim/protocols/toc/toc.c:558
+#: ../libpurple/protocols/toc/toc.c:558
 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."
@@ -14546,85 +10542,71 @@
 "minučių ir pabandykite iš naujo.  Jei ir toliau bandysite, Jums reikės "
 "laukti dar ilgiau."
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Įvyko nežinoma prisijungimo klaida: %s."
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Įvyko nežinoma klaida %d.  Informacija: %s"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Neteisingas grupės pavadinimas"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Jungtis uždaryta"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Laukiama atsako..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC protokolo užlaikymas baigėsi. Dabar Jūs vėl galite siųsti žinutes."
 
-#: ../libgaim/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Slaptažodis pakeistas sėkmingai"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC atsiuntė PAUSE komandą."
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"Kai taip atsitinka, TOC ignoruoja gaunamas žinutes ir gali jus išspirti, jei "
-"atsiunčiate žinutę.  Gaim jokių žinučių į TOC nepraleis.  Tai tik laikina, "
-"būkite kantrūs."
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "_Grupė:"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Gauti katalogo informaciją"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Nustatyti katalogo informaciją"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Nepavyko atverti %s rašymui!"
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "Failų perdavimas nepavyko; greičiausiai kita pusė jį nutraukė."
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Nepavyko prisijungti perdavimui."
 
-#: ../libgaim/protocols/toc/toc.c:2095
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Nepavyko rašyti failo antraštės.  Failas nebus perduotas."
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - Įrašyti kaip..."
-
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Įrašyti kaip..."
+
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
@@ -14632,7 +10614,7 @@
 msgstr[1] "%s prašo %s priimti %d failus: %s (%.2f %s)%s%s"
 msgstr[2] "%s prašo %s priimti %d failų: %s (%.2f %s)%s%s"
 
-#: ../libgaim/protocols/toc/toc.c:2236
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s prašo nusiųsti jam failą"
@@ -14647,35 +10629,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolo papildinys"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:805
 msgid "Your Yahoo! message did not get sent."
 msgstr "Jūsų Yahoo! žinutė nebuvo išsiųsta."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr "Bzzz!!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:875
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s ką tik Jums zvimbtelėjo!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sisteminis pranešimas vartotojui %s:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "Authorization denied message:"
 msgstr "Prieigos teisės nesuteikimo žinutė:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1064
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s atmetė (atgaline data) Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -14684,26 +10666,23 @@
 "%s atmeteė (atgaline data) Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą "
 "dėl šios priežasties: %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 msgid "Add buddy rejected"
 msgstr "Bičiulio pridėjimas atmestas"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1821
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"Yahoo serveris pareikalavo nežinomo tapatybės nustatymo metodo.  Ši Gaim "
-"versija turbūt nesugebės sėkmingai prisijungti prie Yahoo.  Atnaujinimų "
-"ieškokite %s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr "Yahoo serveris pareikalavo nežinomo tapatybės nustatymo metodo.   Jums turbūt nepavyks sėkmingai prisijungti prie Yahoo.  Paieškokite atnaujinimų adresu %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! tapatybės nustatymas nepavyko"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -14712,164 +10691,152 @@
 "Jūs bandėte ignoruoti vartotoją %s, bet jis yra Jūsų bičiulių sąraše.  "
 "Paspauskite „Taip“, jei norite pašalinti ir ignoruoti bičiulį."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 msgid "Ignore buddy?"
 msgstr "Ar ignoruoti bičiulį?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "Nepavyko įprastinis tapatybės nustatymas!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"Įprastinis tapatybės nustatymo metodas nepavyko.  Tai reiškia, kad arba Jūsų "
-"slaptažodis neteisingas, arba kad Yahoo! tapatybės nustatymo metodas "
-"pasikeitė.  Gaim dabar pabandys prisijungti naudodamas žiniatinklio pokalbių "
-"programos tapatybės nustatymo metodu.  Tai sumažins prieinamą funkcionalumą."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Jūsų abonentas užblokuotas, prisijunkite prie Yahoo! svetainės."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Nežinomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetainės galbūt "
 "tai pataisys."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2007
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Nepavyko pridėti bičiulio %s į grupę %s serverio sąraše paskyroje %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 msgid "Could not add buddy to server list"
 msgstr "Nepavyko pridėti bičiulio į serverio sarašą"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Garsinė žinutė %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2461
 msgid "Received unexpected HTTP response from server."
 msgstr "Gautas nelauktas HTTP atsakymas iš serverio."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2485
+#: ../libpurple/protocols/yahoo/yahoo.c:2664
+#: ../libpurple/protocols/yahoo/yahoo.c:2768
+#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Jungties klaida"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3486
 msgid "Not at Home"
 msgstr "Ne namie"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3489
 msgid "Not at Desk"
 msgstr "Ne darbo vietoje"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Not in Office"
 msgstr "Ne biure"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
 msgid "On Vacation"
 msgstr "Atostogose"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Stepped Out"
 msgstr "Trumpam išėjęs"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
+#: ../libpurple/protocols/yahoo/yahoo.c:3015
 msgid "Not on server list"
 msgstr "Nėra serverio sąraše"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3032
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
 msgid "Appear Online"
 msgstr "Atrodyti prisijungusiu"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3035
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Appear Permanently Offline"
 msgstr "Atrodyti atsijungusiu"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3053
 msgid "Presence"
 msgstr "Būsena"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Offline"
 msgstr "Atrodyti atsijungusiu"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3105
 msgid "Don't Appear Permanently Offline"
 msgstr "Neatrodyti atsijungusiu"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3153
 msgid "Join in Chat"
 msgstr "Prisijungti prie pokalbio"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Initiate Conference"
 msgstr "Inicijuoti konferenciją"
 
 #  Use Environmental Settings
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3187
 msgid "Presence Settings"
 msgstr "Būsenos nuostatos"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Start Doodling"
 msgstr "Pradėti paišinėjimą"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#: ../libpurple/protocols/yahoo/yahoo.c:3225
 msgid "Active which ID?"
 msgstr "Kuris ID yra aktyvus?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
 msgid "Join who in chat?"
 msgstr "Prisijungti prie ko į pokalbį?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
 msgid "Activate ID..."
 msgstr "Aktyvuoti ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
 msgid "Join User in Chat..."
 msgstr "Prisijungti prie vartotojo pokalbyje..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3755
+msgid "You have just sent a Buzz!"
+msgstr "Jūs ką tik zvimbtelėjote!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3814
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 "join &lt;kambarys&gt;:  prisijungti prie pokalbių kambario Yahoo tinkle"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  parodyti šio Yahoo tinklo kanalų sąrašą"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz:  pazyzti kontaktui, kad atkreipti jo dėmesį"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle:  paprašyti kontakto pradėti su juo paišymo seansą"
 
@@ -14883,90 +10850,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4023
+#: ../libpurple/protocols/yahoo/yahoo.c:4025
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolo papildinys"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonija"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4045
 msgid "Pager server"
 msgstr "Pranešimų gaviklio serveris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Japan Pager server"
 msgstr "Japonijos pranešimų gaviklio serveris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4051
 msgid "Pager port"
 msgstr "Pranešimų gaviklio prievadas"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "File transfer server"
 msgstr "Failų perdavimo serveris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4057
 msgid "Japan file transfer server"
 msgstr "Japonijos failų perdavimo serveris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4060
 msgid "File transfer port"
 msgstr "Failų perdavimo prievadas"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4063
 msgid "Chat room locale"
 msgstr "Pokalbių kambario lokalė"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4066
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Chat room list URL"
 msgstr "Pokalbių kambarių sąrašo URL"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Yahoo Chat server"
 msgstr "Yahoo pokalbių serveris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Yahoo Chat port"
 msgstr "Yahoo pokalbių serverio prievadas"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "Vartotojas %s atmetė Jūsų konferencijos pakvietimą į kambarį „%s“ dėl "
 "priežasties „%s“."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Pakvietimas atmestas"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Nepavyko prisijungti prie pokalbio"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Nežinomas kambarys"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Galbūt kambarys yra pilnas"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Neprieinamas"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -14974,68 +10941,68 @@
 "Nežinoma klaida. Jums gali tektis atsijungti ir palaukti penkias minutės "
 "prieš atgaunant galimybę prisijungti prie pokalbių kambario"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Jūs dabar kalbate %s."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "Nepavyko prisijungti prie bičiulio pokalbių kambaryje"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "Galbūt jie nėra pokalbių kambaryje?"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr "Nepavyko gauti kambarių sąrašo."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr "Balsai"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr "Internetinės kameros"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr "Nepavyko gauti kambarių sąrašo."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "Vartotojų kambariai"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Nusiųsta Doodle užklausa."
 
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "Negalima nustatyti failo deskriptoriaus."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
 msgid "Write Error"
 msgstr "Rašymo klaida"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japonija profilis"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profilis"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -15043,53 +11010,53 @@
 "Atsiprašome, profiliai, pažymėti kaip tik suaugusiems, nėra palaikomi šiuo "
 "metu."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr "Jeigu norite pamatyti šį profilį, turite šį saitą atverti naršyklėje:"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Hobiai"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Naujienos"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Namų puslapis"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Puiki nuoroda 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Puiki nuoroda 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Puiki nuoroda 3"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Paskutinis atnaujinimas"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Vartotojo %s informacija nepasiekiama"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -15097,7 +11064,7 @@
 "Atsiprašome, bet atrodo, jog šis profilis parašytas šiuo metu nepalaikoma "
 "kalba ar formatu."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -15105,7 +11072,7 @@
 "Nepavyko gauti vartotojo profilio.  Greičiausiai tai yra laikina serverio "
 "problema.  Prašome pabandyti vėliau iš naujo."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 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 "
@@ -15116,15 +11083,15 @@
 "egzistuojančio vartotojo profilio, todėl jei žinote, kad toks vartotojas "
 "egzistuoja, pabandykite vėliau iš naujo."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "Tuščias vartotojo profilis."
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Jungties su YCHT serveriu problemos."
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -15133,7 +11100,7 @@
 "Prarastas prisijungimas prie serverio\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -15141,85 +11108,85 @@
 "(Įvyko pranešimo konvertavimo klaida. Patikrinkite parinktį „Koduotė“ "
 "paskyrų redaktoriuje)"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Nepavyko išsiųsti žinutės į pokalbių kambarį %s,%s,%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1203
 msgid "User"
 msgstr "Vartotojas"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1209
 msgid "Hidden or not logged-in"
 msgstr "Pasislėpęs arba neprisijungęs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1211
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Prisijungęs prie %s nuo %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1546
-#: ../libgaim/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1545
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
 msgid "Anyone"
 msgstr "Bet kas"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2353
 msgid "_Class:"
 msgstr "_Klasė"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr "_Instancija"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr "_Gavėjas:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Bandymas užsirašyti į %s,%s,%s nepavyko"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2689
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;slapyvardis&gt;:  surasti vartotoją"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2694
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;slapyvardis&gt;:  surasti vartotoją"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2699
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;klasė&gt; &lt;instancija&gt; &lt;gavėjas&gt;:  prisijungti prie "
 "naujo pokalbio"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancija&gt;:  siųsti žinutę adresu &lt;ŽINUTĖ,<i>instancija</i>,"
 "*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -15227,7 +11194,7 @@
 "zci &lt;klasė&gt; &lt;instancija&gt;:  siųsti žinutę adresu &lt;<i>klasė</"
 "i>, <i>instancija</i>,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 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;"
@@ -15235,7 +11202,7 @@
 "zcir &lt;klasė&gt; &lt;instancija&gt; &lt;gavėjas&gt;:  siųsti žinutę adresu "
 "&lt;<i>klasė</i>,<i>instancija</i>,<i>gavėjas</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -15243,16 +11210,16 @@
 "zir &lt;instancija&gt; &lt;gavėjas&gt;:  siųsti žinutę adresu &lt;ŽINUTĖ,"
 "<i>instancija</i>,<i>gavėjas</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;klasė&gt;:  siųsti žinutę adresu &lt;<i>klasė</i>,ASMENINĖ,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr "Prisiregistruoti iš naujo"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr "Gauti registracijas iš serverio"
 
@@ -15266,45 +11233,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2939
+#: ../libpurple/protocols/zephyr/zephyr.c:2941
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolo papildinys"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2960
 msgid "Use tzc"
 msgstr "Naudoti „tzc“"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2963
 msgid "tzc command"
 msgstr "„tzc“ komanda"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2966
 msgid "Export to .anyone"
 msgstr "Eksportuoti į .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2969
 msgid "Export to .zephyr.subs"
 msgstr "Eksportuoti į .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Import from .anyone"
 msgstr "Importuoti iš .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "Import from .zephyr.subs"
 msgstr "Importuoti iš .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Realm"
 msgstr "Sritis"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Exposure"
 msgstr "Atskleidimas"
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -15314,70 +11281,70 @@
 "%s"
 
 #  Data is assumed to be the destination sn
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Nepavyko suprasti HTTP tarpininko serverio atsakymo: %s\n"
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP tarpininko serverio jungties klaida %d"
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Kreiptis atmesta: tarpininkaujantis serveris draudžia prievado %d "
 "tuneliavimą."
 
-#: ../libgaim/proxy.c:984
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "Klaida nustatant %s"
 
-#: ../libgaim/proxy.c:1676
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
 msgstr "Nepavyko nustatyti mazgo IP adreso"
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 msgid "_Yes"
 msgstr "_Taip"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 msgid "_No"
 msgstr "_Ne"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1360
 msgid "_Accept"
 msgstr "_Priimti"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Manęs čia nėra šiuo metu"
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:526
 msgid "saved statuses"
 msgstr "išsaugotos būsenos"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s dabar žinomas kaip %s.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:670
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -15386,73 +11353,73 @@
 "Vartotojas %s pakvietė bičiulį %s į pokalbių kambarį %s:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:675
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Vartotojas %s pakvietė bičiulį %s į pokalbių kambarį %s\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:679
 msgid "Accept chat invitation?"
 msgstr "Ar priimti pakvietimą į pokalbių kambarį?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Atstatyti"
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:156
 msgid "Unavailable"
 msgstr "Nepasiekiamas"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobilus"
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s pakeitė būseną iš %s į %s"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s dabar vadinasi %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s nebėra %s"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s tapo neveiklus"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s tapo veiklus"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s tapo neveiklus"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s tapo veiklus"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2442
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s skaitymo klaida"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2443
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -15461,15 +11428,15 @@
 "Failo %s skaitymo metu įvyko klaida.  Failas įkeltas nebuvo, o senasis "
 "failas pervadintas į %s~."
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2906
 msgid "Calculating..."
 msgstr "Skaičiuojama..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2909
 msgid "Unknown."
 msgstr "Nežinoma."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:2935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -15477,7 +11444,7 @@
 msgstr[1] "%d sekundės"
 msgstr[2] "%d sekundžių"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:2947
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -15485,7 +11452,7 @@
 msgstr[1] "%d dienos"
 msgstr[2] "%d dienų"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:2955
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -15493,7 +11460,7 @@
 msgstr[1] "%s, %d valandos"
 msgstr[2] "%s, %d valandų"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:2961
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -15501,7 +11468,7 @@
 msgstr[1] "%d valandos"
 msgstr[2] "%d valandų"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:2969
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -15509,7 +11476,7 @@
 msgstr[1] "%s, %d minutės"
 msgstr[2] "%s, %d minučių"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:2975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -15517,12 +11484,12 @@
 msgstr[1] "%d minutės"
 msgstr[2] "%d minučių"
 
-#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
+#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: ../libgaim/util.c:3292
+#: ../libpurple/util.c:3368
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -15531,17 +11498,4353 @@
 "Negalima išskirti pakankamai atminties %s turinio saugojimui.  Galbūt\n"
 "žiniatinklio serveris tyčia bando padaryti kažką blogo."
 
-#: ../libgaim/util.c:3327
+#: ../libpurple/util.c:3403
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Skaitymo iš %s klaida: %s"
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3434
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Rašymo į %s klaida: %s"
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3459
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nepavyko prisijungti prie %s: %s"
+
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Pokalbiai internete"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin pokalbiai internete"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Bendrauti keliais interneto pokalbių protokolais"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientacija"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Juostelės orientacija"
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:390
+msgid "Login Options"
+msgstr "Seanso pradžios parinktys"
+
+#: ../pidgin/gtkaccount.c:492
+msgid "Local alias:"
+msgstr "Vietinis alternatyvusis vardas:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:554
+msgid "User Options"
+msgstr "Vartotojo parinktys"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:572
+msgid "Use this buddy icon for this account:"
+msgstr "Naudoti tokį vartotojo paveiksliuką šiai paskyrai:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:684
+#, c-format
+msgid "%s Options"
+msgstr "%s parinktys"
+
+#  Use Global Proxy Settings
+#  Use Global Proxy Settings
+#: ../pidgin/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "naudoti GNOME tarpininkų nuostatas"
+
+#  Use Global Proxy Settings
+#  Use Global Proxy Settings
+#: ../pidgin/gtkaccount.c:882
+msgid "Use Global Proxy Settings"
+msgstr "naudoti visuotines tarpininkų nuostatas"
+
+#: ../pidgin/gtkaccount.c:888
+msgid "No Proxy"
+msgstr "be tarpininkų"
+
+#: ../pidgin/gtkaccount.c:894
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:900
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:906
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#  Use Environmental Settings
+#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "naudoti aplinkos nuostatas"
+
+#. 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.
+#: ../pidgin/gtkaccount.c:951
+msgid "If you look real closely"
+msgstr "Jei pažiūrėtumėte tikrai iš arti,"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:954
+msgid "you can see the butterflies mating"
+msgstr "galėtumėte matyti besiporuojancius drugelius"
+
+#: ../pidgin/gtkaccount.c:975
+msgid "Proxy Options"
+msgstr "Tarpininko parinktys"
+
+#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "Tarpininko _tipas:"
+
+#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Mazgas:"
+
+#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "_Prievadas:"
+
+#: ../pidgin/gtkaccount.c:1010
+msgid "_Username:"
+msgstr "_Vartotojo vardas:"
+
+#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "_Slaptažodis:"
+
+#: ../pidgin/gtkaccount.c:1428
+msgid "Add Account"
+msgstr "Pridėti paskyrą"
+
+#: ../pidgin/gtkaccount.c:1452
+msgid "_Basic"
+msgstr "_Pagrindinės nuostatos"
+
+#: ../pidgin/gtkaccount.c:1463
+msgid "_Advanced"
+msgstr "Papildomos _nuostatos"
+
+#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+msgid "Enabled"
+msgstr "Įjungta"
+
+#: ../pidgin/gtkaccount.c:1961
+msgid "Protocol"
+msgstr "Protokolas"
+
+#: ../pidgin/gtkaccount.c:2144
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>Sveikiname pradėjus naudoti %s!</span>\n"
+"\n"
+"Jūs neturite nustatytų paskyrų.  Norėdami su %s prisijungti, paspauskite <b>„Pridėti“</b> mygtuką žemiau ir sukonfigūruokite pirmąją savo paskyrą.  Jei norite, kad %s prisijungtų prie daugiau paskyrų, paspauskite <b>„Pridėti“</b> daugiau kartų ir sukonfigūruokite visas paskyras.\n"
+"\n"
+"Vėliau galite sugrįžti į šį langą sukurti, keisti, ar pašalinti paskyrų per „Paskyros“ -> „Pridėti/Keisti“ meniu bičiulių sąrašo lange."
+
+#: ../pidgin/gtkblist.c:704
+msgid "Join a Chat"
+msgstr "Prisijungti prie pokalbio"
+
+#: ../pidgin/gtkblist.c:725
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Prašome įvesti atitinkamą informaciją apie pokalbį, prie kurio norite "
+"prisijungti\n"
+
+#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "Pas_kyra:"
+
+#  Block button
+#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Blokuoti"
+
+#  Block button
+#: ../pidgin/gtkblist.c:1010
+msgid "Un_block"
+msgstr "_Nebeblokuoti"
+
+#: ../pidgin/gtkblist.c:1061
+msgid "Get _Info"
+msgstr "Gauti _informaciją"
+
+#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+msgid "I_M"
+msgstr "_Kalbėtis"
+
+#: ../pidgin/gtkblist.c:1070
+msgid "_Send File"
+msgstr "_Siųsti failą"
+
+#: ../pidgin/gtkblist.c:1077
+msgid "Add Buddy _Pounce"
+msgstr "_Nauja reakcija į bičiulį"
+
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
+#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+msgid "View _Log"
+msgstr "Žiūrėti žurna_lą"
+
+#: ../pidgin/gtkblist.c:1097
+msgid "Alias..."
+msgstr "Naujas alternatyvusis vardas..."
+
+#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1213
+msgid "_Alias..."
+msgstr "N_aujas alternatyvusis vardas..."
+
+#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
+#: ../pidgin/gtkblist.c:1215
+msgid "_Remove"
+msgstr "_Pašalinti"
+
+#: ../pidgin/gtkblist.c:1155
+msgid "Add a _Buddy"
+msgstr "Įtraukti _bičiulį"
+
+#: ../pidgin/gtkblist.c:1157
+msgid "Add a C_hat"
+msgstr "Įt_raukti pokalbių kambarį"
+
+#: ../pidgin/gtkblist.c:1160
+msgid "_Delete Group"
+msgstr "_Pašalinti grupę"
+
+#: ../pidgin/gtkblist.c:1162
+msgid "_Rename"
+msgstr "P_ervadinti"
+
+#  join button
+#. join button
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+msgid "_Join"
+msgstr "Prisi_jungti"
+
+#: ../pidgin/gtkblist.c:1182
+msgid "Auto-Join"
+msgstr "Automatiškai prisijungti"
+
+#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+msgid "_Collapse"
+msgstr "_Suskleisti"
+
+#: ../pidgin/gtkblist.c:1248
+msgid "_Expand"
+msgstr "Išskl_eisti"
+
+#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
+#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+msgid "/Tools/Mute Sounds"
+msgstr "/Įrankiai/Išjungti garsus"
+
+#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
+#: ../pidgin/gtkpounce.c:421
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Šiuo metu Jūs nesate prisijungęs su paskyra, kuri leistų įtraukti šį bičiulį."
+
+#  Buddies menu
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2757
+msgid "/_Buddies"
+msgstr "/_Bičiuliai"
+
+#: ../pidgin/gtkblist.c:2758
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Bičiuliai/_Nauja žinutė..."
+
+#: ../pidgin/gtkblist.c:2759
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Bičiuliai/Prisijungti prie _pokalbio..."
+
+#: ../pidgin/gtkblist.c:2760
+msgid "/Buddies/Get User _Info..."
+msgstr "/Bičiuliai/Ga_uti vartotojo informaciją..."
+
+#: ../pidgin/gtkblist.c:2761
+msgid "/Buddies/View User _Log..."
+msgstr "/Buddies/_Rodyti vartotojo žurnalus..."
+
+#: ../pidgin/gtkblist.c:2763
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Bičiuliai/Rodyti _atsijungusius bičiulius"
+
+#: ../pidgin/gtkblist.c:2764
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Bičiuliai/Rodyti _tuščias grupes"
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#: ../pidgin/gtkblist.c:2765
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Bičiuliai/Rodyti _informaciją apie bičiulius"
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#: ../pidgin/gtkblist.c:2766
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Bičiuliai/Rodyti n_eveiklumo laikus"
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#: ../pidgin/gtkblist.c:2767
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Bičiuliai/_Surikiuoti bičiulius"
+
+#: ../pidgin/gtkblist.c:2769
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Bičiuliai/Pri_dėti bičiulį..."
+
+#: ../pidgin/gtkblist.c:2770
+msgid "/Buddies/Add C_hat..."
+msgstr "/Bičiuliai/Pridėti pokalbių _kambarį..."
+
+#: ../pidgin/gtkblist.c:2771
+msgid "/Buddies/Add _Group..."
+msgstr "/Bičiuliai/Prid_ėti grupę..."
+
+#: ../pidgin/gtkblist.c:2773
+msgid "/Buddies/_Quit"
+msgstr "/Bičiuliai/Bai_gti"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2776
+msgid "/_Accounts"
+msgstr "/_Paskyros"
+
+#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Accounts/Pridėti\\/Keisti"
+
+#  Tools
+#. Tools
+#: ../pidgin/gtkblist.c:2780
+msgid "/_Tools"
+msgstr "/_Įrankiai"
+
+#: ../pidgin/gtkblist.c:2781
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Įrankiai/_Reakcijos į bičiulius"
+
+#: ../pidgin/gtkblist.c:2782
+msgid "/Tools/Plu_gins"
+msgstr "/Įrankiai/_Papildiniai"
+
+#: ../pidgin/gtkblist.c:2783
+msgid "/Tools/Pr_eferences"
+msgstr "/Įrankiai/N_uostatos"
+
+#: ../pidgin/gtkblist.c:2784
+msgid "/Tools/Pr_ivacy"
+msgstr "/Įrankiai/Pr_ivatumas"
+
+#: ../pidgin/gtkblist.c:2786
+msgid "/Tools/_File Transfers"
+msgstr "/Įrankiai/_Failų perdavimas"
+
+#: ../pidgin/gtkblist.c:2787
+msgid "/Tools/R_oom List"
+msgstr "/Įrankiai/_Kambarių sąrašas"
+
+#: ../pidgin/gtkblist.c:2788
+msgid "/Tools/System _Log"
+msgstr "/Įrankiai/Sistemos žurna_las"
+
+#: ../pidgin/gtkblist.c:2790
+msgid "/Tools/Mute _Sounds"
+msgstr "/Tools/Išjungti gar_sus"
+
+#  Help
+#. Help
+#: ../pidgin/gtkblist.c:2793
+msgid "/_Help"
+msgstr "/Pa_galba"
+
+#: ../pidgin/gtkblist.c:2794
+msgid "/Help/Online _Help"
+msgstr "/Pagalba/_Žinynas internete"
+
+#: ../pidgin/gtkblist.c:2795
+msgid "/Help/_Debug Window"
+msgstr "/Pagalba/_Derinimo langas"
+
+#: ../pidgin/gtkblist.c:2796
+msgid "/Help/_About"
+msgstr "/Pagalba/_Apie"
+
+#: ../pidgin/gtkblist.c:2824
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Abonentas:</b> %s"
+
+#: ../pidgin/gtkblist.c:2902
+msgid "Buddy Alias"
+msgstr "Alternatyvusis bičiulio vardas"
+
+#: ../pidgin/gtkblist.c:2923
+msgid "Logged In"
+msgstr "Prisijungęs"
+
+#: ../pidgin/gtkblist.c:2969
+msgid "Last Seen"
+msgstr "Paskutinį kartą matytas"
+
+#: ../pidgin/gtkblist.c:2989
+msgid "Spooky"
+msgstr "Vaiduokliškas"
+
+#: ../pidgin/gtkblist.c:2991
+msgid "Awesome"
+msgstr "Stulbinantis"
+
+#: ../pidgin/gtkblist.c:2993
+msgid "Rockin'"
+msgstr "Pavarantis"
+
+#: ../pidgin/gtkblist.c:3318
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Neveiklus %d val. %02d min. "
+
+#: ../pidgin/gtkblist.c:3320
+#, c-format
+msgid "Idle %dm"
+msgstr "Neveiklus %d min. "
+
+#: ../pidgin/gtkblist.c:3457
+msgid "/Buddies/New Instant Message..."
+msgstr "/Bičiuliai/Nauja žinutė..."
+
+#  Make menu items sensitive/insensitive where appropriate
+#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+msgid "/Buddies/Join a Chat..."
+msgstr "/Bičiuliai/Prisijungti prie pokalbio..."
+
+#: ../pidgin/gtkblist.c:3459
+msgid "/Buddies/Get User Info..."
+msgstr "/Bičiuliai/Gauti vartotojo informaciją..."
+
+#: ../pidgin/gtkblist.c:3460
+msgid "/Buddies/Add Buddy..."
+msgstr "/Bičiuliai/Pridėti bičiulį..."
+
+#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+msgid "/Buddies/Add Chat..."
+msgstr "/Bičiuliai/Pridėti pokalbių kambarį..."
+
+#: ../pidgin/gtkblist.c:3462
+msgid "/Buddies/Add Group..."
+msgstr "/Bičiuliai/Pridėti grupę..."
+
+#: ../pidgin/gtkblist.c:3497
+msgid "/Tools/Buddy Pounces"
+msgstr "/Įrankiai/Reakcijos į bičiulius"
+
+#: ../pidgin/gtkblist.c:3500
+msgid "/Tools/Privacy"
+msgstr "/Įrankiai/Privatumas"
+
+#: ../pidgin/gtkblist.c:3503
+msgid "/Tools/Room List"
+msgstr "/Įrankiai/Kambarių sąrašas"
+
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d neperskaityta žinutė iš %s\n"
+msgstr[1] "%d neperskaitytos žinutės iš %s\n"
+msgstr[2] "%d neperskaitytų žinučių iš %s\n"
+
+#: ../pidgin/gtkblist.c:3677
+msgid "Manually"
+msgstr "rankiniu būdu"
+
+#: ../pidgin/gtkblist.c:3679
+msgid "Alphabetically"
+msgstr "pagal abėcėlę"
+
+#: ../pidgin/gtkblist.c:3680
+msgid "By status"
+msgstr "pagal statusą"
+
+#: ../pidgin/gtkblist.c:3681
+msgid "By log size"
+msgstr "pagal žurnalo dydį"
+
+#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s atsijungė"
+
+#: ../pidgin/gtkblist.c:3892
+msgid "Re-enable Account"
+msgstr "Iš naujo aktyvuoti paskyrą"
+
+#: ../pidgin/gtkblist.c:3913
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s atsijungė: %s</span>"
+
+#: ../pidgin/gtkblist.c:4066
+msgid "<b>Username:</b>"
+msgstr "<b>Vartotojo vardas:</b>"
+
+#: ../pidgin/gtkblist.c:4073
+msgid "<b>Password:</b>"
+msgstr "<b>Slaptažodis:</b>"
+
+#: ../pidgin/gtkblist.c:4084
+msgid "_Login"
+msgstr "_Prisijungti"
+
+#: ../pidgin/gtkblist.c:4169
+msgid "/Accounts"
+msgstr "/Paskyros"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4183
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span size='larger' weight='bold'>Sveikiname pradėjus naudoti %s!</span>\n"
+"\n"
+"Jūs neturite aktyvuotų paskyrų.  Aktyvuokite jas lange <b>„Paskyros“</b>, pasiekiamame per <b>„Paskyros“ -> „Pridėti/Keisti“</b> meniu bičiulių sąrašo lange.  Aktyvavę paskyras, galėsite prisijungti, nustatyti savo būseną ir šnekėtis su draugais."
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4425
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Bičiuliai/Rodyti atsijungusius bičiulius"
+
+#: ../pidgin/gtkblist.c:4428
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Bičiuliai/Rodyti tuščias grupes"
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#: ../pidgin/gtkblist.c:4434
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Bičiuliai/Rodyti informaciją apie bičiulius"
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#: ../pidgin/gtkblist.c:4437
+msgid "/Buddies/Show Idle Times"
+msgstr "/Bičiuliai/Rodyti neveiklumo laikus"
+
+#: ../pidgin/gtkblist.c:5271
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Prašome įvesti prisijungimo vardą asmens, kurį norite įtraukti į savo "
+"bičiulių sąrašą. Papildomai galite alternatyvųjį vardą. Kur galima, "
+"alternatyvusis vardas bus rodomas vietoje prisijungimo vardo.\n"
+
+#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grupė:"
+
+#: ../pidgin/gtkblist.c:5590
+msgid "This protocol does not support chat rooms."
+msgstr "Šis protokolas nepalaiko pokalbių kambarių."
+
+#: ../pidgin/gtkblist.c:5606
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Šiuo metu nesate prisijungęs su jokiu pokalbių kambarius palaikančiu "
+"protokolu."
+
+#: ../pidgin/gtkblist.c:5647
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Prašome įvesti alternatyvųjį vardą ir kitą informaciją apie pokalbių "
+"kambarį, kurį norite įtraukti į bičiulių sąrašą.\n"
+
+#: ../pidgin/gtkblist.c:5730
+msgid "Please enter the name of the group to be added."
+msgstr "Prašome įvesti pridedamos grupės pavadinimą."
+
+#: ../pidgin/gtkblist.c:6364
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Paskyros/"
+
+#: ../pidgin/gtkblist.c:6388
+msgid "_Edit Account"
+msgstr "K_eisti paskyrą..."
+
+#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+msgid "No actions available"
+msgstr "Veiksmų nėra"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "_Disable"
+msgstr "_Deaktyvuoti"
+
+#: ../pidgin/gtkblist.c:6421
+msgid "Enable Account"
+msgstr "Aktyvuoti paskyrą"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Paskyros/Aktyvuoti paskyrą"
+
+#  Tools
+#: ../pidgin/gtkblist.c:6476
+msgid "/Tools"
+msgstr "/Įrankiai"
+
+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
+#: ../pidgin/gtkblist.c:6546
+msgid "/Buddies/Sort Buddies"
+msgstr "/Bičiuliai/Surikiuoti bičiulius"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"%s nebebandys prisijungti su šia paskyra, kol nepataisysite klaidos\n"
+"ir paskyros neaktyvuosite iš naujo."
+
+#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "Tas bičiulis nenaudoja to paties protokolo kaip šis pokalbių kambarys."
+
+#: ../pidgin/gtkconv.c:802
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Šiuo metu Jūs nesate prisijungęs su jokia paskyra, kuri leistų pakviesti tą "
+"bičiulį."
+
+#: ../pidgin/gtkconv.c:855
+msgid "Invite Buddy Into Chat Room"
+msgstr "Pakviesti bičiulį į pokalbių kambarį"
+
+#  Put our happy label in it.
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:885
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Prašom įvesti vartotojo, kurį norite pakviesti, vardą, kartu su neprivaloma "
+"pakvietimo žinute."
+
+#: ../pidgin/gtkconv.c:906
+msgid "_Buddy:"
+msgstr "_Bičiulis:"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
+msgid "_Message:"
+msgstr "Ž_inutė:"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Negalima atidaryti failo."
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Pokalbis su %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "Įrašyti pokalbį"
+
+#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+msgid "Find"
+msgstr "Paieška"
+
+#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_Ieškoti:"
+
+#: ../pidgin/gtkconv.c:1338
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Žurnalų vedimas įjungtas. Būsimos šio pokalbio žinutės bus įvestos į žurnalą."
+
+#: ../pidgin/gtkconv.c:1346
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Žurnalų vedimas išjungtas. Būsimos šio pokalbio žinutės nebus įvestos į "
+"žurnalą."
+
+#: ../pidgin/gtkconv.c:1614
+msgid "Un-Ignore"
+msgstr "Nebeignoruoti"
+
+#: ../pidgin/gtkconv.c:1617
+msgid "Ignore"
+msgstr "Ignoruoti"
+
+#: ../pidgin/gtkconv.c:1637
+msgid "Get Away Message"
+msgstr "Gauti pasitraukimo žinutę"
+
+#: ../pidgin/gtkconv.c:1660
+msgid "Last said"
+msgstr "Paskutinė žinutė"
+
+#: ../pidgin/gtkconv.c:2495
+msgid "Unable to save icon file to disk."
+msgstr "Negalima įrašyti vartotojo paveiksliuko failo į diską."
+
+#: ../pidgin/gtkconv.c:2565
+msgid "Save Icon"
+msgstr "Įrašyti vartotojo paveiksliuką"
+
+#: ../pidgin/gtkconv.c:2614
+msgid "Animate"
+msgstr "Animuoti"
+
+#: ../pidgin/gtkconv.c:2619
+msgid "Hide Icon"
+msgstr "Paslėpti vartotojo paveiksliuką"
+
+#: ../pidgin/gtkconv.c:2622
+msgid "Save Icon As..."
+msgstr "Įrasyti vartotojo paveiksliuką kaip..."
+
+#: ../pidgin/gtkconv.c:2626
+msgid "Set Custom Icon..."
+msgstr "Nustatyti specialų vartotojo paveiksliuką..."
+
+#: ../pidgin/gtkconv.c:2633
+msgid "Remove Custom Icon"
+msgstr "Pašalinti specialų vartotojo paveiksliuką"
+
+#  Conversation menu
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2774
+msgid "/_Conversation"
+msgstr "/_Pokalbis"
+
+#: ../pidgin/gtkconv.c:2776
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Pokalbis/_Nauja žinutė..."
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/_Find..."
+msgstr "/Pokalbis/_Ieškoti..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/View _Log"
+msgstr "/Pokalbis/Žiūrėti žurna_lą"
+
+#: ../pidgin/gtkconv.c:2784
+msgid "/Conversation/_Save As..."
+msgstr "/Pokalbis/Įrašyti _kaip..."
+
+#: ../pidgin/gtkconv.c:2786
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Pokalbis/Iš_valyti langą"
+
+#: ../pidgin/gtkconv.c:2790
+msgid "/Conversation/Se_nd File..."
+msgstr "/Pokalbis/Nusiųsti _failą..."
+
+#: ../pidgin/gtkconv.c:2791
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Pokalbis/_Pridėti reakciją į bičiulį..."
+
+#: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/_Get Info"
+msgstr "/Pokalbis/_Gauti informaciją"
+
+#: ../pidgin/gtkconv.c:2795
+msgid "/Conversation/In_vite..."
+msgstr "/Pokalbis/P akviesti..."
+
+#: ../pidgin/gtkconv.c:2797
+msgid "/Conversation/M_ore"
+msgstr "/Pokalbis/_Daugiau"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Conversation/Al_ias..."
+msgstr "/Pokalbis/Al_ternatyvusis vardas..."
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Conversation/_Block..."
+msgstr "/Pokalbis/_Blokuoti..."
+
+#: ../pidgin/gtkconv.c:2805
+msgid "/Conversation/_Unblock..."
+msgstr "/Pokalbis/Atbl_okuoti..."
+
+#: ../pidgin/gtkconv.c:2807
+msgid "/Conversation/_Add..."
+msgstr "/Pokalbis/P_ridėti..."
+
+#: ../pidgin/gtkconv.c:2809
+msgid "/Conversation/_Remove..."
+msgstr "/Pokalbis/P_ašalinti..."
+
+#: ../pidgin/gtkconv.c:2814
+msgid "/Conversation/_Close"
+msgstr "/Pokalbis/U_žverti"
+
+#  Options
+#. Options
+#: ../pidgin/gtkconv.c:2818
+msgid "/_Options"
+msgstr "/P_arinktys"
+
+#: ../pidgin/gtkconv.c:2819
+msgid "/Options/Enable _Logging"
+msgstr "/Parinktys/Įjungti ž_urnalų vedimą"
+
+#: ../pidgin/gtkconv.c:2820
+msgid "/Options/Enable _Sounds"
+msgstr "/Parinktys/Įjungti gar_sus"
+
+#: ../pidgin/gtkconv.c:2821
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Parinktys/Rodyt_i vartotojo paveiksliuką"
+
+#: ../pidgin/gtkconv.c:2823
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Parinktys/Rodyti forma_to taikymo priemonių juostas"
+
+#: ../pidgin/gtkconv.c:2824
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Parinktys/Rodyti laiko žy_mas"
+
+#: ../pidgin/gtkconv.c:2899
+msgid "/Conversation/More"
+msgstr "/Pokalbis/Daugiau"
+
+#  Conversation menu
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+msgid "/Conversation"
+msgstr "/Pokalbis"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/View Log"
+msgstr "/Pokalbis/Rodyti žurnalą"
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Send File..."
+msgstr "/Pokalbis/Siųsti failą..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Pokalbis/Pridėti reakciją į bičiulį..."
+
+#: ../pidgin/gtkconv.c:3000
+msgid "/Conversation/Get Info"
+msgstr "/Pokalbis/Gauti informaciją"
+
+#: ../pidgin/gtkconv.c:3004
+msgid "/Conversation/Invite..."
+msgstr "/Pokalbis/Pakviesti..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Conversation/Alias..."
+msgstr "/Pokalbis/Alternatyvusis vardas..."
+
+#: ../pidgin/gtkconv.c:3014
+msgid "/Conversation/Block..."
+msgstr "/Pokalbis/Blokuoti..."
+
+#: ../pidgin/gtkconv.c:3018
+msgid "/Conversation/Unblock..."
+msgstr "/Pokalbis/Atblokuoti..."
+
+#: ../pidgin/gtkconv.c:3022
+msgid "/Conversation/Add..."
+msgstr "/Pokalbis/Pridėti..."
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Conversation/Remove..."
+msgstr "/Pokalbis/Pašalinti..."
+
+#: ../pidgin/gtkconv.c:3030
+msgid "/Options/Enable Logging"
+msgstr "/Parinktys/Įjungti žurnalų vedimą"
+
+#: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Sounds"
+msgstr "/Parinktys/Įjungti garsus"
+
+#: ../pidgin/gtkconv.c:3046
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Parinktys/Rodyti formato taikymo priemonių juostas"
+
+#: ../pidgin/gtkconv.c:3049
+msgid "/Options/Show Timestamps"
+msgstr "/Parinktys/Rodyti laiko žymas"
+
+#: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Buddy Icon"
+msgstr "/Options/Rodyti vartotojo paveiksliuką"
+
+#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+msgid "User is typing..."
+msgstr "Vartotojas rašo..."
+
+#: ../pidgin/gtkconv.c:3176
+msgid "User has typed something and stopped"
+msgstr "Vartotojas kažką parašė, bet toliau neberašo"
+
+#  Build the Send As menu
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3358
+msgid "_Send To"
+msgstr "_Siųsti į"
+
+#  Build the Send As menu
+#: ../pidgin/gtkconv.c:4065
+msgid "_Send"
+msgstr "_Siųsti"
+
+#  Setup the label telling how many people are in the room.
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4213
+msgid "0 people in room"
+msgstr "0 žmonių kambaryje"
+
+#  Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d asmuo kambaryje"
+msgstr[1] "%d asmenys kambaryje"
+msgstr[2] "%d asmenų kambaryje"
+
+#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+msgid "Typing"
+msgstr "Renkamas tekstas"
+
+#: ../pidgin/gtkconv.c:5986
+msgid "Stopped Typing"
+msgstr "Nustota rinkti tekstą"
+
+#: ../pidgin/gtkconv.c:5991
+msgid "Nick Said"
+msgstr "Pasakytas vardas"
+
+#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "Neperskaitytos žinutės"
+
+#: ../pidgin/gtkconv.c:6001
+msgid "New Event"
+msgstr "Naujas įvykis"
+
+#: ../pidgin/gtkconv.c:7122
+msgid "Confirm close"
+msgstr "Patvirtinkite uždarymą"
+
+#: ../pidgin/gtkconv.c:7154
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Turite neperskaitytų žinučių. Ar tikrai norite uždaryti langą?"
+
+#: ../pidgin/gtkconv.c:7689
+msgid "Close other tabs"
+msgstr "Uždaryti kitas korteles"
+
+#: ../pidgin/gtkconv.c:7695
+msgid "Close all tabs"
+msgstr "Uždaryti visas korteles"
+
+#: ../pidgin/gtkconv.c:7703
+msgid "Detach this tab"
+msgstr "Atskirti šią kortelę"
+
+#: ../pidgin/gtkconv.c:7709
+msgid "Close this tab"
+msgstr "Uždaryti šią kortelę"
+
+#: ../pidgin/gtkconv.c:8012
+msgid "Close conversation"
+msgstr "Uždaryti pokalbį"
+
+#: ../pidgin/gtkconv.c:8476
+msgid "Last created window"
+msgstr "Paskutiniame sukurtame lange"
+
+#: ../pidgin/gtkconv.c:8478
+msgid "Separate IM and Chat windows"
+msgstr "Atskiruose asmeninių pokalbių ir pokalbių kambarių languose"
+
+#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Naujame lange"
+
+#: ../pidgin/gtkconv.c:8482
+msgid "By group"
+msgstr "Grupuoti pagal grupę"
+
+#: ../pidgin/gtkconv.c:8484
+msgid "By account"
+msgstr "Grupuoti pagal paskyrą"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Įrašyti derinimo žurnalą"
+
+#: ../pidgin/gtkdebug.c:594
+msgid "Invert"
+msgstr "Priešingai"
+
+#: ../pidgin/gtkdebug.c:597
+msgid "Highlight matches"
+msgstr "Paryškinti rastus rezultatus"
+
+#: ../pidgin/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "T_ik piktogramos"
+
+#: ../pidgin/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "_Tik tekstai"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Piktogramos ir tekstai"
+
+#: ../pidgin/gtkdebug.c:802
+msgid "Filter"
+msgstr "Filtras"
+
+#: ../pidgin/gtkdebug.c:821
+msgid "Right click for more options."
+msgstr "Spustelėkite dešinįjį pelės mygtuką kitų parinkčių rodymui."
+
+#: ../pidgin/gtkdebug.c:851
+msgid "Level "
+msgstr "Lygis "
+
+#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Pasirinkite derinimo informacijos filtravimo lygį."
+
+#: ../pidgin/gtkdebug.c:860
+msgid "All"
+msgstr "Viskas"
+
+#: ../pidgin/gtkdebug.c:861
+msgid "Misc"
+msgstr "Kiti"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Warning"
+msgstr "Perspėjimai"
+
+#: ../pidgin/gtkdebug.c:864
+msgid "Error "
+msgstr "Klaidos "
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Lemtingos klaidos"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+msgid "lead developer"
+msgstr "pagrindinis kūrėjas"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+msgid "developer"
+msgstr "kūrėjas"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "kūrėjas ir svetainės administratorius"
+
+#: ../pidgin/gtkdialogs.c:84
+msgid "support"
+msgstr "palaikymas"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support/QA"
+msgstr "priežiūra ir kokybės kontrolė"
+
+#: ../pidgin/gtkdialogs.c:107
+msgid "win32 port"
+msgstr "perkėlimas į win32"
+
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+msgid "maintainer"
+msgstr "prižiūrėtojas"
+
+#: ../pidgin/gtkdialogs.c:110
+msgid "libfaim maintainer"
+msgstr "libfaim prižiūrėtojas"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:112
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hakeris ir negeriantis, nes prie vairo [tingus netikėlis]"
+
+#: ../pidgin/gtkdialogs.c:113
+msgid "Jabber developer"
+msgstr "Jabber kūrėjas"
+
+#: ../pidgin/gtkdialogs.c:114
+msgid "original author"
+msgstr "pradinis autorius"
+
+#: ../pidgin/gtkdialogs.c:121
+msgid "Afrikaans"
+msgstr "Būrų kalba"
+
+#: ../pidgin/gtkdialogs.c:122
+msgid "Arabic"
+msgstr "Arabų kalba"
+
+#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:205
+msgid "Bulgarian"
+msgstr "Bulgarų kalba"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+msgid "Bengali"
+msgstr "Bengalų kalba"
+
+#: ../pidgin/gtkdialogs.c:129
+msgid "Bosnian"
+msgstr "Bosnių kalba"
+
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+msgid "Catalan"
+msgstr "Katalonų kalba"
+
+#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+msgid "Valencian-Catalan"
+msgstr "Valenciečių-katalonų kalba"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+msgid "Czech"
+msgstr "Čekų kalba"
+
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+msgid "Danish"
+msgstr "Danų kalba"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:209
+msgid "German"
+msgstr "Vokiečių kalba"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+msgid "Dzongkha"
+msgstr "Botijų kalba"
+
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+msgid "Greek"
+msgstr "Graikų kalba"
+
+#: ../pidgin/gtkdialogs.c:143
+msgid "Australian English"
+msgstr "Australų anglų kalba"
+
+#: ../pidgin/gtkdialogs.c:144
+msgid "Canadian English"
+msgstr "Kanadiečių anglų kalba"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "British English"
+msgstr "Britų anglų kalba"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
+msgid "Spanish"
+msgstr "Ispanų kalba"
+
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+msgid "Euskera(Basque)"
+msgstr "Baskų kalba"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
+msgid "Persian"
+msgstr "Persų kalba"
+
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+msgid "Finnish"
+msgstr "Suomių kalba"
+
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "French"
+msgstr "Prancūzų kalba"
+
+#: ../pidgin/gtkdialogs.c:155
+msgid "Galician"
+msgstr "Galeganų kalba"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+msgid "Gujarati"
+msgstr "Gudžaratų kalba"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+msgid "Hebrew"
+msgstr "Hebrajų kalba"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Hindi"
+msgstr "Hindi kalba"
+
+#: ../pidgin/gtkdialogs.c:160
+msgid "Hungarian"
+msgstr "Vengrų kalba"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Indonesian"
+msgstr "Indoneziečių kalba"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+msgid "Italian"
+msgstr "Italų kalba"
+
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+msgid "Japanese"
+msgstr "Japonų kalba"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Georgian"
+msgstr "Gruzinų kalba"
+
+#: ../pidgin/gtkdialogs.c:165
+msgid "Kannada"
+msgstr "Kanadų kalba"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgid "Korean"
+msgstr "Korėjiečių kalba"
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:169
+msgid "Kurdish"
+msgstr "Kurdų kalba"
+
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+msgid "Lithuanian"
+msgstr "Lietuvių kalba"
+
+#: ../pidgin/gtkdialogs.c:171
+msgid "Macedonian"
+msgstr "Makedoniečių kalba"
+
+#: ../pidgin/gtkdialogs.c:172
+msgid "Bokmål Norwegian"
+msgstr "Norvegų kalba (Bokmål)"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Nepali"
+msgstr "Nepalų kalba"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Dutch, Flemish"
+msgstr "Olandų, flamandų kalba"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Norwegian"
+msgstr "Norvegų kalba"
+
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgid "Polish"
+msgstr "Lenkų kalba"
+
+#: ../pidgin/gtkdialogs.c:179
+msgid "Portuguese"
+msgstr "Portugalų kalba"
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Portuguese-Brazil"
+msgstr "Brazilų portugalų kalba"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Pashto"
+msgstr "Puštūnų kalba"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Romanian"
+msgstr "Rumunų kalba"
+
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+msgid "Russian"
+msgstr "Rusų kalba"
+
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
+msgid "Slovak"
+msgstr "Slovakų kalba"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+msgid "Slovenian"
+msgstr "Slovėnų kalba"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Albanian"
+msgstr "Albanų kalba"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+msgid "Serbian"
+msgstr "Serbų kalba"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+msgid "Swedish"
+msgstr "Švedų kalba"
+
+#: ../pidgin/gtkdialogs.c:191
+msgid "Tamil"
+msgstr "Tamilų kalba"
+
+#: ../pidgin/gtkdialogs.c:192
+msgid "Telugu"
+msgstr "Telugu kalba"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Thai"
+msgstr "Tajų kalba"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Turkish"
+msgstr "Turkų kalba"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Vietnamese"
+msgstr "Vietnamiečių kalba"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M. Thanh ir Gnome-Vi komanda"
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+msgid "Simplified Chinese"
+msgstr "Supaprastinta kinų kalba"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:238
+msgid "Traditional Chinese"
+msgstr "Tradicinė kinų kalba"
+
+#: ../pidgin/gtkdialogs.c:204
+msgid "Amharic"
+msgstr "Amharų kalba"
+
+#: ../pidgin/gtkdialogs.c:323
+#, c-format
+msgid "About %s"
+msgstr "Apie %s"
+
+#: ../pidgin/gtkdialogs.c:359
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr "%s yra modulinė pokalbių programa, su kuria galima bendrauti AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu ir QQ tinkluose – visuose vienu metu.  Gaim parašyta naudojanat GTK+.<br><br>Jūs galite keisti ir platinti šią programą GPL (2 ar vėlesnės versijos) sąlygomis.  GPL kopija yra faile „COPYING“, platinamame kartu su %s.  %s autorinės teisės priklauso programos autoriams. Faile „COPYRIGHT“ pateiktas pilnas autorių sąrašas. Mes nepateikiame jokios garantijos šiai programai.<br><br>"
+
+#: ../pidgin/gtkdialogs.c:374
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin kanalas serveryje irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:377
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin kanalas serveryje irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:383
+msgid "Current Developers"
+msgstr "Dabartiniai kūrėjai"
+
+#: ../pidgin/gtkdialogs.c:398
+msgid "Crazy Patch Writers"
+msgstr "Pakvaišę pataisų rašytojai"
+
+#: ../pidgin/gtkdialogs.c:413
+msgid "Retired Developers"
+msgstr "Buvę kūrėjai"
+
+#: ../pidgin/gtkdialogs.c:428
+msgid "Artists"
+msgstr "Menininkai"
+
+#: ../pidgin/gtkdialogs.c:443
+msgid "Current Translators"
+msgstr "Dabartiniai vertėjai"
+
+#: ../pidgin/gtkdialogs.c:463
+msgid "Past Translators"
+msgstr "Buvę vertėjai"
+
+#: ../pidgin/gtkdialogs.c:481
+msgid "Debugging Information"
+msgstr "Derinimo informacija"
+
+#: ../pidgin/gtkdialogs.c:855
+msgid "Get User Info"
+msgstr "Gauti vartotojo informaciją"
+
+#: ../pidgin/gtkdialogs.c:857
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Įveskite vardą arba alternatyvųjį vardą asmens, kurio informaciją Jūs norite "
+"pažiūrėti."
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "Žiūrėti vartotojo žurnalą"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Įveskite vardą arba alternatyvųjį vardą asmens, kurio žurnalą norite "
+"pažiūrėti."
+
+#: ../pidgin/gtkdialogs.c:967
+msgid "Alias Contact"
+msgstr "Alternatyvusis kontakto vardas"
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Enter an alias for this contact."
+msgstr "Įveskite alternatyvųjį vardą šiam kontaktui."
+
+#: ../pidgin/gtkdialogs.c:988
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Įveskite alternatyvųjį vardą vartotojui %s."
+
+#: ../pidgin/gtkdialogs.c:990
+msgid "Alias Buddy"
+msgstr "Alternatyvusis bičiulio vardas"
+
+#: ../pidgin/gtkdialogs.c:1009
+msgid "Alias Chat"
+msgstr "Alternatyvusis pokalbių kambario vardas"
+
+#: ../pidgin/gtkdialogs.c:1010
+msgid "Enter an alias for this chat."
+msgstr "Įveskite alternatyvųjį vardą šiam pokalbių kambariui."
+
+#: ../pidgin/gtkdialogs.c:1047
+#, 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] ""
+"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitą šio bičiulio "
+"paskyrą iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+msgstr[1] ""
+"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitas bičiulio "
+"paskyras iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+msgstr[2] ""
+"Jūs ruošiatės pašalinti kontaktą su %s ir turintį dar %d kitų bičiulio "
+"paskyrų iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+
+#: ../pidgin/gtkdialogs.c:1055
+msgid "Remove Contact"
+msgstr "Pašalinti kontaktą"
+
+#: ../pidgin/gtkdialogs.c:1056
+msgid "_Remove Contact"
+msgstr "_Pašalinti kontaktą"
+
+#: ../pidgin/gtkdialogs.c:1086
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "Jūs ruošiates grupę %s prijungti prie grupės %s. Ar norite tęsti?"
+
+#: ../pidgin/gtkdialogs.c:1093
+msgid "Merge Groups"
+msgstr "Sujungti grupes"
+
+#: ../pidgin/gtkdialogs.c:1094
+msgid "_Merge Groups"
+msgstr "_Sujungti grupes"
+
+#: ../pidgin/gtkdialogs.c:1144
+#, 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 ""
+"Jūs ruošiates pašalinti grupę %s ir visus jos narius iš Jūsų bičiulių "
+"sąrašo.  Ar norite tęsti?"
+
+#: ../pidgin/gtkdialogs.c:1147
+msgid "Remove Group"
+msgstr "Pašalinti grupę"
+
+#: ../pidgin/gtkdialogs.c:1148
+msgid "_Remove Group"
+msgstr "_Pašalinti grupę"
+
+#: ../pidgin/gtkdialogs.c:1181
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Jūs ruošiates pašalinti %s iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+
+#: ../pidgin/gtkdialogs.c:1184
+msgid "Remove Buddy"
+msgstr "Pašalinti bičiulį"
+
+#: ../pidgin/gtkdialogs.c:1185
+msgid "_Remove Buddy"
+msgstr "_Pašalinti bičiulį"
+
+#: ../pidgin/gtkdialogs.c:1206
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Jūs ruošiates pašalinti pokalbių kambarį %s iš Jūsų bičiulių sąrašo.  Ar "
+"norite tęsti?"
+
+#: ../pidgin/gtkdialogs.c:1209
+msgid "Remove Chat"
+msgstr "Pašalinti pokalbių kambarį"
+
+#: ../pidgin/gtkdialogs.c:1210
+msgid "_Remove Chat"
+msgstr "_Pašalinti pokalbių kambarį"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+"Spustelėkite dešinį pelės mygtuką, kad pamatytumėte kitas neperskaitytas "
+"žinutes...\n"
+
+#: ../pidgin/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "Keisti būseną"
+
+#: ../pidgin/gtkdocklet.c:495
+msgid "Show Buddy List"
+msgstr "Rodyti bičiulių sąrašą"
+
+#: ../pidgin/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "Nauja žinutė..."
+
+#: ../pidgin/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "Išjungti garsus"
+
+#: ../pidgin/gtkdocklet.c:543
+msgid "Blink on new message"
+msgstr "Mirksėti gavus naujų žinučių"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:554
+msgid "Quit"
+msgstr "Baigti"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Nepradėta"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Gaunama kaip:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Gaunama iš:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Siunčiama kam:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Siunčiama kaip:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "Jokia programa nėra sukonfigūruota atverti šio tipo failą."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Failo atvėrimo metu įvyko klaida."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Programos %s paleidimo klaida: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Programos %s vykdymo klaida"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "Procesas grąžino klaidos kodą %d"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Failo pavadinimas:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Vietinis failas:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Greitis:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Praėjo laiko:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Liko laiko:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "_Uždaryti ši langą pasibaigus visiems failų perdavimams"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "_Pašalinti pabaigtus perdavimus"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "_Informacija apie perdavimą"
+
+#  Pause button
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+msgid "_Pause"
+msgstr "_Sustabdyti"
+
+#  Resume button
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "_Tęsti"
+
+#: ../pidgin/gtkimhtml.c:793
+msgid "Paste as Plain _Text"
+msgstr "Įdėti kaip gryną _tekstą"
+
+#: ../pidgin/gtkimhtml.c:810
+msgid "_Reset formatting"
+msgstr "Atstatyti fo_rmato taikymą"
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "Hipersaito spalva"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "Spalva hipersaitų vaizdavimui."
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr "Hipersaito paryškinimo spalva"
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Hipersaito spalva, kai virš jo yra pelės žymeklis."
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "Kopijuoti _el. pašto adresą"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "_Atverti saitą naršyklėje"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "Kopijuoti _saito adresą"
+
+#: ../pidgin/gtkimhtml.c:3271
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weigth='bold'>Neatpažintas failo tipas</span>\n"
+"\n"
+"Laikyti, kad failas yra PNG tipo."
+
+#: ../pidgin/gtkimhtml.c:3274
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Neatpažintas failo tipas\n"
+"\n"
+"Naudojamas numatytasis tipas PNG."
+
+#: ../pidgin/gtkimhtml.c:3287
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Vaizdo įrašymo klaida</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3290
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Vaizdo įrašymo klaida\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+msgid "Save Image"
+msgstr "Įrašyti vaizdą"
+
+#: ../pidgin/gtkimhtml.c:3410
+msgid "_Save Image..."
+msgstr "Įrašyti vai_zdą..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "Pasirinkti šriftą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "Pasirinkti teksto spalvą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "Pasirinkti fono spalvą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "_Aprašymas"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Prašome įvesti norimo įterpti saito URL ir aprašymą. Aprašymas nėra būtinas."
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Prašome įvesti norimo įterpti saito URL."
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "Įterpti saitą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "Įterpt_i"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Nepavyko išsaugoti vaizdo: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Įterpti vaizdą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Šis apipavidalinimas neturi šypsenėlių."
+
+#  show everything
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Šypsokis!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Pusjuodis"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursyvas"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Pabraukimas"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Didesnis šrifto dydis"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Mažesnis šrifto dydis"
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Šrifto garnitūras"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Šrifto spalva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Fono spalva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Pašalinti formato taikymą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Įterpti saitą"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Įterpti paveiksliuką"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Įterpti šypsenėlę"
+
+#: ../pidgin/gtklog.c:262
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr "Ar tikrai norite negrįžtamai ištrinti pokalbių su %s žurnalą, pradėtą %s?"
+
+#: ../pidgin/gtklog.c:273
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "Ar tikrai norite negrįžtamai ištrinti pokalbių %s žurnalą, pradėtą %s?"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "Ar tikrai norite negrįžtamai ištrinti sistemos žurnalą, pradėtą %s?"
+
+#: ../pidgin/gtklog.c:419
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Pokalbis kambaryje %s (%s)</span>"
+
+#: ../pidgin/gtklog.c:422
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Pokalbis su %s (%s)</span>"
+
+#: ../pidgin/gtklog.c:469
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: ../pidgin/gtklog.c:516
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Sisteminiai įvykiai įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "
+"būsenos pasikeitimus į sistemos žurnalą“."
+
+#: ../pidgin/gtklog.c:520
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Skubiosios žinutės įrašomos į žurnalą, jei įjungta nuostata „Rašyti visas "
+"skubiąsias žinutes į žurnalą“."
+
+#: ../pidgin/gtklog.c:523
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Pokalbiai kambariuose įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "
+"pokalbius kambariuoe į žurnalą“.\""
+
+#: ../pidgin/gtklog.c:527
+msgid "No logs were found"
+msgstr "Žurnalų nerasta"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:542
+msgid "_Browse logs folder"
+msgstr "_Naršyti žurnalų aplanką"
+
+#: ../pidgin/gtklog.c:606
+msgid "Total log size:"
+msgstr "Viso žurnalo dydis:"
+
+#: ../pidgin/gtklog.c:675
+#, c-format
+msgid "Conversations in %s"
+msgstr "Pokalbiai kambaryje %s"
+
+#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#, c-format
+msgid "Conversations with %s"
+msgstr "Pokalbiai su %s"
+
+#  Window **********
+#: ../pidgin/gtklog.c:760
+msgid "System Log"
+msgstr "Sistemos žurnalas"
+
+#: ../pidgin/gtkmain.c:364
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Daugiau informacijos suteikia komanda „%s -h“.\n"
+
+#: ../pidgin/gtkmain.c:366
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Vartojimas: %s [PARINKTIS] ...\n"
+"\n"
+"  -c, --config=KATALOGAS  naudoti KATALOGAS konfigūracinių failų paieškai\n"
+"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
+"  -h, --help              parodyti šią pagalbą ir baigti\n"
+"  -n, --nologin           neprisijungti automatiškai\n"
+"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"
+"                          VARDAS nurodo paskyrą ar kableliais atskirtas paskyras)\n"
+"  -v, --version           parodyti šios programos versiją ir baigti\n"
+
+#: ../pidgin/gtkmain.c:550
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the Pidgin\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"Įvyko %s segmentacijos klaida ir pabandyta išvesti atminties išklotinę.\n"
+"Tai yra programos riktas ir atsitiko be jokios Jūsų kaltės.\n"
+"\n"
+"Jeigu Jūs galite atkartoti šią klaidą, prašome informuoti Gaim kūrėjus\n"
+"apie klaidą adresu\n"
+"%sbug.php\n"
+"\n"
+"Įsitikinkite, kad nurodote, ką darėte, kai įvyko klaida, ir pridėkite \n"
+"programos steko išklotinę (angl. „backtrace“) iš atminties išklotinės \n"
+"failo.  Jeigu nežinote, kaip gauti programos steko išklotinę, perskaitykite\n"
+"instrukcijas adresu %sgdb.php\n"
+"\n"
+"Jeigu jums reikia papildomos pagalbos, AIM\n"
+"protokolu parašykite vartotojui SeanEgn arba LSchiere.  Informacija, kaip \n"
+"pasiekti Sean ir Luke kitais protokolais, yra adresu\n"
+"%scontactinfo.php\n"
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "Atidaryti visas žinutes"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Jūs gavote laišką!</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "Siuntėjas"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s turi %d naują pranešimą."
+msgstr[1] "%s turi %d naujus pranešimus."
+msgstr[2] "%s turi %d naujų pranešimų."
+
+#: ../pidgin/gtknotify.c:520
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Neteisinga naršyklės komanda „%s“."
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "Negalima atverti URL"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Programos „%s“ paleidimo klaida: %s"
+
+#: ../pidgin/gtknotify.c:1065
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Pasirinkta 'Rankinė' naršyklės komanda, tačiau komanda nenustatyta."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "Šie papildiniai bus iškelti."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Keletas papildinių bus iškelta."
+
+#: ../pidgin/gtkplugin.c:285
+msgid "Unload Plugins"
+msgstr "Iškelti papildinius"
+
+#: ../pidgin/gtkplugin.c:397
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Autorius:</span>\t%s\n"
+"<span weight=\"bold\">Svetainė:</span>\t\t%s\n"
+"<span weight=\"bold\">Failas:</span>\t        %s"
+
+#: ../pidgin/gtkplugin.c:407
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Klaida: %s\n"
+"Patikrinkite, ar papildinio internetinėje svetainėje nėra atnaujinimo.</span>"
+
+#: ../pidgin/gtkplugin.c:533
+msgid "Configure Pl_ugin"
+msgstr "Konfigūr_uoti papildinį"
+
+#: ../pidgin/gtkplugin.c:596
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Informacija apie papildinį</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Pasirinkite failą"
+
+#  Create the "Pounce Who" frame.
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:522
+msgid "Pounce on Whom"
+msgstr "Į ką reaguoti"
+
+#: ../pidgin/gtkpounce.c:549
+msgid "_Buddy name:"
+msgstr "_Bičiulio vardas:"
+
+#: ../pidgin/gtkpounce.c:583
+msgid "Si_gns on"
+msgstr "pr_isijungia"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Signs o_ff"
+msgstr "atsi_jungia"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "_pasitraukia"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "su_grįžta"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "tampa neve_iklus"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Is no longer i_dle"
+msgstr "ta_mpa veiklus"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Starts _typing"
+msgstr "pradeda rašy_ti"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "P_auses while typing"
+msgstr "trumpam nustoja raš_yti"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "Stops t_yping"
+msgstr "nustoja raš_yti"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Sends a _message"
+msgstr "i_šsiunčia žinutę"
+
+#: ../pidgin/gtkpounce.c:644
+msgid "Ope_n an IM window"
+msgstr "Atidaryti pokalbių la_ngą"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "_Pop up a notification"
+msgstr "_Parodyti pranešimo langą"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "Send a _message"
+msgstr "Nusiųsti _žinutę"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "E_xecute a command"
+msgstr "_Įvykdyti komandą"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "P_lay a sound"
+msgstr "_Groti garsą"
+
+#: ../pidgin/gtkpounce.c:657
+msgid "Brows_e..."
+msgstr "Nar_šyti...."
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Br_owse..."
+msgstr "_Naršyti...."
+
+#: ../pidgin/gtkpounce.c:660
+msgid "Pre_view"
+msgstr "Pa_klausyti"
+
+#: ../pidgin/gtkpounce.c:784
+msgid "P_ounce only when my status is not available"
+msgstr "Reaguoti tik tada, kai aš es_u nepasiekamas"
+
+#: ../pidgin/gtkpounce.c:789
+msgid "_Recurring"
+msgstr "_Reakcija yra pasikartojanti"
+
+#  Create the "Pounce When" frame.
+#: ../pidgin/gtkpounce.c:1243
+msgid "Pounce Target"
+msgstr "Reakcija į"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "Nepavyko išpakuoti šypsenėlių apipavidalinimo failo."
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Pasirinkite norimą naudoti šypsenėlių apipavidalinimą iš sąrašo žemiau. "
+"Nauji apipavidalinimai gali būti įdiegti nutempiant juos pele į "
+"apipavidalinimų sąrašą."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Piktograma"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Piktograma sistemos juostelėje"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Rodyti piktogramą sistemos juostelėje:"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "visada"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "kai yra neperskaitytų žinučių"
+
+#  IM Convo trans options
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Pokalbių langų slėpimas"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Slėpti naujus pokalbius"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+msgid "When away"
+msgstr "kai pasitraukęs"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Kortelės"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Rodyti pokalbius ir kambarius languose su kor_telėmis"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Rodyti _uždarymo mygtuką ant kortelių"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "Tal_pinimas:"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "viršuje"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "apačioje"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "kairėje"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "dešinėje"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "vertikalus kairėje"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "vertikalus dešinėje"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "Nau_ji pokalbiai:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Gaunamas žinutes rodyti su _formatavimu"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Rodyt_i vartotojų paveiksliukus"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Leisti bičiulių pikt_ogramų animaciją"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "I_nformuoti bičiulius, kai jiems rašote"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "_Paryškinti neteisingai parašytus žodžius"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Naudoti _tolygią slinktį"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "Mirginti _langą, kai gaunamos žinutės"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Numatytasis formato taikymas"
+
+# Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas su protokolais kurie palaiko formato taikymą. :)
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas protokoluose, palaikančiuose "
+"formato taikymą. :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "ST_UN Serveris:"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\\\"italic\\\">Pavyzdžiui: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "_Automatiškai aptikti IP adresą"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "Viešas _IP:"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "Prievadai"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "Rankiniu būdu nurodyti klauso_mų prievadų režį"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "Pirmas prievada_s:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "Paskutinis pri_evadas:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Tarpininkaujantis serveris"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "be tarpininko"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Vartotojas:"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "SeaMonkey"
+
+#: ../pidgin/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME numatytasis"
+
+#: ../pidgin/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid "Manual"
+msgstr "Rankinis"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "Naršyklės išrinkimas"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "_Naršyklė:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "_Atverti saitą kame:"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "pagal naršyklės nustatymą"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "esamame lange"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "naujoje kortelėje"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Rankinis:\n"
+"(%s žymi URL)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "Žurnalo _formatas:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Rašyti visus asmeninius pokalbius į žurna_lą"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Raš_yti visus pokalbius kambariuose į žurnalą"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Ra_šyti visus būsenos pasikeitimus į sistemos žurnalą"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Garso išrinkimas"
+
+#: ../pidgin/gtkprefs.c:1521
+msgid "Quietest"
+msgstr "Tyliausiai"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "Tyliau"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "Tyliai"
+
+#: ../pidgin/gtkprefs.c:1529
+msgid "Loud"
+msgstr "Garsiai"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Louder"
+msgstr "Garsiau"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Loudest"
+msgstr "Garsiausiai"
+
+#: ../pidgin/gtkprefs.c:1596
+msgid "Sound Method"
+msgstr "Garso grojimo būdas:"
+
+#: ../pidgin/gtkprefs.c:1597
+msgid "_Method:"
+msgstr "_Būdas:"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "Console beep"
+msgstr "pyptelėjimai"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Automatic"
+msgstr "automatinis"
+
+#: ../pidgin/gtkprefs.c:1604
+msgid "Command"
+msgstr "komanda"
+
+#: ../pidgin/gtkprefs.c:1605
+msgid "No sounds"
+msgstr "be garsų"
+
+#: ../pidgin/gtkprefs.c:1613
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Garso k_omanda:\n"
+"(%s reiškia failo vardą)"
+
+#: ../pidgin/gtkprefs.c:1639
+msgid "Sound Options"
+msgstr "Garso parinktys"
+
+#: ../pidgin/gtkprefs.c:1640
+msgid "Sounds when conversation has _focus"
+msgstr "Groti _garsus, kai pokalbio langas yra veikiamasis"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "Įjungti garsus:"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "tik kai esu pasiekiamas"
+
+#: ../pidgin/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "tik kai esu nepasiekiamas"
+
+#: ../pidgin/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "Garsumas:"
+
+#: ../pidgin/gtkprefs.c:1681
+msgid "Sound Events"
+msgstr "Garsai ir veiksmai"
+
+#: ../pidgin/gtkprefs.c:1732
+msgid "Play"
+msgstr "Groti"
+
+#: ../pidgin/gtkprefs.c:1739
+msgid "Event"
+msgstr "Įvykis"
+
+#: ../pidgin/gtkprefs.c:1758
+msgid "Test"
+msgstr "Testuoti"
+
+#: ../pidgin/gtkprefs.c:1762
+msgid "Reset"
+msgstr "Atstatyti"
+
+#: ../pidgin/gtkprefs.c:1766
+msgid "Choose..."
+msgstr "Pasirinkti..."
+
+#: ../pidgin/gtkprefs.c:1809
+msgid "_Report idle time:"
+msgstr "_Rodyti neveiklumo laiką:"
+
+#: ../pidgin/gtkprefs.c:1814
+msgid "Based on keyboard or mouse use"
+msgstr "pagal klaviatūros ir pelės naudojimą"
+
+#: ../pidgin/gtkprefs.c:1823
+msgid "_Auto-reply:"
+msgstr "_Automatinis atsakymas:"
+
+#: ../pidgin/gtkprefs.c:1827
+msgid "When both away and idle"
+msgstr "ir kai pasitraukęs, ir kai neveiklus"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1833
+msgid "Auto-away"
+msgstr "Automatinis pasitraukimas"
+
+#: ../pidgin/gtkprefs.c:1835
+msgid "Change status when _idle"
+msgstr "Pake_isti būseną, kai neveiklus"
+
+#: ../pidgin/gtkprefs.c:1839
+msgid "_Minutes before changing status:"
+msgstr "Kiek minučių turi praeiti iki būsenos keitimo:"
+
+#: ../pidgin/gtkprefs.c:1847
+msgid "Change _status to:"
+msgstr "Pakei_sti būseną į:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1868
+msgid "Status at Startup"
+msgstr "Būsena programos paleidimo metu"
+
+#: ../pidgin/gtkprefs.c:1870
+msgid "Use status from last _exit at startup"
+msgstr "Programos paleidimo metu nustatyti paskutinę prieš tai naudotą būseną"
+
+#: ../pidgin/gtkprefs.c:1876
+msgid "Status to a_pply at startup:"
+msgstr "Programos paleidimo metu nustatyti būseną:"
+
+#: ../pidgin/gtkprefs.c:1914
+msgid "Interface"
+msgstr "Sąsaja"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Smiley Themes"
+msgstr "Šypsenėlių apipavidalinimai"
+
+#: ../pidgin/gtkprefs.c:1917
+msgid "Sounds"
+msgstr "Garsai"
+
+#  We use the registered default browser in windows
+#: ../pidgin/gtkprefs.c:1923
+msgid "Browser"
+msgstr "Naršyklė"
+
+#: ../pidgin/gtkprefs.c:1927
+msgid "Status / Idle"
+msgstr "Būsenos ir neveiklumas"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Leisti visiems vartotojams susisiekti su manimi"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Leisti tik vartotojus iš mano bičiulių sąrašo"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Leisti žemiau išvardintus vartotojus"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Blokuoti visus vartotojus"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Blokuoti žemiau išvardintus vartotojus"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Privatumas"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Privatumo nuostatų pakeitimai iš karto tampa aktyvūs"
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Nustatyti privatumo parinktis vartotojui:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+msgid "Permit User"
+msgstr "Leisti vartotoją"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Įveskite vartotojo, kuriam leidžiate su jumis susisiekti, vardą"
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+"Prašau įvesti vartotojo, kuriam norite leisti su jumis susisiekti, vardą"
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+msgid "_Permit"
+msgstr "_Leisti"
+
+#: ../pidgin/gtkprivacy.c:570
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Ar leisti vartotojui %s susisiekti su Jumis?"
+
+#: ../pidgin/gtkprivacy.c:572
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Ar esate tikras, kad norite leisti vartotojui %s susisiekti su Jumis?"
+
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+msgid "Block User"
+msgstr "Blokuoti vartotoją"
+
+#: ../pidgin/gtkprivacy.c:600
+msgid "Type a user to block."
+msgstr "Įveskite vartotoją, kurį blokuojate, vardą."
+
+#: ../pidgin/gtkprivacy.c:601
+msgid "Please enter the name of the user you wish to block."
+msgstr "Prašau įvesti vartotojo, kurį norite blokuoti, vardą."
+
+#: ../pidgin/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "Ar blokuoti vartotoją %s?"
+
+#: ../pidgin/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Ar esate tikras, kad norite blokuoti vartotoją %s?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Vykdyti"
+
+#: ../pidgin/gtkrequest.c:1469
+msgid "That file already exists"
+msgstr "Toks failas jau yra"
+
+#: ../pidgin/gtkrequest.c:1470
+msgid "Would you like to overwrite it?"
+msgstr "Ar norite jį perrašyti?"
+
+#: ../pidgin/gtkrequest.c:1471
+msgid "Overwrite"
+msgstr "Perrašyti"
+
+#: ../pidgin/gtkrequest.c:1472
+msgid "Choose New Name"
+msgstr "Parinkti kitą vardą"
+
+#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+msgid "Select Folder..."
+msgstr "Pasirinkite aplanką..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Kambarių sąrašas"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "_Gauti sąrašą"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "_Pridėti pokalbių kambarį"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Ar tikrai norite pašalinti pasirinktas įrašytas būsenas?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+msgid "_Use"
+msgstr "Pasi_šalinti"
+
+#: ../pidgin/gtksavedstatuses.c:725
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Toks pavadinimas jau yra.  Privalote pasirinkti unikalų pavadinimą."
+
+#: ../pidgin/gtksavedstatuses.c:913
+msgid "Different"
+msgstr "Skirtinga"
+
+#: ../pidgin/gtksavedstatuses.c:1106
+msgid "_Title:"
+msgstr "_Pavadinimas:"
+
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+msgid "_Status:"
+msgstr "_Būsena:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1157
+msgid "Use a _different status for some accounts"
+msgstr "Kai kurioms paskyroms naudoti kitokią būseną"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1221
+msgid "Sa_ve & Use"
+msgstr "I_šsaugoti ir pasišalinti"
+
+#: ../pidgin/gtksavedstatuses.c:1427
+#, c-format
+msgid "Status for %s"
+msgstr "Paskyros %s būsena"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Bičiulis prisijungia"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Bičiulis atsijungia"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Gauta žinutė"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Gauta žinutė, pradedanti pokalbį"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Išsiųsta žinutė"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Asmuo ateina į pokalbių kambarį"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Asmuo palieka pokalbių kambarį"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Jūs kalbate pokalbių kambaryje"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Kiti kalba pokalbių kambaryje"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Kas nors pokalbių kambaryje pasako Jūsų vardą"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer klaida"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "Nepavyko paleisti GStreamer."
+
+#: ../pidgin/gtkstatusbox.c:611
+msgid "Waiting for network connection"
+msgstr "Laukiama tinklo jungties"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "Įkeliant %s įvyko klaida: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "Nepavyko įkelti vaizdo"
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Negalima išsiųsti katalogo %s."
+
+#: ../pidgin/gtkutils.c:1421
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr "%s negali perduoti katalogo.  Jums reikia perduoti jame esančius failus po vieną."
+
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1467
+msgid "You have dragged an image"
+msgstr "Jūs atitempėte pele paveiksliuką"
+
+#: ../pidgin/gtkutils.c:1454
+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 ""
+"Galite šį paveiksliuką nusiųsti kaip failą, įterpti į šią žinutę, arba "
+"naudoti kaip paveiksliuką šiam vartotojui."
+
+#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+msgid "Set as buddy icon"
+msgstr "Naudoti kaip vartotojo paveiksliuką"
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+msgid "Send image file"
+msgstr "Nusiųsti kaip failą"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+msgid "Insert in message"
+msgstr "Įterpti į žinutę"
+
+#: ../pidgin/gtkutils.c:1463
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Ar norite paveiksliuką naudoti kaip šio vartotojo paveiksliuką?"
+
+#: ../pidgin/gtkutils.c:1468
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"Galite šį paveiksliuką nusiųsti kaip failą, įterpti į žinutę, arba naudoti "
+"kaip šio vartotojo paveiksliuką."
+
+#: ../pidgin/gtkutils.c:1470
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Galite šį paveiksliuką įterpti į žinutę arba naudoti kaip šio vartotojo "
+"paveiksliuką."
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1524
+msgid "Cannot send launcher"
+msgstr "Negalima išsiųsti paleidyklės"
+
+#: ../pidgin/gtkutils.c:1524
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Jūs atitempėte pele darbastalio paleidyklę.  Greičiausiai norite siųsti ne "
+"pačią paleidyklę, o jos paleidžiamą objektą."
+
+#: ../pidgin/gtkutils.c:2291
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Failas:</b> %s\n"
+"<b>Failo dydis:</b> %s\n"
+"<b>Vaizdo dydis:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2611
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+"Failas „%s“ yra per didelis %s.  Pabandykite su mažesniu paveiksliuku.\n"
+
+#: ../pidgin/gtkutils.c:2613
+msgid "Icon Error"
+msgstr "Paveiksliuko klaida"
+
+#: ../pidgin/gtkutils.c:2614
+msgid "Could not set icon"
+msgstr "Nepavyko nustatyti paveiksliuko"
+
+#: ../pidgin/gtkutils.c:2715
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nepavyko atverti failo „%s“: %s"
+
+#: ../pidgin/gtkutils.c:2764
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Paveiksliuko „%s“ nepavyko įkelti dėl nežinomos priežasties, turbūt tai yra "
+"sugadintas paveiksliuko failas"
+
+#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Įrašyti failą"
+
+#: ../pidgin/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Pasirinkite spalvą"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Alias"
+msgstr "_Alternatyvusis vardas"
+
+#: ../pidgin/pidginstock.c:90
+msgid "Close _tabs"
+msgstr "Uždaryti kor_teles"
+
+#: ../pidgin/pidginstock.c:92
+msgid "_Get Info"
+msgstr "_Gauti informaciją"
+
+#  Invite
+#: ../pidgin/pidginstock.c:93
+msgid "_Invite"
+msgstr "Pakv_iesti"
+
+#: ../pidgin/pidginstock.c:94
+msgid "_Modify"
+msgstr "_Keisti"
+
+#: ../pidgin/pidginstock.c:95
+msgid "_Open Mail"
+msgstr "_Atverti paštą"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Rodyti statistiką"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Atsakymo tikimybė:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Statistikos parinktys"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr "Didžiausias atsakymo laukimo laikas:"
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+msgid "minutes"
+msgstr "minutės"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr "Didžiausias paskutinio pamatymo laiko skirtumas:"
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "Slenkstis:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr "Kontaktų prieinamumo nuspėjimas"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr "Kontaktų prieinamumo nuspėjimo papildinys."
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"Kontaktų prieinamumo papildinys parodo statistinę informaciją apie bičiulius "
+"vartotojų bičiulių sąraše."
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "bičiulis yra neveiklus"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "bičiulis yra pasitraukęs"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "bičiulis yra ilgam pasitraukęs"
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "bičiulis yra mobilus"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "bičiulis yra atsijungęs"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Kiek taškų skiriama, kai..."
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr "Bičiulis su <i>daugiausia taškų</i> turės kontakto pirmenybę.\n"
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Jeigu keli bičiuliai surinko vienodai taškų, pasirinkti paskutinį"
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Kiek taškų skiriama paskyrai..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Kontakto pirmenybė"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "Leidžia keisti reikšmes, susietas su skirtingomis bičiulių būsenomis."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Leidžia keisti reikšmes, susietas su įvairiomis bičiulių būsenomis, "
+"naudojamas kontakto pirmenybės skaičiavimuose."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Pokalbių spalvos"
+
+#  IM Convo trans options
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Nustatyti pokalbių lango spalvas"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Klaidų pranešimai"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Paryškintos žinutės"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Sisteminės žinutės"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Išsiųstos žinutės"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Gautos žinutės"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Pasirinkite sąsajos elemento „%s“ spalvą"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Ignoruoti gaunamų žinučių formato taikymą"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Taikyti pokalbių kambariuose"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Taikyti asmeniniams pokalbiams"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Pagal pokalbių skaičių"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Pokalbių patalpinimas"
+
+#: ../pidgin/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Pokalbių skaičius langui"
+
+#: ../pidgin/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+"Talpinant pagal skaičių atskirti asmeninių pokalbių ir pokalbių kambarių "
+"langus"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#  *< name
+#  *< version
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Papildomi pokalbių talpinimo į langus nustatymai"
+
+#  *< summary
+#  *  description
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Apriboja pokalbių skaičių viename lange ir gali suskirstyti asmeninius "
+"pokalbius ir pokalbius kambariuose į atskirus langus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gaiminc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Demonstracinis Pidgin papildinys"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Pavyzdinis papildinis, kuris daro šį bei tą – skaitykite jo aprašymą."
+
+#. *  description
+#: ../pidgin/plugins/gaiminc.c:96
+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 ""
+"Tai yra tikrai kietas papildinys, mokantis daug ką daryti:\n"
+"- jis Jums pasako, kas parašė programą, kai prisijungiate;\n"
+"- jis apsuka visą gaunamą tekstą\n"
+"- jis nusiunčia žinutę Jūsų bičiuliams iškart, kai jie prisijungia."
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Pelės gestų konfigūracija"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Vidurinis pelės klavišas"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Dešinysis pelės klavišas"
+
+#  "Visual gesture display" checkbox
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Vizualus gesto pavaizdavimas"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Pelės gestai"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Leidžia naudoti pelės gestus"
+
+#  *  description
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\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 ""
+"Suteikia galimybę naudoti pelės gestus pokalbių kambariuose.\n"
+"Tempkite vidurinį pelės mygtuką šių veiksmų atlikimui:\n"
+"\n"
+"Tempkite žemyn ir į dešinę pokalbio užvėrimui.\n"
+"Tempkite aukštyn ir į kairę persijungimui į prieš tai buvusį pokalbį.\n"
+"Tempkite aukštyn ir į dešinę persijungimui į kitą pokalbį."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Greitasis bendravimas"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+"Pasirinkite asmenį iš Jūsų adresų knygos arba sukurkite naują asmens įrašą."
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Naujas asmuo"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Pasirinkti bičiulį"
+
+#  Add the label.
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Pasirinkti asmenį iš Jūsų adresų knygos, prie kurio pridėti šį bičiulį, arba "
+"sukurti naują asmenį."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Vartotojo _duomenys"
+
+#  "Associate Buddy" button
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "_Susieti bičiulį"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "Negalima išsiųsti el. laiško"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "Vykdomasis Evolution failas nerastas PATH kintamajame."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "Nerastas šio bičiulio el. pašto adresas."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "Įtraukti į adresų knygą"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "Nusiųsti el. laišką"
+
+#  Configuration frame
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Evolution integracijos konfigūravimas"
+
+#  Label
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+"Pasirinkite visas paskyras, į kurias bičiuliai turėtų būti pridedami "
+"automatiškai."
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr "Evolution integracija"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:524
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr "Suteikia integraciją su Evolution"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Prašau žemiau įvesti asmens informaciją."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Prašau žemiau įvesti bičiulio vardą ir paskyros tipą."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Paskyros tipas:"
+
+#  Optional Information section
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Nebūtina informacija:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Vardas:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Pavardė:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "El. pašto adresas:"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK signalų testas"
+
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Testas, skirtas nustatyti, ar visi sąsajos signalai veikia teisingai."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Istorija"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Suskleisti pasitraukiant"
+
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Suskleidžia bičiulių sąrašą ir Jūsų pokalbius, kai Jūs pasitraukiate."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Pašto tikrinimas"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Patikrina, ar negautas naujas vietinis paštas."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Įdeda mažą langelį į bičiulių sąrašą, kuris parodo, ar turite naujo pašto."
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Skirtukas"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Pokalbių lange nubrėžia naujas žinutes atskiriančią liniją"
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "Skirtuką piešti "
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "_asmeninių pokalbių languose"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "_pokalbių kambarių languose"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Prašoma pradėti muzikinių žinučių seansą.  Spustelėkite MM piktogramą seanso "
+"pradėjimui."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Muzikinių žinučių seansas patvirtintas."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr "Muzikinės žinutės"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Komandos vykdymo metu įvyko konfliktas"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr "Redaktoriaus vykdymo klaida"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "Įvyko klaida:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr "Muzikinių žinučių parinktys"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr "Partitūrų redaktoriaus kelias"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Vykdyti"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Muzikinių žinučių papildinys kolektyviniam muzikos kūrimui."
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"Muzikinių žinučių papildinys leidžia keliems vartotojams vienu metu kurti tą "
+"patį muzikinį kūrinį."
+
+#  ---------- "Notify For" ----------
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Pranešti apie:"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "        tik kai kas n_ors pasako Jūsų vardą"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "_veikiamuosius langus"
+
+#  ---------- "Notification Methods" ----------
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Pranešimo būdai:"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "p_ridėti eilutę prieš lango pavadinimą:"
+
+#  Count method button
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "į_terpti naujų žinučių skaičių į lango pavadinimą"
+
+#  Count method button
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "įterpti naujų žinučių skaičių į _X sąvybę"
+
+#  Urgent method button
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą"
+
+#  IM Convo trans options
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "P_akelti pokalbių langą"
+
+#  ---------- "Notification Removals" ----------
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Baigti pranešimą, kai:"
+
+#  Remove on focus button
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "pokalbių _langas tampa veikiamasis"
+
+#  Remove on click button
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "spragtelėjama ant pokalbių la_ngo"
+
+#  Remove on type button
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "rašo_ma į pokalbių langą"
+
+#  Remove on message send button
+#  Remove on message send button
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "iš_siunčiama žinutė"
+
+#  Remove on conversation switch button
+#  Remove on conversation switch button
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "kai pers_ijungiama į pokalbio kortelę"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:895
+msgid "Message Notification"
+msgstr "Pranešimai apie žinutes"
+
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Siūlo keletą būdų, kaip Jums pranešti apie neperskaitytas žinutes"
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "Žymeklio spalva"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Antrinė žymeklio spalva"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Hipersaito spalva"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView skleidiklio dydis"
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView horizontalus atskyrimo tarpas"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Pokalbio įrašas"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "Pokalbio istorija"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "Žurnalų žiūryklė"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "Užklausos dialogas"
+
+#  ---------- "Notify For" ----------
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "Informacinis dialogas"
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView įtraukos skleidikliai"
+
+#: ../pidgin/plugins/pidginrc.c:322
+msgid "Select Color"
+msgstr "Pasirinkite spalvą"
+
+#: ../pidgin/plugins/pidginrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Pasirinkite sąsajos elemento „%s“ šriftą"
+
+#: ../pidgin/plugins/pidginrc.c:398
+msgid "Select Interface Font"
+msgstr "Pasirinkite sąsajos šriftą"
+
+#: ../pidgin/plugins/pidginrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ sąsajos šriftas"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ prieigos klavišų parinktis"
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "Sąsajos spalvos"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr "Sąsajos elementų dydžiai"
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "Šriftai"
+
+#  Tools
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "Įrankiai"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Įrašyti nuostatas į %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Iš naujo įkelti gtkrc failus"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#: ../pidgin/plugins/pidginrc.c:616
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ apipavidalinimo parinktys"
+
+#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Leidžia keisti dažnai naudojamas gtkrc parinktis."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Neapdorota įvestis"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Leidžia Jums tiesiogiai įvesti tekstinių protokolų komandas."
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Leidžia Jums siųsti neapdorotą įvesti tekstiniams protokolams (Jabber, MSN, "
+"IRC, TOC). Paspauskite 'Enter' įvedimo langelyje išsiuntimui. Stebėkite "
+"derinimo langą."
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "Jūs naudojate %s versiją %s.  Naujausia versija yra %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Atnaujinimų žurnalas:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr "Jūs galite parsisiųsti versiją %s iš: <br><a href=\"http://pidgin.im/\">http://pidgin.im</a>."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Pasirodė nauja versija"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Pranešimai apie išleistas naujas versijas"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Periodiškai patikrina, ar neišleistos naujos versijos"
+
+#  *  description
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Periodiškai patikrina, ar neišleistos naujos versijos ir praneša apie tai "
+"vartotojui kartu su pakeitimų sąrašu."
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "Pakartoto žodžio pataisymas"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "Toks žodis jau yra pataisymų sąraše."
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "Teksto pakeitimai"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "Jūs parašote"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "Jūs išsiunčiate"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "Tik ištisi žodžiai"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "Skirti mažąsias ir didžiąsias raides"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "Sukurti naują teksto pakeitimą"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "Jūs parašo_te:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "Jūs iš_siunčiate:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"Tikslus didžiųjų ir mažųjų raidžių sutapimas (panaikinkite žymėjimą "
+"automatiniam apdorojimui)"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "Keisti tik _ištisus žodžius"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Bendrosios teksto pakeitimo parinktys"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "Leisti paskutinio žodžio pakeitimą išsiuntimo metu"
+
+#: ../pidgin/plugins/spellchk.c:2367
+msgid "Text replacement"
+msgstr "Teksto pakeitimas"
+
+#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Pakeičia tekstą išsiunčiamose žinutėse pagal vartotojo sukurtas taisykles."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Bičiulių juosta"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Horizontalus slenkantis bičiulių sąrašo variantas."
+
+#: ../pidgin/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "Rodyti laiko žymes kas"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:195
+msgid "Timestamp"
+msgstr "Laiko žymos"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "Rodo iChat stiliaus laiko žymas"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Kas N minučių rodo iChat stiliaus laiko žymes"
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Laiko žymės formatavimo parinktys"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr "Būtinai naudoti tradicinį %s 24 valandų laiko _formatą"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Rodyti datas..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "pokalbiuose:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "uždelstoms žinutėms"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "uždelstoms žinutėms ir pokalbių kambariams"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "Ž_urnaluose:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:144
+msgid "Message Timestamp Formats"
+msgstr "Žinučių laiko žymių formatai"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:147
+msgid "Customizes the message timestamp formats."
+msgstr "Parenka žinučių laiko žymių formatus."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:149
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Šis papildinys leidžia vartotojui pasirinkti pokalbių ir žurnalų žinučių "
+"laiko žymių formatus."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Nepermatomumas:"
+
+#  IM Convo trans options
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Pokalbių langai"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "Pokalb_ių langų permatotumas"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "Rodyti šliaužiklio juo_stą pokalbių lange"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Aktyvavus pokalbių langą pašalinti jo permatomumą"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Visada viršuje"
+
+#  Buddy List trans options
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Bičiulių sąrašo langas"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "_Bičiulių sąrašo lango permatomumas"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Aktyvavus bičiulių sąrašo langą pašalinti jo permatomumą"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Permatomumas"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Kintamas permatumomas bičiulių sąrašo ir pokalbių langams."
+
+#  *  description
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Šis papildinys suteikia reguliuojamą alfa permatomumą pokalbių ir bičiulių "
+"sąrašo langams.\n"
+"\n"
+"* Pastaba: šis papildinys reikalauja Windows 2000 arba vėlesnės versijos."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ vykdymo laiko bibliotekos versija"
+
+#  Autostart
+#  Autostart
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Paleidimas"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "Paleisti %s Window_s paleidimo metu"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "_Pritvirtinamas bičiulių langas"
+
+#  Blist On Top
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "Lai_kyti bičiulių sąrašo langą viršuje:"
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr "tik kai pritvirtintas"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr "Gavus pokalbių žinučių _mirginti langą"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
+msgid "Pidgwin Options"
+msgstr "Pidgwin parinktys"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Options specific to Pidgin for Windows."
+msgstr "Specifinės Pidgin parinktys Windows operacinei sistemai."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "Leidžia keisti Pidgin parinktis, kurios yra specifinės Windows operacinėje sistemoje, pavyzdžiui, bičiulių sąrašo lango pritvirtinimą."
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>Atsijungė.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP pultas"
+
+#  Set up stuff for the account box
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Paskyra:"
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>Neprisijungta prie XMPP</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "Įterpti <iq/> strofą."
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "Įterpti <presence/> strofą."
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "Įterpti <message/> strofą."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Siųsti ir gauti neapdorotas XMPP strofas."
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
--- a/po/pt_BR.po	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/pt_BR.po	Sat Jun 16 19:48:23 2007 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-24 20:35-0300\n"
-"PO-Revision-Date: 2007-05-24 20:31-0300\n"
+"POT-Creation-Date: 2007-06-13 22:50-0300\n"
+"PO-Revision-Date: 2007-06-13 22:36-0300\n"
 "Last-Translator: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -50,7 +50,7 @@
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -67,9 +67,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1426
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
 
@@ -81,16 +82,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:599
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:528
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3996
 msgid "Modify Account"
 msgstr "Modificar conta"
 
@@ -98,31 +99,29 @@
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:429 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:437
-#: ../pidgin/gtkblist.c:5389
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Nome de usuário:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "Apelido:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
 #: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2157 ../finch/gntplugin.c:360
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
@@ -134,13 +133,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:1788
 #: ../libpurple/protocols/jabber/buddy.c:1824
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6007
+#: ../libpurple/protocols/oscar/oscar.c:6046
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -159,24 +159,32 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3244 ../pidgin/gtkaccount.c:1911
-#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109
-#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204
-#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -194,7 +202,7 @@
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1903
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -207,14 +215,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1910 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2062 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
 
@@ -223,15 +231,16 @@
 msgstr "Você pode ativar/desativar as contas a partir da lista abaixo."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:333
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
 #: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Adicionar"
@@ -241,32 +250,32 @@
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2448
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fez de %s seu amigo(a)%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2500
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "Negar"
 
@@ -290,18 +299,19 @@
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2846
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Nome de usuário"
 
 #: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
 #: ../libpurple/protocols/msn/msn.c:1364
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973
-#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apelido"
@@ -313,17 +323,21 @@
 #: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
 #: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Conta"
 
 #: ../finch/gntblist.c:331 ../finch/gntblist.c:819
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3146 ../pidgin/gtkblist.c:5343
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5394
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
@@ -337,9 +351,9 @@
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1537 ../libpurple/protocols/msn/msn.c:1602
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -347,7 +361,7 @@
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
@@ -371,7 +385,7 @@
 
 #: ../finch/gntblist.c:436 ../finch/gntblist.c:823
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
 msgid "Add Group"
 msgstr "Criar grupo"
 
@@ -399,18 +413,19 @@
 msgid "Edit Settings"
 msgstr "Modificar configurações"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Information"
 msgstr "Informações"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Retrieving..."
 msgstr "Obtendo..."
 
 #: ../finch/gntblist.c:866 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ver info"
 
@@ -420,8 +435,9 @@
 
 #. if (q_bud && is_online(q_bud->status)) {
 #: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1635
 msgid "Send File"
 msgstr "Enviar arquivo"
 
@@ -465,14 +481,14 @@
 msgstr "Confirmar remoção"
 
 #: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2234 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Lista de amigos"
@@ -493,28 +509,32 @@
 #: ../libpurple/protocols/jabber/buddy.c:818
 #: ../libpurple/protocols/jabber/buddy.c:1589
 #: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2999
 msgid "Nickname"
 msgstr "Apelido"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2900
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1810
+#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3419 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "Inativo"
 
@@ -551,134 +571,135 @@
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:2030 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2143 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2153 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa para quem você deseja mandar "
 "mensagens instantâneas."
 
-#: ../finch/gntblist.c:2156 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6006
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3995
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2176 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2182
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2186
+#: ../finch/gntblist.c:2189
 msgid "Show offline buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntblist.c:2192
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "Ordenar por status"
 
-#: ../finch/gntblist.c:2196
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabeticamente"
 
-#: ../finch/gntblist.c:2200
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "Ordenar por tamanho do log"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s foi desconectado devido ao seguinte erro:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Erro de conexão"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Conectar"
+#: ../finch/gntconn.c:113
+#, 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"
+"O Finch não tentará reconectar esta conta até que você corrija o erro e "
+"reative a mesma."
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Você digitou um número incorreto de argumentos para este "
 "comando."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando só funciona em bate-papos, não em conversas."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando só funciona em conversas, não em bate-papos."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando não funciona neste protocolo."
 
@@ -738,15 +759,15 @@
 msgid "List of users:\n"
 msgstr "Lista de usuários:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -754,7 +775,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7079
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -762,12 +783,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7082
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -775,11 +796,11 @@
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
@@ -863,24 +884,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/jabber.c:1220
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:803
 #: ../libpurple/protocols/oscar/oscar.c:808
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2659
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3051 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Status"
@@ -900,8 +921,9 @@
 #. Close button
 #: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
 #: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2475 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Fechar"
 
@@ -927,7 +949,7 @@
 msgid "Finished"
 msgstr "Concluída"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferindo"
 
@@ -939,7 +961,7 @@
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "De"
 
@@ -972,11 +994,11 @@
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
 msgid "IM"
 msgstr "MI"
 
@@ -1038,7 +1060,7 @@
 msgstr "Configurar plugin"
 
 #: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1954
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -1059,9 +1081,7 @@
 msgstr "Quem terá a ação"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1214,12 +1234,12 @@
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1815
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1814 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Nunca"
@@ -1253,12 +1273,12 @@
 msgstr "Gravar mudanças de status no log do sistema"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1918
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1929
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "Logs"
 
@@ -1266,13 +1286,13 @@
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
@@ -1302,37 +1322,38 @@
 msgstr "Tipo"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5467
-#: ../libpurple/protocols/oscar/oscar.c:5685
-#: ../libpurple/protocols/oscar/oscar.c:5699
-#: ../libpurple/protocols/oscar/oscar.c:5715
-#: ../libpurple/protocols/oscar/oscar.c:5722
-#: ../libpurple/protocols/oscar/oscar.c:5729
+#: ../libpurple/protocols/oscar/oscar.c:5506
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5738
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5768
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3479
-#: ../libpurple/protocols/yahoo/yahoo.c:3485
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
@@ -1545,8 +1566,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin de protocolo faltando para %s"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3992
+msgid "Connection Error"
+msgstr "Erro de conexão"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
@@ -1595,7 +1621,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Amigos"
@@ -1621,7 +1647,7 @@
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -1638,7 +1664,8 @@
 msgid "The message is too large."
 msgstr "A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "Não foi possível enviar mensagem."
 
@@ -1650,32 +1677,32 @@
 msgid "_Send Message"
 msgstr "Envia_r mensagem"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "Você mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
@@ -2198,12 +2225,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2234
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5799
-#: ../libpurple/protocols/oscar/oscar.c:5854
-#: ../libpurple/protocols/oscar/oscar.c:6080
-#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2248,8 +2275,8 @@
 "automaticamente for concluída\n"
 "(apenas quando não há conversa com o remetente)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1613
-#: ../libpurple/protocols/msn/msn.c:1643
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Anotações"
 
@@ -2257,7 +2284,7 @@
 msgid "Enter your notes below..."
 msgstr "Digite suas anotações abaixo..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Alterar anotações..."
 
@@ -2269,18 +2296,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "Anotações em amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "Guarda anotações em amigos específicos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Adiciona a opção de guardar anotações em amigos na sua lista de amigos."
@@ -2480,30 +2507,30 @@
 msgid "(UTC)"
 msgstr "(Greenwich)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "O usuário está desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Auto-resposta enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectou."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Uma ou mais mensagens pode(m) não ter sido enviada(s)."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Você foi desconectado do servidor."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2511,70 +2538,70 @@
 "Atualmente, você está desconectado. Nenhuma mensagem será recebida até que "
 "você conecte-se."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "A mensagem não pôde ser enviada porque o limite de tamanho foi excedido."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "A mensagem não pôde ser enviada."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "Configuração geral da leitura de logs"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "Cálculos rápidos de tamanho"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "Utilizar heurística de nome"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "Diretório de logs"
 
@@ -2584,20 +2611,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "Leitor de logs"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Inclui o log de outros clientes de mensagem instantânea no leitor de logs."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2688,9 +2715,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Sim"
 
@@ -2698,9 +2727,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Não"
 
@@ -2827,7 +2858,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2835,8 +2866,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornece suporte a SSL através do GNUTLS."
 
@@ -2846,7 +2877,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2854,8 +2885,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL através do Mozilla NSS."
 
@@ -2931,7 +2962,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fornece suporte ao carregamento de plugins Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2940,11 +2971,11 @@
 "plugins TCL, instale o ActiveTCL de http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Não foi possível escutar por conexões de mensagens instantâneas\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2954,18 +2985,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4500
-#: ../libpurple/protocols/oscar/oscar.c:5545
+#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:5584
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3382
-#: ../libpurple/protocols/yahoo/yahoo.c:3455 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1824
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Ausente"
@@ -2980,86 +3012,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin do protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nome do host"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Sobrenome"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "E-mail"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "Conta do AIM"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "Conta do AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "Conta do XMPP"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "Não foi possível abrir socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "Erro ao definir as opções do socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "Não foi possível vincular socket à porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "Não foi possível escutar no socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Configurações de proxy inválidas"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3130,8 +3167,8 @@
 msgstr "O registro foi concluído com sucesso!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "Senha"
 
@@ -3157,9 +3194,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
@@ -3168,8 +3205,8 @@
 msgid "Year of birth"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1542
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3182,14 +3219,14 @@
 msgstr "Homem ou mulher"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Masculino"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3252,10 +3289,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5556
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3398
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Desconectado"
@@ -3265,22 +3302,23 @@
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Disponível"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2658
-#: ../libpurple/protocols/oscar/oscar.c:3689
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3687
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
 #: ../libpurple/protocols/jabber/buddy.c:1585
 #: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
@@ -3289,7 +3327,7 @@
 msgstr "Ano de nascimento"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3901
+#: ../libpurple/protocols/oscar/oscar.c:3899
 msgid "Unable to display the search results."
 msgstr "Não foi possível exibir os resultados da busca."
 
@@ -3418,21 +3456,24 @@
 msgstr "Usuário do Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "O tópico atual é: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Nenhum tópico foi definido"
 
@@ -3476,11 +3517,12 @@
 msgstr "Ver mensagem do dia (MOTD)"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -3490,21 +3532,21 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2747
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
@@ -3515,18 +3557,17 @@
 msgstr "Não foi possível criar socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "Falha na negociação SSL"
 
@@ -3535,15 +3576,18 @@
 msgstr "Erro de leitura"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Usuários"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Tópico"
@@ -3567,23 +3611,26 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6623
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2140
-#: ../libpurple/protocols/oscar/oscar.c:6587
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6626
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
@@ -3593,18 +3640,25 @@
 msgstr "Codificações"
 
 #: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Nome do usuário"
 
 #: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nome real"
 
@@ -3643,13 +3697,15 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3690
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apelido"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Atualmente em"
 
@@ -3669,98 +3725,99 @@
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s apagou o tópico."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico do %s é: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensagem desconhecida '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Mensagem desconhecida"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "O servidor IRC recebeu uma mensagem que não foi entendida."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuários em %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Resposta do comando Time"
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "O horário local do servidor IRC é:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Canal inexistente"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "Canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "O usuário está desconectado"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Apelido ou canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "É necessário um convite para entrar em %s."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Você foi expulso por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3768,7 +3825,7 @@
 "O apelido selecionado foi rejeitado pelo servidor. Provavelmente, ele contém "
 "caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3776,43 +3833,44 @@
 "O nome de conta selecionado foi rejeitado pelo servidor. Provavelmente, ele "
 "contém caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Você saiu do canal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1107
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Não foi possível entrar em %s: Registro requerido"
 
-#: ../libpurple/protocols/irc/msgs.c:1108
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Não foi possível entrar no canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1142
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Este usuário ou canal está temporariamente indisponível."
 
-#: ../libpurple/protocols/irc/msgs.c:1154
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -3922,7 +3980,7 @@
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
@@ -4032,21 +4090,21 @@
 "whowas &lt;apelido&gt;:  Exibe informações de um usuário que está "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4119,13 +4177,15 @@
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sobrenome"
 
@@ -4135,7 +4195,7 @@
 msgstr "Nome"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4166,7 +4226,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
@@ -4180,8 +4241,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
 #: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Email"
@@ -4203,14 +4266,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1611
-#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "Birthday"
 msgstr "Data de nascimento"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Descrição"
@@ -4240,29 +4303,32 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:665
 #: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "Prioridade"
 
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome do meio"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Endereço"
 
@@ -4303,7 +4369,7 @@
 msgstr "Parar de monitorar a presença"
 
 #: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
@@ -4312,9 +4378,9 @@
 msgstr "Ausente (estendido)"
 
 #: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5721
+#: ../libpurple/protocols/oscar/oscar.c:5760
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
@@ -4325,7 +4391,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1587
 #: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "Last Name"
 msgstr "Sobrenome"
 
@@ -4365,8 +4431,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3704
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
@@ -4405,7 +4471,7 @@
 msgstr "Diretório de busca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5227
+#: ../libpurple/protocols/oscar/oscar.c:5246
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -4475,7 +4541,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erro ao obter lista de salas"
 
@@ -4510,425 +4577,443 @@
 msgid "Read Error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Não foi possível estabelecer conexão com o servidor:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "ID do XMPP inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Registro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Já está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha as informações abaixo para registrar sua nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Registrar nova conta do XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5515
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6301
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6312
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "Procurar por usuários..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "Recurso não implementado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "Saiu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Malformed XMPP ID"
 msgstr "ID do XMPP em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "Não permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "Pagamento requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "Registro requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
-msgid "Remote Server Timeout"
-msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
-
-#: ../libpurple/protocols/jabber/jabber.c:1516
-msgid "Server Overloaded"
-msgstr "Servidor sobrecarregado"
-
-#: ../libpurple/protocols/jabber/jabber.c:1518
-msgid "Service Unavailable"
-msgstr "Serviço indisponível"
-
 #: ../libpurple/protocols/jabber/jabber.c:1520
-msgid "Subscription Required"
-msgstr "Inscrição requerida"
+msgid "Remote Server Timeout"
+msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
 #: ../libpurple/protocols/jabber/jabber.c:1522
+msgid "Server Overloaded"
+msgstr "Servidor sobrecarregado"
+
+#: ../libpurple/protocols/jabber/jabber.c:1524
+msgid "Service Unavailable"
+msgstr "Serviço indisponível"
+
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Subscription Required"
+msgstr "Inscrição requerida"
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "Endereçamento impróprio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
-msgid "Invalid ID"
-msgstr "ID inválido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Invalid Namespace"
-msgstr "Namespace inválido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1575
-msgid "Invalid XML"
-msgstr "XML inválido"
-
 #: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Non-matching Hosts"
-msgstr "Hosts não compatíveis"
+msgid "Invalid ID"
+msgstr "ID inválido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1579
+msgid "Invalid Namespace"
+msgstr "Namespace inválido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1581
+msgid "Invalid XML"
+msgstr "XML inválido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1583
+msgid "Non-matching Hosts"
+msgstr "Hosts não compatíveis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Não foi possível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Não foi possível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4936,7 +5021,7 @@
 "affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filiação do usuário com a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4944,19 +5029,19 @@
 "role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usuário na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [servidor]: Entra num bate-papo neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuário&gt; [sala]:  Expulsa um usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4979,7 +5064,7 @@
 msgstr "Plugin do protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:501
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
 msgid "Domain"
 msgstr "Domínio"
 
@@ -4998,7 +5083,8 @@
 
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866 ../pidgin/gtkaccount.c:830
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
@@ -5031,7 +5117,7 @@
 msgid "XMPP Message Error"
 msgstr "Erro de mensagem do XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
@@ -5040,16 +5126,16 @@
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5057,11 +5143,11 @@
 "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as "
 "configurações padrão?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
@@ -5075,18 +5161,48 @@
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois o usuário não suporta "
 "transferência de arquivos."
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Falha no envio de arquivo"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Não foi possível enviar o arquivo para %s, ID do Jabber inválido"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+"Não foi possível enviar arquivo para %s, pois o usuário não está conectado"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Não foi possível enviar arquivo para %s, pois você não está recebendo "
+"informações de presença deste usuário"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr ""
+"Favor selecionar o recurso de %s para o qual você gostaria de mandar um "
+"arquivo"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Selecione um recurso"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5304,8 +5420,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Autenticação mal sucedida"
 
@@ -5404,8 +5521,8 @@
 msgstr "Tem você"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Volto já"
 
@@ -5413,21 +5530,23 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Ocupado"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Ao telefone"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
@@ -5478,31 +5597,31 @@
 msgid "Failed to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1463 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1534 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Geral"
 
-#: ../libpurple/protocols/msn/msn.c:1541
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1543
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: ../libpurple/protocols/msn/msn.c:1544
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5510,186 +5629,188 @@
 msgid "Location"
 msgstr "Localização"
 
-#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1747 ../libpurple/protocols/msn/msn.c:1754
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1555 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1681 ../libpurple/protocols/msn/msn.c:1688
-#: ../libpurple/protocols/msn/msn.c:1696 ../libpurple/protocols/msn/msn.c:1703
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Animais de estimação"
 
-#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Locais em que viveu"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1582 ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Informações do contato"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Parceiro(a)"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Telefone doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Telefone doméstico 2"
 
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3781
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Celular pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Fax doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "E-Mail pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "MI Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1612
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Aniversário de casamento"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Negócios"
 
-#: ../libpurple/protocols/msn/msn.c:1630
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Título de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Telefone do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Telefone 2 do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1636
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Celular de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Pager de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Fax de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "E-Mail de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1641
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "MI de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1642
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Data de início"
 
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1718
-#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "O usuário não criou um perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1829
 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 "
@@ -5699,7 +5820,7 @@
 "que o usuário não existe, ou que o usuário existe mas não criou um perfil "
 "público."
 
-#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5707,7 +5828,7 @@
 "Não foi possível encontrar nenhuma informação no perfil do usuário. "
 "Provavelmente o usuário não existe."
 
-#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL do Perfil"
@@ -5722,19 +5843,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2108 ../libpurple/protocols/msn/msn.c:2110
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2149
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
-#: ../libpurple/protocols/msn/msn.c:2157
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
@@ -5765,7 +5886,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -5803,15 +5924,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Serviço temporariamente indisponível."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Não foi possível renomear grupo"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Não foi possível remover grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1323
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5866,7 +5987,7 @@
 msgstr "Erro ao processar HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3457
+#: ../libpurple/protocols/oscar/oscar.c:3455
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Você conectou de outro local."
@@ -5881,36 +6002,36 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN vão sair do ar temporariamente."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Não foi possível autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sua lista de amigos do MSN está temporariamente indisponível. Favor aguardar "
 "e tentar novamente."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Negociando"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Iniciando autenticação"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Recebendo o cookie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Enviando o cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
@@ -5950,14 +6071,23 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"A mensagem não pôde ser enviada porque não podemos estabelecer uma sessão "
+"com o servidor. Isto é provavelmente um problema do mesmo, tente novamente "
+"em alguns minutos:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s está chamando sua atenção!"
@@ -6341,18 +6471,18 @@
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
 #: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2451
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "O servidor encerrou a conexão."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
 #: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2445 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6362,21 +6492,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Não foi possível estabelecer conexão com o servidor:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6408,7 +6529,7 @@
 msgstr "Plugin do protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificação"
@@ -6561,8 +6682,8 @@
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2310
+#: ../pidgin/gtkutils.c:2340
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
@@ -6576,13 +6697,15 @@
 msgstr "Mensagem instantânea direta do AIM"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Bate-papo"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "Receber arquivo"
 
@@ -6655,17 +6778,17 @@
 msgstr "Câmera"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5693
+#: ../libpurple/protocols/oscar/oscar.c:5732
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "Não disponível"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5714
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -6674,7 +6797,7 @@
 msgstr "Permitir que outros vejam seu status pela Web"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:156
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Invisível"
@@ -6684,13 +6807,13 @@
 msgstr "Conectado"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "Endereço IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2849
+#: ../libpurple/protocols/oscar/oscar.c:2847
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
@@ -6802,10 +6925,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:5798
-#: ../libpurple/protocols/oscar/oscar.c:6079 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -6824,51 +6947,51 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "Não foi possível conseguir um hash de conexão AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "Não foi possível conseguir um hash de conexão válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1642
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1698
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:2406
-#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:2276
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6879,18 +7002,18 @@
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %u aceitou seu pedido para adicioná-lo(a) à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6903,7 +7026,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2430
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6916,7 +7039,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2438
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6929,38 +7052,38 @@
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2459
+#: ../libpurple/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuário de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2465
+#: ../libpurple/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Você quer adicionar este amigo à sua lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2553
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Você perdeu %hu mensagem de %s por que ela era inválida."
 msgstr[1] "Você perdeu %hu mensagens de %s por que elas eram inválidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2562
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Você perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6971,21 +7094,21 @@
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2580
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque você é muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque você é muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2600
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, 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."
@@ -6993,61 +7116,61 @@
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2822
-#: ../libpurple/protocols/oscar/oscar.c:2826
+#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2756
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Não foi possível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2820
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2823
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informação do usuário %s indisponível:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:2852
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2862
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Available Message"
 msgstr "Mensagem de 'Disponível':"
 
-#: ../libpurple/protocols/oscar/oscar.c:2920
+#: ../libpurple/protocols/oscar/oscar.c:2918
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2997
+#: ../libpurple/protocols/oscar/oscar.c:2995
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3184
+#: ../libpurple/protocols/oscar/oscar.c:3182
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7055,7 +7178,7 @@
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3387
+#: ../libpurple/protocols/oscar/oscar.c:3385
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7063,85 +7186,86 @@
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3459
+#: ../libpurple/protocols/oscar/oscar.c:3457
 msgid "You have been signed off for an unknown reason."
 msgstr "Você foi desconectado por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3472
+#: ../libpurple/protocols/oscar/oscar.c:3470
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3719
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/oscar/oscar.c:3747
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3781
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: ../libpurple/protocols/oscar/oscar.c:3867
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nomes de usuário está associado com %s"
 msgstr[1] "Os seguintes nomes de usuário estão associados com %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3912
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Screen name"
 msgstr "Nome de usuário"
 
-#: ../libpurple/protocols/oscar/oscar.c:3938
+#: ../libpurple/protocols/oscar/oscar.c:3936
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3959
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Você deve receber um e-mail pedindo para confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/oscar/oscar.c:3959
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3990
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7150,13 +7274,13 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:3996
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7165,7 +7289,7 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado é muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7174,7 +7298,7 @@
 "Erro 0x%04x: Não foi possível mudar endereço de e-mail porque já existe um "
 "pedido pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7183,7 +7307,7 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este já "
 "possui muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7192,32 +7316,32 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este é "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O endereço de e-mail de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4023
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4197
+#: ../libpurple/protocols/oscar/oscar.c:4195
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você precisa estar "
 "conectado diretamente para enviar imagens por mensagens instantâneas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4461
 msgid "Unable to set AIM profile."
 msgstr "Não foi possível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4443
+#: ../libpurple/protocols/oscar/oscar.c:4462
 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 "
@@ -7227,7 +7351,7 @@
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4457
+#: ../libpurple/protocols/oscar/oscar.c:4476
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7242,11 +7366,11 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4481
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4526
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7261,11 +7385,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4512
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4581
+#: ../libpurple/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7276,17 +7400,17 @@
 "Nomes de usuário têm que começar com uma letra e conter apenas letras, "
 "números e espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4583
-#: ../libpurple/protocols/oscar/oscar.c:5006
-#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:4602
+#: ../libpurple/protocols/oscar/oscar.c:5025
+#: ../libpurple/protocols/oscar/oscar.c:5039
 msgid "Unable To Add"
 msgstr "Não foi possível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4687
+#: ../libpurple/protocols/oscar/oscar.c:4706
 msgid "Unable To Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4688
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7295,16 +7419,16 @@
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4892
-#: ../libpurple/protocols/oscar/oscar.c:4893
-#: ../libpurple/protocols/oscar/oscar.c:4898
-#: ../libpurple/protocols/oscar/oscar.c:5074
-#: ../libpurple/protocols/oscar/oscar.c:5075
-#: ../libpurple/protocols/oscar/oscar.c:5080
+#: ../libpurple/protocols/oscar/oscar.c:4911
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5093
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5099
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5004
+#: ../libpurple/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7313,12 +7437,12 @@
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5004
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7329,7 +7453,7 @@
 "mais comum para isso é que você tem o número máximo de amigos permitido na "
 "sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5111
+#: ../libpurple/protocols/oscar/oscar.c:5130
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7338,23 +7462,23 @@
 "O usuário %s lhe deu permissão para adicioná-lo à sua lista de amigos. Você "
 "deseja adicioná-lo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5119
+#: ../libpurple/protocols/oscar/oscar.c:5138
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %s aceitou seu pedido para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7365,53 +7489,53 @@
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5216
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5233
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/oscar/oscar.c:5292
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inválido especificado."
 
-#: ../libpurple/protocols/oscar/oscar.c:5343
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você não pode enviar "
 "imagens por mensagens instantâneas em bate-papos do AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5482
-#: ../libpurple/protocols/oscar/oscar.c:5487
+#: ../libpurple/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "Away Message"
 msgstr "Mensagem de ausência"
 
-#: ../libpurple/protocols/oscar/oscar.c:5487
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Você selecionou abrir uma mensagem instantânea direta com %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5847
+#: ../libpurple/protocols/oscar/oscar.c:5886
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7419,65 +7543,65 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5853
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/oscar.c:5927
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5894
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5902
+#: ../libpurple/protocols/oscar/oscar.c:5941
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:5999
+#: ../libpurple/protocols/oscar/oscar.c:6038
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6023
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome do usuário pode mudar apenas a capitalização e os "
 "espaços."
 
-#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6126
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7485,73 +7609,73 @@
 "Você pode re-requisitar autorização destes amigos clicando com o botão "
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Find Buddy by E-Mail"
 msgstr "Encontrar amigo por e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endereço de e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endereço de e-mail do amigo que você está procurando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6307
+#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Set User Info (URL)..."
 msgstr "Definir informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6322
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6332
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o endereço de E-Mail registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Mudar o endereço de E-Mail registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6354
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6399
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar por amigos pelo endereço de E-Mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Use recent buddies group"
 msgstr "Mostrar grupo \"Amigos Recentes\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6436
+#: ../libpurple/protocols/oscar/oscar.c:6475
 msgid "Show how long you have been idle"
 msgstr "Mostra por quanto tempo você esteve inativo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6591
+#: ../libpurple/protocols/oscar/oscar.c:6630
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8055,13 +8179,7 @@
 msgstr "Não foi possível conectar, verifique o log de depuração"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2380
-#: ../libpurple/protocols/yahoo/yahoo.c:2408
-#: ../libpurple/protocols/yahoo/yahoo.c:2515
-#: ../libpurple/protocols/yahoo/yahoo.c:2536
-#: ../libpurple/protocols/yahoo/yahoo.c:2620
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8470,7 +8588,7 @@
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
 msgid "Topic:"
 msgstr "Tópico:"
 
@@ -8495,6 +8613,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+msgid "Connect"
+msgstr "Conectar"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8731,60 +8853,85 @@
 msgstr "Esconder identidade do cliente"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "O usuário %s não está presente na rede"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Não foi possível fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Erro ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falha ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tempo esgotado ao fazer o acordo de chaves"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "O acordo de chaves foi abortado"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "O acordo de chaves foi abortado"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "O acordo de chaves já começou"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "O acordo de chaves não pode ser iniciado com você mesmo"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "O usuário remoto não está mais presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8793,7 +8940,8 @@
 "Um pedido de acordo de chaves foi recebido de %s. Você gostaria de fazer o "
 "acordo de chaves?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8804,69 +8952,99 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Pedido de acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Não foi possível definir chave da mensagem instantânea"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Definir senha de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Não foi possível obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Exibir chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Não foi possível carregar chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Não foi possível obter informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "O amigo %s não é certificado"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8875,16 +9053,19 @@
 "deste. Você pode usar o comando Obter Chave Pública para fazê-lo."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "O amigo %s não está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8892,15 +9073,18 @@
 "Para adicionar um amigo você precisa importar a chave pública desde. "
 "Pressione importar para importar uma chave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Selecione o usuário correto"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8908,7 +9092,8 @@
 "Mais de um usuário foi encontrado com a mesma chave pública. Selecione o "
 "usuário correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8917,237 +9102,318 @@
 "correto da lista para adicioná-lo à sua lista de amigos."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Desconectado, mas na rede"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Me acorde"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperativo"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robô"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Furioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Enciumado"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Envergonhado"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invencível"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Apaixonado"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sonolento"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Chateado"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Empolgado"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos do usuário"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humor"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localização geográfica"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Redefinir chave de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Mensagem instantânea com troca de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Obter chave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Expulsar usuário do servidor"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenhar no quadro de atividades"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Frase-senha:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "O canal %s não existe na rede"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informações do canal"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Não foi possível obter informações do canal"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome do canal:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuários:</b> %d<br>"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador do canal:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra do canal:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC do canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tópico do canal:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Impressão digital da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Impressão digital legível da chave do fundador:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adicionar chave pública do canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir chave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frase-senha do canal"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves públicas do canal"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9162,333 +9428,446 @@
 "apenas usuários cujas chaves públicas estiverem listadas podem entrar no "
 "canal."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticação do canal"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adicionar/remover"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome do grupo privado do canal %s e a frase-senha."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adicionar grupo privado no canal"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Lista de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Defina o limite de usuários do canal. Defina para zero para redefinir o "
 "limite de usuários."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adicionar grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Redefinir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Definir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Definir limite de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Redefinir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Definir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Redefinir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Definir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Redefinir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Você é o fundador do canal em <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Você tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Não foi possível entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Não foi possível chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferência de arquivo segura"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Erro durante a transferência do arquivo"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "O outro lado desconectou"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Falha no acordo de chaves"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "Tempo limite de conexão esgotado"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Falha ao criar a conexão"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "A sessão de transferência de arquivo não existe"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nenhuma sessão de transferência de arquivo ativa"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Transferência de arquivo já começou"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Não foi possível fazer o acordo de chaves para a transferência"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Não foi possível iniciar a transferência de arquivo"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Não foi possível enviar o arquivo"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Ocorreu um erro"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s mudou o tópico de <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos do canal <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Você foi expulso de <I>%s</I> por <I>%s</I>: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Você foi 'killado' por %s: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "'Killado' por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconexão do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informação pessoal"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Data de nascimento"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Função de trabalho"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organização"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Você é o fundador do canal em <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Nome real"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de status"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Impressão digital da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Impressão digital legível da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mais..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Não foi possível desconectar sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Não foi possível definir tópico"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Falha ao mudar apelido"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Não foi possível obter lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "A rede está vazia"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nenhuma chave pública foi recebida"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Não foi possível obter informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Não foi possível obter estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Estatísticas do servidor indisponíveis"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9523,105 +9902,66 @@
 "Total de operadores de servidor: %d\n"
 "Total de servidores de roteador: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estatísticas da rede"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falha no ping"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "O servidor retornou a resposta do ping"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Não foi possível 'killar' usuário"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Erro ao conectar no servidor SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Falha na troca de chaves"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
-"Reconectar para criar uma nova sessão."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Desconectado pelo servidor"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "MONITORAR"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Não é possível monitorar o usuário"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Recuperando sessão"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticando conexão"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verificando a chave pública do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Falha: Versões incompatíveis, atualize seu cliente"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Falha: O usuário remoto não confia/suporta sua chave pública."
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Falha: O usuário remoto não suporta o grupo KE proposto."
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Falha: O usuário remoto não suporta a cifra proposta"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Falha: O usuário remoto não suporta o PKCS proposto"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Falha: O usuário remoto não suporta a função de hash proposta"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Falha: O usuário remoto não suporta o HMAC proposto"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Falha: Assinatura incorreta"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Falha: Cookie inválido"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Falha: Autenticação mal sucedida"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9630,12 +9970,12 @@
 "A chave pública de %s foi recebida. Sua cópia local não confere com esta "
 "chave. Você ainda deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "A chave pública de %s foi recebida. Deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9648,73 +9988,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar chave pública"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de chave pública não suportada"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Desconectado pelo servidor"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Erro ao conectar no servidor SILC"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Falha na troca de chaves"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
+"Reconectar para criar uma nova sessão."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Falha na conexão"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Não foi possível iniciar conexão do cliente SILC"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Conectando ao servidor SILC"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Não foi possível carregar par de chaves SILC"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Não foi possível criar conexão."
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "João sem nome"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Não foi possível iniciar protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Não foi possível encontrar/acessar diretório ~/.silc"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Conectando ao servidor SILC"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Não foi possível carregar par de chaves SILC: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Não foi possível criar conexão."
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Erro ao carregar par de chaves do SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Seu humor atual"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9722,46 +10089,63 @@
 "\n"
 "Seu método preferido de contatos"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Seu status atual"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Serviços online"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permitir que os outros vejam os serviços que você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permitir que os outros vejam qual computador você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Seu arquivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Fuso horário (GMT)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributos de status online do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9771,173 +10155,217 @@
 "e suas informações pessoais. Por favor preencha as informações que você "
 "deseja que seja vista por outros usuários vejam sobre você."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Não há mensagem do dia disponível"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Não há mensagem do dia associada com esta conexão."
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Criar novo par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "As frases-senha não conferem"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Falha ao gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Tamanho da chave"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Frase-senha (redigitar)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Status online"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Ver mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Criar par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuário <I>%s</I> não está presente na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Tópico muito extenso"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Você precisa especificar um apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "canal %s não encontrado"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modos do canal de %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nenhum modo de canal está definido em %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Falha ao definir cmodes de %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando desconhecido: %s, (Pode ser uma falha do cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Vê ou altera o tópico"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entra em um canal nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Lista os canais desta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;usuário&gt; [&lt;mensagem&gt;]:  Manda uma mensagem privada para "
 "um usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Exibe a mensagem do dia do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconecta do servidor sem sair do mesmo"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usuário&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usuário do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9945,7 +10373,8 @@
 "cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
 "modos do canal."
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9953,16 +10382,19 @@
 "cumode &lt;usuário|canal&gt; +|-&lt;modos&gt; &lt;usuário&gt;: Muda os modos "
 "do usuário no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuário&gt;: Define seus modos na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usuário&gt; [-pubkey]: Obtém privilégios de operador do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9970,38 +10402,46 @@
 "invite &lt;canal&gt; [-|+]&lt;usuário&gt;:  convida um usuário ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusuário&gt; [comentário]:  Expulsa o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usuário&gt;]:  Bane o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usuário|servidor&gt;:  Obtém a chave pública do servidor ou do "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estatísticas do servidor e da rede"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usuários no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10018,118 +10458,143 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plugin do protocolo de conferência segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1921
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "Usar \"Perfect Forward Secrecy\""
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "Autenticação via chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Rejeitar ser monitorado por outros usuários"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Bloquear convites"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instantâneas sem troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Rejeitar pedidos de atributos de status online"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensagens no quadro de atividades"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "Expandir contatos _automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "Assinar digitalmente e verificar todas as mensagens"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Criando par de chaves do SILC..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Não foi possível criar par de chaves do SILC\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome do usuário: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome do host: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organização: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Tamanho da chave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versão: %s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10140,7 +10605,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10149,37 +10615,44 @@
 "Impressão digital legível da chave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informações da chave pública"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computador"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s mandou uma mensagem para o quadro de atividades. Deseja abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10188,10 +10661,71 @@
 "%s mandou uma mensagem para o quadro de atividades no canal %s. Você deseja "
 "abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Quadro de atividades"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Estatísticas do servidor indisponíveis"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Falha: Versões incompatíveis, atualize seu cliente"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Falha: O usuário remoto não confia/suporta sua chave pública."
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Falha: O usuário remoto não suporta o grupo KE proposto."
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Falha: O usuário remoto não suporta a cifra proposta"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Falha: O usuário remoto não suporta o PKCS proposto"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Falha: O usuário remoto não suporta a função de hash proposta"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Falha: O usuário remoto não suporta o HMAC proposto"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Falha: Assinatura incorreta"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Falha: Cookie inválido"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Falha: Autenticação mal sucedida"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Não foi possível iniciar conexão do cliente SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "João sem nome"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Não foi possível encontrar/acessar diretório ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Não foi possível carregar par de chaves SILC: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10424,7 +10958,8 @@
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
+#: ../pidgin/gtkblist.c:5847
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -10580,123 +11115,141 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2490
-#: ../libpurple/protocols/yahoo/yahoo.c:2669
-#: ../libpurple/protocols/yahoo/yahoo.c:2772
-#: ../libpurple/protocols/yahoo/yahoo.c:2782
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema na conexão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"A conexão com %s foi perdida:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Não foi possível estabelecer conexão com %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Não estou por perto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Fora do escritório"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "De férias"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2989
-#: ../libpurple/protocols/yahoo/yahoo.c:3019
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3036
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3039
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3057
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3157
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3163
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Iniciar conferência"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3191
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Configurações de presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Ativar qual ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3241
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3257
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Ingressar usuário no bate-papo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "Você acabou de chamar a atenção do usuário!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3828
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lista as salas desta rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3832
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
@@ -10710,56 +11263,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4072
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Servidor do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4075
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Servidor japonês do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4078
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4081
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Servidor de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Servidor japonês de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Porta da transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Locale da sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4101
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4104
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Servidor de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4107
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
@@ -10849,7 +11402,7 @@
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Erro ao enviar"
 
@@ -11130,7 +11683,7 @@
 msgstr "Exposição"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11161,7 +11714,7 @@
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Não foi possível resolver host"
 
@@ -11254,27 +11807,27 @@
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s tornou-se inativo"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s voltou da inatividade"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11283,62 +11836,67 @@
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3365 ../libpurple/util.c:3663
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Não foi possível conectar a %s"
 
-#: ../libpurple/util.c:3491
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11347,17 +11905,17 @@
 "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3526
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3557
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3582
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
@@ -11383,55 +11941,71 @@
 msgstr "A orientação da bandeja"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:408
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Opções de conexão"
 
-#: ../pidgin/gtkaccount.c:524
-msgid "Local alias:"
-msgstr "Apelido local:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Pro_tocolo:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "_Nome de usuário:"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "Apelido _local:"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "Lembrar _senha"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:586
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "Opções do usuário"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "Notificar ao receber novos e_mails"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:604
-msgid "Use this buddy icon for this account:"
-msgstr "Usar este ícone de exibição para esta conta:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "Usar este _ícone de exibição para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:724
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
-#: ../pidgin/gtkaccount.c:929
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
 
-#: ../pidgin/gtkaccount.c:930
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkaccount.c:942
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:948
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:960 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -11440,60 +12014,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:999
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "Se você olhar bem de perto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1002
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-#: ../pidgin/gtkaccount.c:1023
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1050 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1058
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:1065 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1471
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1495
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1506
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2200
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11517,11 +12091,11 @@
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:727
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:748
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11529,95 +12103,93 @@
 "Por favor digite as informações apropriadas sobre o bate-papo em que você "
 "gostaria de entrar.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5441
+#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1048
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1099
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1108
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1115
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar ação de _usuário"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "_Apelidar..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
+#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1198
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1201
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1203
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1223
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1289
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
+#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4529
+#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11625,126 +12197,117 @@
 "Você não está conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2846
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usuário..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Exibir amig_os desconectados"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Exibir grupos _vazios"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Exibir _detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Exibir _tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigo_s"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2862
+msgid "/Buddies/_About Pidgin"
+msgstr "/Amigos/_Sobre o Pidgin"
+
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Adicionar\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2870
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2872
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2873
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2879
+msgid "/Tools/_Debug Window"
+msgstr "/Ferramentas/Janela de _depuração"
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#. Help
-#: ../pidgin/gtkblist.c:2868
-msgid "/_Help"
-msgstr "/_Ajuda"
-
-#: ../pidgin/gtkblist.c:2869
-msgid "/Help/Online _Help"
-msgstr "/Ajuda/_Ajuda online"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Help/_Debug Window"
-msgstr "/Ajuda/Janela de _depuração"
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Help/_About"
-msgstr "/Ajuda/_Sobre"
-
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2909
 #, c-format
 msgid ""
 "\n"
@@ -11753,127 +12316,127 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2987
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "Visto pela última vez em"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "Assustador"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "Impressionante"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3414
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3416
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3561
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3563
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3564
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3566
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3601
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3604
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3781
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3783
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3784
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3785
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:3997
 msgid "Re-enable Account"
 msgstr "Re-ativar conta"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4021
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4173
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4180
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4191
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4276
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4290
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11892,23 +12455,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4537
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4540
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4546
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Exibir detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4549
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Exibir tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5418
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -11919,17 +12482,20 @@
 "amigo. O apelido será exibido no lugar do nome do usuário sempre que "
 "possível.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupo:"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5453
+msgid "_Screen name:"
+msgstr "Nome de _usuário:"
+
+#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+msgid "A_lias:"
+msgstr "Ape_lido:"
+
+#: ../pidgin/gtkblist.c:5741
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5757
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11937,7 +12503,7 @@
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5798
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11945,39 +12511,39 @@
 "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo "
 "que você gostaria de adicionar à sua lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5886
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6526
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6550
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6571
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6583
 msgid "Enable Account"
 msgstr "Ativar conta"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6589
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Ativar conta"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6638
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6708
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -11994,21 +12560,21 @@
 "O %s não tentará reconectar esta conta até que você corrija o erro e reative "
 "a mesma."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:813
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Você não está conectado com uma conta que permita convidar este amigo."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:866
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:896
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12016,189 +12582,197 @@
 "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:917
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Não foi possível abrir arquivo."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:1000
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1036
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1394
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Gravação iniciada. A partir de agora, as mensagens desta conversa serão "
 "gravadas."
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1402
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Gravação parada. A partir de agora, as mensagens dessa conversa não serão "
 "gravadas."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1650
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1653
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1673
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1696
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2556
 msgid "Unable to save icon file to disk."
 msgstr "Não foi possível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2607
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2659
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2664
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2667
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2671
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2684
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2826
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2828
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2845
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2857
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2859
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2861
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2866
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversa/Inserir lin_k..."
+
+#: ../pidgin/gtkconv.c:2868
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Conversa/Inserir imag_em..."
+
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2878
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2879
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Gravar _log"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2880
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2881
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2883
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2884
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
@@ -12207,165 +12781,173 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3088
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3094
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3098
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3104
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3114
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3130
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3136
+msgid "/Conversation/Insert Link..."
+msgstr "/Conversa/Inserir link..."
+
+#: ../pidgin/gtkconv.c:3140
+msgid "/Conversation/Insert Image..."
+msgstr "/Conversa/Inserir imagem..."
+
+#: ../pidgin/gtkconv.c:3146
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar log"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3149
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3165
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3168
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Mostrar ícones de amigos"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3297
 msgid "User has typed something and stopped"
 msgstr "O usuário digitou algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3479
 msgid "_Send To"
 msgstr "_Enviar para"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4193
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4226
+#: ../pidgin/gtkconv.c:4344
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5415 ../pidgin/gtkconv.c:5536
+#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: ../pidgin/gtkconv.c:6102 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:6108
+#: ../pidgin/gtkconv.c:6237
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:6113
+#: ../pidgin/gtkconv.c:6242
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:6118 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6123
+#: ../pidgin/gtkconv.c:6252
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7252
+#: ../pidgin/gtkconv.c:7384
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:7284
+#: ../pidgin/gtkconv.c:7416
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?"
 
-#: ../pidgin/gtkconv.c:7806
+#: ../pidgin/gtkconv.c:7938
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:7812
+#: ../pidgin/gtkconv.c:7944
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:7820
+#: ../pidgin/gtkconv.c:7952
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:7826
+#: ../pidgin/gtkconv.c:7958
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8344
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8867
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8869
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e bate-papos"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8873
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8875
 msgid "By account"
 msgstr "Por conta"
 
@@ -12812,11 +13394,11 @@
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:858
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12824,43 +13406,43 @@
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "Ver log do usuário"
 
-#: ../pidgin/gtkdialogs.c:950
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:995
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12875,15 +13457,15 @@
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1064
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1098
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12892,15 +13474,15 @@
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1105
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12909,30 +13491,30 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1197
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1224
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12941,11 +13523,11 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
@@ -13063,44 +13645,44 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
-#: ../pidgin/gtkimhtml.c:1284
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "Cor do hyperlink"
 
-#: ../pidgin/gtkimhtml.c:1285
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "Cor a ser usada para desenhar os hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1288
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "Cor do hyperlink sob o cursor"
 
-#: ../pidgin/gtkimhtml.c:1289
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Cor a ser usada para desenhar os hyperlinks quando o mouse está sobre eles."
 
-#: ../pidgin/gtkimhtml.c:1505
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar endereço de e-mail"
 
-#: ../pidgin/gtkimhtml.c:1517
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no navegador"
 
-#: ../pidgin/gtkimhtml.c:1527
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "_Copiar endereço do link"
 
-#: ../pidgin/gtkimhtml.c:3200
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13110,7 +13692,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3203
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13120,7 +13702,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3216
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13131,7 +13713,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3219
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13142,35 +13724,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3299 ../pidgin/gtkimhtml.c:3311
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: ../pidgin/gtkimhtml.c:3339
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Selecionar fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Selecionar cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Descrição"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13178,83 +13760,83 @@
 "Por favor digite a URL e a descrição do link que você gostaria de inserir.  "
 "A descrição é opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que você gostaria de inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Não foi possível armazenar imagem: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "Este tema não possui emoticons disponíveis."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:925 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../pidgin/gtkimhtmltoolbar.c:936 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../pidgin/gtkimhtmltoolbar.c:947 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:963
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "Maior tamanho de fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:975
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "Menor tamanho de fonte"
 
 #: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font"
+msgid "Font face"
 msgstr "Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1008
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1020
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "Cor do fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1039
-msgid "Reset font"
-msgstr "Redefinir fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1059
+#: ../pidgin/gtkimhtmltoolbar.c:1033
+msgid "Reset formatting"
+msgstr "Limpar formatação"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1083
-msgid "Insert"
-msgstr "Inserir"
+#: ../pidgin/gtkimhtmltoolbar.c:1069
+msgid "Insert smiley"
+msgstr "Inserir emoticon"
 
 #: ../pidgin/gtklog.c:267
 #, c-format
@@ -13347,12 +13929,12 @@
 msgid "System Log"
 msgstr "Log do sistema"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:368
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Tente `%s -h' para mais informações.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:370
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13378,7 +13960,7 @@
 "                      vírgula)\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:490
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13594,8 +14176,8 @@
 msgstr "Pré-_visualizar"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "_Executar apenas quando meu status for indisponível"
+msgid "P_ounce only when my status is not Available"
+msgstr "_Executar apenas quando meu status não for Disponível"
 
 #: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
@@ -13629,7 +14211,7 @@
 msgid "_Show system tray icon:"
 msgstr "Mo_strar ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13648,7 +14230,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "Quando ausente"
 
@@ -13697,39 +14279,55 @@
 msgid "N_ew conversations:"
 msgstr "Novas conv_ersas:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar _formatação nas mensagens recebidas"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar animação nos íc_ones de amigos"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que você está digitando para eles"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "Realçar palavras _mal grafadas"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "Usar rolagem suave"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Fonte"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Usar a fonte de documento do _tema"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Usar a fonte do _tema"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "_Fonte para as conversas:"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "Formatação padrão"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13737,119 +14335,119 @@
 "Sua mensagem enviada aparecerá assim quando você usar protocolos que "
 "suportem formatação. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "_Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "Detectar endereço IP _automaticamente"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "Portas"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "Porta _inicial:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "Porta _final:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "Padrão do GNOME"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "Navegador padrão"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13858,80 +14456,80 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "_Formato do log:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "_Gravar todas as mensagens instantâneas"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "Gravar todos as mudanças de _status no log do sistema"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
 msgid "(default)"
 msgstr "(padrão)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "Comando"
 
-#: ../pidgin/gtkprefs.c:1608
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1616
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13940,117 +14538,117 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "Opções de som"
 
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "Emitir sons quando a janela da conversa _ganhar foco"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
-#: ../pidgin/gtkprefs.c:1656
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:1742
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "Evento"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "Testar"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../pidgin/gtkprefs.c:1769
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: ../pidgin/gtkprefs.c:1812
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:1817
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1836
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-#: ../pidgin/gtkprefs.c:1838
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "Mudar status após _inatividade"
 
-#: ../pidgin/gtkprefs.c:1842
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de alterar o status:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1871
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:1873
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1879
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../pidgin/gtkprefs.c:1926
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:1930
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
@@ -14141,23 +14739,23 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
@@ -14180,7 +14778,7 @@
 msgstr "Você tem certeza de que deseja remover os status salvos selecionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Usar"
 
@@ -14194,25 +14792,25 @@
 msgid "Different"
 msgstr "Outro"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Use um status _diferente para algumas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
@@ -14269,25 +14867,25 @@
 msgid "Waiting for network connection"
 msgstr "Esperando pela conexão de rede"
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:593
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s."
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14296,12 +14894,12 @@
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente."
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1442
 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."
@@ -14309,31 +14907,31 @@
 "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta "
 "mensagem, ou usá-la como o ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Você deseja defini-la como o ícone de amigo deste usuário?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Você pode enviar esta imagem como uma transferência de arquivos ou incluí-la "
-"nesta mensagem, ou usá-la como o ícone de amigo deste usuário."
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o "
+"ícone de amigo para este usuário."
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14346,11 +14944,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14358,7 +14956,7 @@
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2268
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14369,25 +14967,25 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2564
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2566
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2567
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2667
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14433,6 +15031,26 @@
 msgid "_Open Mail"
 msgstr "_Abrir e-mail"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Padrão"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Emoticons do Pidgin"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Ao selecionar este tema, os emoticons gráficos serão desativados."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "nenhum"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Mostrar estatísticas"
@@ -14722,6 +15340,11 @@
 "Selecione uma pessoa do seu catálogo de endereços abaixo, ou adicione uma "
 "nova pessoa."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grupo:"
+
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14753,34 +15376,34 @@
 msgid "_Associate Buddy"
 msgstr "_Associar amigo"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "Não foi possível enviar e-mail."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "O executável do evolution não foi encontrado no PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "Não foi encontrado um endereço de E-Mail para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Adicionar ao catálogo de endereços"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Enviar e-mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Configuração da integração com o Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selecionar todas as contas onde amigos devem ser adicionados automaticamente."
@@ -14791,7 +15414,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Integração com o Evolution"
 
@@ -14799,8 +15422,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Fornece integração com o Evolution."
 
@@ -15223,28 +15846,19 @@
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Você está usando o %s, versão %s. A versão atual é a %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Log de alterações:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Você pode obter a versão %s em:<br><a href=\"http://pidgin.sourceforge.net/"
-"\">http://pidgin.sourceforge.net</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"Você está usando o %s, versão %s. A versão atual é a %s. Você pode obtê-la "
+"em <a href=\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Log de alterações:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "Nova versão disponível"
 
@@ -15254,19 +15868,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "Notificação de nova versão"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "Verifica periodicamente por novas versões."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15561,7 +16175,7 @@
 "Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
 "de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "\"<font color='#777777'>Desconectado.</font>"
 
@@ -15571,39 +16185,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "Console XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "Conta: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Não conectado ao XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "Inserir um comando (stanza) <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "Inserir um comando (stanza) <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "Inserir um comando (stanza) <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plugin é útil para depurar servidores ou clientes XMPP."
--- a/po/ru.po	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/ru.po	Sat Jun 16 19:48:23 2007 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-07 11:26+0400\n"
-"PO-Revision-Date: 2007-05-11 15:00+0400\n"
+"POT-Creation-Date: 2007-06-11 12:34+0400\n"
+"PO-Revision-Date: 2007-06-12 12:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,13 @@
 "  -n, --nologin       не входить автоматически\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -53,19 +59,16 @@
 "http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/finch.c:306
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1225
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Ошибка"
 
@@ -75,18 +78,18 @@
 
 #: ../finch/gntaccount.c:120
 msgid "Screenname of an account must be non-empty."
-msgstr ""
-
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+msgstr "Идентификатор учётной записи должен быть непустым."
+
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "Уведомления о новой почте"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1441
-#: ../pidgin/gtkblist.c:3947
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3976
 msgid "Modify Account"
 msgstr "Изменить учётную запись"
 
@@ -94,32 +97,30 @@
 msgid "New Account"
 msgstr "Новая учётная запись"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5356
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Идентификатор пользователя:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5377
-#: ../pidgin/gtkblist.c:5740
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "Псевдоним:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2142 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
 #: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
@@ -127,16 +128,17 @@
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6047
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -152,27 +154,35 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1879
-#: ../pidgin/gtkaccount.c:2470 ../pidgin/gtkblist.c:5796
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5856
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -182,15 +192,15 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1871
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -203,14 +213,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1878 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2047 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2296 ../pidgin/gtkdocklet.c:541
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Учётные записи"
 
@@ -219,15 +229,16 @@
 msgstr "Вы можете включать/выключать учётные записи из следующего списка."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2469
-#: ../pidgin/gtkblist.c:5795 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5855 ../pidgin/gtkconv.c:1686
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Добавить"
@@ -237,101 +248,110 @@
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2416
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s добавил %s в свой список собеседников%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2468
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "Добавить собеседника в список?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2520
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2543 ../pidgin/gtkaccount.c:2549
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "Авторизовать собеседника?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "Авторизовать"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "Отказать"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
-msgstr ""
-
-#: ../finch/gntblist.c:280
+msgstr "Вы должны задать идентификатор пользователя для собеседника."
+
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
-msgstr ""
-
-#: ../finch/gntblist.c:282
+msgstr "Вы должны задать группу."
+
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "Вы должны выбрать учётную запись."
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:285
+msgid "The selected account is not online."
+msgstr ""
+
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "Ошибка добавления собеседника"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1954 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2845
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Идентификатор пользователя"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1196 ../libpurple/protocols/msn/msn.c:1360
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "Группа"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1246
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2948 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Учётная запись"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5310
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5361
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Добавить собеседника"
 
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "Введите информацию о собеседнике."
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Чаты"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1533 ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -339,162 +359,184 @@
 msgid "Name"
 msgstr "Имя"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5686
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5741
 msgid "Add Chat"
 msgstr "Добавить чат"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:402
 msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+msgstr "Вы можете изменить больше информации позже из контекстного меню."
+
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "Ошибка добавления группы"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:416
 msgid "You must give a name for the group to add."
 msgstr "Вы должны дать имя добавляемой группе."
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "Группа с таким именем уже существует."
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5792
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5852
 msgid "Add Group"
 msgstr "Добавить группу"
 
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "Введите имя группы"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "Изменить чат"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "Обновите нужные поля."
 
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Изменить"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "Присоединяться автоматически"
 
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "Изменить настройки"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+msgid "Information"
+msgstr "Информация"
+
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+msgid "Retrieving..."
+msgstr "Загрузка..."
+
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Получить информацию"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "Добавить правило"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:636
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1634
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "Просмотреть журнал"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Введите новое имя для %s"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1196
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "Переименовать"
 
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:964
+msgid "Set Alias"
+msgstr "Задать псевдоним"
+
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "Введите пустую строку для сброса имени."
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1041
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Удаление этого контакта приведёт к удалению всех входящих в него собеседников"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1049
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "Удаление этой группы приведёт к удалению всех входящих в неё собеседников"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1054
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Вы действительно хотите удалить %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "Подтвердить удаление"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1198 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1683 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Удалить"
 
 #. Buddy List
-#: ../finch/gntblist.c:1172 ../finch/gntblist.c:2219 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4189
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4220
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Список собеседников"
 
-#: ../finch/gntblist.c:1203
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "Место помечено"
 
-#: ../finch/gntblist.c:1208
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "Обратить пометку"
 
 #. General
-#: ../finch/gntblist.c:1241 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1368 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2972
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1261 ../finch/gntprefs.c:242
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:533 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2992
-#: ../pidgin/gtkblist.c:3381 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3402 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "Бездействие"
 
-#: ../finch/gntblist.c:1350
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -503,12 +545,12 @@
 "В сети: %d\n"
 "Всего: %d"
 
-#: ../finch/gntblist.c:1359
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Учётная запись: %s (%s)"
 
-#: ../finch/gntblist.c:1371
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -517,162 +559,159 @@
 "\n"
 "Последнее появление: %s назад"
 
-#: ../finch/gntblist.c:1636 ../pidgin/gtkdocklet.c:489
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Новый..."
 
-#: ../finch/gntblist.c:1643 ../pidgin/gtkdocklet.c:490
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Сохранённый..."
 
-#: ../finch/gntblist.c:2015 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Модули"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "_Имя"
 
-#: ../finch/gntblist.c:2128 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "_Учётная запись"
 
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Новое мгновенное сообщение"
 
-#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Введите идентификатор пользователя или псевдоним персоны, которой вы хотели "
 "бы отправить сообщение."
 
-#: ../finch/gntblist.c:2141 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6008
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3946
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3975
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2161 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Параметры"
 
-#: ../finch/gntblist.c:2167
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "Отправить мгновенное сообщение..."
 
-#: ../finch/gntblist.c:2171
-msgid "Toggle offline buddies"
-msgstr "Обратить показывание собеседников не в сети"
-
-#: ../finch/gntblist.c:2177
+#: ../finch/gntblist.c:2189
+msgid "Show offline buddies"
+msgstr "Показывать собеседников не в сети"
+
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "Сортировать по статусу"
 
-#: ../finch/gntblist.c:2181
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "Сортировать по алфавиту"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "Сортировать по размеру журнала"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "Соединение с %s разорвано."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"Соединение с %s было разорвано из-за следующей ошибки:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3943
-msgid "Connection Error"
-msgstr "Ошибка соединения"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3948
-msgid "Connect"
-msgstr "Установить соединение"
-
-#: ../finch/gntconv.c:103
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Нет такой команды."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Синтаксическая ошибка:  Вы ввели неверное количество аргументов для этой "
 "команды."
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
 msgid "Your command failed for an unknown reason."
 msgstr "Ваша команда не была выполнена по неизвестной причине."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
 msgid "That command only works in chats, not IMs."
 msgstr "Эта команда работает только в чатах, не в мгновенных сообщениях."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
 msgid "That command only works in IMs, not chats."
 msgstr "Эта команда работает только в мгновенных сообщениях, не в чатах."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
 msgid "That command doesn't work on this protocol."
 msgstr "Эта команда не работает с этим протоколом."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Команды пока не поддерживаются. Сообщение НЕ было отправлено."
 
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -681,24 +720,48 @@
 "\n"
 "%s набирает сообщение..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "Вы покинули этот чат."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Адресат"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Беседа"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Очистить"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Показывать время сообщений"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Добавить правило..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "Список пользователей:\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
 msgid "Supported debug options are:  version"
 msgstr "Поддерживаемые параметры отладки:  version"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
 msgid "No such command (in this context)."
 msgstr "Нет такой команды (в этом контексте)."
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -706,18 +769,20 @@
 "Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
 "Следующие команды доступны в этом контексте:\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7171
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+"say &lt;сообщение&gt;:  Отправить обычное сообщение, как если бы вы не "
+"использовали команду."
+
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7174
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;действие&gt;:  Отправить действие в стиле IRC собеседнику или в чат."
 
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7177
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -725,39 +790,43 @@
 "debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
 "беседу."
 
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7180
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Очистить окно беседы."
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7183
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  Вывести список пользователей в чате."
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Вывести окно модулей."
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Вывести список собеседников."
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Вывести окно учётных записей."
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Вывести окно отладки."
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: Вывести окно настроек."
 
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Вывести окно сохранённых статусов."
 
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Окно отладки"
 
@@ -765,18 +834,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Очистить"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Фильтр: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "Время"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -809,24 +878,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1210
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:803
 #: ../libpurple/protocols/oscar/oscar.c:808
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:2658
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3036
-#: ../pidgin/gtkblist.c:3049 ../pidgin/gtkblist.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Статус"
@@ -844,10 +913,11 @@
 msgstr "Остановить"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2443 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Закрыть"
 
@@ -873,27 +943,27 @@
 msgid "Finished"
 msgstr "Завершено"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Передача"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "Адреса e-mail"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "Вам пришла почта!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1170
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "От"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Тема"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -901,45 +971,57 @@
 msgstr[1] "%s (%s) имеет %d новых сообщения."
 msgstr[2] "%s (%s) имеет %d новых сообщений."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Новая почта"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "Информация для %s"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "Информация о собеседнике"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "Продолжить"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1662 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Информация"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1623
 msgid "IM"
 msgstr "Мгновенное сообщение"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "Присоединиться"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr ""
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -956,24 +1038,24 @@
 "Веб-сайт: %s\n"
 "Имя файла: %s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
-
-#: ../finch/gntplugin.c:208
+msgstr "Модуль необходимо загрузить перед его настройкой."
+
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
-msgstr ""
-
-#: ../finch/gntplugin.c:229
+msgstr "Этот модуль не имеет настраиваемых параметров."
+
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "Вы можете загружать/выгружать модули из следующего списка."
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "Настроить модуль"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -994,9 +1076,7 @@
 msgstr "За кем следить"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5404
-#: ../pidgin/gtkblist.c:5720
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "Учётная запись:"
 
@@ -1145,69 +1225,69 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Неизвестное событие слежения. Сообщите об этом!"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Основываясь на использовании клавиатуры"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "С момента последней отправки сообщения"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Никогда"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "Показывать время бездействия"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "Показывать собеседников не в сети"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "Показывать время сообщений"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "Уведомлять собеседников о наборе сообщения"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "Формат журнала"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "Записывать мгновенные сообщения"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "Записывать чаты"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "Записывать изменения статуса"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "Журналы"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "Ещё не реализовано."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "Сохранить файл..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "Открыть файл..."
 
@@ -1237,38 +1317,39 @@
 msgstr "Тип"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1242
 #: ../libpurple/protocols/jabber/jabber.c:1252
 #: ../libpurple/protocols/jabber/jabber.c:1262
 #: ../libpurple/protocols/jabber/jabber.c:1272
 #: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1294
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5469
-#: ../libpurple/protocols/oscar/oscar.c:5687
-#: ../libpurple/protocols/oscar/oscar.c:5701
-#: ../libpurple/protocols/oscar/oscar.c:5717
-#: ../libpurple/protocols/oscar/oscar.c:5724
-#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5739
+#: ../libpurple/protocols/oscar/oscar.c:5755
+#: ../libpurple/protocols/oscar/oscar.c:5762
+#: ../libpurple/protocols/oscar/oscar.c:5769
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Сообщение"
@@ -1284,7 +1365,7 @@
 
 #: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
-msgstr ""
+msgstr "Введите непустое название для статуса."
 
 #: ../finch/gntstatus.c:302
 msgid "Duplicate title"
@@ -1325,7 +1406,7 @@
 
 #: ../finch/plugins/gntclipboard.c:149
 msgid "GntClipboard"
-msgstr ""
+msgstr "Gnt-буфер обмена"
 
 #: ../finch/plugins/gntclipboard.c:151
 msgid "Clipboard plugin"
@@ -1337,66 +1418,66 @@
 "X, if possible."
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s в сети"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s не в сети"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s отправил вам сообщение"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s произнёс ваше имя в %s"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s отправил сообщение в %s"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Собеседник входит/выходит"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Вы принимаете мгновенное сообщение"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Кто-то говорит в чате"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Кто-то произносит ваше имя в чате"
 
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:343
+msgstr "Когда уведомлять"
+
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:349
+msgstr "И пищать!"
+
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:369
+msgstr "Установить подсказку СРОЧНО для окна терминала."
+
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+msgstr "Gnt-уведомления"
+
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr ""
+msgstr "Модуль уведомлений"
 
 #: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
@@ -1405,7 +1486,7 @@
 
 #: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Модуль истории требует ведения журнала"
 
 #: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
@@ -1414,6 +1495,10 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"Ведение журнала может быть включено из Инструменты -> Настройки -> Журналы.\n"
+"\n"
+"Включение журналов для мгновенных сообщений и/или чатов активирует историю "
+"для соответствующих типов бесед."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
@@ -1428,6 +1513,7 @@
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
+"При открытии новой беседы этот модуль вставит прошлую беседу в текущую."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1472,8 +1558,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Отсутствует модуль протокола для %s"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3972
+msgid "Connection Error"
+msgstr "Ошибка соединения"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1332
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "Новые пароли не совпадают."
 
@@ -1513,8 +1604,8 @@
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
@@ -1522,7 +1613,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5200 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5251 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Собеседники"
@@ -1546,9 +1637,9 @@
 msgstr "+++ %s вышел"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -1565,7 +1656,8 @@
 msgid "The message is too large."
 msgstr "Сообщение слишком велико."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "Не удаётся отправить сообщение."
 
@@ -1577,32 +1669,32 @@
 msgid "_Send Message"
 msgstr "_Отправить сообщение"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s вошёл в комнату."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] вошёл в комнату."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s вышел из комнаты."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
@@ -1675,7 +1767,7 @@
 msgid "Unknown reason"
 msgstr "Причина неизвестна"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:429
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1704,7 +1796,7 @@
 
 #: ../libpurple/ft.c:248
 msgid "Directory is not writable."
-msgstr ""
+msgstr "Каталог недоступен для записи."
 
 #: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
@@ -1774,31 +1866,31 @@
 msgid "File transfer complete"
 msgstr "Передача файлов завершена"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Вы отменили передачу %s"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "Передача файлов отменена"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s отменил передачу %s"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s отменил передачу файлов"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Не удалось произвести передачу файлов для %s."
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Не удалось произвести передачу файлов от %s."
@@ -2036,7 +2128,7 @@
 
 #: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
-msgstr ""
+msgstr "Модуль не реализует всех требуемых функций"
 
 #: ../libpurple/plugin.c:547
 #, c-format
@@ -2104,12 +2196,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#: ../libpurple/protocols/oscar/oscar.c:5856
-#: ../libpurple/protocols/oscar/oscar.c:6082
-#: ../libpurple/protocols/oscar/oscar.c:6152 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5894
+#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6190 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "О_тменить"
@@ -2152,18 +2244,18 @@
 "файлов\n"
 "(только при отсутствии беседы с отправителем)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1609
-#: ../libpurple/protocols/msn/msn.c:1639
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Заметки"
 
 #: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "Ниже введите ваши заметки..."
 
 #: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
-msgstr ""
+msgstr "Изменить заметки..."
 
 #. *< major version
 #. *< minor version
@@ -2175,18 +2267,20 @@
 #. *< id
 #: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
-msgstr ""
+msgstr "Заметки о собеседниках"
 
 #. *< name
 #. *< version
 #: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Сохраняет заметки об отдельных собеседниках."
 
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
+"Добавляет возможность сохранения заметок для собеседников в списке "
+"собеседников."
 
 #. *< type
 #. *< ui_requirement
@@ -2379,99 +2473,99 @@
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "Пользователь не в сети."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Автоматический отклик отправлен:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s не в сети."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Одно или несколько сообщений могли быть недоставленными."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Вы были отсоединены от сервера."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Сообщение не может быть отправлено, так как был превышен максимальный размер."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 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.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "Основные настройки системы чтения журналов"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "Быстрое вычисление размера"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "Каталог журнала"
 
@@ -2481,21 +2575,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "Система чтения журналов"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Включает журналы других клиентов обмена сообщениями в систему просмотра "
 "журналов."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2572,21 +2666,25 @@
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Да"
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Нет"
 
@@ -2626,7 +2724,7 @@
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:72
@@ -2710,7 +2808,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2718,8 +2816,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Предоставляет поддержку SSL посредством GNUTLS."
 
@@ -2729,7 +2827,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2737,8 +2835,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Предоставляет поддержку SSL посредством Mozilla NSS."
 
@@ -2814,18 +2912,18 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Предоставляет поддержку модулей на языке Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Не удаётся прослушивать входящие соединения\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2834,18 +2932,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/bonjour/bonjour.c:294
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4496
-#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/oscar/oscar.c:4520
+#: ../libpurple/protocols/oscar/oscar.c:5585
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Отошёл"
@@ -2860,86 +2959,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Модуль протокола Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr ""
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Имя узла"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Имя"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Фамилия"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "E-mail"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "Учётная запись AIM"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "Учётная запись AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
-msgid "Jabber Account"
-msgstr "Учётная запись Jabber"
-
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+msgid "XMPP Account"
+msgstr "Учётная запись XMPP"
+
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
-msgstr ""
-
-#: ../libpurple/protocols/bonjour/jabber.c:374
+msgstr "Bonjour"
+
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s закрыл беседу."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "Не удаётся открыть сокет"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "Ошибка установки параметров сокета"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "Не удалось связать сокет с портом"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "Не удалось осуществить прослушивание сокета"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Неверные настройки прокси"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3008,8 +3112,8 @@
 msgstr "Регистрация завершена успешно!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1367
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "Пароль"
 
@@ -3035,9 +3139,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Город"
@@ -3046,8 +3150,8 @@
 msgid "Year of birth"
 msgstr "Год рождения"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1538
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3721
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3060,14 +3164,14 @@
 msgstr "Мужчина или женщина"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3721
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Мужчина"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3721
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3127,38 +3231,39 @@
 msgstr "Добавить к чату..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5557
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3036 ../pidgin/gtkblist.c:3360
-#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3381
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Не в сети"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Доступен"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3688
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Имя"
 
@@ -3167,7 +3272,7 @@
 msgstr "Год рождения"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3900
 msgid "Unable to display the search results."
 msgstr "Не удаётся отобразить результаты поиска."
 
@@ -3211,7 +3316,7 @@
 msgid "Connection failed."
 msgstr "Не удалось установить соединение."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:548
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Заблокирован"
 
@@ -3296,21 +3401,24 @@
 msgstr "Пользователь Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "текущая тема: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Тема не установлена"
 
@@ -3345,7 +3453,7 @@
 msgstr "MOTD для %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Сервер разорвал соединение"
 
@@ -3354,11 +3462,12 @@
 msgstr "Просмотреть MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Канал:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "_Пароль:"
 
@@ -3368,60 +3477,62 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1040
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Соединение"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "Не удалось создать сокет"
 
-#: ../libpurple/protocols/irc/irc.c:402
-#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Не удалось соединиться с узлом"
 
-#: ../libpurple/protocols/irc/irc.c:424
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Не удалось установить соединение"
 
-#: ../libpurple/protocols/irc/irc.c:427
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "Не удалось выполнить согласование SSL"
 
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: ../libpurple/protocols/irc/irc.c:761
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Тема"
@@ -3434,56 +3545,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "Модуль протокола IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Наименее плохой модуль протокола IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2131
-#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6624
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Сервер"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2136
-#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6627
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Порт"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "Кодировки"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:309
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Настоящее имя"
 
@@ -3491,155 +3611,158 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Неверный режим"
 
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Вас выгнали из %s."
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Изгнан"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:294
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(оператор IRC)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:295
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(идентифицирован)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:296
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3689
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:322
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Сейчас на"
 
-#: ../libpurple/protocols/irc/msgs.c:327
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Бездействует"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "В сети с"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s сменил тему на: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:412
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s очистил тему."
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Тема для %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:438
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Неизвестное сообщение '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Неизвестное сообщение"
 
-#: ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "Сервер IRC не понял полученное сообщение."
 
-#: ../libpurple/protocols/irc/msgs.c:460
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Пользователи на %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:557
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Отклик времени"
 
-#: ../libpurple/protocols/irc/msgs.c:558
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "Локальное время сервера IRC:"
 
-#: ../libpurple/protocols/irc/msgs.c:569
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Нет такого канала"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:580
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "нет такого канала"
 
-#: ../libpurple/protocols/irc/msgs.c:583
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Пользователь не в сети"
 
-#: ../libpurple/protocols/irc/msgs.c:588
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Нет такого псевдонима или канала"
 
-#: ../libpurple/protocols/irc/msgs.c:608
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Не удалось отправить"
 
-#: ../libpurple/protocols/irc/msgs.c:664
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Присоединение к %s требует приглашения."
 
-#: ../libpurple/protocols/irc/msgs.c:665
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Только по приглашению"
 
-#: ../libpurple/protocols/irc/msgs.c:777
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Вы были удалены оператором %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:782 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Удалён оператором %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:805
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) установлен %s"
 
-#: ../libpurple/protocols/irc/msgs.c:890 ../libpurple/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Неверный псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:892
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3647,7 +3770,7 @@
 "Выбранный вами псевдоним был отвергнут сервером. Вероятно, он содержит "
 "недопустимые символы."
 
-#: ../libpurple/protocols/irc/msgs.c:897
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3655,52 +3778,53 @@
 "Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
 "содержит недопустимые символы."
 
-#: ../libpurple/protocols/irc/msgs.c:936
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:936
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Вы покинули канал%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Ошибка: неверный PONG с сервера"
 
-#: ../libpurple/protocols/irc/msgs.c:1001
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Ответ PING -- задержка: %lu секунд"
 
-#: ../libpurple/protocols/irc/msgs.c:1082
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Не удаётся присоединиться к %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1083
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Не удаётся присоединиться к %s: Требуется регистрация."
+
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Не удаётся присоединиться к каналу"
 
-#: ../libpurple/protocols/irc/msgs.c:1117
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Псевдоним или канал временно недоступен."
 
-#: ../libpurple/protocols/irc/msgs.c:1129
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;действие для выполнения&gt;:  Выполнить действие."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3708,11 +3832,11 @@
 "away [сообщение]:  Установить сообщение об отсутствии. Если сообщение не "
 "задано, удалить сообщение об отсутствии."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Послать команду для chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3720,7 +3844,7 @@
 "deop &lt;псевдоним1&gt; [псевдоним2] ...:  Забрать у пользователя статус "
 "оператора канала. Вы должны быть оператором канала для этого."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3730,7 +3854,7 @@
 "голоса на канале, лишая его возможности говорить, если канал модерируемый "
 "(+m). Вы должны быть оператором канала для этого."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3738,27 +3862,27 @@
 "invite &lt;псевдоним&gt; [комната]:  Пригласить пользователя присоединиться "
 "к вам на указанном или текущем канале."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-
 #: ../libpurple/protocols/irc/parse.c:129
 msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:130
+msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
 "kick &lt;псевдоним&gt; [сообщение]:  Удалить пользователя с канала. Вы "
 "должны быть оператором канала для этого."
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3766,15 +3890,15 @@
 "list:  Вывести список каналов в сети. <i>Имейте в виду, что некоторые "
 "серверы за это могут разорвать соединение с вами.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;действие для выполнения&gt;:  Выполнить действие."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Послать команду для memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3782,28 +3906,28 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;псевдоним|канал&gt;:  Установить или "
 "снять режим пользователя или канала."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [канал]:  Вывести список пользователей, присутствующих сейчас на "
 "канале."
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Послать команду для nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3811,17 +3935,17 @@
 "op &lt;псевдоним1&gt; [псевдоним2] ...:  Дать пользователю статус оператора "
 "канала. Вы должны быть оператором канала для этого."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Послать команду для operserv"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3829,7 +3953,7 @@
 "part [комната] [сообщение]:  Покинуть указанный или текущий канал. Сообщение "
 "необязательно."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3837,22 +3961,22 @@
 "ping [псевдоним]:  Запросить величину задержки связи с пользователем (или с "
 "сервером, если пользователь не указан)."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером. Сообщение необязательно."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Послать команду без обработки непосредственно серверу."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -3860,24 +3984,24 @@
 "remove &lt;псевдоним&gt; [сообщение]:  Удалить пользователя из комнаты. Вы "
 "должны быть оператором канала для этого."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Выводит текущее локальное время на сервере IRC."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему канала."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Установить или снять режим пользователя."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -3885,37 +4009,37 @@
 "voice &lt;псевдоним1&gt; [псевдоним2] ...:  Дать пользователю статус голоса "
 "на канале. Вы должны быть оператором канала для этого."
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [сервер] &lt;псевдоним&gt;:  Получить информацию о пользователе."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;псевдоним&gt;:  Получить информацию о пользователе, вышедшем из "
 "сети."
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Время ответа от %s: %lu секунд"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Ответ CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -3931,17 +4055,42 @@
 "Сервер требует аутентификацию простым текстом через нешифрованный поток"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s требует аутентификацию простым текстом через нешифрованное соединение. "
+"Позволить это и продолжить аутентификацию?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "Неверный отклик от сервера."
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -3949,41 +4098,27 @@
 "Этот сервер требует аутентификацию простым текстом через нешифрованное "
 "соединение. Позволить это и продолжить аутентификацию?"
 
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
-msgid "Server does not use any supported authentication method"
-msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "Неверный отклик от сервера."
-
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "Ошибка SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Полное имя"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Фамилия"
 
@@ -3993,7 +4128,7 @@
 msgstr "Имя"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4024,7 +4159,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Страна"
 
@@ -4037,9 +4173,11 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-mail"
@@ -4061,22 +4199,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "Birthday"
 msgstr "Дата рождения"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3047
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Описание"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "Изменить Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Изменить XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
@@ -4096,30 +4234,33 @@
 msgstr "Операционная система"
 
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Ресурс"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1241
 #: ../libpurple/protocols/jabber/jabber.c:1251
 #: ../libpurple/protocols/jabber/jabber.c:1261
 #: ../libpurple/protocols/jabber/jabber.c:1271
 #: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "Приоритет"
 
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Отчество"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Адрес"
 
@@ -4135,130 +4276,130 @@
 msgid "Logo"
 msgstr "Логотип"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "Показаться для"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1250
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:160
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5723
+#: ../libpurple/protocols/oscar/oscar.c:5761
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3700
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "Следующее является результатами вашего поиска"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "Не удалось опросить каталог"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "Не удалось опросить сервер каталога."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Инструкции сервера: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/oscar/oscar.c:3712
 msgid "E-Mail Address"
 msgstr "Адрес e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "Искать пользователей Jabber"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "Искать пользователей XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Искать"
 
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "Неверный каталог"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "Введите каталог пользователей"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "Выберите каталог пользователей для поиска"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "Поиск в каталоге"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Комната:"
@@ -4271,80 +4412,81 @@
 msgid "_Handle:"
 msgstr "_Имя:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s не является допустимым именем комнаты"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Неверное имя комнаты"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s не является допустимым именем сервера"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s не является допустимым именем комнаты"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Неверное имя комнаты"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Ошибка настройки"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Не удаётся настроить"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Ошибка настройки комнаты"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Эта комната не имеет возможности настройки"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Ошибка регистрации"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Изменение псевдонима не поддерживается в чатах не-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Ошибка загрузки списка комнат"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Неверный сервер"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Войти на сервер конференций"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Выберите сервер конференций для опроса"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Искать комнаты"
 
@@ -4363,446 +4505,468 @@
 msgid "Read Error"
 msgstr "Ошибка чтения"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Не удалось установить соединение с сервером:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Не удаётся создать сокет"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Неверный Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
+msgid "Invalid XMPP ID"
+msgstr "Неверный XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:573
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Неверный XMPP ID. Должен быть задан домен."
+
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Регистрация завершена успешно"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Регистрация завершилась неудачно"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Уже зарегистрировано"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "State"
 msgstr "Область"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Почтовый код"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Дата"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "Зарегистрировать новую учётную запись Jabber"
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
+msgid "Register New XMPP Account"
+msgstr "Зарегистрировать новую учётную запись XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "Зарегистрировать"
 
-#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "Инициализация потока"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: ../libpurple/protocols/jabber/jabber.c:1058
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "Повторная инициализация потока"
 
-#: ../libpurple/protocols/jabber/jabber.c:1124
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5555
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "Обе"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1173
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "Для"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Нет"
 
-#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "Подписка"
 
-#: ../libpurple/protocols/jabber/jabber.c:1310
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "Пароль изменён"
 
-#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "Пароль был изменён."
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
-#: ../libpurple/protocols/jabber/jabber.c:1316
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "Пароль (ещё раз)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1377
-#: ../libpurple/protocols/jabber/jabber.c:1378
-msgid "Change Jabber Password"
-msgstr "Изменить пароль Jabber"
-
-#: ../libpurple/protocols/jabber/jabber.c:1378
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
+msgid "Change XMPP Password"
+msgstr "Изменить пароль XMPP"
+
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "Введите новый пароль"
 
-#: ../libpurple/protocols/jabber/jabber.c:1390
-#: ../libpurple/protocols/oscar/oscar.c:6303
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Установить пользовательскую информацию..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1395
-#: ../libpurple/protocols/oscar/oscar.c:6314
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Изменить пароль..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "Искать пользователей..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "Неверный запрос"
 
-#: ../libpurple/protocols/jabber/jabber.c:1480
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "Конфликт"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "Функция не реализована"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "Запрещено"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "Ушёл"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "Внутренняя ошибка сервера"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "Элемент не найден"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Malformed Jabber ID"
-msgstr "Неверный Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1502
+msgid "Malformed XMPP ID"
+msgstr "Неверно сформированный XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "Недопустимо"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "Не разрешено"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "Требуется плата"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "Получатель недоступен"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
-msgid "Registration Required"
-msgstr "Требуется регистрация"
-
-#: ../libpurple/protocols/jabber/jabber.c:1508
-msgid "Remote Server Not Found"
-msgstr "Удалённый сервер не найден"
-
-#: ../libpurple/protocols/jabber/jabber.c:1510
-msgid "Remote Server Timeout"
-msgstr "Истекло время ожидания удалённого сервера"
-
-#: ../libpurple/protocols/jabber/jabber.c:1512
-msgid "Server Overloaded"
-msgstr "Сервер перегружен"
-
-#: ../libpurple/protocols/jabber/jabber.c:1514
-msgid "Service Unavailable"
-msgstr "Служба недоступна"
-
 #: ../libpurple/protocols/jabber/jabber.c:1516
-msgid "Subscription Required"
-msgstr "Требуется подписка"
+msgid "Registration Required"
+msgstr "Требуется регистрация"
 
 #: ../libpurple/protocols/jabber/jabber.c:1518
+msgid "Remote Server Not Found"
+msgstr "Удалённый сервер не найден"
+
+#: ../libpurple/protocols/jabber/jabber.c:1520
+msgid "Remote Server Timeout"
+msgstr "Истекло время ожидания удалённого сервера"
+
+#: ../libpurple/protocols/jabber/jabber.c:1522
+msgid "Server Overloaded"
+msgstr "Сервер перегружен"
+
+#: ../libpurple/protocols/jabber/jabber.c:1524
+msgid "Service Unavailable"
+msgstr "Служба недоступна"
+
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Subscription Required"
+msgstr "Требуется подписка"
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "Непредвиденный запрос"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "Авторизация прервана"
 
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "Неправильная кодировка в авторизации"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "Неверный идентификатор авторизации"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "Неверный механизм авторизации"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "Механизм авторизации слишком слаб"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "Временная ошибка аутентификации"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "Ошибка аутентификации"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "Неверный формат"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "Неверный префикс пространства имён"
 
-#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
 msgstr "Конфликт ресурсов"
 
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Истекло время ожидания соединения"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "Узел ушёл"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "Узел неизвестен"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
-msgid "Improper Addressing"
-msgstr "Неправильная адресация"
-
-#: ../libpurple/protocols/jabber/jabber.c:1567
-msgid "Invalid ID"
-msgstr "Неверный ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1569
-msgid "Invalid Namespace"
-msgstr "Неверное пространство имён"
-
-#: ../libpurple/protocols/jabber/jabber.c:1571
-msgid "Invalid XML"
-msgstr "Неверный XML"
-
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Non-matching Hosts"
-msgstr "Несочетаемые узлы"
+msgid "Improper Addressing"
+msgstr "Неправильная адресация"
 
 #: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Policy Violation"
-msgstr "Нарушение правил"
+msgid "Invalid ID"
+msgstr "Неверный ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1579
-msgid "Remote Connection Failed"
-msgstr "Не удалось установить удалённое соединение"
+msgid "Invalid Namespace"
+msgstr "Неверное пространство имён"
 
 #: ../libpurple/protocols/jabber/jabber.c:1581
+msgid "Invalid XML"
+msgstr "Неверный XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1583
+msgid "Non-matching Hosts"
+msgstr "Несочетаемые узлы"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
+msgid "Policy Violation"
+msgstr "Нарушение правил"
+
+#: ../libpurple/protocols/jabber/jabber.c:1589
+msgid "Remote Connection Failed"
+msgstr "Не удалось установить удалённое соединение"
+
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
 msgstr "Недостаток ресурсов"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "Ограниченный XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "Обратитесь к другому узлу"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "Выключение системы"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "Неопределённое состояние"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "Неподдерживаемая кодировка"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "Неподдерживаемый тип строфы"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "Неподдерживаемая версия"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "XML не сформирован должным образом"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "Ошибка потока"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Не удаётся выгнать пользователя %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1717
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1770
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Не удаётся удалить пользователя %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1801
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Настроить комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [комната]:  Покинуть комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register:  Зарегистрировать комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:1825
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
 
-#: ../libpurple/protocols/jabber/jabber.c:1831
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [комната]:  Выгнать пользователя из комнаты."
 
-#: ../libpurple/protocols/jabber/jabber.c:1837
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1843
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;пользователь&gt; [сообщение]:  Пригласить пользователя в комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;комната&gt; [сервер]:  Присоединиться к чату на этом сервере."
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;пользователь&gt; [комната]:  Удалить пользователя из комнаты."
 
-#: ../libpurple/protocols/jabber/jabber.c:1866
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4821,53 +4985,64 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Модуль протокола Jabber"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "Модуль протокола XMPP"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+msgid "Domain"
+msgstr "Домен"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "Принудительно использовать старый (порт 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Соединяться на порт"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "Соединяться с сервером"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s покинул беседу."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Сообщение от %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s установил тему: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "Тема: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Не удалось доставить сообщение для %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Ошибка сообщения Jabber"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "Ошибка сообщения XMPP"
+
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Код %s)"
@@ -4876,16 +5051,16 @@
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "Создать новую комнату"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -4893,39 +5068,65 @@
 "Вы создаёте новую комнату. Хотите настроить её или принять установки по "
 "умолчанию?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Настроить комнату"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
 msgstr "Ошибка в чате %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Ошибка присоединения к чату %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Не удаётся отправить файл для %s, пользователь не поддерживает приём файлов"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Не удалось отправить файл"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Не удаётся отправить файл для %s, неверный JID"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Не удаётся отправить файл для %s, пользователь не в сети"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Не удаётся отправить файл для %s, нет подписки на присутствие пользователя"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Выбрать ресурс"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr ""
+msgstr "Проблема с синхронизацией списка собеседников в %s (%s)"
 
 #: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
@@ -5139,8 +5340,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Аутентификация завершилась неудачно"
 
@@ -5174,367 +5376,371 @@
 msgid "MSN Error: %s\n"
 msgstr "Ошибка MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Введите ваше дружеское имя."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Это имя, под которым вас будут видеть другие пользователи MSN."
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Введите номер вашего домашнего телефона."
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Введите номер вашего рабочего телефона."
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Введите номер вашего мобильного телефона."
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:314
+#: ../libpurple/protocols/msn/msn.c:323
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Запретить"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Отправить мобильное сообщение."
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Страница"
 
-#: ../libpurple/protocols/msn/msn.c:538
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:568 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Скоро вернусь"
 
-#: ../libpurple/protocols/msn/msn.c:572 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Занят"
 
-#: ../libpurple/protocols/msn/msn.c:576
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../libpurple/protocols/msn/msn.c:580
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Ввести дружеское имя..."
 
-#: ../libpurple/protocols/msn/msn.c:613
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Ввести номер домашнего телефона..."
 
-#: ../libpurple/protocols/msn/msn.c:617
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Ввести номер рабочего телефона..."
 
-#: ../libpurple/protocols/msn/msn.c:621
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Ввести номер мобильного телефона..."
 
-#: ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Разрешить/запретить мобильные устройства..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Разрешить/запретить мобильные страницы..."
 
-#: ../libpurple/protocols/msn/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:676
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Создать _чат"
 
-#: ../libpurple/protocols/msn/msn.c:714
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
 
-#: ../libpurple/protocols/msn/msn.c:739
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Не удалось соединиться с сервером."
 
-#: ../libpurple/protocols/msn/msn.c:1459 ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
-#: ../libpurple/protocols/msn/msn.c:1530 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Основные"
 
-#: ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3744
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Возраст"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Занятость"
 
-#: ../libpurple/protocols/msn/msn.c:1540
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Местоположение"
 
-#: ../libpurple/protocols/msn/msn.c:1545 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Хобби и интересы"
 
-#: ../libpurple/protocols/msn/msn.c:1551 ../libpurple/protocols/msn/msn.c:1671
-#: ../libpurple/protocols/msn/msn.c:1677 ../libpurple/protocols/msn/msn.c:1684
-#: ../libpurple/protocols/msn/msn.c:1692 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Немного о себе"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Брачный статус"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Интересы"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Домашние животные"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Родной город"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Места проживания"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Мода"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Юмор"
 
-#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Музыка"
 
-#: ../libpurple/protocols/msn/msn.c:1578 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Любимая цитата"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Контактная информация"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Персональное"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../libpurple/protocols/msn/msn.c:1602
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Персональный мобильный телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Домашний факс"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Персональный e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Работа"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Название работы"
 
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Company"
 msgstr "Компания"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Отдел"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Профессия"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Рабочий телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: ../libpurple/protocols/msn/msn.c:1632
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Рабочий мобильный телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Рабочий пейджер"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Рабочий факс"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Рабочий e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1714
-#: ../libpurple/protocols/msn/msn.c:1721 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Любимые вещи"
 
-#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
-#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msn/msn.c:1829
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1818
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL профиля"
@@ -5549,19 +5755,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2104 ../libpurple/protocols/msn/msn.c:2106
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "Модуль протокола MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2140
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2145
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2153
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5592,7 +5798,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
@@ -5630,15 +5836,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Служба временно недоступна."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Не удаётся переименовать группу"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Не удаётся удалить группу"
 
-#: ../libpurple/protocols/msn/notification.c:1303
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5684,7 +5890,7 @@
 msgstr "Ошибка разбора HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3456
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Вы подключены из другого места."
@@ -5697,35 +5903,35 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "Серверы MSN временно выключаются."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Не удаётся аутентифицировать: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Согласование"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Запуск аутентификации"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Получение данных"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Отправка данных"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Загрузка списка собеседников"
 
@@ -5767,17 +5973,23 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка коммутационной "
 "панели:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
@@ -5801,87 +6013,87 @@
 msgid "The screen name specified is invalid."
 msgstr "Указанный идентификатор пользователя недопустим."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Требуемые параметры не переданы"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Не удаётся писать в сеть"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Не удаётся читать из сети"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Ошибка связи с сервером"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Конференция не найдена"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Конференция не существует"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Папка с таким именем уже существует"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Срок действия пароля истёк"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Пользователь не найден"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Учётная запись была отключена"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Сервер не смог получить доступ к каталогу"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Ваш системный администратор отключил эту операцию"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Сервер недоступен; повторите попытку позже"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Нельзя добавить контакт в ту же папку дважды"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Нельзя добавить себя самого"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Главный архив не настроен"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Неправильный идентификатор пользователя или пароль"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Не удалось узнать узел введённого идентификатора пользователя"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -5889,31 +6101,31 @@
 "Ваша учётная запись была отключена, так как было введено слишком много "
 "неправильных паролей"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Вы не можете добавить одну и ту же персону в беседу дважды"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Вы достигли предела допустимого количества контактов"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Вы ввели неправильный идентификатор пользователя"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Произошла ошибка при обновлении каталога"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Несовместимая версия протокола"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Пользователь заблокировал вас"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -5921,11 +6133,11 @@
 "Эта ознакомительная версия не позволяет входить одновременно более, чем "
 "десяти пользователям"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Пользователь не в сети или заблокировал вас"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Неизвестная ошибка: 0x%X"
@@ -6162,19 +6374,19 @@
 msgstr "Порт сервера"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Сервер разорвал соединение."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6184,21 +6396,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "При соединении с сервером получены недопустимые данные."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Не удалось установить соединение с сервером:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6230,8 +6433,8 @@
 msgstr "Модуль протокола ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Кодировка"
 
@@ -6279,7 +6482,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
-msgstr "Оценить клиента"
+msgstr "Оценить клиент"
 
 #: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
@@ -6379,8 +6582,8 @@
 "кодировки, либо клиент %s содержит ошибки.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
+#: ../pidgin/gtkutils.c:2339
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Значок собеседника"
@@ -6394,13 +6597,15 @@
 msgstr "Прямое соединение AIM"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Чат"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:5963
 msgid "Get File"
 msgstr "Получить файл"
 
@@ -6473,17 +6678,17 @@
 msgstr "Камера"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5695
+#: ../libpurple/protocols/oscar/oscar.c:5733
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5730
+#: ../libpurple/protocols/oscar/oscar.c:5768
 msgid "Not Available"
 msgstr "Недоступен"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5716
+#: ../libpurple/protocols/oscar/oscar.c:5754
 msgid "Occupied"
 msgstr "Занят"
 
@@ -6492,8 +6697,8 @@
 msgstr "Статус на веб-страницах"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Невидимый"
 
@@ -6502,13 +6707,13 @@
 msgstr "В сети"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "IP-адрес"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:2848
 msgid "Warning Level"
 msgstr "Уровень предупреждения"
 
@@ -6556,14 +6761,14 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Неверный идентификатор пользователя."
 
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Неправильный пароль."
 
@@ -6614,10 +6819,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5800
-#: ../libpurple/protocols/oscar/oscar.c:6081 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:6119 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -6636,49 +6841,49 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "Не удаётся получить допустимый хэш входа AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "Не удаётся получить допустимый хэш входа."
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "Не удаётся инициализировать соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5198
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2271
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Причина не указана."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2277
 msgid "Authorization Denied Message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2405
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6689,18 +6894,18 @@
 "следующей причине:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2406
 msgid "ICQ authorization denied."
 msgstr "В авторизации ICQ отказано."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Пользователь %u дал своё согласие добавить его в ваш список собеседников."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6713,7 +6918,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6726,7 +6931,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2437
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6739,24 +6944,24 @@
 "Сообщение:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2458
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Пользователь ICQ %u отправил вам собеседника: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2464
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Хотите добавить этого собеседника в список собеседников?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2469 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Добавить"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2470
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2554
 #, 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."
@@ -6764,7 +6969,7 @@
 msgstr[1] "Вы не получили %hu сообщения от %s, так как они были некорректны."
 msgstr[2] "Вы не получили %hu сообщений от %s, так как они были некорректны."
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2563
 #, 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."
@@ -6775,7 +6980,7 @@
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6788,7 +6993,7 @@
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -6799,7 +7004,7 @@
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -6810,7 +7015,7 @@
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, 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."
@@ -6819,61 +7024,61 @@
 msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2754
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не удаётся отправить сообщение: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2754
+#: ../libpurple/protocols/oscar/oscar.c:2759
+#: ../libpurple/protocols/oscar/oscar.c:2821
+#: ../libpurple/protocols/oscar/oscar.c:2825
 msgid "Unknown reason."
 msgstr "Причина неизвестна."
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2757
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Не удаётся отправить сообщение для %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2821
 #, c-format
 msgid "User information not available: %s"
 msgstr "Пользовательская информация недоступна: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2824
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Пользовательская информация для %s недоступна:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2853
 msgid "Online Since"
 msgstr "В сети с"
 
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Член с"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2863
 msgid "Capabilities"
 msgstr "Возможности"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2893
 msgid "Available Message"
 msgstr "Статусное сообщение"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2919
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:2996
 msgid "Your AIM connection may be lost."
 msgstr "Ваше соединение AIM может быть потеряно."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3183
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -6881,7 +7086,7 @@
 "[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
 "недопустимые символы.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3386
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6889,56 +7094,57 @@
 "Последнее предпринятое вами действие не может быть выполнено, так как вы "
 "превысили предел. Подождите 10 секунд и попытайтесь снова."
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3458
 msgid "You have been signed off for an unknown reason."
 msgstr "Вы были отключены по неизвестной причине."
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3471
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3718
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3748
 msgid "Personal Web Page"
 msgstr "Персональная Web-страница"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3772
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Zip Code"
 msgstr "Индекс"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Division"
 msgstr "Отдел"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Position"
 msgstr "Должность"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Web Page"
 msgstr "Web-страница"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3810
 msgid "Work Information"
 msgstr "Информация о работе"
 
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3866
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -6946,29 +7152,29 @@
 msgstr[1] "Следующие идентификаторы пользователей соотнесены с %s"
 msgstr[2] "Следующие идентификаторы пользователей соотнесены с %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Screen name"
 msgstr "Идентификатор пользователя"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3937
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3960
 msgid "Account Confirmation Requested"
 msgstr "Запрошено подтверждение учётной записи"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3991
 msgid "Error Changing Account Info"
 msgstr "Ошибка изменения информации об учётной записи"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3994
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6977,14 +7183,14 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя отличается от оригинального."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3997
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как он недопустим."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4000
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6993,7 +7199,7 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя слишком велик."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4003
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7002,7 +7208,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого "
 "идентификатора пользователя уже есть ожидающий запрос."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4006
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7011,7 +7217,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
 "соотнесено слишком много идентификаторов пользователей."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4009
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7020,32 +7226,32 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
 "неверен."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4012
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Ошибка 0x%04x: Неизвестная ошибка."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4024
 msgid "Account Info"
 msgstr "Информация об учётной записи"
 
-#: ../libpurple/protocols/oscar/oscar.c:4193
+#: ../libpurple/protocols/oscar/oscar.c:4196
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
 "отправки изображений."
 
-#: ../libpurple/protocols/oscar/oscar.c:4438
+#: ../libpurple/protocols/oscar/oscar.c:4462
 msgid "Unable to set AIM profile."
 msgstr "Не удаётся установить профиль AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4463
 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 "
@@ -7055,7 +7261,7 @@
 "входа. Ваш профиль остаётся неустановленным; попытайтесь установить его ещё "
 "раз, когда будете полностью подключены."
 
-#: ../libpurple/protocols/oscar/oscar.c:4453
+#: ../libpurple/protocols/oscar/oscar.c:4477
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7070,11 +7276,11 @@
 msgstr[2] ""
 "Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
 
-#: ../libpurple/protocols/oscar/oscar.c:4458
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Profile too long."
 msgstr "Профиль слишком велик."
 
-#: ../libpurple/protocols/oscar/oscar.c:4503
+#: ../libpurple/protocols/oscar/oscar.c:4527
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7092,11 +7298,11 @@
 "Максимальный размер сообщения об отсутствии в %d байт был превышен. "
 "Сообщение об отсутствии было урезано."
 
-#: ../libpurple/protocols/oscar/oscar.c:4508
+#: ../libpurple/protocols/oscar/oscar.c:4532
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#: ../libpurple/protocols/oscar/oscar.c:4577
+#: ../libpurple/protocols/oscar/oscar.c:4601
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7104,17 +7310,17 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4579
-#: ../libpurple/protocols/oscar/oscar.c:5002
-#: ../libpurple/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
 msgid "Unable To Add"
 msgstr "Не удаётся добавить"
 
-#: ../libpurple/protocols/oscar/oscar.c:4683
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не удаётся загрузить список собеседников"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4708
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7123,16 +7329,16 @@
 "собеседников не потерян и, вероятно, станет доступен в течение нескольких "
 "часов."
 
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4894
-#: ../libpurple/protocols/oscar/oscar.c:5070
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5076
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4913
+#: ../libpurple/protocols/oscar/oscar.c:4918
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5100
 msgid "Orphans"
 msgstr "Сироты"
 
-#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5024
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7141,12 +7347,12 @@
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
 "много собеседников. Удалите один и попытайтесь снова."
 
-#: ../libpurple/protocols/oscar/oscar.c:5000
-#: ../libpurple/protocols/oscar/oscar.c:5014
+#: ../libpurple/protocols/oscar/oscar.c:5024
+#: ../libpurple/protocols/oscar/oscar.c:5038
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5014
+#: ../libpurple/protocols/oscar/oscar.c:5038
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7157,7 +7363,7 @@
 "причиной этого является то, что вы имеете максимальное количество допустимых "
 "собеседников в списке собеседников."
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5131
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7166,22 +7372,22 @@
 "Пользователь %s разрешил добавить его в ваш список собеседников. Хотите "
 "добавить его?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5114
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
 msgstr "Авторизация дана"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5212
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
 
-#: ../libpurple/protocols/oscar/oscar.c:5195
+#: ../libpurple/protocols/oscar/oscar.c:5213
 msgid "Authorization Granted"
 msgstr "Авторизация дана"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5216
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7192,53 +7398,53 @@
 "следующей причине:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5199
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "Authorization Denied"
 msgstr "В авторизации отказано"
 
-#: ../libpurple/protocols/oscar/oscar.c:5235
+#: ../libpurple/protocols/oscar/oscar.c:5253
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Обмен:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5275
+#: ../libpurple/protocols/oscar/oscar.c:5293
 msgid "Invalid chat name specified."
 msgstr "Указано неверное имя чата."
 
-#: ../libpurple/protocols/oscar/oscar.c:5345
+#: ../libpurple/protocols/oscar/oscar.c:5362
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
 "AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5484
-#: ../libpurple/protocols/oscar/oscar.c:5489
+#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5527
 msgid "Away Message"
 msgstr "Сообщение об отсутствии"
 
-#: ../libpurple/protocols/oscar/oscar.c:5489
+#: ../libpurple/protocols/oscar/oscar.c:5527
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(загрузка)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:5727
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5797
+#: ../libpurple/protocols/oscar/oscar.c:5835
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Комментарий собеседника для %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5798
+#: ../libpurple/protocols/oscar/oscar.c:5836
 msgid "Buddy Comment:"
 msgstr "Комментарий собеседника:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5845
+#: ../libpurple/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Вы выбрали открытие прямого соединения с %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5887
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7246,65 +7452,65 @@
 "Так как это раскроет ваш IP-адрес, это можно считать угрозой безопасности. "
 "Хотите продолжить?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5855
+#: ../libpurple/protocols/oscar/oscar.c:5893
 msgid "C_onnect"
 msgstr "_Установить соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5928
 msgid "Get AIM Info"
 msgstr "Получить информацию AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5896
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий собеседника"
 
-#: ../libpurple/protocols/oscar/oscar.c:5904
+#: ../libpurple/protocols/oscar/oscar.c:5942
 msgid "Get Status Msg"
 msgstr "Получить сообщение о статусе"
 
-#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5955
 msgid "Direct IM"
 msgstr "Прямое соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:5977
 msgid "Re-request Authorization"
 msgstr "Повторный запрос авторизации"
 
-#: ../libpurple/protocols/oscar/oscar.c:5998
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Require authorization"
 msgstr "Требовать авторизацию"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Статус на веб-страницах (вызывает появление СПАМА!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6006
+#: ../libpurple/protocols/oscar/oscar.c:6044
 msgid "ICQ Privacy Options"
 msgstr "Параметры конфиденциальности ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "The new formatting is invalid."
 msgstr "Новое форматирование недопустимо."
 
-#: ../libpurple/protocols/oscar/oscar.c:6026
+#: ../libpurple/protocols/oscar/oscar.c:6064
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Форматирование идентификатора пользователя может влиять только на регистр "
 "букв и пробелы."
 
-#: ../libpurple/protocols/oscar/oscar.c:6079
+#: ../libpurple/protocols/oscar/oscar.c:6117
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6125
+#: ../libpurple/protocols/oscar/oscar.c:6163
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6128
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Вы ожидаете авторизацию от следующих собеседников"
 
-#: ../libpurple/protocols/oscar/oscar.c:6129
+#: ../libpurple/protocols/oscar/oscar.c:6167
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7312,73 +7518,73 @@
 "Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6147
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Search for a buddy by e-mail address"
 msgstr "Искать собеседника по адресу e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Введите адрес e-mail собеседника, которого вы ищете."
 
-#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "_Search"
 msgstr "_Искать"
 
-#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
 msgstr "Установить пользовательскую информацию (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6320
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
 msgstr "Изменить пароль (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6324
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr "Настроить перенаправление сообщений (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6334
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set Privacy Options..."
 msgstr "Установить параметры конфиденциальности..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
 
-#: ../libpurple/protocols/oscar/oscar.c:6345
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Показать текущий зарегистрированный адрес e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Изменить текущий зарегистрированный адрес e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать собеседников без авторизации"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Искать собеседника по адресу e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "Искать собеседника по информации"
 
-#: ../libpurple/protocols/oscar/oscar.c:6435
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Show how long you have been idle"
 msgstr "Показывать, как долго вы бездействовали"
 
-#: ../libpurple/protocols/oscar/oscar.c:6590
+#: ../libpurple/protocols/oscar/oscar.c:6631
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7874,13 +8080,7 @@
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8283,7 +8483,7 @@
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4250
 msgid "Topic:"
 msgstr "Тема:"
 
@@ -8306,6 +8506,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3977
+msgid "Connect"
+msgstr "Установить соединение"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8316,12 +8520,12 @@
 msgstr "Последний известный клиент"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Имя пользователя"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
@@ -8391,39 +8595,39 @@
 msgid "Synchronize List with Server"
 msgstr "Синхронизировать со списком с сервера"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Импортировать список Sametime для учётной записи %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Экспортировать список Sametime для учётной записи %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Не удаётся добавить группу: группа существует"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Группа с именем '%s' уже присутствует в списке собеседников."
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Не удаётся добавить группу"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Вероятные совпадения"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8431,37 +8635,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Не удаётся добавить группу: группа не найдена"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Результаты поиска для '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8472,117 +8676,142 @@
 "можете добавить этих пользователей в список собеседников или отправить им "
 "сообщения с помощью кнопок действия ниже."
 
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "Результаты поиска"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Нет совпадений"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Нет совпадений"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Искать пользователя"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Поиск пользователей"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Поиск пользователей..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Пользователь %s не присутствует в сети"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Согласование ключей"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Не удаётся выполнить согласование ключей"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Произошла ошибка во время согласования ключей"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Не удалось выполнить согласование ключей"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Истекло время ожидания во время согласования ключей"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Согласование ключей было прервано"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Согласование ключей было прервано"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Согласование ключей уже начато"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Согласование ключей не может быть начато с самим собой"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Удалённый пользователь больше не присутствует в сети"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8591,7 +8820,8 @@
 "Получен запрос согласования ключей от %s. Хотите выполнить согласование "
 "ключей?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8602,69 +8832,99 @@
 "Удалённый узел: %s\n"
 "Удалённый порт: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Запрос согласования ключей"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Получить публичный ключ"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Не удаётся загрузить публичный ключ"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Показать публичный ключ"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Не удалось загрузить публичный ключ"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Пользовательская информация"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Не удаётся получить пользовательскую информацию"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Собеседник %s не проверен"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8674,16 +8934,19 @@
 "для получения публичного ключа."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Собеседник %s не присутствует в сети"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8691,15 +8954,18 @@
 "Чтобы добавить собеседника, вы должны импортировать его публичный ключ. "
 "Нажмите \"Импортировать...\" для импортирования публичного ключа."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Импортировать..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Выберите корректного пользователя"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8707,7 +8973,8 @@
 "Было найдено несколько пользователей с одинаковыми публичными ключами. "
 "Выберите из списка одного из них для добавления в список собеседников."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8716,237 +8983,318 @@
 "списка одного из них для добавления в список собеседников."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Независимый"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Недомогающий"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Разбудите меня"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Гиперактивный"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Робот"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Счастливый"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Печальный"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Рассерженный"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Ревнующий"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Стыдящийся"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Непобедимый"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Влюблённый"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Сонный"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Скучающий"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Возбуждённый"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Озабоченный"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Режимы пользователя"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Настроение"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Предпочитаемый контакт"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Предпочитаемый язык"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Устройство"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Часовой пояс"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Географическое положение"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Получить публичный ключ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Убить пользователя"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Парольная фраза:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Канал %s отсутствует в сети"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Информация о канале"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Не удаётся получить информацию о канале"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Имя канала:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Количество пользователей:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Основатель канала::</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Шифр канала:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC канала:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Тема канала:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Режимы канала:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Добавить публичный ключ канала"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Открыть публичный ключ..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Парольная фраза канала"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Список публичных ключей канала"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8955,333 +9303,446 @@
 "able to join."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Аутентификация канала"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Добавить / Удалить"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Введите имя личной группы и парольную фразу канала %s."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Добавить личную группу канала"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Предел количества пользователей"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Установить предел количества пользователей на канале. Установите в ноль для "
 "сброса предела количества пользователей."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Список приглашённых"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Список изгнанных"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Добавить личную группу"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Сбросить перманентно"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Установить перманентно"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Установить предел количества пользователей"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Сбросить ограничение темы"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Установить ограничение темы"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Сбросить личный канал"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Установить личный канал"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Сбросить секретный канал"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Установить секретный канал"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Вы являетесь основателем канала на <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Вы сможете войти в личную группу после того, как войдёте на канал %s."
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Присоединиться к личной группе"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Не удаётся присоединиться к личной группе"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Вызвать команду"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Не удаётся вызвать команду"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Безопасная передача файлов"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Ошибка во время передачи файлов"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Соединение разорвано"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Не удалось выполнить согласование ключей"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "Истекло время ожидания соединения"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Не удалось создать соединение"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Сессия передачи файлов не существует"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Нет активных сессий передачи файлов"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Передача файлов уже начата"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Не удалось выполнить согласование ключей для передачи файлов"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Не удалось начать передачу файлов"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Не удаётся отправить файл"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Произошла ошибка"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s изменил тему <I>%s</I> на: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> установил режим канала <I>%s</I> в: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> снял все режимы канала <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> установил режимы <I>%s</I> в: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> снял все режимы <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Вы были удалены из <I>%s</I> оператором <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Вы были убиты оператором %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Убит оператором %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Отключиться от сервера"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Персональная информация"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "День рождения"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Должность"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Организация"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Отдел"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Заметки"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Присоединиться к чату"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Вы являетесь основателем канала на <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Настоящее имя"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Текст статуса"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Ещё..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Разорвать соединение с сервером"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Не удаётся разорвать соединение"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Не удаётся установить тему"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Список комнат"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Не удаётся получить список комнат"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Сеть пуста"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Не было получено публичных ключей"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Информация о сервере"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Не удаётся получить информацию о сервере"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Статистика сервера"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Не удаётся получить статистику сервера"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Нет доступной статистики сервера"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9301,105 +9762,66 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Статистика сети"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Не удалось убить пользователя"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Ошибка во время соединения с сервером SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Не удалось выполнить обмен ключами"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
-"создания нового соединения."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Соединение разорвано сервером"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "НАБЛЮДАТЬ"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Не удаётся наблюдать за пользователем"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Возобновление сессии"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Аутентификация соединения"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Проверка публичного ключа сервера"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Требуется парольная фраза"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Ошибка: Несоответствие версии, обновите своего клиента"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Ошибка: Удалённая система не признаёт/поддерживает ваш публичный ключ"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Ошибка: Неправильная подпись"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Ошибка: Неверные данные"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Ошибка: Аутентификация завершилась неудачно"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9408,12 +9830,12 @@
 "Получен публичный ключ %s. Локальная копия не совпадает с этим ключом. Всё "
 "ещё хотите принять этот публичный ключ?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Получен публичный ключ %s. Хотите принять этот публичный ключ?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9422,73 +9844,100 @@
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Проверить публичный ключ"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Просмотреть..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Неподдерживаемый тип публичного ключа"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Соединение разорвано сервером"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Ошибка во время соединения с сервером SILC"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Не удалось выполнить обмен ключами"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
+"создания нового соединения."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Не удалось установить соединение"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Не удаётся инициализировать соединение клиента SILC"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Выполнение обмена ключами"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Соединение с сервером SILC"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Не удалось загрузить пару ключей SILC"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Не удаётся создать соединение"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Не удаётся инициализировать протокол SILC"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Не удаётся найти или получить доступ к каталогу ~/.silc"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Соединение с сервером SILC"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Не удалось загрузить пару ключей SILC: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Не удаётся создать соединение"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Ошибка загрузки пары ключей SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Ваше текущее настроение"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "Нормально"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Влюблённый"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9496,46 +9945,63 @@
 "\n"
 "Предпочитаемые вами способы контакта"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Видеоконференция"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Ваш текущий статус"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Сетевые службы"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Позволить другим видеть, какие службы вы используете"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Позволить другим видеть, какой компьютер вы используете"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Ваш файл VCard"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Часовой пояс (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Атрибуты сетевого статуса пользователя"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9545,181 +10011,226 @@
 "статусе и вашу персональную информацию. Введите информацию о себе, которую "
 "вы хотели бы сделать доступной для просмотра другими пользователями."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Сообщение дня"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Нет доступного сообщения дня"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Нет сообщения дня, соотнесённого с этим соединением"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Создать новую пару ключей SILC"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Парольные фразы не совпадают"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Не удалось выполнить генерацию пары ключей"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Длина ключа"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Файл публичного ключа"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Файл личного ключа"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Парольная фраза (наберите ещё раз)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Сгенерировать пару ключей"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Сетевой статус"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Просмотреть сообщение дня"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Создать пару ключей SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Пользователь <I>%s</I> не присутствует в сети"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Тема слишком велика"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Вы должны указать псевдоним"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "канал %s не найден"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "режимы канала для %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "нет установленных режимов канала на %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Не удалось установить режимы канала для %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Неизвестная команда: %s, (возможно, ошибка в клиенте)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [канал]:  Покинуть чат"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [канал]:  Покинуть чат"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;новая тема&gt;]:  Просмотреть или изменить тему"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;канал&gt; [&lt;пароль&gt;]:  Присоединиться к чату в этой сети"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Вывести список каналов в этой сети"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;псевдоним&gt; &lt;сообщение&gt;:  Отправить пользователю личное "
 "сообщение"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;псевдоним&gt; [&lt;сообщение&gt;]:  Отправить пользователю личное "
 "сообщение"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Просмотреть сообщение дня сервера"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Прервать эту сессию"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером, сообщение необязательно"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;команда&gt;:  Вызвать любую команду клиента silc"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;псевдоним&gt; [-публичный ключ|&lt;причина&gt;]:  Убить пользователя"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9727,57 +10238,68 @@
 "cumode &lt;канал&gt; +|-&lt;режимы&gt; &lt;псевдоним&gt;:  Изменить режимы "
 "пользователя на канале"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;режимы пользователя&gt;:  Установить свои режимы в сети"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;псевдоним&gt; [-публичный ключ]:  Получить привилегии оператора "
 "сервера"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;канал&gt; &lt;псевдоним&gt; [комментарий]:  Удалить пользователя с "
 "канала"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [сервер]:  Просмотреть административные подробности о сервере"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;канал&gt; +|-&lt;псевдоним&gt;]:  Выгнать пользователя с канала"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;псевдоним|сервер&gt;:  Загрузить публичный ключ пользователя или "
 "сервера"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Просмотреть статистику сервера и сети"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Послать PING серверу"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;канал&gt;:  Вывести список пользователей, присутствующих на канале"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9792,116 +10314,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "Модуль протокола SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Протокол Secure Internet Live Conferencing (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "Сеть"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "Файл публичного ключа"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "Файл личного ключа"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "Шифр"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "Аутентификация публичного ключа"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Запретить просмотр другими пользователями"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Блокировать приглашения"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "Блокировать сообщения без обмена ключами"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Отвергать запросы атрибута сетевого статуса"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "Делать цифровую подпись и проверку всех сообщений"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Создание пары ключей SILC..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Не удаётся создать пару ключей SILC\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Настоящее имя: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Имя пользователя: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Имя узла: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Организация: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Страна: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Алгоритм: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Длина ключа: \t%d бит\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Версия: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9909,80 +10456,149 @@
 "\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Информация о публичном ключе"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Видеоконференция"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Компьютер"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Терминал"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Нет доступной статистики сервера"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Ошибка: Несоответствие версии, обновите свой клиент"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Ошибка: Удалённая система не признаёт/поддерживает ваш публичный ключ"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Ошибка: Неправильная подпись"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Ошибка: Неверные данные"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Ошибка: Аутентификация завершилась неудачно"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Не удаётся инициализировать соединение клиента SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Не удаётся найти или получить доступ к каталогу ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Не удалось загрузить пару ключей SILC: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Не удалось записать"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "Не удалось создать сокет для прослушивания"
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Не удалось разрешить имя узла"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "Не удалось разрешить имя узла"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "Идентификаторы пользователей SIP не могут содержать пробелы или символы @"
@@ -9995,36 +10611,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
+#: ../libpurple/protocols/simple/simple.c:1859
+msgid "Use UDP"
+msgstr "Использовать UDP"
+
 #: ../libpurple/protocols/simple/simple.c:1861
-msgid "Use UDP"
-msgstr "Использовать UDP"
+msgid "Use proxy"
+msgstr "Использовать прокси"
 
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "Использовать прокси"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr ""
 
@@ -10184,7 +10800,8 @@
 msgid "Password Change Successful"
 msgstr "Пароль изменён успешно"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5460
+#: ../pidgin/gtkblist.c:5814
 msgid "_Group:"
 msgstr "_Группа:"
 
@@ -10246,30 +10863,30 @@
 msgid "TOC Protocol Plugin"
 msgstr "Модуль протокола TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Системное сообщение Yahoo! для %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s (повторно) не разрешил добавить его в ваш список."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10277,11 +10894,11 @@
 msgstr ""
 "%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "В добавлении собеседника отказано"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10289,163 +10906,181 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Аутентификация Yahoo! завершилась неудачно"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, 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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Игнорировать собеседника?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ваша учётная запись заблокирована, войдите с веб-сайта Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с веб-сайта Yahoo! может исправить это."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "Получен непредвиденный HTTP-отклик от сервера."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Проблема с соединением"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Соединение с %s потеряно:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Не удалось установить соединение с %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Не дома"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Не за столом"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Не в офисе"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "Вышел"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Не в списке на сервере"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Присутствие"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Вероятно не в сети"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Присоединиться в чате"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Создать конференцию"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Настройки присутствия"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr ""
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Активировать какой ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "К кому присоединиться в чате?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Активировать ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Присоединиться к пользователю в чате..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Вывести список комнат в сети Yahoo"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
-msgid "buzz: Buzz a user to get their attention"
-msgstr ""
-
 #: ../libpurple/protocols/yahoo/yahoo.c:3838
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Вывести список комнат в сети Yahoo"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10459,56 +11094,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Модуль протокола Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Сервер пейджера"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Сервер пейджера Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Порт пейджера"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Сервер передачи файлов"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Сервер передачи файлов Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Порт передачи файлов"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Языковой формат чата"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорировать приглашения в конференции и чаты"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Сервер чата Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Порт чата Yahoo"
 
@@ -10595,7 +11230,7 @@
 msgstr "Не удаётся установить дескриптор файла."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Ошибка записи"
 
@@ -10711,99 +11346,99 @@
 msgstr "Не удаётся отправить в чат %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Пользователь"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Скрыт или не в сети"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>В %s с %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Любой"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Класс:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Инстанция:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Получатель:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Попытка подписки к %s,%s,%s завершилась неудачно"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;псевдоним&gt;: Найти пользователя"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;псевдоним&gt;: Найти пользователя"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Подписаться повторно"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Загрузить подписки с сервера"
 
@@ -10817,45 +11452,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Модуль протокола Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Использовать tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "Команда tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Экспортировать в .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Экспортировать в .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Импортировать из .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Импортировать из .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr ""
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -10885,7 +11520,7 @@
 msgid "Error resolving %s"
 msgstr "Ошибка разрешения имени %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Не удалось разрешить имя узла"
 
@@ -10923,7 +11558,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s теперь известен как %s.\n"
 
-#: ../libpurple/server.c:674
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10932,73 +11567,73 @@
 "%s приглашает %s в чат %s:\n"
 "%s"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s приглашает %s в чат %s\n"
 
-#: ../libpurple/server.c:683
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "Принять приглашение в чат?"
 
-#: ../libpurple/status.c:154
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Не установлен"
 
-#: ../libpurple/status.c:157
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Недоступен"
 
-#: ../libpurple/status.c:161
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr ""
 
-#: ../libpurple/status.c:610
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s изменил статус с %s на %s"
 
-#: ../libpurple/status.c:620
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s теперь %s"
 
-#: ../libpurple/status.c:625
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s больше не %s"
 
-#: ../libpurple/status.c:1257
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s начал бездействовать"
 
-#: ../libpurple/status.c:1274
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s перестал бездействовать"
 
-#: ../libpurple/status.c:1336
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s начал бездействовать"
 
-#: ../libpurple/status.c:1338
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s перестал бездействовать"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "Ошибка чтения %s"
 
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11007,15 +11642,15 @@
 "Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
 "переименован в %s~."
 
-#: ../libpurple/util.c:2970
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "Подсчёт..."
 
-#: ../libpurple/util.c:2973
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: ../libpurple/util.c:2999
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -11023,7 +11658,7 @@
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: ../libpurple/util.c:3011
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -11031,7 +11666,7 @@
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: ../libpurple/util.c:3019
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -11039,7 +11674,7 @@
 msgstr[1] "%s, %d часа"
 msgstr[2] "%s, %d часов"
 
-#: ../libpurple/util.c:3025
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -11047,7 +11682,7 @@
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: ../libpurple/util.c:3033
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -11055,7 +11690,7 @@
 msgstr[1] "%s, %d минуты"
 msgstr[2] "%s, %d минут"
 
-#: ../libpurple/util.c:3039
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -11063,29 +11698,34 @@
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Не удаётся соединиться с %s"
 
-#: ../libpurple/util.c:3431
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3466
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Ошибка чтения из %s: %s"
 
-#: ../libpurple/util.c:3497
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Ошибка записи в %s: %s"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Не удаётся соединиться с %s: %s"
@@ -11111,55 +11751,71 @@
 msgstr "Ориентация лотка."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Параметры входа"
 
-#: ../pidgin/gtkaccount.c:500
-msgid "Local alias:"
-msgstr "Локальный псевдоним:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "П_ротокол:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "_Идентификатор пользователя:"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "_Локальный псевдоним:"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "З_апомнить пароль"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "Параметры пользователя"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "Уведомления о новой по_чте"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
-msgid "Use this buddy icon for this account:"
-msgstr "Использовать этот значок собеседника для этой учётной записи:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "Использовать этот _значок собеседника для этой учётной записи:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "Параметры %s"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "Использовать настройки прокси GNOME"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "Использовать глобальные настройки прокси"
 
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "Нет прокси"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "Использовать настройки окружения"
 
@@ -11168,60 +11824,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "Если приглядитесь"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "вы можете увидеть спаривающихся бабочек"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "Параметры прокси"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
-msgstr "_Тип прокси:"
-
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+msgstr "Т_ип прокси:"
+
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "_Узел:"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "П_орт:"
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "Па_роль:"
 
-#: ../pidgin/gtkaccount.c:1439
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "Добавить учётную запись"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "_Основные"
 
-#: ../pidgin/gtkaccount.c:1474
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "_Дополнительные"
 
-#: ../pidgin/gtkaccount.c:1946 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../pidgin/gtkaccount.c:1974
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../pidgin/gtkaccount.c:2168
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11245,11 +11901,11 @@
 "учётных записей позже через меню <b>Учётные записи->Добавить/Изменить</b> "
 "окна списка собеседников."
 
-#: ../pidgin/gtkblist.c:722
+#: ../pidgin/gtkblist.c:717
 msgid "Join a Chat"
 msgstr "Присоединиться к чату"
 
-#: ../pidgin/gtkblist.c:743
+#: ../pidgin/gtkblist.c:738
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11257,95 +11913,93 @@
 "Введите соответствующую информацию о чате, к которому вы хотели бы "
 "присоединиться.\n"
 
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:749 ../pidgin/gtkblist.c:5408
+#: ../pidgin/gtkblist.c:5775 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "У_чётная запись:"
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Блокировать"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1038
 msgid "Un_block"
 msgstr "Раз_блокировать"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1089
 msgid "Get _Info"
 msgstr "_Информация"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1092 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "Мгновенное сооб_щение"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1098
 msgid "_Send File"
 msgstr "Отправить _файл"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1105
 msgid "Add Buddy _Pounce"
 msgstr "Добавить п_равило"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1109 ../pidgin/gtkblist.c:1113
+#: ../pidgin/gtkblist.c:1215 ../pidgin/gtkblist.c:1238
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-#: ../pidgin/gtkblist.c:1115
-msgid "Alias..."
-msgstr "Псевдоним..."
-
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1125 ../pidgin/gtkblist.c:1134
+#: ../pidgin/gtkblist.c:1223 ../pidgin/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "_Псевдоним..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
-#: ../pidgin/gtkblist.c:1236
+#: ../pidgin/gtkblist.c:1128 ../pidgin/gtkblist.c:1136
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1185
 msgid "Add a _Buddy"
 msgstr "Добавить _собеседника"
 
-#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1188
 msgid "Add a C_hat"
 msgstr "Добавить _чат"
 
-#: ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1191
 msgid "_Delete Group"
 msgstr "_Удалить группу"
 
-#: ../pidgin/gtkblist.c:1183
+#: ../pidgin/gtkblist.c:1193
 msgid "_Rename"
 msgstr "Пере_именовать"
 
 #. join button
-#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1211 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "П_рисоединиться"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1213
 msgid "Auto-Join"
 msgstr "Присоединяться автоматически"
 
-#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+#: ../pidgin/gtkblist.c:1251 ../pidgin/gtkblist.c:1274
 msgid "_Collapse"
 msgstr "_Свернуть"
 
-#: ../pidgin/gtkblist.c:1269
+#: ../pidgin/gtkblist.c:1279
 msgid "_Expand"
 msgstr "Р_азвернуть"
 
-#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
-#: ../pidgin/gtkblist.c:4490 ../pidgin/gtkblist.c:4500
+#: ../pidgin/gtkblist.c:1524 ../pidgin/gtkblist.c:1536
+#: ../pidgin/gtkblist.c:4522 ../pidgin/gtkblist.c:4532
 msgid "/Tools/Mute Sounds"
 msgstr "/Инструменты/Отключить звуки"
 
-#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:1996 ../pidgin/gtkconv.c:4610
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11353,126 +12007,117 @@
 "Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2836
 msgid "/_Buddies"
 msgstr "/_Собеседники"
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2837
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Собеседники/Новое мгновенное сооб_щение..."
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Собеседники/Присоединиться к _чату..."
 
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Get User _Info..."
 msgstr "/Собеседники/Получить пользовательскую _информацию..."
 
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/View User _Log..."
 msgstr "/Собеседники/Просмотреть _журнал пользователя..."
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Собеседники/Показывать собеседников _не в сети"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2843
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Собеседники/Показывать п_устые группы"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Собеседники/Показывать _подробности о собеседнике"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Собеседники/Показывать _время бездействия"
 
-#: ../pidgin/gtkblist.c:2825
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Собеседники/_Сортировать собеседников"
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Собеседники/_Добавить собеседника..."
 
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Add C_hat..."
 msgstr "/Собеседники/Добавить ч_ат..."
 
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/Add _Group..."
 msgstr "/Собеседники/Добавить _группу..."
 
-#: ../pidgin/gtkblist.c:2831
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/_About Pidgin"
+msgstr "/Собеседники/_О Pidgin"
+
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/_Quit"
 msgstr "/Собеседники/В_ыйти"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2856
 msgid "/_Accounts"
 msgstr "/_Учётные записи"
 
-#: ../pidgin/gtkblist.c:2835 ../pidgin/gtkblist.c:6413
+#: ../pidgin/gtkblist.c:2857 ../pidgin/gtkblist.c:6473
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Учётные записи/Добавить\\/Изменить"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2860
 msgid "/_Tools"
 msgstr "/_Инструменты"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Инструменты/_Слежение за собеседниками"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Plu_gins"
 msgstr "/Инструменты/_Модули"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Pr_eferences"
 msgstr "/Инструменты/_Настройки"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_ivacy"
 msgstr "/Инструменты/К_онфиденциальность"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2866
 msgid "/Tools/_File Transfers"
 msgstr "/Инструменты/Передача _файлов"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/R_oom List"
 msgstr "/Инструменты/Список _комнат"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/System _Log"
 msgstr "/Инструменты/Системный _журнал"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2869
+msgid "/Tools/_Debug Window"
+msgstr "/Инструменты/Окно о_тладки"
+
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Инструменты/Отключить _звуки"
 
-#. Help
-#: ../pidgin/gtkblist.c:2851
-msgid "/_Help"
-msgstr "/_Помощь"
-
-#: ../pidgin/gtkblist.c:2852
-msgid "/Help/Online _Help"
-msgstr "/Помощь/Помощь в _сети"
-
-#: ../pidgin/gtkblist.c:2853
-msgid "/Help/_Debug Window"
-msgstr "/Помощь/Окно _отладки"
-
-#: ../pidgin/gtkblist.c:2854
-msgid "/Help/_About"
-msgstr "/Помощь/О _программе"
-
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11481,73 +12126,73 @@
 "\n"
 "<b>Учётная запись:</b> %s"
 
-#: ../pidgin/gtkblist.c:2960
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "Псевдоним собеседника"
 
-#: ../pidgin/gtkblist.c:2981
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "В сети"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "Последнее появление"
 
-#: ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3051
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3376
+#: ../pidgin/gtkblist.c:3397
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Бездействует %dч %02dм"
 
-#: ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkblist.c:3399
 #, c-format
 msgid "Idle %dm"
 msgstr "Бездействует %dм"
 
-#: ../pidgin/gtkblist.c:3515
+#: ../pidgin/gtkblist.c:3544
 msgid "/Buddies/New Instant Message..."
 msgstr "/Собеседники/Новое мгновенное сообщение..."
 
-#: ../pidgin/gtkblist.c:3516 ../pidgin/gtkblist.c:3549
+#: ../pidgin/gtkblist.c:3545 ../pidgin/gtkblist.c:3578
 msgid "/Buddies/Join a Chat..."
 msgstr "/Собеседники/Присоединиться к чату..."
 
-#: ../pidgin/gtkblist.c:3517
+#: ../pidgin/gtkblist.c:3546
 msgid "/Buddies/Get User Info..."
 msgstr "/Собеседники/Получить пользовательскую информацию..."
 
-#: ../pidgin/gtkblist.c:3518
+#: ../pidgin/gtkblist.c:3547
 msgid "/Buddies/Add Buddy..."
 msgstr "/Собеседники/Добавить собеседника..."
 
-#: ../pidgin/gtkblist.c:3519 ../pidgin/gtkblist.c:3552
+#: ../pidgin/gtkblist.c:3548 ../pidgin/gtkblist.c:3581
 msgid "/Buddies/Add Chat..."
 msgstr "/Собеседники/Добавить чат..."
 
-#: ../pidgin/gtkblist.c:3520
+#: ../pidgin/gtkblist.c:3549
 msgid "/Buddies/Add Group..."
 msgstr "/Собеседники/Добавить группу..."
 
-#: ../pidgin/gtkblist.c:3555
+#: ../pidgin/gtkblist.c:3584
 msgid "/Tools/Privacy"
 msgstr "/Инструменты/Конфиденциальность"
 
-#: ../pidgin/gtkblist.c:3558
+#: ../pidgin/gtkblist.c:3587
 msgid "/Tools/Room List"
 msgstr "/Инструменты/Список комнат"
 
-#: ../pidgin/gtkblist.c:3655 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3684 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -11555,54 +12200,54 @@
 msgstr[1] "%d непрочитанных сообщения от %s\n"
 msgstr[2] "%d непрочитанных сообщений от %s\n"
 
-#: ../pidgin/gtkblist.c:3732
+#: ../pidgin/gtkblist.c:3761
 msgid "Manually"
 msgstr "Вручную"
 
-#: ../pidgin/gtkblist.c:3734
+#: ../pidgin/gtkblist.c:3763
 msgid "Alphabetically"
 msgstr "По алфавиту"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3764
 msgid "By status"
 msgstr "По статусу"
 
-#: ../pidgin/gtkblist.c:3736
+#: ../pidgin/gtkblist.c:3765
 msgid "By log size"
 msgstr "По размеру журнала"
 
-#: ../pidgin/gtkblist.c:3938 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3967 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Соединение с %s разорвано"
 
-#: ../pidgin/gtkblist.c:3948
+#: ../pidgin/gtkblist.c:3977
 msgid "Re-enable Account"
 msgstr "Повторно включить учётную запись"
 
-#: ../pidgin/gtkblist.c:3969
+#: ../pidgin/gtkblist.c:4001
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
 
-#: ../pidgin/gtkblist.c:4122
+#: ../pidgin/gtkblist.c:4153
 msgid "<b>Username:</b>"
 msgstr "<b>Имя пользователя:</b>"
 
-#: ../pidgin/gtkblist.c:4129
+#: ../pidgin/gtkblist.c:4160
 msgid "<b>Password:</b>"
 msgstr "<b>Пароль:</b>"
 
-#: ../pidgin/gtkblist.c:4140
+#: ../pidgin/gtkblist.c:4171
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4225
+#: ../pidgin/gtkblist.c:4256
 msgid "/Accounts"
 msgstr "/Учётные записи"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4239
+#: ../pidgin/gtkblist.c:4270
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11621,23 +12266,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4484
+#: ../pidgin/gtkblist.c:4516
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Собеседники/Показывать собеседников не в сети"
 
-#: ../pidgin/gtkblist.c:4487
+#: ../pidgin/gtkblist.c:4519
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Собеседники/Показывать пустые группы"
 
-#: ../pidgin/gtkblist.c:4493
+#: ../pidgin/gtkblist.c:4525
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Собеседники/Показывать подробности о собеседнике"
 
-#: ../pidgin/gtkblist.c:4496
+#: ../pidgin/gtkblist.c:4528
 msgid "/Buddies/Show Idle Times"
 msgstr "/Собеседники/Показывать время бездействия"
 
-#: ../pidgin/gtkblist.c:5334
+#: ../pidgin/gtkblist.c:5385
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -11648,23 +12293,26 @@
 "собеседника. Псевдоним будет показываться вместо идентификатора "
 "пользователя, когда это возможно.\n"
 
-#: ../pidgin/gtkblist.c:5394 ../pidgin/gtkblist.c:5755
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Группа:"
-
-#: ../pidgin/gtkblist.c:5653
+#. End of account box
+#: ../pidgin/gtkblist.c:5420
+msgid "_Screen name:"
+msgstr "_Идентификатор пользователя:"
+
+#: ../pidgin/gtkblist.c:5442 ../pidgin/gtkblist.c:5796
+msgid "A_lias:"
+msgstr "_Псевдоним:"
+
+#: ../pidgin/gtkblist.c:5708
 msgid "This protocol does not support chat rooms."
 msgstr "Этот протокол не поддерживает чаты."
 
-#: ../pidgin/gtkblist.c:5669
+#: ../pidgin/gtkblist.c:5724
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
 
-#: ../pidgin/gtkblist.c:5710
+#: ../pidgin/gtkblist.c:5765
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11672,39 +12320,39 @@
 "Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
 "добавить в список собеседников.\n"
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5853
 msgid "Please enter the name of the group to be added."
 msgstr "Введите имя добавляемой группы."
 
-#: ../pidgin/gtkblist.c:6433
+#: ../pidgin/gtkblist.c:6493
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6457
+#: ../pidgin/gtkblist.c:6517
 msgid "_Edit Account"
 msgstr "_Изменить учётную запись"
 
-#: ../pidgin/gtkblist.c:6470 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6530 ../pidgin/gtkconv.c:2984
 msgid "No actions available"
 msgstr "Нет доступных действий"
 
-#: ../pidgin/gtkblist.c:6478
+#: ../pidgin/gtkblist.c:6538
 msgid "_Disable"
 msgstr "_Выключить"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6550
 msgid "Enable Account"
 msgstr "Включить учётную запись"
 
-#: ../pidgin/gtkblist.c:6496
+#: ../pidgin/gtkblist.c:6556
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6545
+#: ../pidgin/gtkblist.c:6605
 msgid "/Tools"
 msgstr "/Инструменты"
 
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6675
 msgid "/Buddies/Sort Buddies"
 msgstr "/Собеседники/Сортировать собеседников"
 
@@ -11717,22 +12365,22 @@
 "re-enable the account."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:812
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Вы не подключены с учётной записью, позволяющей пригласить этого собеседника."
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:865
 msgid "Invite Buddy Into Chat Room"
 msgstr "Пригласить собеседника в чат"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:895
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -11740,188 +12388,196 @@
 "Введите имя пользователя, которого вы хотите пригласить, вместе с "
 "необязательным текстом приглашения."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:916
 msgid "_Buddy:"
 msgstr "_Собеседник:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "Сооб_щение:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2542 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Не удаётся открыть файл."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:999
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Беседа с %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1035
 msgid "Save Conversation"
 msgstr "Сохранить беседу"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Найти"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Искать:"
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1393
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1401
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
 "записаны."
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1649
 msgid "Un-Ignore"
 msgstr "Не игнорировать"
 
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1652
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1672
 msgid "Get Away Message"
 msgstr "Получить сообщение об отсутствии"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1695
 msgid "Last said"
 msgstr "Последнее сказанное"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2550
 msgid "Unable to save icon file to disk."
 msgstr "Не удаётся сохранить файл значка на диск."
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2601
 msgid "Save Icon"
 msgstr "Сохранить значок"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2653
 msgid "Animate"
 msgstr "Анимировать"
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2658
 msgid "Hide Icon"
 msgstr "Скрыть значок"
 
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2661
 msgid "Save Icon As..."
 msgstr "Сохранить значок как..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2665
 msgid "Set Custom Icon..."
 msgstr "Установить собственный значок..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2678
 msgid "Remove Custom Icon"
 msgstr "Удалить собственный значок"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2820
 msgid "/_Conversation"
 msgstr "/_Беседа"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2822
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Беседа/Новое мгновенное сооб_щение..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Find..."
 msgstr "/Беседа/_Найти..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/View _Log"
 msgstr "/Беседа/Просмотреть _журнал"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2830
 msgid "/Conversation/_Save As..."
 msgstr "/Беседа/Со_хранить как..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Беседа/О_чистить"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/Se_nd File..."
 msgstr "/Беседа/Отправить _файл..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2837
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить п_равило..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2839
 msgid "/Conversation/_Get Info"
 msgstr "/Беседа/Получить _информацию"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2841
 msgid "/Conversation/In_vite..."
 msgstr "/Беседа/Приг_ласить..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/M_ore"
 msgstr "/Беседа/_Ещё"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/Al_ias..."
 msgstr "/Беседа/_Псевдоним..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/_Block..."
 msgstr "/Беседа/_Блокировать..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2851
 msgid "/Conversation/_Unblock..."
 msgstr "/Беседа/Раз_блокировать..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/_Add..."
 msgstr "/Беседа/_Добавить..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Remove..."
 msgstr "/Беседа/_Удалить..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2860
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Беседа/Вставить _ссылку..."
+
+#: ../pidgin/gtkconv.c:2862
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Беседа/Вставить из_ображение..."
+
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Close"
 msgstr "/Беседа/_Закрыть"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2872
 msgid "/_Options"
 msgstr "/_Параметры"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2873
 msgid "/Options/Enable _Logging"
 msgstr "/Параметры/Вести _журнал"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2874
 msgid "/Options/Enable _Sounds"
 msgstr "/Параметры/Воспроизводить _звуки"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2875
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Параметры/Показывать з_начок собеседника"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2877
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Параметры/Показывать _панели форматирования"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2878
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Параметры/Показывать _время сообщений"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2954
 msgid "/Conversation/More"
 msgstr "/Беседа/Ещё"
 
@@ -11930,93 +12586,101 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:3008 ../pidgin/gtkconv.c:3040
 msgid "/Conversation"
 msgstr "/Беседа"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:3048
 msgid "/Conversation/View Log"
 msgstr "/Беседа/Просмотреть журнал"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:3054
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:3058
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Get Info"
 msgstr "/Беседа/Получить информацию"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3068
 msgid "/Conversation/Invite..."
 msgstr "/Беседа/Пригласить..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3074
 msgid "/Conversation/Alias..."
 msgstr "/Беседа/Псевдоним..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3078
 msgid "/Conversation/Block..."
 msgstr "/Беседа/Блокировать..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3082
 msgid "/Conversation/Unblock..."
 msgstr "/Беседа/Разблокировать..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3086
 msgid "/Conversation/Add..."
 msgstr "/Беседа/Добавить..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3090
 msgid "/Conversation/Remove..."
 msgstr "/Беседа/Удалить..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3096
+msgid "/Conversation/Insert Link..."
+msgstr "/Беседа/Вставить ссылку..."
+
+#: ../pidgin/gtkconv.c:3100
+msgid "/Conversation/Insert Image..."
+msgstr "/Беседа/Вставить изображение..."
+
+#: ../pidgin/gtkconv.c:3106
 msgid "/Options/Enable Logging"
 msgstr "/Параметры/Вести журнал"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3109
 msgid "/Options/Enable Sounds"
 msgstr "/Параметры/Воспроизводить звуки"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3122
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Параметры/Показывать панели форматирования"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3125
 msgid "/Options/Show Timestamps"
 msgstr "/Параметры/Показывать время сообщений"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3128
 msgid "/Options/Show Buddy Icon"
 msgstr "/Параметры/Показывать значок собеседника"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3212 ../pidgin/gtkconv.c:3254
 msgid "User is typing..."
 msgstr "Пользователь набирает сообщение..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3257
 msgid "User has typed something and stopped"
 msgstr "Пользователь что-то набрал и остановился"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3439
 msgid "_Send To"
 msgstr "_Адресат"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4153
 msgid "_Send"
 msgstr "_Отправить"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4304
 msgid "0 people in room"
 msgstr "0 пользователей в комнате"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12024,71 +12688,71 @@
 msgstr[1] "%d пользователя в комнате"
 msgstr[2] "%d пользователей в комнате"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6191 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Набирает сообщение"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6197
 msgid "Stopped Typing"
 msgstr "Прекратил набор сообщения"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6202
 msgid "Nick Said"
 msgstr "Произнесено имя"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+#: ../pidgin/gtkconv.c:6207 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Непрочитанные сообщения"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6212
 msgid "New Event"
 msgstr "Новое событие"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7344
 msgid "Confirm close"
 msgstr "Подтвердить закрытие"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7376
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7898
 msgid "Close other tabs"
 msgstr "Закрыть другие вкладки"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7904
 msgid "Close all tabs"
 msgstr "Закрыть все вкладки"
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7912
 msgid "Detach this tab"
 msgstr "Отделить эту вкладку"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7918
 msgid "Close this tab"
 msgstr "Закрыть эту вкладку"
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8304
 msgid "Close conversation"
 msgstr "Закрыть беседу"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8827
 msgid "Last created window"
 msgstr "Последнее созданное окно"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8829
 msgid "Separate IM and Chat windows"
 msgstr "Отдельные окна мгновенных сообщений и чатов"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8831 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "Новое окно"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8833
 msgid "By group"
 msgstr "По группе"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8835
 msgid "By account"
 msgstr "По учётной записи"
 
@@ -12096,59 +12760,59 @@
 msgid "Save Debug Log"
 msgstr "Сохранить отладочную информацию в журнал"
 
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Инвертировать"
 
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Подсветить совпадения"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Только _значки"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Только _текст"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "Значки _и текст"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Фильтр"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Щёлкните правой кнопкой мыши для доступа к другим параметрам."
 
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Уровень "
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Все"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Разное"
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Ошибка "
 
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Неисправимая ошибка"
 
@@ -12162,8 +12826,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "разработчик"
 
@@ -12171,11 +12835,11 @@
 msgid "developer & webmaster"
 msgstr "разработчик и веб-мастер"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "поддержка"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "поддержка и контроль качества"
 
@@ -12197,8 +12861,8 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber-разработчик"
+msgid "XMPP developer"
+msgstr "XMPP-разработчик"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
@@ -12213,7 +12877,7 @@
 msgstr "Арабский"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "Болгарский"
 
@@ -12226,8 +12890,8 @@
 msgid "Bosnian"
 msgstr "Боснийский"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "Каталанский"
 
@@ -12235,7 +12899,7 @@
 msgid "Valencian-Catalan"
 msgstr "Валенсийский-каталанский"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "Чешский"
 
@@ -12244,7 +12908,7 @@
 msgstr "Датский"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "Немецкий"
 
@@ -12273,9 +12937,9 @@
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "Испанский"
 
@@ -12288,14 +12952,14 @@
 msgid "Persian"
 msgstr "Персидский"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "Финский"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "Французский"
 
@@ -12307,7 +12971,11 @@
 msgid "Gujarati"
 msgstr "Гуджарати"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "Команда переводчиков на гуджарати"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "Иврит"
 
@@ -12323,24 +12991,32 @@
 msgid "Indonesian"
 msgstr "Индонезийский"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "Японский"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "Грузинский"
 
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Переводчики Ubuntu на грузинский"
+
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "Каннада"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "Команда переводчиков на каннада"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "Корейский"
 
@@ -12349,187 +13025,186 @@
 msgid "Kurdish"
 msgstr "Курдский"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "Литовский"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "Македонский"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "Букмол"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "Непальский"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "Нидерландский, фламандский"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "Польский"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../pidgin/gtkdialogs.c:182
-msgid "Portuguese-Brazil"
-msgstr "Португальский-бразильский"
-
 #: ../pidgin/gtkdialogs.c:183
+msgid "Portuguese-Brazil"
+msgstr "Португальский-бразильский"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "Пашто"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "Румынский"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "Русский"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "Словенский"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "Албанский"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "Тамильский"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "Телугу"
 
-#: ../pidgin/gtkdialogs.c:195
-msgid "Thai"
-msgstr "Тайский"
-
 #: ../pidgin/gtkdialogs.c:196
+msgid "Thai"
+msgstr "Тайский"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "Турецкий"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "Вьетнамский"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh и команда Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "Упрощённый китайский"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "Гонконгский китайский"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "Амхарский"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "О %s"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s - модульный клиент обмена сообщениями, позволяющий использовать AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
-"Sametime, Bonjour, Zephyr, Gadu-Gadu и QQ одновременно.  Написан с "
-"использованием GTK+.<BR><BR>Вы можете изменять и распространять программу по "
-"условиям GPL (версии 2 или более поздней).  Копия GPL содержится в файле "
-"'COPYING', распространяемом с %s.  Авторские права на %s принадлежат "
-"участникам проекта.  Полный список участников проекта смотрите в файле "
-"'COPYRIGHT'.  Мы не предоставляем никаких гарантий на эту программу.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 на irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:369
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s - графический модульный клиент обмена сообщениями, основывающийся на "
+"библиотеке libpurple, позволяющей использовать AIM, MSN, Yahoo!, XMPP, ICQ, "
+"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
+"Gadu-Gadu и QQ одновременно.  Написан с использованием GTK+.<BR><BR>Вы "
+"можете изменять и распространять программу по условиям GPL (версии 2 или "
+"более поздней).  Копия GPL содержится в файле 'COPYING', распространяемом с %"
+"s.  Авторские права на %s принадлежат участникам проекта.  Полный список "
+"участников проекта смотрите в файле 'COPYRIGHT'.  Мы не предоставляем "
+"никаких гарантий на эту программу.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "Текущие разработчики"
 
-#: ../pidgin/gtkdialogs.c:402
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "Одержимые писатели заплаток"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "Разработчики, отошедшие от дел"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "Художники"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "Текущие переводчики"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "Предыдущие переводчики"
 
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "Отладочная информация"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "Получить пользовательскую информацию"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12537,11 +13212,11 @@
 "Введите идентификатор пользователя или псевдоним персоны, информацию о "
 "которой вы хотели бы просмотреть."
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "Просмотреть журнал пользователя"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12549,32 +13224,32 @@
 "Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
 "хотели бы просмотреть."
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "Псевдоним контакта"
 
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "Введите псевдоним для этого контакта."
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Введите псевдоним для %s."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "Псевдоним собеседника"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "Псевдоним чата"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "Введите псевдоним для этого чата."
 
-#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12592,15 +13267,15 @@
 "Вы удалите контакт, содержащий %s и %d других собеседников из списка "
 "собеседников. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "Удалить контакт"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "_Удалить контакт"
 
-#: ../pidgin/gtkdialogs.c:1096
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12608,15 +13283,15 @@
 msgstr ""
 "Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "Объединить группы"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "_Объединить группы"
 
-#: ../pidgin/gtkdialogs.c:1156
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12625,72 +13300,69 @@
 "Вы удалите группу %s и всех её членов из списка собеседников. Хотите "
 "продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "_Удалить группу"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "Удалить собеседника"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "_Удалить собеседника"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "Удалить чат"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "_Удалить чат"
 
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr ""
 "Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
 
-#: ../pidgin/gtkdocklet.c:454
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Изменить статус"
 
-#: ../pidgin/gtkdocklet.c:506
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Показывать список собеседников"
 
-#: ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Новое сообщение..."
 
-#: ../pidgin/gtkdocklet.c:547
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Отключить звуки"
 
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Мерцать при наличии нового сообщения"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:565
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Выйти"
 
@@ -12780,43 +13452,43 @@
 msgid "_Resume"
 msgstr "_Возобновить"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "Вставить как простой _текст"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "Восстановить _форматирование"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "Цвет гиперссылки"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "Цвет для отображения гиперссылок."
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "Цвет подсветки гиперссылки"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Цвет для отображения гиперссылок при наведении на них курсора мыши."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "_Скопировать адрес e-mail"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "_Скопировать ссылку"
 
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12826,7 +13498,7 @@
 "\n"
 "Принимается за PNG."
 
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12836,7 +13508,7 @@
 "\n"
 "Принимается за PNG."
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12847,7 +13519,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12858,35 +13530,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Сохранить изображение..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Выбрать шрифт"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Выбрать цвет текста"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Выбрать цвет фона"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Описание"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -12894,81 +13566,81 @@
 "Введите URL и описание ссылки, которую вы хотите вставить. Описание "
 "необязательно."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Введите URL ссылки, которую вы хотите вставить."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Вставить ссылку"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Вставить"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Не удалось сохранить изображение: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Вставить изображение"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "Эта тема не имеет доступных смайликов."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "Смайл!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Жирный"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Наклонный"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Подчёркнутый"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
-msgstr "Больший размер шрифта"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
-msgstr "Меньший размер шрифта "
-
-#: ../pidgin/gtkimhtmltoolbar.c:989
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "Облик шрифта"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "Цвет шрифта"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "Восстановить форматирование"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "Вставить ссылку"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "Вставить изображение"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "Вставить смайлик"
 
@@ -13087,26 +13759,26 @@
 "                      разделённых запятыми)\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../pidgin/gtkmain.c:498
+#: ../pidgin/gtkmain.c:496
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13137,22 +13809,22 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Команда запуска браузера \"%s\" неверна."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "Не удаётся открыть URL"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Ошибка запуска \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Был выбран браузер \"Другой\", но команда не была задана."
@@ -13282,7 +13954,7 @@
 msgstr "Т_ест"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
+msgid "P_ounce only when my status is not Available"
 msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
 
 #: ../pidgin/gtkpounce.c:791
@@ -13317,7 +13989,7 @@
 msgid "_Show system tray icon:"
 msgstr "_Показывать значок системного лотка:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13336,7 +14008,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Скрывать новые беседы:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "Во время отсутствия"
 
@@ -13385,39 +14057,55 @@
 msgid "N_ew conversations:"
 msgstr "_Новые беседы:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "Показывать _форматирование во входящих сообщениях"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
-msgstr "Показывать _значки собеседников"
-
-#: ../pidgin/gtkprefs.c:905
+msgstr "Показывать з_начки собеседников"
+
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "Разрешить _анимацию значков собеседников"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "Подсвечивать слова с _ошибками"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "Использовать плавную прокрутку"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "_Мерцать окном при принятии мгновенных сообщений"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Шрифт"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Использовать шрифт документа из _темы"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Использовать шрифт из _темы"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "_Шрифт беседы:"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "Форматирование по умолчанию"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13425,119 +14113,119 @@
 "Так будет выглядеть текст ваших сообщений с использованием протоколов, "
 "поддерживающих форматирование. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "ST_UN-сервер:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "Определять IP-адрес _автоматически"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "Публичный _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "Порты"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "Указать диапазон прослушиваемых портов _вручную"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "_Начальный порт:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "_Конечный порт:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "Прокси-сервер"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "Нет прокси"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "_Пользователь:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "Браузер GNOME по умолчанию"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "Другой"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "_Открывать ссылку в:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "По умолчанию"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "Существующее окно"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "Новая вкладка"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13546,75 +14234,80 @@
 "_Вручную:\n"
 "(%s для URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "_Формат журнала:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "Записывать все _мгновенные сообщения"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "Записывать все _чаты"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "Записывать все изменения _статуса в системный журнал"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
+msgid "(default)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "Выбор звука"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "Очень тихо"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "Тихо"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "Ниже среднего"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "Выше среднего"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "Громко"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "Очень громко"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "Метод воспроизведения звука"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "_Метод:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "Сигнал динамиком"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "Команда"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "Нет звуков"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13623,117 +14316,117 @@
 "_Команда воспроизведения звука:\n"
 "(%s для имени файла)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "Параметры звука"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "Звуки, когда окно беседы в _фокусе"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "Воспроизводить звуки:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "Только во время присутствия"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
 msgstr "Только во время отсутствия"
 
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "Громкость:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "Звуковые события"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "Воспроизводить"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "Событие"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "Тест"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "Сброс"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "Выбрать..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "Сообщать _время бездействия:"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "Основываясь на использовании клавиатуры или мыши"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "_Автоматический ответ:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "Во время отсутствия и бездействия"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "Авто-\"Отошёл\""
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "Менять статус при _бездействии"
 
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "_Минут до изменения статуса:"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "Менять _статус на:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "Статус при запуске"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "Использовать при запуске статус, бывший до в_ыхода"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "_Применить при запуске статус:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "Темы смайликов"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "Звуки"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "Браузер"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "Статус / Бездействие"
 
@@ -13823,23 +14516,23 @@
 msgid "Apply"
 msgstr "Применить"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "Такой файл уже существует"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "Хотите перезаписать его?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "Выбрать новое имя"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "Выбрать папку..."
 
@@ -13862,7 +14555,7 @@
 msgstr "Вы действительно хотите удалить выбранные сохранённые статусы?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Применить"
 
@@ -13874,25 +14567,25 @@
 msgid "Different"
 msgstr "Отличающийся"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Название:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "_Статус:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Использовать _отличающийся статус для некоторых учётных записей"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Сохранить _и применить"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "Статус для %s"
@@ -13949,63 +14642,67 @@
 msgid "Waiting for network connection"
 msgstr "Ожидание сетевого соединения"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:593
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Произошла следующая ошибка при загрузке %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "Не удалось загрузить изображение"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Нельзя отправить папку %s."
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+"individually."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "Вы перетащили изображение"
 
-#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1442
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "Установить в качестве значка собеседника"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "Отправить файл изображения"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "Вставить в сообщение"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 "Хотите установить это изображение в качестве значка собеседника для этого "
 "пользователя?"
 
-#: ../pidgin/gtkutils.c:1472
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14016,17 +14713,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "Нельзя отправить ярлык"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:2267
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14037,25 +14734,25 @@
 "<b>Размер файла:</b> %s\n"
 "<b>Размер изображения:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2563
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2565
 msgid "Icon Error"
 msgstr "Ошибка значка"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2566
 msgid "Could not set icon"
 msgstr "Не удалось установить значок"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не удалось открыть файл '%s': %s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2715
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14069,6 +14766,12 @@
 msgid "Select color"
 msgstr "Выбрать цвет"
 
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Псевдоним"
@@ -14093,6 +14796,26 @@
 msgid "_Open Mail"
 msgstr "Открыть _почту"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Смайлики Pidgin"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "нет"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Вывести статистику"
@@ -14265,11 +14988,18 @@
 msgid "Conversation Placement"
 msgstr "Расположение бесед"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Количество бесед в окне"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 "Разделять окна мгновенных сообщений и чатов при расположении по количеству"
@@ -14280,19 +15010,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Экстра-расположение"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Дополнительные параметры расположения бесед."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -14362,6 +15092,11 @@
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Группа:"
+
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14393,34 +15128,34 @@
 msgid "_Associate Buddy"
 msgstr "Соотнести собеседника"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "Не удаётся отправить e-mail"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "Исполняемый файл evolution не был найден в PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Добавить в адресную книгу"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Отправить e-mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Настройка интеграции с Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Выберите все учётные записи, собеседники которых должны быть добавлены "
@@ -14432,7 +15167,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Интеграция с Evolution"
 
@@ -14440,8 +15175,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Предоставляет интеграцию с Evolution."
 
@@ -14697,7 +15432,7 @@
 #: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
-"Предоставляет множество способов уведомления вас о непрочтённых сообщениях."
+"Предоставляет множество способов уведомления вас о непрочитанных сообщениях."
 
 #. *< type
 #. *< ui_requirement
@@ -14743,38 +15478,30 @@
 msgid "Hyperlink Color"
 msgstr "Цвет гиперссылки"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Размер расширителя GtkTreeView"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Горизонтальное разделение GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Область ввода окна беседы"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "История бесед"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Система просмотра журналов"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Диалог запроса"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Диалог уведомления"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "Выберите цвет"
@@ -14796,36 +15523,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "Цвета интерфейса"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Размер виджетов"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "Инструменты"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Записать настройки в %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "Повторно прочитать файлы gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Управление темой GTK+ для Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
 
@@ -14837,41 +15584,32 @@
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте."
+"основывающиеся на тексте."
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте (Jabber, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
+"основывающиеся на тексте (XMPP, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
 "в области ввода. Смотрите за окном отладки."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Вы используете %s версии %s. Последняя доступная версия %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Список изменений:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Вы можете получить версию %s здесь:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"Вы используете %s версии %s. Последняя доступная версия %s. Вы можете "
+"получить её по адресу <a href=\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Список изменений:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "Доступна новая версия"
 
@@ -14881,19 +15619,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "Уведомление о выпуске"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "Периодически проверяет наличие новых версий."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15017,10 +15755,8 @@
 msgstr "Параметры формата времени"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr ""
-"_Принудительно использовать (традиционный для %s) 24-часовой формат времени"
+msgid "_Force 24-hour time format"
+msgstr "_Принудительно использовать 24-часовой формат времени"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15188,7 +15924,7 @@
 "Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
 "собеседников."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
 
@@ -15198,39 +15934,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "Консоль XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "Учётная запись: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "Вставить станс <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "Вставить станс <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "Вставить станс <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
--- a/po/stats.pl	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/stats.pl	Sat Jun 16 19:48:23 2007 +0000
@@ -33,6 +33,7 @@
 $lang{pt_BR} = "Portuguese (Brazilian)";
 $lang{'sr@Latn'} = "Serbian (Latin)";
 $lang{zh_CN} = "Chinese (Simplified)";
+$lang{zh_HK} = "Chinese (Hong Kong)";
 $lang{zh_TW} = "Chinese (Traditional)";
 
 opendir(DIR, ".") || die "can't open directory: $!";
--- a/po/zh_TW.po	Sat Jun 16 19:44:59 2007 +0000
+++ b/po/zh_TW.po	Sat Jun 16 19:48:23 2007 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
+# $InternalId: zh_TW.po,v 1.473 2007/06/14 08:14:46 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -48,9 +48,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-05-21 00:01-0400\n"
-"PO-Revision-Date: 2007-05-20 01:57-0400\n"
+"Project-Id-Version: Pidgin 2.0.2\n"
+"POT-Creation-Date: 2007-06-13 07:40-0400\n"
+"PO-Revision-Date: 2007-06-14 01:22-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@
 msgstr "Finch"
 
 #  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -103,15 +103,16 @@
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤,請調查後改以人手完成轉移程序,"
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
 #: ../libpurple/protocols/jabber/buddy.c:1426
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
 
@@ -124,16 +125,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3996
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -142,31 +143,29 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
-#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
@@ -178,13 +177,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:1788
 #: ../libpurple/protocols/jabber/buddy.c:1824
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6046
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -203,24 +203,32 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3231
-#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -233,12 +241,12 @@
 #: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
 #: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -251,14 +259,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -267,15 +275,16 @@
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
@@ -285,109 +294,114 @@
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他(她)的好友清單%s%s。"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "給予認證?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:285
 msgid "The selected account is not online."
 msgstr "所指定的帳號目前沒有連線。"
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
 #: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5394
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -395,185 +409,191 @@
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:402
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節,請用快顯選單。"
 
-#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:416
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實:是「加入」抑或「新增」?
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:784
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」?
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1635
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:964
 msgid "Set Alias"
 msgstr "設定別名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1041
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1049
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1054
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1055
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
 #: ../libpurple/protocols/jabber/buddy.c:1589
 #: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2999
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3419 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -582,12 +602,12 @@
 "上線:%d 人\n"
 "總數:%d 人"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號:%s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -597,143 +617,143 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6003
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3995
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2189
 msgid "Show offline buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s 因下列錯誤結束了連線:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "連線錯誤"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "連線"
+#: ../finch/gntconn.c:113
+#, 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"
+"在您更正這個錯誤並重新啟動這個帳號前,Finch 將不會再試著重新連線。"
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
@@ -795,15 +815,15 @@
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -811,28 +831,28 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
@@ -864,7 +884,7 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses:「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -872,7 +892,7 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "清除"
 
@@ -880,7 +900,7 @@
 msgid "Filter: "
 msgstr "過濾器:"
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "暫停"
 
@@ -916,24 +936,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/jabber.c:1220
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:803
 #: ../libpurple/protocols/oscar/oscar.c:808
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
@@ -953,8 +973,9 @@
 #. Close button
 #: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
 #: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -981,7 +1002,7 @@
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -997,7 +1018,7 @@
 # FIXME 原文一詞兩義,根本無法翻譯
 #  NOTE gntnotify 字義為「發信人」
 #  NOTE Jabber 術語字義見「Both」條
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "已認證對方"
 
@@ -1033,11 +1054,11 @@
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
 msgid "IM"
 msgstr "即時訊息"
 
@@ -1100,7 +1121,7 @@
 msgstr "設定模組"
 
 #: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1121,9 +1142,7 @@
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "帳號:"
 
@@ -1278,12 +1297,12 @@
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
@@ -1317,12 +1336,12 @@
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "日誌"
 
@@ -1330,13 +1349,13 @@
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -1369,37 +1388,38 @@
 msgstr "格式"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5464
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5696
-#: ../libpurple/protocols/oscar/oscar.c:5712
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5506
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5738
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5768
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
@@ -1468,7 +1488,7 @@
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr "當 gnt 的剪則薄內容有所變更時,儘可能把新的內容滙出至 X 視窗系統。"
+msgstr "當 gnt 的剪貼簿內容有所變更時,儘可能把新的內容匯出至 X 視窗系統。"
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1610,8 +1630,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3992
+msgid "Connection Error"
+msgstr "連線錯誤"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
@@ -1668,7 +1693,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1694,7 +1719,7 @@
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1711,7 +1736,8 @@
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1723,32 +1749,32 @@
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -2251,12 +2277,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#: ../libpurple/protocols/oscar/oscar.c:6077
-#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2314,8 +2340,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "(只發生在未與傳送者進行交談的情況下)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "備註"
 
@@ -2323,7 +2349,7 @@
 msgid "Enter your notes below..."
 msgstr "請在下面的空位輸入備註"
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "編輯備註..."
 
@@ -2335,18 +2361,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "好友備註"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
 
@@ -2553,40 +2579,40 @@
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "自動回應送出:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "您目前是離線狀態。在您重新登入前,將無法收到任何訊息。"
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限,所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
@@ -2594,32 +2620,32 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -2627,28 +2653,28 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
 #  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等(後兩者似乎只限用於數學)
 #  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則;單從字義判斷,合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -2658,20 +2684,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2756,9 +2782,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "是"
 
@@ -2766,9 +2794,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "否"
 
@@ -2895,7 +2925,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2903,8 +2933,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -2914,7 +2944,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2922,8 +2952,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -2997,7 +3027,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3006,11 +3036,11 @@
 "com 下載及安裝 ActiveTCL。\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎?"
@@ -3018,18 +3048,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:5584
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
@@ -3044,89 +3075,94 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "姓"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "電子郵件"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "AIM 帳號"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "電子郵件"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "AIM 帳號"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "XMPP 帳號"
 
 # NOTE 這是通訊協定名稱,不是問候語
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "無法送出訊息,交談無法開始。"
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "無法送出訊息,交談無法開始。"
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3196,8 +3232,8 @@
 msgstr "註冊成功!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "密碼"
 
@@ -3223,9 +3259,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3234,8 +3270,8 @@
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3248,14 +3284,14 @@
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3299,7 +3335,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "請輸您的舊密碼及你的新密碼:"
+msgstr "請輸入您的舊密碼及你的新密碼:"
 
 #: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
@@ -3318,10 +3354,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5556
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3398
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
@@ -3331,22 +3367,23 @@
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "上線"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3687
 msgid "UIN"
 msgstr "帳號"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
 #: ../libpurple/protocols/jabber/buddy.c:1585
 #: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
@@ -3355,7 +3392,7 @@
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3899
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -3485,21 +3522,24 @@
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -3543,11 +3583,12 @@
 msgstr "顯示是日訊息 (MOTD)"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "密碼(_P):"
 
@@ -3557,22 +3598,22 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
@@ -3583,7 +3624,6 @@
 msgstr "無法建立 Socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
@@ -3593,12 +3633,12 @@
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
@@ -3608,15 +3648,18 @@
 msgstr "讀取錯誤"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "主題"
@@ -3640,23 +3683,26 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2130
-#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6623
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6626
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
@@ -3666,18 +3712,25 @@
 msgstr "編碼"
 
 #: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "使用者"
 
 #: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "姓名"
 
@@ -3719,13 +3772,15 @@
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
@@ -3747,150 +3802,152 @@
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱,暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "無法加入 %s:必須註冊。"
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -3995,7 +4052,7 @@
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
@@ -4104,21 +4161,21 @@
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;暱稱&gt;:取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4158,10 +4215,10 @@
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:437
 #: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:714
-#: ../libpurple/protocols/jabber/auth.c:848
-#: ../libpurple/protocols/jabber/auth.c:873
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
@@ -4173,25 +4230,28 @@
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
 # XXX 好像有些怪,譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
@@ -4201,7 +4261,7 @@
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4232,7 +4292,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "國家"
 
@@ -4246,8 +4307,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
 #: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "電子郵件"
@@ -4269,14 +4332,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
@@ -4310,31 +4373,34 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:665
 #: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
@@ -4378,7 +4444,7 @@
 msgstr "從好友名單中移除"
 
 #: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "想聊天"
 
@@ -4387,9 +4453,9 @@
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5760
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
@@ -4400,7 +4466,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1587
 #: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "Last Name"
 msgstr "姓"
 
@@ -4438,8 +4504,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
@@ -4479,7 +4545,7 @@
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5246
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
@@ -4555,7 +4621,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
@@ -4593,98 +4660,113 @@
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"無法與伺服器建立連線:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "State"
 msgstr "省/州"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -4693,82 +4775,84 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4776,52 +4860,52 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "項目未找到"
 
 # FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Malformed XMPP ID"
 msgstr "畸型的 XMPP 帳號"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4829,78 +4913,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1526
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4910,181 +4994,182 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]:禁止某使用者進入聊天室"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5093,7 +5178,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5101,19 +5186,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
@@ -5134,7 +5219,7 @@
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
 msgid "Domain"
 msgstr "域名"
 
@@ -5154,7 +5239,8 @@
 
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -5187,7 +5273,7 @@
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -5196,26 +5282,26 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
@@ -5229,16 +5315,45 @@
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+
+#  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
+#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
+#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "無法傳送檔案至 %s,因為未獲對方認證"
+
+#  FIXME 這不通順 - acli 20070614
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "選擇一個 Resource"
+
 # XXX 暫譯
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
@@ -5463,8 +5578,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -5569,8 +5685,8 @@
 msgstr "你在他(她)的好友清單裏"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "馬上回來"
 
@@ -5578,21 +5694,23 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "忙碌"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "電話中"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
@@ -5642,31 +5760,31 @@
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5674,187 +5792,189 @@
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
-#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3781
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1829
 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 "
@@ -5863,14 +5983,14 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
 "用者存在,但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5885,19 +6005,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
@@ -5928,7 +6048,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
@@ -5973,17 +6093,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6038,7 +6158,7 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3455
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
@@ -6052,34 +6172,34 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證:%s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單,請過一會後重試。"
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "交談中"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
@@ -6117,14 +6237,22 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"因為無法與伺服器建立工作階段,所以訊息無法送出(這大概是伺服器出現了問題,請"
+"幾分鐘後重試):"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "因為 Switchboard 發生錯誤,所以訊息無法送出"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤,訊息可能沒有送出:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫您!"
@@ -6500,19 +6628,19 @@
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2284
-#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6522,21 +6650,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "連線至伺服器時收到無效的資料。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6568,7 +6687,7 @@
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
@@ -6725,8 +6844,8 @@
 "用有問題的用戶端程式。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2310
+#: ../pidgin/gtkutils.c:2340
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -6741,13 +6860,15 @@
 msgstr "AIM 式即時訊息"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -6832,17 +6953,17 @@
 msgstr "照相機"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:5732
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "忙碌"
 
@@ -6852,7 +6973,7 @@
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
@@ -6862,13 +6983,13 @@
 msgstr "上線"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "IP 位址"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:2847
 msgid "Warning Level"
 msgstr "警告等級"
 
@@ -6918,14 +7039,14 @@
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
@@ -6978,10 +7099,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -7000,48 +7121,48 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5193
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2276
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7051,17 +7172,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7074,7 +7195,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7087,7 +7208,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7100,38 +7221,38 @@
 "訊息為:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2553
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2562
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7141,21 +7262,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2580
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, 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."
@@ -7163,70 +7284,70 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2756
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2820
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2823
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2852
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2862
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2918
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:2995
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3182
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3385
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7234,113 +7355,114 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3457
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3470
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3747
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3936
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3959
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3990
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3996
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7348,37 +7470,37 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4023
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4195
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4461
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
+#: ../libpurple/protocols/oscar/oscar.c:4462
 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 "
@@ -7387,7 +7509,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4476
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7398,11 +7520,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4481
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4526
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7413,11 +7535,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7428,17 +7550,17 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+#: ../libpurple/protocols/oscar/oscar.c:4602
+#: ../libpurple/protocols/oscar/oscar.c:5025
+#: ../libpurple/protocols/oscar/oscar.c:5039
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4706
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7446,16 +7568,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4890
-#: ../libpurple/protocols/oscar/oscar.c:4895
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#: ../libpurple/protocols/oscar/oscar.c:5077
+#: ../libpurple/protocols/oscar/oscar.c:4911
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5093
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5099
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7464,12 +7586,12 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7479,7 +7601,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5130
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7489,23 +7611,23 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5138
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5190
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7515,32 +7637,32 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5216
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5292
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對,又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7548,89 +7670,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文,但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
+#: ../libpurple/protocols/oscar/oscar.c:5886
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5927
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5941
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」,不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6038
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7638,74 +7760,74 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6399
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6475
 msgid "Show how long you have been idle"
-msgstr "顯示你閒置多久時間"
-
-#: ../libpurple/protocols/oscar/oscar.c:6588
+msgstr "顯示您閒置多久時間"
+
+#: ../libpurple/protocols/oscar/oscar.c:6630
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7939,11 +8061,14 @@
 msgid "Reject request"
 msgstr "拒絕"
 
+#  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
+#  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
+#  NOTE 中文採用「你」應該也是恰當的。
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
 #: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
-msgstr "對不起,我和你合不來……"
+msgstr "對不起,我和你,合不來的……"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:142
@@ -8209,13 +8334,7 @@
 msgstr "無法登入,請檢查除錯記錄"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2378
-#: ../libpurple/protocols/yahoo/yahoo.c:2406
-#: ../libpurple/protocols/yahoo/yahoo.c:2513
-#: ../libpurple/protocols/yahoo/yahoo.c:2534
-#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8642,7 +8761,7 @@
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
 msgid "Topic:"
 msgstr "主題:"
 
@@ -8669,6 +8788,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+msgid "Connect"
+msgstr "連線"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8898,67 +9021,93 @@
 msgstr "隱藏客戶端識別"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "使用者 %s 不在網路上"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "交換密鑰"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "無法交換密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "交換密鑰中出現錯誤"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "交換密鑰失敗"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "交換密鑰逾時"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "交換密鑰被中止"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "交換密鑰被中止"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "交換密鑰己開始"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "不可與自己交換密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "由 %s 收到一個交換密鑰要求,您想交換密鑰嗎?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8969,69 +9118,99 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "交換密鑰要求"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "無法設定即時訊息密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9040,37 +9219,44 @@
 "鑰」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9078,6 +9264,7 @@
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "暫停連線"
 
@@ -9085,235 +9272,315 @@
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "機械人"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "開心"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "時區"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "密碼(_P):"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "頻道資訊"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>頻道名稱:</b>%s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>使用者人數:</b>%d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>頻道創立者:</b>%s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>頻道加密方式 (Cipher):</b>%s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>頻道身份驗證代碼 (HMAC):</b>%s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式:</b>"
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9326,338 +9593,452 @@
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "您是 <I>%s</I> 的頻道創立者"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,您必須首先加入頻道 %s"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "未知的指令"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全的檔案傳輸"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "檔案傳輸時發生錯誤"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "遠端結束連線"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "拒絕不符權限的操作"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "交換密鑰失敗"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "連線已逾時"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "連線失敗"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "檔案傳輸工作階段不存在"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "沒有進行中的檔案傳輸工作階段"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "檔案傳輸已開始"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "無法交換密鑰以供傳輸"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "無法開始檔案傳輸"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "出現了錯誤"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "生日"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "職責"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "所屬機構"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "部門"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "備註"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "您是 <I>%s</I> 的頻道創立者"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "姓名"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#  FIXME 看了原始碼也不知所云,所以大概會是譯錯 - acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "這個網路是空白的"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "伺服器沒有統計資料"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9692,117 +10073,79 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "連線至 SILC 伺服器時發生錯誤"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "密鑰交換失敗"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "伺服器中斷了連線"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#  XXX acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "WATCH"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "無法追蹤使用者"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "失敗:版本不符,請更新您的用戶端程式"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "失敗:遠端不信任/不支援您的公鑰"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
-
-#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
-
-#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "失敗:錯誤的簽章"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "失敗:無效的 Cookie"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "失敗:認證失敗"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到 %s 的公鑰,接受這個公鑰嗎?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9815,74 +10158,98 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "核實公鑰"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "檢視(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "不支援的公鑰類型"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "伺服器中斷了連線"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "密鑰交換失敗"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "無法初始化 SILC 的用戶端連線"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "連線至 SILC 伺服器中"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "無法讀取 SILC 密鑰對"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "無法建立連結"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-# NOTE 香港會寫「陳大文」,台灣人會看不明(寫「老張」一類,港人看見會覺得很怪),頭痛 :P
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "無名氏"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "無法找到或存取 ~/.silc 目錄"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "連線至 SILC 伺服器中"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對:%s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "無法建立連結"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "讀取 SILC 密鑰對途中出現錯誤"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "正常"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9890,49 +10257,67 @@
 "\n"
 "聯絡方法"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "視訊會議中"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "目前狀態"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "所用之線上服務"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知您使用那些線上服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
+#  XXX 看了原始碼也不知所云,暫時只有直譯了事
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "時區 (UTC)"
+
 #  XXX 好像很怪
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9941,174 +10326,219 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "密鑰對產生失敗"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "密鑰長度"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "私鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "產生密鑰對"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 密鑰對..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令:%s(可能是客戶端的錯誤)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網路上的聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10116,15 +10546,18 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
 "模式"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10132,37 +10565,45 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的用戶端"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得用戶端或伺服器的公鑰"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10179,121 +10620,147 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "網路"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
+#  XXX 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#  XXX 但其實譯文並不統一 - acli 20070614
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "使用完全向前保密 (PFS)"
+
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#  TODO 譯文有待改進,這是意譯
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "拒絕伺服器端的好友狀態捕捉"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "拒絕邀請"
-
 #  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "拒絕上線狀態屬性要求"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "建立 SILC key pair 中..."
+msgstr "產生 SILC 密鑰對中..."
+
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "無法產生 SILC 密鑰對\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "姓名:   \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "使用者名稱:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "電子郵件:\t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主機名稱: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "所屬機構: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "國家:   \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "演算法:  \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密鑰長度: \t%d 個位元\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "版本:   \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10304,7 +10771,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10313,47 +10781,118 @@
 "公鑰指紋可讀版本 (Babbleprint):\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "電腦"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "電子手帳"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "終端機"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s 傳送訊息到白板。您要開啟白板嗎?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s 傳送訊息到 %s 頻道的白板。您要開啟白板嗎?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "白板"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "伺服器沒有統計資料"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "失敗:版本不符,請更新您的用戶端程式"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "失敗:遠端不信任/不支援您的公鑰"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
+
+#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
+
+#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "失敗:錯誤的簽章"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "失敗:無效的 Cookie"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "失敗:認證失敗"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "無法初始化 SILC 的用戶端連線"
+
+# NOTE 香港會寫「陳大文」,台灣人會看不明(寫「老張」一類,港人看見會覺得很怪),頭痛 :P
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "無名氏"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "無法找到或存取 ~/.silc 目錄"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "無法讀取 SILC 密鑰對:%s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10584,7 +11123,8 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
+#: ../pidgin/gtkblist.c:5847
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -10645,32 +11185,32 @@
 msgstr "TOC 協定模組"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s 在呼叫您!"
 
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10679,11 +11219,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10693,11 +11233,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10706,70 +11246,88 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2488
-#: ../libpurple/protocols/yahoo/yahoo.c:2667
-#: ../libpurple/protocols/yahoo/yahoo.c:2770
-#: ../libpurple/protocols/yahoo/yahoo.c:2780
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"與 %s 之間的連線突然中斷:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"無法與 %s 建立連線:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10777,92 +11335,92 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線,所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10876,57 +11434,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "傳呼伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11019,7 +11577,7 @@
 msgstr "無法建立檔案介紹。"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "寫入錯誤"
 
@@ -11315,7 +11873,7 @@
 msgstr "現身程度"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11345,7 +11903,7 @@
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
@@ -11439,28 +11997,28 @@
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11468,79 +12026,84 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "無法打開 %s:重新導向的次數超過了上限"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體,網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3523
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
@@ -11567,59 +12130,75 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "登入選項"
 
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "通訊協定(_T):"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "帳號(_N):"
+
 # NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "帳號別名(只在本機生效):"
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "帳號別名(只在本機生效)(_L):"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "使用者自定選項"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "新郵件通知(_M)"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "使用下列好友圖示:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "使用下列好友圖示(_I):"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11628,60 +12207,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:982
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:985
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11705,233 +12284,222 @@
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:727
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:748
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5441
+#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1048
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1099
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1108
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1115
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "別名..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
+#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1198
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1201
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1203
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1223
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1289
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
+#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2846
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2862
+msgid "/Buddies/_About Pidgin"
+msgstr "/好友/關於 Pidgin(_A)"
+
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2870
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2872
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2873
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2879
+msgid "/Tools/_Debug Window"
+msgstr "/工具/除錯視窗(_D)"
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
-#. Help
-#: ../pidgin/gtkblist.c:2868
-msgid "/_Help"
-msgstr "說明(_H)"
-
-#: ../pidgin/gtkblist.c:2869
-msgid "/Help/Online _Help"
-msgstr "線上說明(_H)"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Help/_Debug Window"
-msgstr "/說明/除錯視窗(_D)"
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Help/_About"
-msgstr "/說明/關於(_A)"
-
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2909
 #, c-format
 msgid ""
 "\n"
@@ -11940,128 +12508,128 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2987
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3414
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3416
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3561
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3563
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3564
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3566
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3601
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3604
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3781
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3783
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3784
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3785
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:3997
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4021
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4173
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4180
 msgid "<b>Password:</b>"
 msgstr "<b>密碼:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4191
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4276
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4290
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12079,23 +12647,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4537
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4540
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4546
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4549
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5418
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12104,66 +12672,69 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "群組:"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5453
+msgid "_Screen name:"
+msgstr "帳號(_S):"
+
+#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+msgid "A_lias:"
+msgstr "別名(_L):"
+
+#: ../pidgin/gtkblist.c:5741
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5757
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5798
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5886
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6526
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6550
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6571
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6583
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6589
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6638
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6708
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12178,209 +12749,217 @@
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:813
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:866
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:896
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:917
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:1000
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1036
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1394
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1402
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1650
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1653
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1673
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1696
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2556
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2607
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2659
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2664
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2667
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2671
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2684
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2826
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2828
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2845
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2857
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2859
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2861
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2866
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/交談/插入連結(_k)..."
+
+#: ../pidgin/gtkconv.c:2868
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/交談/插入影像(_E)..."
+
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2878
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2879
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2880
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2881
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2883
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2884
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12389,234 +12968,242 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3088
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3094
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3098
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3104
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3114
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3130
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3136
+msgid "/Conversation/Insert Link..."
+msgstr "/交談/插入連結..."
+
+#: ../pidgin/gtkconv.c:3140
+msgid "/Conversation/Insert Image..."
+msgstr "/交談/插入影像..."
+
+#: ../pidgin/gtkconv.c:3146
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3149
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3165
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3168
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3297
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3479
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4193
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4344
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6237
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6242
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6252
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7384
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7416
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:7938
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:7944
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:7952
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:7958
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8344
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8867
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8869
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8873
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8875
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:651
-msgid "_Text Only"
-msgstr "顯示文字(_T)"
-
 #: ../pidgin/gtkdebug.c:652
+msgid "_Text Only"
+msgstr "顯示文字(_T)"
+
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
@@ -12630,8 +13217,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "開發者"
 
@@ -12639,11 +13226,11 @@
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "支援兼品管"
 
@@ -12682,7 +13269,7 @@
 msgstr "阿拉伯文"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
@@ -12698,8 +13285,8 @@
 msgstr "波希尼亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "加泰隆文"
 
@@ -12708,7 +13295,7 @@
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "捷克文"
 
@@ -12717,7 +13304,7 @@
 msgstr "丹麥文"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "德文"
 
@@ -12749,9 +13336,9 @@
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "西班牙文"
 
@@ -12764,14 +13351,14 @@
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "法文"
 
@@ -12789,7 +13376,7 @@
 msgid "Gujarati Language Team"
 msgstr "古吉拉特文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "希伯來文"
 
@@ -12811,16 +13398,16 @@
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
 #  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "義大利文"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "喬治亞文"
 
@@ -12839,7 +13426,7 @@
 msgid "Kannada Translation team"
 msgstr "康納達文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "韓文"
 
@@ -12850,13 +13437,14 @@
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -12865,56 +13453,56 @@
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
 #  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "標準挪威文"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE 這是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "新挪威文"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  NOTE「普什圖」在三地都看來是較正常的譯法
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "普什圖文"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -12922,73 +13510,74 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "坦米爾文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "德拉威文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "港式中文"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:369
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13008,17 +13597,12 @@
 "部貢獻者共同所有,貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
 "何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
-
 #: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "現任開發者"
 
@@ -13026,80 +13610,80 @@
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "前任開發者"
 
 #  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13115,32 +13699,32 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併,新群組以後者命名。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13148,42 +13732,42 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13309,44 +13893,44 @@
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3211
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13357,7 +13941,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13367,7 +13951,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13378,7 +13962,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13389,117 +13973,118 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "粗體"
 
 # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#  XXX 譯「文字顏色」會否較好? - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "清除格式化"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "插入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "插入影像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "插入表情"
 
@@ -13587,13 +14172,13 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:368
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:370
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13618,7 +14203,7 @@
 "哪些帳號,並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:490
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13814,7 +14399,7 @@
 msgstr "預覽(_V)"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
+msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
 #: ../pidgin/gtkpounce.c:791
@@ -13850,7 +14435,7 @@
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S):"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13869,7 +14454,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "離開期間"
 
@@ -13918,160 +14503,177 @@
 msgid "N_ew conversations:"
 msgstr "新交談(_E):"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "字型"
+
+#  XXX 要覆查 - acli 20070614
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "使用主題指定的文件字型(_T)"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "使用主題指定的字型(_T)"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "交談用的字型(_F):"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "預設格式"
 
 # NOTE 這不是說明文,而是樣本本身,玩死人了 :P
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr ""
 "這是一個樣本。假如您使用的協定支援格式化,送出訊息的式樣將會類似這段文字。"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U):"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14080,80 +14682,80 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
 msgid "(default)"
 msgstr "(預設)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "自動"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "指令"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14162,118 +14764,118 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "啟動音效:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "事件"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "測試"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "重置"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "音效"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
@@ -14362,23 +14964,23 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -14402,7 +15004,7 @@
 msgstr "您確定您要刪除被選取的狀態?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "使用(_U)"
 
@@ -14415,25 +15017,25 @@
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
@@ -14490,37 +15092,37 @@
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:593
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄,您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1442
 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."
@@ -14528,31 +15130,31 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
-"給這個使用者。"
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"您可以透過檔案傳輸,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用"
+"者。"
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14565,17 +15167,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器;您大概想傳送啟動器要啟動的檔案,而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2268
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14586,25 +15188,25 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2564
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2566
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2567
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2667
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14649,6 +15251,27 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "預設"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin 表情圖示"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "不使用表情圖示,選擇這個主題即可。"
+
+# NOTE 這個「none」是指「沒有(不使用)圖示」
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "無"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "顯示統計資料"
@@ -14939,6 +15562,11 @@
 msgid "Select a person from your address book below, or add a new person."
 msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "群組:"
+
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
@@ -14974,30 +15602,30 @@
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "無法送出電子郵件"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "找不到與這個好友相關的電郵地址。"
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "傳送電子郵件"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -15005,7 +15633,7 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
@@ -15015,7 +15643,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15026,8 +15654,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15454,31 +16082,21 @@
 "讓您直接輸入指令對各種文字模式的通訊協定(例如 XMPP、MSN、IRC 及 TOC)進行操"
 "作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
-# XXX 暫譯
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "您目前使用的 %s 版本為 %s ,最新的版本是 %s。<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>功能說明:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"您可以由下列網址,取得最新的 %s 版:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>"
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"您目前使用的 %s 版本為 %s,最新的版本是 %s。新版本可由以下網址取得:<a href="
+"\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>功能說明:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "有新版本"
 
@@ -15488,19 +16106,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "新版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "不時查看有沒有新版本。"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15791,7 +16409,7 @@
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>已登出。</font>"
 
@@ -15801,29 +16419,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "XMPP 監控器"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "帳號:"
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
 #  NOTE Jabber 的「stanza」譯「段落」,下同
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "插入 <presence/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "插入 <message/> 段落。"
 
@@ -15831,15 +16449,105 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#  TODO 譯文有待改進,這是意譯
+#~ msgid "Reject watching by other users"
+#~ msgstr "拒絕伺服器端的好友狀態捕捉"
+
+#~ msgid "Block invites"
+#~ msgstr "拒絕邀請"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "拒絕上線狀態屬性要求"
+
+#~ msgid "Alias..."
+#~ msgstr "別名..."
+
+#, fuzzy
+#~ msgid "_Font"
+#~ msgstr "字型"
+
+#, fuzzy
+#~ msgid "_Bold"
+#~ msgstr "粗體"
+
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
+#, fuzzy
+#~ msgid "_Italic"
+#~ msgstr "斜體"
+
+#, fuzzy
+#~ msgid "_Underline"
+#~ msgstr "底線"
+
+#, fuzzy
+#~ msgid "_Normal"
+#~ msgstr "正常"
+
+#, fuzzy
+#~ msgid "_Smaller"
+#~ msgstr "儲存(_S)"
+
+#, fuzzy
+#~ msgid "_Reset font"
+#~ msgstr "清除格式化(_R)"
+
+#, fuzzy
+#~ msgid "_Smiley"
+#~ msgstr "笑一個!"
+
+#, fuzzy
+#~ msgid "_Image"
+#~ msgstr "儲存影像"
+
+#, fuzzy
+#~ msgid "_Link"
+#~ msgstr "登入(_L)"
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "您可以由下列網址,取得最新的 %s 版:<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像"
+#~ "檔給這個使用者。"
+
+#~ msgid "/_Help"
+#~ msgstr "說明(_H)"
+
+#~ msgid "/Help/Online _Help"
+#~ msgstr "線上說明(_H)"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/說明/關於(_A)"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s 因下列錯誤結束了連線:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道"
+#~ "<BR><BR>"
+
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "GtkTreeView 展開器大小"
 
@@ -16049,18 +16757,6 @@
 #~ "\n"
 #~ "<b>狀態:</b>頂呱呱"
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/交談/插入連結(_k)..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/交談/插入影像(_E)..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/交談/插入連結..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/交談/插入影像..."
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
@@ -16239,10 +16935,6 @@
 #~ msgstr "選擇"
 
 #  XXX 要覆查
-#~ msgid "Select a number"
-#~ msgstr "選擇一個編號"
-
-#  XXX 要覆查
 #~ msgid "Faces"
 #~ msgstr "好友圖示"
 
@@ -16266,9 +16958,6 @@
 #~ msgid "Please wait for new version"
 #~ msgstr "請等待新版本推出"
 
-#~ msgid "Connection timeout!"
-#~ msgstr "連線已逾時!"
-
 # TODO 譯文有待改進 - 20061028
 #~ msgid "User info is not updated"
 #~ msgstr "無法更新使用者資訊"