changeset 19109:1cb69ea47a6e

propagate from branch 'im.pidgin.pidgin' (head d2f50519c5ed668dd980277afdc25d71ccb8a852) to branch 'im.pidgin.soc.2007.finchfeat' (head 6429a075d71b5b1cc70abf9b5d55875f793168c8)
author Eric Polino <aluink@pidgin.im>
date Thu, 21 Jun 2007 20:37:57 +0000 (2007-06-21)
parents 32c479656486 (current diff) a573a67c80a4 (diff)
children 60c6090c0e29
files finch/gntprefs.c finch/gntrequest.c finch/gntui.c finch/libgnt/gntmain.c finch/libgnt/gntstyle.c finch/libgnt/gnttree.c finch/libgnt/gntwm.c libpurple/protocols/qq/group_misc.c libpurple/protocols/qq/group_misc.h
diffstat 314 files changed, 29367 insertions(+), 19111 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 19 19:40:06 2007 +0000
+++ b/ChangeLog	Thu Jun 21 20:37:57 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.API	Tue Jun 19 19:40:06 2007 +0000
+++ b/ChangeLog.API	Thu Jun 21 20:37:57 2007 +0000
@@ -13,21 +13,13 @@
 		    UIs can now use better scheduling for whole-second timers.  For
 		    example, clients based on the glib event loop can now use
 		    g_timeout_add_seconds.
-		* gtk_imhtml_setup_entry
-		* pidgin_create_window
 		* purple_blist_node_get_type
 		* purple_conversation_do_command
 		* purple_conversation_get_extended_menu
 		* purple_core_ensure_single_instance
 		    This is for UIs to use to ensure only one copy is running.
 		* purple_dbus_is_owner
-		* purple_dbusify_const_GList
-		* purple_dbusify_const_GSList
-		* purple_const_GList_to_array
-		* purple_const_GSList_to_array
 		* purple_image_data_calculate_filename
-		* pidgin_retrieve_user_info, shows immediate feedback when getting
-		  information about a user.
 		* purple_timeout_add_seconds
 		    Callers should prefer this to purple_timeout_add for timers
 		    longer than 1 second away.  Be aware of the rounding, though.
@@ -35,11 +27,12 @@
 		    Callers should prefer this to purple_timeout_add for timers
 		    longer than 1 second away.  Be aware of the rounding, though.
 		* purple_xfer_get_remote_user
-		* gtk_imhtml_animation_new
-		    Can be used for inserting an animated image into an IMHTML.
+		* purple_pounces_get_all_for_ui
 
 		Changed:
-		* Mark some return types const:
+		* The documentation of the following functions now properly
+		  declares that the returned value must not be modified or
+		  freed, which was always the case:
 			* purple_accounts_get_all
 			* purple_connections_get_all
 			* purple_connections_get_connecting
@@ -49,26 +42,57 @@
 			* purple_get_conversations
 			* purple_get_ims
 			* purple_notify_user_info_get_entries
-
-		Deprecated:
-		* purple_dbusify_GList:  Use purple_dbusify_const_GList (and
-		  g_list_free if needed) if depending on 2.1.0 is okay.
-		* purple_dbusify_GSList:  Use purple_dbusify_const_GSList (and
-		  g_slist_free if needed) if depending on 2.1.0 is okay..
-		* purple_GList_to_array:  Use purple_const_GList_to_array (and
-		  g_list_free if needed) if depending on 2.1.0 is okay..
-		* purple_GSList_to_array:  Use purple_const_GSList_to_array (and
-		  g_slist_free if needed) if depending on 2.1.0 is okay..
+		* The following functions now return a GList* instead of a
+		  const GList*, as const is not very useful with GLists.  The
+		  returned value still must not be modified or freed:
+			* purple_account_get_status_types
+			* purple_mime_document_get_fields
+			* purple_mime_document_get_parts
+			* purple_mime_part_get_fields
+			* purple_request_fields_get_required
+			* purple_request_field_list_get_selected
+			* purple_request_field_list_get_items
+			* purple_status_type_get_attrs
+			* purple_presence_get_statuses
+		* purple_request_field_list_set_selected now takes a GList*
+		  instead of a const GList* for items, as const is not very
+		  useful with GLists.  The passed list is still not modified
+		  or freed.
+		* purple_presence_add_list now takes a GList* instead of a
+		  const GList* for source_list, as const is not very useful with
+		  GLists.  The passed list is still not modified or freed.
 
 	Pidgin:
+		Added:
+		* gtk_imhtml_setup_entry
+		* pidgin_create_window
+		* pidgin_retrieve_user_info and pidgin_retrieve_user_info_in_chat,
+		  shows immediate feedback when getting information about a user.
+		* gtk_imhtml_animation_new
+		    Can be used for inserting an animated image into an IMHTML.
+		* pidgin_menu_position_func_helper
+		* pidgin_blist_get_name_markup, returns the buddy list markup
+		  text for a given buddy.
+
 		Changed:
 		* pidgin_append_menu_action returns the menuitem added to the menu.
 		* pidgin_separator returns the separator added to the menu.
+		* PidginConversation has struct members to handle the new info
+		  pane:
+		  	* infopane
+			* infopane_hbox
+			* infopane_model
+			* infopane_iter
 
 	Finch:
 		Added:
 		* finch_retrieve_user_info
 
+		Changed:
+		* gnt_tree_get_rows() now returns a GList* instead of a const
+		  GList*, as const is not very useful with GLists.  The
+		  returned value still must not be modified or freed.
+
 version 2.0.2 (6/14/2007):
 	Pidgin:
 		Deprecated:
--- a/ChangeLog.win32	Tue Jun 19 19:40:06 2007 +0000
+++ b/ChangeLog.win32	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/NEWS	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/configure.ac	Thu Jun 21 20:37:57 2007 +0000
@@ -52,10 +52,10 @@
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
 
-m4_define([gnt_lt_current], [0])
-m4_define([gnt_major_version], [1])
+m4_define([gnt_lt_current], [1])
+m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [0])
-m4_define([gnt_micro_version], [1])
+m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -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/doc/gtkrc-2.0	Tue Jun 19 19:40:06 2007 +0000
+++ b/doc/gtkrc-2.0	Thu Jun 21 20:37:57 2007 +0000
@@ -39,16 +39,17 @@
 }
 widget_class "*" style "my-style-name"
 
-# This style sets the expander size on a treeview to 0, which has the result
+# This sets the expander size on a treeview to 0, which has the result
 # of reducing the indent for items in the tree. This can be applied to the
-# Pidgin buddy list to reduce it's width.
-style "my-narrow-tree"
-{
-  GtkTreeView::expander_size = 0
-}
-
+# Pidgin buddy list to reduce the width of group and contact rows.
+# With the recent (~2.0.0) buddy list changes this isn't particularly
+# important anymore.
+#style "my-narrow-tree"
+#{
+#  GtkTreeView::expander_size = 0
+#}
 # And apply the style to the buddy list:
-widget "*pidgin_blist_treeview" style "my-narrow-tree"
+#widget "*pidgin_blist_treeview" style "my-narrow-tree"
 
 # In Pidgin, you can set custom keybindings in your theme.
 # Here is an example to follow:
--- a/finch/finch.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/finch.c	Thu Jun 21 20:37:57 2007 +0000
@@ -19,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
@@ -37,7 +39,6 @@
 #include "whiteboard.h"
 
 #include "gntdebug.h"
-#include "finch.h"
 #include "gntprefs.h"
 #include "gntui.h"
 #include "gntidle.h"
--- a/finch/gntaccount.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntaccount.c	Thu Jun 21 20:37:57 2007 +0000
@@ -33,6 +33,8 @@
 #include <gnttree.h>
 #include <gntwindow.h>
 
+#include "finch.h"
+
 #include <account.h>
 #include <accountopt.h>
 #include <connection.h>
@@ -42,7 +44,6 @@
 
 #include "gntaccount.h"
 #include "gntblist.h"
-#include "finch.h"
 
 #include <string.h>
 
@@ -641,7 +642,7 @@
 
 void finch_accounts_show_all()
 {
-	const GList *iter;
+	GList *iter;
 	GntWidget *box, *button;
 
 	if (accounts.window)
@@ -734,7 +735,7 @@
 
 void finch_accounts_init()
 {
-	const GList *iter;
+	GList *iter;
 
 	purple_signal_connect(purple_accounts_get_handle(), "account-added",
 			finch_accounts_get_handle(), PURPLE_CALLBACK(account_added_callback),
@@ -831,7 +832,7 @@
 {
 	PurpleConnection *gc = purple_account_get_connection(data->account);
 
-	if (g_list_find((GList *)purple_connections_get_all(), gc))
+	if (g_list_find(purple_connections_get_all(), gc))
 	{
 		purple_blist_request_add_buddy(data->account, data->username,
 									 NULL, data->alias);
--- a/finch/gntblist.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntblist.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include <account.h>
 #include <blist.h>
 #include <notify.h>
@@ -33,7 +35,6 @@
 #include <util.h>
 #include "debug.h"
 
-#include "finch.h"
 #include "gntbox.h"
 #include "gntcombobox.h"
 #include "gntentry.h"
--- a/finch/gntconn.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntconn.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,14 +22,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include "account.h"
 #include "core.h"
-#include "connection.c"
+#include "connection.h"
 #include "debug.h"
 #include "request.h"
 
 #include "gntconn.h"
-#include "finch.h"
 
 #define INITIAL_RECON_DELAY_MIN  8000
 #define INITIAL_RECON_DELAY_MAX 60000
--- a/finch/gntconv.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntconv.c	Thu Jun 21 20:37:57 2007 +0000
@@ -24,12 +24,13 @@
  */
 #include <string.h>
 
+#include "finch.h"
+
 #include <cmds.h>
 #include <idle.h>
 #include <prefs.h>
 #include <util.h>
 
-#include "finch.h"
 #include "gntaccount.h"
 #include "gntblist.h"
 #include "gntconv.h"
@@ -440,6 +441,16 @@
 }
 
 static void
+gained_focus_cb(GntWindow *window, FinchConv *fc)
+{
+	GList *iter;
+	for (iter = fc->list; iter; iter = iter->next) {
+		purple_conversation_set_data(iter->data, "unseen-count", 0);
+		purple_conversation_update(iter->data, PURPLE_CONV_UPDATE_UNSEEN);
+	}
+}
+
+static void
 finch_create_conversation(PurpleConversation *conv)
 {
 	FinchConv *ggc = conv->ui_data;
@@ -529,6 +540,7 @@
 
 	g_free(title);
 	gnt_box_give_focus_to_child(GNT_BOX(ggc->window), ggc->entry);
+	g_signal_connect(G_OBJECT(ggc->window), "gained-focus", G_CALLBACK(gained_focus_cb), ggc);
 }
 
 static void
@@ -622,6 +634,11 @@
 
 	if (flags & (PURPLE_MESSAGE_RECV | PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_ERROR))
 		gnt_widget_set_urgent(ggconv->tv);
+	if (flags & PURPLE_MESSAGE_RECV && !gnt_widget_has_focus(ggconv->window)) {
+		int count = GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count"));
+		purple_conversation_set_data(conv, "unseen-count", GINT_TO_POINTER(count + 1));
+		purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN);
+	}
 }
 
 static void
--- a/finch/gntft.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntft.c	Thu Jun 21 20:37:57 2007 +0000
@@ -86,7 +86,7 @@
 static void
 update_title_progress()
 {
-	const GList *list;
+	GList *list;
 	int num_active_xfers = 0;
 	guint64 total_bytes_xferred = 0;
 	guint64 total_file_size = 0;
@@ -172,7 +172,7 @@
 void
 finch_xfer_dialog_new(void)
 {
-	const GList *iter;
+	GList *iter;
 	GntWidget *window;
 	GntWidget *bbox;
 	GntWidget *button;
@@ -411,7 +411,7 @@
 
 	size_str      = purple_str_size_to_units(purple_xfer_get_size(xfer));
 	remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer));
-	kbsec = g_strdup_printf(_("%.2f KB/s"), kbps);
+	kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps);
 
 	gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_PROGRESS,
 			g_ascii_dtostr(prog_str, sizeof(prog_str), purple_xfer_get_progress(xfer) * 100.));
--- a/finch/gntnotify.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntnotify.c	Thu Jun 21 20:37:57 2007 +0000
@@ -29,10 +29,11 @@
 #include <gnttree.h>
 #include <gntutils.h>
 
+#include "finch.h"
+
 #include <util.h>
 
 #include "gntnotify.h"
-#include "finch.h"
 
 static struct
 {
--- a/finch/gntplugin.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntplugin.c	Thu Jun 21 20:37:57 2007 +0000
@@ -29,10 +29,11 @@
 #include <gntline.h>
 #include <gnttree.h>
 
+#include "finch.h"
+
 #include "notify.h"
 #include "request.h"
 
-#include "finch.h"
 #include "gntplugin.h"
 #include "gntrequest.h"
 
@@ -106,6 +107,9 @@
 	char *text;
 	GList *list = NULL, *iter = NULL;
 
+	if (!plugin)
+		return;
+
 	/* If the selected plugin was unseen before, mark it as seen. But save the list
 	 * only when the plugin list is closed. So if the user enables a plugin, and it
 	 * crashes, it won't get marked as seen so the user can fix the bug and still
--- a/finch/gntpounce.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntpounce.c	Thu Jun 21 20:37:57 2007 +0000
@@ -137,12 +137,12 @@
 static void
 populate_pounces_list(PouncesManager *dialog)
 {
-	const GList *pounces;
+	GList *pounces;
 
 	gnt_tree_remove_all(GNT_TREE(dialog->tree));
 
-	for (pounces = purple_pounces_get_all(); pounces != NULL;
-			pounces = g_list_next(pounces))
+	for (pounces = purple_pounces_get_all_for_ui(FINCH_UI); pounces != NULL;
+			pounces = g_list_delete_link(pounces, pounces))
 	{
 		add_pounce_to_treeview(GNT_TREE(dialog->tree), pounces->data);
 	}
@@ -288,7 +288,7 @@
 	GntWidget *hbox, *vbox;
 	GntWidget *button;
 	GntWidget *combo;
-	const GList *list;
+	GList *list;
 
 	g_return_if_fail((cur_pounce != NULL) ||
 	                 (account != NULL) ||
@@ -303,7 +303,7 @@
 		dialog->pounce  = NULL;
 		dialog->account = account;
 	} else {
-		const GList *connections = purple_connections_get_all();
+		GList *connections = purple_connections_get_all();
 		PurpleConnection *gc;
 
 		if (connections != NULL) {
--- a/finch/gntprefs.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntprefs.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,10 +22,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include <prefs.h>
 #include <savedstatuses.h>
 
-#include "finch.h"
 #include "gntprefs.h"
 #include "gntrequest.h"
 
@@ -89,7 +90,7 @@
 get_status_titles()
 {
 	GList *list = NULL;
-	const GList *iter;
+	GList *iter;
 	for (iter = purple_savedstatuses_get_all(); iter; iter = iter->next) {
 		char *str;
 		if (purple_savedstatus_is_transient(iter->data))
--- a/finch/gntrequest.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntrequest.c	Thu Jun 21 20:37:57 2007 +0000
@@ -297,7 +297,7 @@
 				GList *list = NULL;
 				if (purple_request_field_list_get_multi_select(field))
 				{
-					const GList *iter;
+					GList *iter;
 					GntWidget *tree = field->ui_data;
 
 					iter = purple_request_field_list_get_items(field);
@@ -433,7 +433,7 @@
 			else if (type == PURPLE_REQUEST_FIELD_CHOICE)
 			{
 				int id;
-				const GList *list;
+				GList *list;
 				GntWidget *combo = gnt_combo_box_new();
 				gnt_box_add_widget(GNT_BOX(hbox), combo);
 				field->ui_data = combo;
@@ -449,7 +449,7 @@
 			}
 			else if (type == PURPLE_REQUEST_FIELD_LIST)
 			{
-				const GList *list;
+				GList *list;
 				gboolean multi = purple_request_field_list_get_multi_select(field);
 				if (multi)
 				{
@@ -490,7 +490,7 @@
 			{
 				gboolean all;
 				PurpleAccount *def;
-				const GList *list;
+				GList *list;
 				GntWidget *combo = gnt_combo_box_new();
 				gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
 				gnt_box_add_widget(GNT_BOX(hbox), combo);
--- a/finch/gntstatus.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntstatus.c	Thu Jun 21 20:37:57 2007 +0000
@@ -31,10 +31,11 @@
 #include <gntline.h>
 #include <gnttree.h>
 
+#include "finch.h"
+
 #include <notify.h>
 #include <request.h>
 
-#include "finch.h"
 #include "gntstatus.h"
 
 static struct
@@ -83,7 +84,7 @@
 static void
 populate_statuses(GntTree *tree)
 {
-	const GList *list;
+	GList *list;
 
 	for (list = purple_savedstatuses_get_all(); list; list = list->next)
 	{
@@ -244,7 +245,7 @@
 static void
 set_substatuses(EditStatus *edit)
 {
-	const GList *iter;
+	GList *iter;
 	for (iter = gnt_tree_get_rows(GNT_TREE(edit->tree)); iter; iter = iter->next) {
 		RowInfo *key = iter->data;
 		if (gnt_tree_get_choice(GNT_TREE(edit->tree), key)) {
@@ -410,7 +411,7 @@
 		EditSubStatus *sub;
 		GntWidget *window, *combo, *entry, *box, *button, *l;
 		PurpleSavedStatusSub *substatus = NULL;
-		const GList *iter;
+		GList *iter;
 		char *name;
 		RowInfo *selected = gnt_tree_get_selection_data(tree);
 		PurpleAccount *account = selected->account;
@@ -497,7 +498,7 @@
 	GntWidget *window, *box, *button, *entry, *combo, *label, *tree;
 	PurpleStatusPrimitive prims[] = {PURPLE_STATUS_AVAILABLE, PURPLE_STATUS_AWAY,
 		PURPLE_STATUS_INVISIBLE, PURPLE_STATUS_OFFLINE, PURPLE_STATUS_UNSET}, current;
-	const GList *iter;
+	GList *iter;
 	int i;
 
 	if (saved)
--- a/finch/gntui.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/gntui.c	Thu Jun 21 20:37:57 2007 +0000
@@ -19,6 +19,8 @@
  * 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 "gntui.h"
 
 #include "gntaccount.h"
@@ -34,7 +36,6 @@
 #include "gntrequest.h"
 #include "gntstatus.h"
 #include "gntsound.h"
-#include "internal.h"
 
 #include <prefs.h>
 
--- a/finch/libgnt/Makefile.am	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/Makefile.am	Thu Jun 21 20:37:57 2007 +0000
@@ -1,6 +1,6 @@
 EXTRA_DIST=genmarshal
 
-SUBDIRS = . 
+SUBDIRS = . wms
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnt.pc
 
--- a/finch/libgnt/configure.ac	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/configure.ac	Thu Jun 21 20:37:57 2007 +0000
@@ -24,11 +24,11 @@
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [0])
-m4_define([gnt_major_version], [1])
+m4_define([gnt_lt_current], [1])
+m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [0])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [beta7])
+m4_define([gnt_version_suffix], [devel])
 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]))
--- a/finch/libgnt/gntfilesel.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntfilesel.c	Thu Jun 21 20:37:57 2007 +0000
@@ -46,6 +46,7 @@
 static GntWindowClass *parent_class = NULL;
 static guint signals[SIGS] = { 0 };
 static void (*orig_map)(GntWidget *widget);
+static void (*orig_size_request)(GntWidget *widget);
 
 static void
 gnt_file_sel_destroy(GntWidget *widget)
@@ -552,6 +553,19 @@
 }
 
 static void
+gnt_file_sel_size_request(GntWidget *widget)
+{
+	GntFileSel *sel;
+	if (widget->priv.height > 0)
+		return;
+
+	sel = GNT_FILE_SEL(widget);
+	sel->dirs->priv.height = 16;
+	sel->files->priv.height = 16;
+	orig_size_request(widget);
+}
+
+static void
 gnt_file_sel_class_init(GntFileSelClass *klass)
 {
 	GntBindableClass *bindable = GNT_BINDABLE_CLASS(klass);
@@ -560,6 +574,8 @@
 	kl->destroy = gnt_file_sel_destroy;
 	orig_map = kl->map;
 	kl->map = gnt_file_sel_map;
+	orig_size_request = kl->size_request;
+	kl->size_request = gnt_file_sel_size_request;
 
 	signals[SIG_FILE_SELECTED] = 
 		g_signal_new("file_selected",
--- a/finch/libgnt/gntmain.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntmain.c	Thu Jun 21 20:37:57 2007 +0000
@@ -435,10 +435,14 @@
 
 	setup_io();
 
+#ifdef NO_WIDECHAR
+	ascii_only = TRUE;
+#else
 	if (locale && (strstr(locale, "UTF") || strstr(locale, "utf")))
 		ascii_only = FALSE;
 	else
 		ascii_only = TRUE;
+#endif
 
 	initscr();
 	typeahead(-1);
--- a/finch/libgnt/gntstyle.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntstyle.c	Thu Jun 21 20:37:57 2007 +0000
@@ -139,8 +139,7 @@
 		if (!name)
 			return;
 
-		ws = g_object_new(GNT_TYPE_WS, NULL);
-		gnt_ws_set_name(ws, name);
+		ws = gnt_ws_new(name);
 		gnt_wm_add_workspace(wm, ws);
 		g_free(name);
 
--- a/finch/libgnt/gnttree.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gnttree.c	Thu Jun 21 20:37:57 2007 +0000
@@ -753,15 +753,16 @@
 			g_signal_emit(tree, signals[SIG_TOGGLED], 0, row->key);
 			redraw_tree(tree);
 		}
+	} else {
+		return FALSE;
 	}
 
 	if (old != tree->current)
 	{
 		tree_selection_changed(tree, old, tree->current);
-		return TRUE;
 	}
 
-	return FALSE;
+	return TRUE;
 }
 
 static void
@@ -1016,7 +1017,7 @@
 	return ret;
 }
 
-const GList *gnt_tree_get_rows(GntTree *tree)
+GList *gnt_tree_get_rows(GntTree *tree)
 {
 	return tree->list;
 }
--- a/finch/libgnt/gnttree.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gnttree.h	Thu Jun 21 20:37:57 2007 +0000
@@ -190,7 +190,13 @@
  */
 GList * gnt_tree_get_selection_text_list(GntTree *tree);
 
-const GList *gnt_tree_get_rows(GntTree *tree);
+/**
+ *
+ * @param tree
+ *
+ * @constreturn
+ */
+GList *gnt_tree_get_rows(GntTree *tree);
 
 /**
  * 
--- a/finch/libgnt/gntwm.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntwm.c	Thu Jun 21 20:37:57 2007 +0000
@@ -338,8 +338,7 @@
 	wm->title_places = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	gnt_style_read_workspaces(wm);
 	if (wm->workspaces == NULL) {
-		wm->cws = g_object_new(GNT_TYPE_WS, NULL);
-		gnt_ws_set_name(wm->cws, "default");
+		wm->cws = gnt_ws_new("default");
 		gnt_wm_add_workspace(wm, wm->cws);
 	} else {
 		wm->cws = wm->workspaces->data;
@@ -1005,12 +1004,11 @@
 	GntWM *wm = GNT_WM(bindable);
 
 	endwin();
-	refresh();
-	curs_set(0);   /* endwin resets the cursor to normal */
 
 	g_hash_table_foreach(wm->nodes, (GHFunc)refresh_node, NULL);
 	update_screen(wm);
 	gnt_ws_draw_taskbar(wm->cws, TRUE);
+	curs_set(0);   /* endwin resets the cursor to normal */
 
 	return FALSE;
 }
@@ -1104,6 +1102,16 @@
 }
 
 static gboolean
+workspace_new(GntBindable *bindable, GList *null)
+{
+	GntWM *wm = GNT_WM(bindable);
+	GntWS *ws = gnt_ws_new(NULL);
+	gnt_wm_add_workspace(wm, ws);
+	gnt_wm_switch_workspace(wm, g_list_index(wm->workspaces, ws));
+	return TRUE;
+}
+
+static gboolean
 ignore_keys_start(GntBindable *bindable, GList *n)
 {
 	GntWM *wm = GNT_WM(bindable);
@@ -1302,6 +1310,8 @@
 				"\033" GNT_KEY_CTRL_K, NULL);
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "help-for-widget", help_for_widget,
 				"\033" "/", NULL);
+	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "workspace-new", workspace_new,
+				GNT_KEY_F9, NULL);
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "workspace-next", workspace_next,
 				"\033" ">", NULL);
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "workspace-prev", workspace_prev,
@@ -1366,6 +1376,7 @@
 
 	return type;
 }
+
 void
 gnt_wm_add_workspace(GntWM *wm, GntWS *ws)
 {
@@ -1503,12 +1514,39 @@
 	return FALSE;
 }
 
+#if !GLIB_CHECK_VERSION(2,4,0)
+typedef struct
+{
+	GntWM *wm;
+	GntWS *ret;
+	gchar *title;
+} title_search;
+
+static void match_title_search(gpointer key, gpointer value, gpointer search)
+{
+	title_search *s = search;
+	if (s->ret)
+		return;
+	if (match_title(key, NULL, s->title))
+		s->ret = g_hash_table_lookup(s->wm->title_places, key);
+}
+#endif
+
 static GntWS *
 new_widget_find_workspace(GntWM *wm, GntWidget *widget, gchar *wid_title)
 {
 	GntWS *ret;
 	const gchar *name;
+#if GLIB_CHECK_VERSION(2,4,0)
 	ret = g_hash_table_find(wm->title_places, match_title, wid_title);
+#else
+	title_search *s = NULL;
+	s = g_new0(title_search, 1);
+	s->wm = wm;
+	s->title = wid_title;
+	g_hash_table_foreach(wm->title_places, match_title_search, s);
+	ret = s->ret;
+#endif
 	if (ret)
 		return ret;
 	name = gnt_widget_get_name(widget);
@@ -1600,6 +1638,7 @@
 			gnt_wm_raise_window(wm, node->me);
 		} else {
 			bottom_panel(node->panel);     /* New windows should not grab focus */
+			gnt_widget_set_focus(node->me, FALSE);
 			gnt_widget_set_urgent(node->me);
 			if (wm->cws != ws)
 				gnt_ws_widget_hide(widget, wm->nodes);
--- a/finch/libgnt/gntwm.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntwm.h	Thu Jun 21 20:37:57 2007 +0000
@@ -163,7 +163,7 @@
 	/* List of windows. Although the WM can keep a list of its own for the windows,
 	 * it'd be better if there was a way to share between the 'core' and the WM.
 	 */
-	/*const GList *(*window_list)();*/
+	/*GList *(*window_list)();*/
 
 	void (*res1)(void);
 	void (*res2)(void);
--- a/finch/libgnt/gntws.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntws.c	Thu Jun 21 20:37:57 2007 +0000
@@ -154,6 +154,13 @@
 	return type;
 }
 
+GntWS *gnt_ws_new(const char *name)
+{
+	GntWS *ws = GNT_WS(g_object_new(GNT_TYPE_WS, NULL));
+	ws->name = g_strdup(name ? name : "(noname)");
+	return ws;
+}
+
 const char * gnt_ws_get_name(GntWS *ws)
 {
 	return ws->name;
--- a/finch/libgnt/gntws.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/gntws.h	Thu Jun 21 20:37:57 2007 +0000
@@ -45,6 +45,7 @@
 
 GType gnt_ws_get_gtype(void);
 
+GntWS *gnt_ws_new(const char *name);
 void gnt_ws_set_name(GntWS *, const gchar *);
 void gnt_ws_add_widget(GntWS *, GntWidget *);
 void gnt_ws_remove_widget(GntWS *, GntWidget *);
--- a/finch/libgnt/wms/irssi.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/wms/irssi.c	Thu Jun 21 20:37:57 2007 +0000
@@ -177,7 +177,8 @@
 {
 	char title[256];
 	snprintf(title, sizeof(title), "%d: %s",
-			(int)g_object_get_data(G_OBJECT(node->me), "irssi-index") + 1, GNT_BOX(node->me)->title);
+			GPOINTER_TO_INT(g_object_get_data(G_OBJECT(node->me), "irssi-index")) + 1,
+			GNT_BOX(node->me)->title);
 	wbkgdset(node->window, '\0' | COLOR_PAIR(gnt_widget_has_focus(node->me) ? GNT_COLOR_TITLE : GNT_COLOR_TITLE_D));
 	mvwaddstr(node->window, 0, 0, title);
 	update_panels();
@@ -192,7 +193,7 @@
 	const char *name = gnt_widget_get_name(win);
 	if (!name || !GNT_IS_BOX(win) || strcmp(name, "conversation-window"))
 		return;
-	g_object_set_data(G_OBJECT(win), "irssi-index", GINT_TO_POINTER(g_list_index(wm->list, win)));
+	g_object_set_data(G_OBJECT(win), "irssi-index", GINT_TO_POINTER(g_list_index(wm->cws->list, win)));
 	g_timeout_add(0, (GSourceFunc)update_conv_window_title, node);
 }
 
@@ -221,12 +222,12 @@
 	int x, y, w, h;
 	GntWidget *win;
 
-	if (wm->ordered == NULL || is_budddylist(win = GNT_WIDGET(wm->ordered->data)))
+	if (wm->cws->ordered == NULL || is_budddylist(win = GNT_WIDGET(wm->cws->ordered->data)))
 		return FALSE;
 
 	find_window_position(irssi, win, &hor, &vert);
 
-	switch ((int)list->data) {
+	switch (GPOINTER_TO_INT(list->data)) {
 		case 'k':
 			vert = MAX(0, vert - 1);
 			break;
--- a/finch/libgnt/wms/s.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/libgnt/wms/s.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1,6 +1,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "internal.h"
+
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"
@@ -121,7 +123,7 @@
 static GntWidget *
 find_widget(GntWM *wm, const char *wname)
 {
-	const GList *iter = wm->cws->list;
+	GList *iter = wm->cws->list;
 	for (; iter; iter = iter->next) {
 		GntWidget *widget = iter->data;
 		const char *name = gnt_widget_get_name(widget);
--- a/finch/plugins/Makefile.am	Tue Jun 19 19:40:06 2007 +0000
+++ b/finch/plugins/Makefile.am	Thu Jun 21 20:37:57 2007 +0000
@@ -28,7 +28,7 @@
 
 endif # PLUGINS
 
-EXTRA_DIST = 
+EXTRA_DIST = pietray.py
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/finch/plugins/pietray.py	Thu Jun 21 20:37:57 2007 +0000
@@ -0,0 +1,183 @@
+#!/usr/bin/env python
+
+# This is a dbus script to show a docklet for Finch. This should work
+# for any 'compatible' purple client.
+#
+# By 'compatible', I mean any client that sets and updates the
+# "unseen-count" data on the conversations.
+#
+# It allows doing the following things:
+#    - It allows changing status.
+#    - It shows the current status and info about unread messages in
+#      the tooltip.
+#    - It can blink on unread IM/Chat messages, and it allows canging
+#      the preference for that.
+# 
+# It requires GTK+ 2.10 or above, since it uses GtkStatusIcon.
+# 
+# Sadrul <sadrul@pidgin.im>
+
+import pygtk
+pygtk.require("2.0")
+import gtk
+import dbus, gobject, dbus.glib
+import os # to get the pkg-config output
+
+bus = dbus.SessionBus()
+obj = bus.get_object(
+    "im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
+purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
+
+def pack_image_label(menu, image, label):
+	item = gtk.ImageMenuItem(label)
+	if image:
+		img = gtk.Image()
+		img.set_from_stock(image, 1)
+		item.set_image(img)
+	menu.append(item)
+	return item
+
+def activate_primitive_status(item, status):
+	saved = purple.PurpleSavedstatusFindTransientByTypeAndMessage(status, "")
+	if not saved:
+		saved = purple.PurpleSavedstatusNew("", status)
+	purple.PurpleSavedstatusActivate(saved)
+
+def activate_popular_status(item, time):
+	saved = purple.PurpleSavedstatusFindByCreationTime(time)
+	if saved:
+		purple.PurpleSavedstatusActivate(saved)
+
+def generate_status_menu(menu):
+	item = gtk.MenuItem("Available")
+	item.connect("activate", activate_primitive_status, 2)
+	menu.append(item)
+
+	item = gtk.MenuItem("Away")
+	item.connect("activate", activate_primitive_status, 5)
+	menu.append(item)
+
+	item = gtk.MenuItem("Invisible")
+	item.connect("activate", activate_primitive_status, 4)
+	menu.append(item)
+
+	item = gtk.MenuItem("Offline")
+	item.connect("activate", activate_primitive_status, 1)
+	menu.append(item)
+
+	menu.append(gtk.MenuItem())
+
+	popular = purple.PurpleSavedstatusesGetPopular(10)
+	for pop in popular:
+		title = purple.PurpleSavedstatusGetTitle(pop).replace('_', '__')
+		item = gtk.MenuItem(title)
+		item.set_data("timestamp", purple.PurpleSavedstatusGetCreationTime(pop))
+		item.connect("activate", activate_popular_status, purple.PurpleSavedstatusGetCreationTime(pop))
+		menu.append(item)
+
+def toggle_pref(item, pref):
+	purple.PurplePrefsSetBool(pref, item.get_active())
+
+def popup_menu(icon, button, tm, none):
+	menu = gtk.Menu()
+
+	item = gtk.CheckMenuItem("Blink for unread IM")
+	item.set_active(purple.PurplePrefsGetBool("/plugins/dbus/docklet/blink/im"))
+	item.connect("activate", toggle_pref, "/plugins/dbus/docklet/blink/im")
+	menu.append(item)
+
+	item = gtk.CheckMenuItem("Blink for unread Chats")
+	item.set_active(purple.PurplePrefsGetBool("/plugins/dbus/docklet/blink/chat"))
+	item.connect("activate", toggle_pref, "/plugins/dbus/docklet/blink/chat")
+	menu.append(item)
+
+	menu.append(gtk.MenuItem())
+
+	#item = pack_image_label(menu, None, "Change Status...")
+	item = gtk.MenuItem("Change Status...")
+	menu.append(item)
+	submenu = gtk.Menu()
+	item.set_submenu(submenu)
+	generate_status_menu(submenu)
+
+	menu.show_all()
+	menu.popup(None, None, None, button, tm)
+
+def get_status_message():
+	status = purple.PurpleSavedstatusGetCurrent()
+	msg = purple.PurpleSavedstatusGetMessage(status)
+	if msg and len(msg) > 0:
+		text = msg + " "
+	else:
+		text = ""
+	text = text + "(" + {
+		2: "Available",
+		5: "Away",
+		4: "Invisible",
+		1: "Offline"
+	}[purple.PurpleSavedstatusGetType(status)] + ")"
+	return text
+
+def detect_unread_conversations():
+	im = purple.PurplePrefsGetBool("/plugins/dbus/docklet/blink/im")
+	chat = purple.PurplePrefsGetBool("/plugins/dbus/docklet/blink/chat")
+	tooltip = ""
+	blink = False
+	if im and chat:
+		convs = purple.PurpleGetConversations()
+	elif im:
+		convs = purple.PurpleGetIms()
+	elif chat:
+		convs = purple.PurpleGetChats()
+	else:
+		convs = None
+	for conv in convs:
+		count = purple.PurpleConversationGetData(conv, "unseen-count")
+		if count and count > 0:
+			blink = True
+			tooltip = tooltip + "\n" + purple.PurpleConversationGetName(conv) + " (" + str(count) + ")"
+	t.set_from_file(path + "/share/pixmaps/pidgin.png")
+	if blink:
+		# I hate this icon
+		# t.set_from_file(path + "/share/pixmaps/pidgin/tray/22/tray-message.png")
+		tooltip = "\nUnread Messages:" + tooltip
+	# There's going to be some way to expose the client's display name in 2.1.0.
+	# Use that instead of hardcoding Finch here.
+	t.set_tooltip("Finch: " + get_status_message() + tooltip)
+	t.set_blinking(blink)
+
+def conversation_updated(conv, type):
+	detect_unread_conversations()
+
+def savedstatus_changed(new, old):
+	# Change the icon for status perhaps?
+	detect_unread_conversations()
+
+def init_prefs():
+	if not purple.PurplePrefsExists("/plugins/dbus/docklet/blink"):
+		purple.PurplePrefsAddNone("/plugins")
+		purple.PurplePrefsAddNone("/plugins/dbus")
+		purple.PurplePrefsAddNone("/plugins/dbus/docklet")
+		purple.PurplePrefsAddNone("/plugins/dbus/docklet/blink")
+		purple.PurplePrefsAddBool("/plugins/dbus/docklet/blink/im", True)
+		purple.PurplePrefsAddBool("/plugins/dbus/docklet/blink/chat", True)
+
+pkg = os.popen("pkg-config --variable=prefix pidgin")
+path = pkg.readline().rstrip()
+
+bus.add_signal_receiver(conversation_updated,
+  dbus_interface="im.pidgin.purple.PurpleInterface",
+  signal_name="ConversationUpdated")
+
+bus.add_signal_receiver(savedstatus_changed,
+  dbus_interface="im.pidgin.purple.PurpleInterface",
+  signal_name="SavedstatusChanged")
+
+t = gtk.StatusIcon()
+t.connect("popup-menu", popup_menu, None)
+
+init_prefs()
+detect_unread_conversations()
+
+gtk.main ()
+
--- a/libpurple/Makefile.mingw	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/Makefile.mingw	Thu Jun 21 20:37:57 2007 +0000
@@ -72,6 +72,7 @@
 			upnp.c \
 			util.c \
 			value.c \
+			version.c \
 			xmlnode.c \
 			whiteboard.c \
 			win32/giowin32.c \
--- a/libpurple/account.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/account.c	Thu Jun 21 20:37:57 2007 +0000
@@ -205,7 +205,7 @@
 {
 	PurpleStatusType *type = purple_status_get_type(status);
 	xmlnode *node, *child;
-	const GList *attrs, *attr;
+	GList *attrs, *attr;
 
 	node = xmlnode_new("attributes");
 
@@ -241,7 +241,7 @@
 statuses_to_xmlnode(const PurplePresence *presence)
 {
 	xmlnode *node, *child;
-	const GList *statuses, *status;
+	GList *statuses, *status;
 
 	node = xmlnode_new("statuses");
 
@@ -371,7 +371,7 @@
 accounts_to_xmlnode(void)
 {
 	xmlnode *node, *child;
-	const GList *cur;
+	GList *cur;
 
 	node = xmlnode_new("account");
 	xmlnode_set_attrib(node, "version", "1.0");
@@ -877,7 +877,7 @@
 void
 purple_account_destroy(PurpleAccount *account)
 {
-	const GList *l;
+	GList *l;
 
 	g_return_if_fail(account != NULL);
 
@@ -1805,7 +1805,7 @@
 PurpleStatusType *
 purple_account_get_status_type(const PurpleAccount *account, const char *id)
 {
-	const GList *l;
+	GList *l;
 
 	g_return_val_if_fail(account != NULL, NULL);
 	g_return_val_if_fail(id      != NULL, NULL);
@@ -1824,7 +1824,7 @@
 PurpleStatusType *
 purple_account_get_status_type_with_primitive(const PurpleAccount *account, PurpleStatusPrimitive primitive)
 {
-	const GList *l;
+	GList *l;
 
 	g_return_val_if_fail(account != NULL, NULL);
 
@@ -1857,7 +1857,7 @@
 	return purple_presence_is_status_active(account->presence, status_id);
 }
 
-const GList *
+GList *
 purple_account_get_status_types(const PurpleAccount *account)
 {
 	g_return_val_if_fail(account != NULL, NULL);
@@ -2272,7 +2272,7 @@
 	schedule_accounts_save();
 }
 
-const GList *
+GList *
 purple_accounts_get_all(void)
 {
 	return accounts;
@@ -2282,7 +2282,7 @@
 purple_accounts_get_all_active(void)
 {
 	GList *list = NULL;
-	const GList *all = purple_accounts_get_all();
+	GList *all = purple_accounts_get_all();
 
 	while (all != NULL) {
 		PurpleAccount *account = all->data;
@@ -2300,7 +2300,7 @@
 purple_accounts_find(const char *name, const char *protocol_id)
 {
 	PurpleAccount *account = NULL;
-	const GList *l;
+	GList *l;
 	char *who;
 
 	g_return_val_if_fail(name != NULL, NULL);
@@ -2327,7 +2327,7 @@
 void
 purple_accounts_restore_current_statuses()
 {
-	const GList *l;
+	GList *l;
 	PurpleAccount *account;
 
 	/* If we're not connected to the Internet right now, we bail on this */
--- a/libpurple/account.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/account.h	Thu Jun 21 20:37:57 2007 +0000
@@ -369,7 +369,7 @@
  *                  as a NULL-terminated list of id/value pairs.
  */
 void purple_account_set_status(PurpleAccount *account, const char *status_id,
-							 gboolean active, ...);
+							 gboolean active, ...) G_GNUC_NULL_TERMINATED;
 
 
 /**
@@ -672,9 +672,9 @@
  *
  * @param account The account.
  *
- * @return The account's status types.
+ * @constreturn The account's status types.
  */
-const GList *purple_account_get_status_types(const PurpleAccount *account);
+GList *purple_account_get_status_types(const PurpleAccount *account);
 
 /**
  * Returns a protocol-specific integer setting for an account.
@@ -884,9 +884,9 @@
 /**
  * Returns a list of all accounts.
  *
- * @return A list of all accounts.
+ * @constreturn A list of all accounts.
  */
-const GList *purple_accounts_get_all(void);
+GList *purple_accounts_get_all(void);
 
 /**
  * Returns a list of all enabled accounts
--- a/libpurple/accountopt.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/accountopt.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * 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 "accountopt.h"
 #include "util.h"
 
@@ -282,7 +284,7 @@
 	return option->masked;
 }
 
-const GList *
+GList *
 purple_account_option_get_list(const PurpleAccountOption *option)
 {
 	g_return_val_if_fail(option != NULL, NULL);
--- a/libpurple/accountopt.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/accountopt.h	Thu Jun 21 20:37:57 2007 +0000
@@ -296,9 +296,9 @@
  *
  * @param option The account option.
  *
- * @return The list values.
+ * @constreturn The list values.
  */
-const GList *purple_account_option_get_list(const PurpleAccountOption *option);
+GList *purple_account_option_get_list(const PurpleAccountOption *option);
 
 /*@}*/
 
--- a/libpurple/blist.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/blist.c	Thu Jun 21 20:37:57 2007 +0000
@@ -35,8 +35,6 @@
 #include "value.h"
 #include "xmlnode.h"
 
-#define PATHSIZE 1024
-
 static PurpleBlistUiOps *blist_ui_ops = NULL;
 
 static PurpleBuddyList *purplebuddylist = NULL;
@@ -304,7 +302,7 @@
 {
 	xmlnode *node, *child, *grandchild;
 	PurpleBlistNode *gnode;
-	const GList *cur;
+	GList *cur;
 
 	node = xmlnode_new("purple");
 	xmlnode_set_attrib(node, "version", "1.0");
@@ -1774,7 +1772,7 @@
 
 	node = (PurpleBlistNode *)buddy;
 	cnode = node->parent;
-	gnode = cnode->parent;
+	gnode = (cnode != NULL) ? cnode->parent : NULL;
 	contact = (PurpleContact *)cnode;
 	group = (PurpleGroup *)gnode;
 
@@ -1783,35 +1781,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 +1841,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);
 }
 
@@ -1893,7 +1893,7 @@
 {
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleBlistNode *node;
-	const GList *l;
+	GList *l;
 
 	g_return_if_fail(group != NULL);
 
--- a/libpurple/buddyicon.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/buddyicon.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1021,7 +1021,7 @@
 _purple_buddy_icons_account_loaded_cb()
 {
 	const char *dirname = purple_buddy_icons_get_cache_dir();
-	const GList *cur;
+	GList *cur;
 
 	for (cur = purple_accounts_get_all(); cur != NULL; cur = cur->next)
 	{
--- a/libpurple/cmds.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/cmds.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
 
 #include <string.h>
 
+#include "internal.h"
+
 #include "account.h"
 #include "util.h"
 #include "cmds.h"
--- a/libpurple/connection.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/connection.c	Thu Jun 21 20:37:57 2007 +0000
@@ -456,7 +456,7 @@
 void
 purple_connections_disconnect_all(void)
 {
-	const GList *l;
+	GList *l;
 	PurpleConnection *gc;
 
 	while ((l = purple_connections_get_all()) != NULL) {
@@ -466,13 +466,13 @@
 	}
 }
 
-const GList *
+GList *
 purple_connections_get_all(void)
 {
 	return connections;
 }
 
-const GList *
+GList *
 purple_connections_get_connecting(void)
 {
 	return connections_connecting;
--- a/libpurple/connection.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/connection.h	Thu Jun 21 20:37:57 2007 +0000
@@ -259,16 +259,16 @@
  * Returns a list of all active connections.  This does not
  * include connections that are in the process of connecting.
  *
- * @return A list of all active connections.
+ * @constreturn A list of all active connections.
  */
-const GList *purple_connections_get_all(void);
+GList *purple_connections_get_all(void);
 
 /**
  * Returns a list of all connections in the process of connecting.
  *
- * @return A list of connecting connections.
+ * @constreturn A list of connecting connections.
  */
-const GList *purple_connections_get_connecting(void);
+GList *purple_connections_get_connecting(void);
 
 /**
  * Checks if gc is still a valid pointer to a gc.
@@ -279,7 +279,7 @@
  * TODO: Eventually this bad boy will be removed, because it is
  *       a gross fix for a crashy problem.
  */
-#define PURPLE_CONNECTION_IS_VALID(gc) (g_list_find((GList *)purple_connections_get_all(), (gc)) != NULL)
+#define PURPLE_CONNECTION_IS_VALID(gc) (g_list_find(purple_connections_get_all(), (gc)) != NULL)
 
 /*@}*/
 
--- a/libpurple/conversation.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/conversation.c	Thu Jun 21 20:37:57 2007 +0000
@@ -631,7 +631,7 @@
 purple_conversation_foreach(void (*func)(PurpleConversation *conv))
 {
 	PurpleConversation *conv;
-	const GList *l;
+	GList *l;
 
 	g_return_if_fail(func != NULL);
 
@@ -732,19 +732,19 @@
 	return g_hash_table_lookup(conv->data, key);
 }
 
-const GList *
+GList *
 purple_get_conversations(void)
 {
 	return conversations;
 }
 
-const GList *
+GList *
 purple_get_ims(void)
 {
 	return ims;
 }
 
-const GList *
+GList *
 purple_get_chats(void)
 {
 	return chats;
@@ -759,7 +759,7 @@
 	PurpleConversation *c = NULL;
 	gchar *name1;
 	const gchar *name2;
-	const GList *cnv;
+	GList *cnv;
 
 	g_return_val_if_fail(name != NULL, NULL);
 
@@ -819,7 +819,7 @@
 		return;
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM &&
-		!g_list_find((GList *)purple_get_conversations(), conv))
+		!g_list_find(purple_get_conversations(), conv))
 		return;
 
 	displayed = g_strdup(message);
@@ -1250,7 +1250,7 @@
 	return users;
 }
 
-const GList *
+GList *
 purple_conv_chat_get_users(const PurpleConvChat *chat)
 {
 	g_return_val_if_fail(chat != NULL, NULL);
@@ -1284,7 +1284,7 @@
 	if (!purple_conv_chat_is_user_ignored(chat, name))
 		return;
 
-	item = g_list_find((GList *)purple_conv_chat_get_ignored(chat),
+	item = g_list_find(purple_conv_chat_get_ignored(chat),
 					   purple_conv_chat_get_ignored_user(chat, name));
 
 	purple_conv_chat_set_ignored(chat,
@@ -1304,7 +1304,7 @@
 	return ignored;
 }
 
-const GList *
+GList *
 purple_conv_chat_get_ignored(const PurpleConvChat *chat)
 {
 	g_return_val_if_fail(chat != NULL, NULL);
@@ -1315,7 +1315,7 @@
 const char *
 purple_conv_chat_get_ignored_user(const PurpleConvChat *chat, const char *user)
 {
-	const GList *ignored;
+	GList *ignored;
 
 	g_return_val_if_fail(chat != NULL, NULL);
 	g_return_val_if_fail(user != NULL, NULL);
@@ -1810,7 +1810,7 @@
 	PurpleConversation *conv;
 	PurpleConversationUiOps *ops;
 	GList *users;
-	const GList *l;
+	GList *l;
 	GList *names = NULL;
 
 	g_return_if_fail(chat != NULL);
@@ -1919,7 +1919,7 @@
 PurpleConversation *
 purple_find_chat(const PurpleConnection *gc, int id)
 {
-	const GList *l;
+	GList *l;
 	PurpleConversation *conv;
 
 	for (l = purple_get_chats(); l != NULL; l = l->next) {
@@ -1968,7 +1968,7 @@
 PurpleConvChatBuddy *
 purple_conv_chat_cb_find(PurpleConvChat *chat, const char *name)
 {
-	const GList *l;
+	GList *l;
 	PurpleConvChatBuddy *cb = NULL;
 
 	g_return_val_if_fail(chat != NULL, NULL);
--- a/libpurple/conversation.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/conversation.h	Thu Jun 21 20:37:57 2007 +0000
@@ -502,23 +502,23 @@
  *
  * This list includes both IMs and chats.
  *
- * @return A GList of all conversations.
+ * @constreturn A GList of all conversations.
  */
-const GList *purple_get_conversations(void);
+GList *purple_get_conversations(void);
 
 /**
  * Returns a list of all IMs.
  *
- * @return A GList of all IMs.
+ * @constreturn A GList of all IMs.
  */
-const GList *purple_get_ims(void);
+GList *purple_get_ims(void);
 
 /**
  * Returns a list of all chats.
  *
- * @return A GList of all chats.
+ * @constreturn A GList of all chats.
  */
-const GList *purple_get_chats(void);
+GList *purple_get_chats(void);
 
 /**
  * Finds a conversation with the specified type, name, and Purple account.
@@ -875,9 +875,9 @@
  *
  * @param chat The chat.
  *
- * @return The list of users.
+ * @constreturn The list of users.
  */
-const GList *purple_conv_chat_get_users(const PurpleConvChat *chat);
+GList *purple_conv_chat_get_users(const PurpleConvChat *chat);
 
 /**
  * Ignores a user in a chat room.
@@ -912,7 +912,7 @@
  *
  * @return The list of ignored users.
  */
-const GList *purple_conv_chat_get_ignored(const PurpleConvChat *chat);
+GList *purple_conv_chat_get_ignored(const PurpleConvChat *chat);
 
 /**
  * Returns the actual name of the specified ignored user, if it exists in
--- a/libpurple/core.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/core.c	Thu Jun 21 20:37:57 2007 +0000
@@ -489,13 +489,33 @@
 			/* We're only going to duplicate a logs symlink. */
 			if (!strcmp(entry, "logs"))
 			{
+				char *link;
+#if GLIB_CHECK_VERSION(2,4,0)
+				GError *err = NULL;
+
+				if ((link = g_file_read_link(name, &err)) == NULL)
+				{
+					char *name_utf8 = g_filename_to_utf8(name, -1, NULL, NULL, NULL);
+					purple_debug_error("core", "Error reading symlink %s: %s. Please report this at http://developer.pidgin.im\n",
+					                   name_utf8 ? name_utf8 : name, err->message);
+					g_free(name_utf8);
+					g_error_free(err);
+					g_free(name);
+					g_dir_close(dir);
+					g_free(status_file);
+					g_free(old_user_dir);
+					return FALSE;
+				}
+#else
 				char buf[MAXPATHLEN];
 				size_t linklen;
 
 				if ((linklen = readlink(name, buf, sizeof(buf) - 1) == -1))
 				{
+					char *name_utf8 = g_filename_to_utf8(name, -1, NULL, NULL, NULL);
 					purple_debug_error("core", "Error reading symlink %s: %s. Please report this at http://developer.pidgin.im\n",
-					                   name, strerror(errno));
+					                   name_utf8, strerror(errno));
+					g_free(name_utf8);
 					g_free(name);
 					g_dir_close(dir);
 					g_free(status_file);
@@ -504,13 +524,18 @@
 				}
 				buf[linklen] = '\0';
 
-				logs_dir = g_strconcat(user_dir, G_DIR_SEPARATOR_S "logs", NULL);
+				/* This way we don't have to GLIB_VERSION_CHECK every g_free(link) below. */
+				link = g_strdup(buf);
+#endif
 
-				if (!strcmp(buf, "../.purple/logs") || !strcmp(buf, logs_dir))
+				logs_dir = g_build_filename(user_dir, "logs", NULL);
+
+				if (!strcmp(link, "../.purple/logs") || !strcmp(link, logs_dir))
 				{
 					/* If the symlink points to the new directory, we're
 					 * likely just trying again after a failed migration,
 					 * so there's no need to fail here. */
+					g_free(link);
 					g_free(logs_dir);
 					continue;
 				}
@@ -522,12 +547,13 @@
 				g_unlink(logs_dir);
 
 				/* Relative links will most likely still be
-				 * valid from ~/.purple, though not it's not
+				 * valid from ~/.purple, though it's not
 				 * guaranteed.  Oh well. */
-				if (symlink(buf, logs_dir))
+				if (symlink(link, logs_dir))
 				{
 					purple_debug_error("core", "Error symlinking %s to %s: %s. Please report this at http://developer.pidgin.im\n",
-					                   logs_dir, buf, strerror(errno));
+					                   logs_dir, link, strerror(errno));
+					g_free(link);
 					g_free(name);
 					g_free(logs_dir);
 					g_dir_close(dir);
@@ -536,6 +562,7 @@
 					return FALSE;
 				}
 
+				g_free(link);
 				g_free(logs_dir);
 				continue;
 			}
--- a/libpurple/dbus-analyze-functions.py	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/dbus-analyze-functions.py	Thu Jun 21 20:37:57 2007 +0000
@@ -3,7 +3,7 @@
 import sys
 
 # types translated into "int"
-simpletypes = ["int", "gint", "guint", "gboolean"]
+simpletypes = ["int", "gint", "guint", "gboolean", "gpointer", "size_t", "gssize", "time_t"]
 
 # List "excluded" contains functions that shouldn't be exported via
 # DBus.  If you remove a function from this list, please make sure
@@ -32,8 +32,8 @@
     "purple_log_read",
     ]
 
-# This is a list of functions that return a GList* whose elements are
-# string, not pointers to objects.
+# This is a list of functions that return a GList* or GSList * whose elements
+# are strings, not pointers to objects.
 stringlists = [
     "purple_prefs_get_path_list",
     "purple_prefs_get_string_list",
@@ -41,6 +41,32 @@
     "purple_uri_list_extract_uris",
 ]
 
+# This is a list of functions that return a GList* or GSList* that should
+# not be freed.  Ideally, this information should be obtained from the Doxygen
+# documentation at some point.
+constlists = [
+    "purple_account_get_status_types",
+    "purple_accounts_get_all",
+    "purple_account_option_get_list",
+    "purple_connections_get_all",
+    "purple_connections_get_connecting",
+    "purple_get_conversations",
+    "purple_get_ims",
+    "purple_get_chats",
+    "purple_conv_chat_get_users",
+    "purple_conv_chat_get_ignored",
+    "purple_mime_document_get_fields",
+    "purple_mime_document_get_parts",
+    "purple_mime_part_get_fields",
+    "purple_notify_user_info_get_entries",
+    "purple_request_fields_get_required",
+    "purple_request_field_list_get_selected",
+    "purple_request_field_list_get_items",
+    "purple_savedstatuses_get_all",
+    "purple_status_type_get_attrs",
+    "purple_presence_get_statuses",
+]
+
 pointer = "#pointer#"
 myexception = "My Exception"
 
@@ -93,21 +119,26 @@
 
     def processinput(self, type, name):
         const = False
+        unsigned = False
         if type[0] == "const":
             type = type[1:]
             const = True
 
+        if type[0] == "unsigned":
+            type = type[1:]
+            unsigned = True
+
         if len(type) == 1:
             # simple types (int, gboolean, etc.) and enums
             if (type[0] in simpletypes) or ((type[0].startswith("Purple") and not type[0].endswith("Callback"))):
-                return self.inputsimple(type, name)
+                return self.inputsimple(type, name, unsigned)
 
         # pointers ... 
         if (len(type) == 2) and (type[1] == pointer):
             # strings
             if type[0] in ["char", "gchar"]:
                 if const:
-                    return self.inputstring(type, name)
+                    return self.inputstring(type, name, unsigned)
                 else:
                     raise myexception
 
@@ -152,7 +183,7 @@
                 return self.outputpurplestructure(type, name)
 
             if type[0] in ["GList", "GSList"]:
-                return self.outputlist(type, name, const)
+                return self.outputlist(type, name)
 
         raise myexception
     
@@ -206,12 +237,18 @@
             print "typedef struct _%s %s;" % (type[0], type[0])
             self.knowntypes.append(type[0])
 
-    def inputsimple(self, type, name):
+    def inputsimple(self, type, name, us):
         self.paramshdr.append("%s %s" % (type[0], name))
-        self.inputparams.append(("G_TYPE_INT", name))
+        if us:
+            self.inputparams.append(("G_TYPE_UINT", name))
+        else:
+            self.inputparams.append(("G_TYPE_INT", name))
 
-    def inputstring(self, type, name):
-        self.paramshdr.append("const char *%s" % name)
+    def inputstring(self, type, name, us):
+        if us:
+            self.paramshdr.append("const unsigned char *%s" % name)
+        else:
+            self.paramshdr.append("const char *%s" % name)
         self.inputparams.append(("G_TYPE_STRING", name))
         
     def inputpurplestructure(self, type, name):
@@ -254,7 +291,7 @@
         self.returncode.append("return (%s*) GINT_TO_POINTER(%s);" % (type[0], name));
         self.definepurplestructure(type)
 
-    def outputlist(self, type, name, const):
+    def outputlist(self, type, name):
         self.functiontype = "%s*" % type[0]
         self.decls.append("GArray *%s;" % name)
         self.outputparams.append(('dbus_g_type_get_collection("GArray", G_TYPE_INT)', name))
@@ -298,7 +335,7 @@
         print "\tdbus_message_append_args(reply_DBUS,",
         for param in self.cparamsout:
             if type(param) is str:
-                print "%s," % param
+                print "%s," % param,
             else:
                 print "DBUS_TYPE_%s, &%s," % param,
         print "DBUS_TYPE_INVALID);"
@@ -322,15 +359,23 @@
 
     # input parameters
 
-    def inputsimple(self, type, name):
-        self.cdecls.append("\tdbus_int32_t %s;" % name)
-        self.cparams.append(("INT32", name))
-        self.addintype("i", name)
+    def inputsimple(self, type, name, us):
+        if us:
+            self.cdecls.append("\tdbus_int32_t %s;" % name)
+            self.cparams.append(("INT32", name))
+            self.addintype("i", name)
+        else:
+            self.cdecls.append("\tdbus_uint32_t %s;" % name)
+            self.cparams.append(("UINT32", name))
+            self.addintype("u", name)
 
-    def inputstring(self, type, name):
-        self.cdecls.append("\tconst char *%s;" % name)
+    def inputstring(self, type, name, us):
+        if us:
+            self.cdecls.append("\tconst unsigned char *%s;" % name)
+        else:
+            self.cdecls.append("\tconst char *%s;" % name)
         self.cparams.append(("STRING", name))
-        self.ccode  .append("\tNULLIFY(%s);" % name)
+        self.ccode.append("\t%s = (%s && %s[0]) ? %s : NULL;" % (name,name,name,name))
         self.addintype("s", name)
 
     def inputhash(self, type, name):
@@ -390,28 +435,20 @@
 
     # GList*, GSList*, assume that list is a list of objects
     # unless the function is in stringlists
-    def outputlist(self, type, name, const):
+    def outputlist(self, type, name):
         self.cdecls.append("\tdbus_int32_t %s_LEN;" % name)
         self.ccodeout.append("\tg_free(%s);" % name)
 
-        if const:
-            const_prefix = "const_"
-        else:
-            const_prefix = ""
-
-        if (const):
-            self.cdecls.append("\tconst %s *list;" % type[0]);
-        else:
-            self.cdecls.append("\t%s *list;" % type[0]);
+        self.cdecls.append("\t%s *list;" % type[0]);
 
         if self.function.name in stringlists:
             self.cdecls.append("\tchar **%s;" % name)
             self.ccode.append("\tlist = %s;" % self.call)
-            self.ccode.append("\t%s = (char **)purple_const_%s_to_array(list, &%s_LEN);" % \
+            self.ccode.append("\t%s = (char **)purple_%s_to_array(list, FALSE, &%s_LEN);" % \
                          (name, type[0], name))
-            self.cparamsout.append("\tDBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &%s, %s_LEN" \
+            self.cparamsout.append("DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &%s, %s_LEN" \
                           % (name, name))
-            if (not const):
+            if (not (self.function.name in constlists)):
                 type_name = type[0].lower()[1:]
                 self.ccodeout.append("\tg_%s_foreach(list, (GFunc)g_free, NULL);" % type_name)
                 self.ccodeout.append("\tg_%s_free(list);" % type_name)
@@ -419,11 +456,11 @@
         else:
             self.cdecls.append("\tdbus_int32_t *%s;" % name)
             self.ccode.append("\tlist = %s;" % self.call)
-            self.ccode.append("\t%s = purple_dbusify_const_%s(list, &%s_LEN);" % \
+            self.ccode.append("\t%s = purple_dbusify_%s(list, FALSE, &%s_LEN);" % \
                          (name, type[0], name))
-            if (not const):
+            if (not (self.function.name in constlists)):
                 self.ccode.append("\tg_%s_free(list);" % type[0].lower()[1:])
-            self.cparamsout.append("\tDBUS_TYPE_ARRAY, DBUS_TYPE_INT32, &%s, %s_LEN" \
+            self.cparamsout.append("DBUS_TYPE_ARRAY, DBUS_TYPE_INT32, &%s, %s_LEN" \
                               % (name, name))
             self.addouttype("ai", name)
 
--- a/libpurple/dbus-bindings.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/dbus-bindings.h	Thu Jun 21 20:37:57 2007 +0000
@@ -83,52 +83,14 @@
 					int              first_arg_type,
 					va_list          var_args);
 
-/**
- * @deprecated In 3.0.0, this method will have a signature and behavior
- *             like that of purple_dbusify_const_GList().
- */
 dbus_int32_t* purple_dbusify_GList(GList *list, gboolean free_memory, 
 				 dbus_int32_t *len);
-/**
- * @deprecated In 3.0.0, this method will have a signature and behavior
- *             like that of purple_dbusify_const_GSList().
- */
 dbus_int32_t* purple_dbusify_GSList(GSList *list, gboolean free_memory,
 				  dbus_int32_t *len);
-
-/**
- * @since 2.1.0
- */
-dbus_int32_t* purple_dbusify_const_GList(const GList *list, dbus_int32_t *len);
-
-/**
- * @since 2.1.0
- */
-dbus_int32_t* purple_dbusify_const_GSList(const GSList *list, dbus_int32_t *len);
-
-/**
- * @deprecated In 3.0.0, this method will have a signature and behavior
- *             like that of purple_const_GList_to_array().
- */
 gpointer* purple_GList_to_array(GList *list, gboolean free_memory,
 			      dbus_int32_t *len);
-/**
- * @deprecated In 3.0.0, this method will have a signature and behavior
- *             like that of purple_const_GSList_to_array().
- */
 gpointer* purple_GSList_to_array(GSList *list, gboolean free_memory,
 			      dbus_int32_t *len);
-
-/**
- * @since 2.1.0
- */
-gpointer* purple_const_GList_to_array(const GList *list, dbus_int32_t *len);
-
-/**
- * @since 2.1.0
- */
-gpointer* purple_const_GSList_to_array(const GSList *list, dbus_int32_t *len);
-
 GHashTable *purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error);
 
 const char* empty_to_null(const char *str);
--- a/libpurple/dbus-server.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/dbus-server.c	Thu Jun 21 20:37:57 2007 +0000
@@ -120,7 +120,7 @@
 	if ((id == 0) && (node != NULL))
 	{
 		purple_debug_warning("dbus",
-				"Need to register an object with the dbus subsystem.\n");
+				"Need to register an object with the dbus subsystem. (If you are not a developer, please ignore this message.)\n");
 		return 0;
 	}
 	return id;
@@ -290,45 +290,19 @@
 }
 
 dbus_int32_t *
-purple_dbusify_const_GList(const GList *list, dbus_int32_t *len)
+purple_dbusify_GList(GList *list, gboolean free_memory, dbus_int32_t *len)
 {
 	dbus_int32_t *array;
 	int i;
-	const GList *elem;
+	GList *elem;
 
-	/* g_list_length() should really take a const GList */
-	*len = g_list_length((GList *)list);
+	*len = g_list_length(list);
 	array = g_new0(dbus_int32_t, *len);
 	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
 		array[i] = purple_dbus_pointer_to_id(elem->data);
 
-	return array;
-}
-
-dbus_int32_t *
-purple_dbusify_GList(GList *list, gboolean free_memory, dbus_int32_t *len)
-{
-	dbus_int32_t *array = purple_dbusify_const_GList(list, len);
-
-	if (!free_memory)
-		return array;
-
-	g_list_free(list);
-	return array;
-}
-
-dbus_int32_t *
-purple_dbusify_const_GSList(const GSList *list, dbus_int32_t *len)
-{
-	dbus_int32_t *array;
-	int i;
-	const GSList *elem;
-
-	/* g_slist_length should really take a const GSList */
-	*len = g_slist_length((GSList *)list);
-	array = g_new0(dbus_int32_t, *len);
-	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
-		array[i] = purple_dbus_pointer_to_id(elem->data);
+	if (free_memory)
+		g_list_free(list);
 
 	return array;
 }
@@ -336,26 +310,17 @@
 dbus_int32_t *
 purple_dbusify_GSList(GSList *list, gboolean free_memory, dbus_int32_t *len)
 {
-	dbus_int32_t *array = purple_dbusify_const_GSList(list, len);
-
-	if (!free_memory)
-		return array;
-
-	g_slist_free(list);
-	return array;
-}
+	dbus_int32_t *array;
+	int i;
+	GSList *elem;
 
-gpointer *
-purple_const_GList_to_array(const GList *list, dbus_int32_t *len)
-{
-	gpointer *array;
-	int i;
-	const GList *elem;
+	*len = g_slist_length(list);
+	array = g_new0(dbus_int32_t, *len);
+	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
+		array[i] = purple_dbus_pointer_to_id(elem->data);
 
-	*len = g_list_length((GList *)list);
-	array = g_new0(gpointer, *len);
-	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
-		array[i] = elem->data;
+	if (free_memory)
+		g_slist_free(list);
 
 	return array;
 }
@@ -363,39 +328,36 @@
 gpointer *
 purple_GList_to_array(GList *list, gboolean free_memory, dbus_int32_t *len)
 {
-	gpointer *array = purple_const_GList_to_array(list, len);
-
-	if (!free_memory)
-		return array;
-
-	g_list_free(list);
-	return array;
-}
-
-gpointer *
-purple_const_GSList_to_array(const GSList *list, dbus_int32_t *len)
-{
 	gpointer *array;
 	int i;
-	const GSList *elem;
+	GList *elem;
 
-	*len = g_slist_length((GSList *)list);
+	*len = g_list_length(list);
 	array = g_new0(gpointer, *len);
 	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
 		array[i] = elem->data;
 
+	if (free_memory)
+		g_list_free(list);
+
 	return array;
 }
 
 gpointer *
 purple_GSList_to_array(GSList *list, gboolean free_memory, dbus_int32_t *len)
 {
-	gpointer *array = purple_const_GSList_to_array(list, len);
+	gpointer *array;
+	int i;
+	GSList *elem;
 
-	if (!free_memory)
-		return array;
+	*len = g_slist_length(list);
+	array = g_new0(gpointer, *len);
+	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
+		array[i] = elem->data;
 
-	g_slist_free(list);
+	if (free_memory)
+		g_slist_free(list);
+
 	return array;
 }
 
@@ -798,7 +760,7 @@
 	dbus_message_iter_init_append(signal, &iter);
 
 	if (purple_dbus_message_append_purple_values(&iter, num_values, values, vargs))
-		purple_debug_warning("dbus", "The signal \"%s\" caused some dbus error.\n", name);
+		purple_debug_warning("dbus", "The signal \"%s\" caused some dbus error. (If you are not a developer, please ignore this message.)\n", name);
 
 	dbus_connection_send(purple_dbus_connection, signal, NULL);
 
@@ -835,8 +797,18 @@
 void
 purple_dbus_uninit(void)
 {
-	/* Surely we must do SOME kind of uninitialization? */
+	DBusError error;
+	if (!purple_dbus_connection)
+		return;
 
+	dbus_error_init(&error);
+	dbus_connection_unregister_object_path(purple_dbus_connection, DBUS_PATH_PURPLE);
+	dbus_bus_release_name(purple_dbus_connection, DBUS_SERVICE_PURPLE, &error);
+	dbus_error_free(&error);
+	dbus_connection_unref(purple_dbus_connection);
+	purple_dbus_connection = NULL;
+	purple_signals_disconnect_by_handle(purple_dbus_get_handle());
 	g_free(init_error);
 	init_error = NULL;
 }
+
--- a/libpurple/dbus-useful.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/dbus-useful.c	Thu Jun 21 20:37:57 2007 +0000
@@ -11,7 +11,7 @@
 		       gboolean (*account_test)(const PurpleAccount *account))
 {
 	PurpleAccount *result = NULL;
-	const GList *l;
+	GList *l;
 	char *who;
 
 	if (name)
--- a/libpurple/example/nullclient.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/example/nullclient.c	Thu Jun 21 20:37:57 2007 +0000
@@ -20,6 +20,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
+/* XXX: we probably shouldn't include internal.h in examples */
+#include "internal.h"
+
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
--- a/libpurple/idle.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/idle.c	Thu Jun 21 20:37:57 2007 +0000
@@ -199,7 +199,7 @@
 	/* Idle reporting stuff */
 	if (report_idle && (time_idle >= IDLEMARK))
 	{
-		const GList *l;
+		GList *l;
 		for (l = purple_connections_get_all(); l != NULL; l = l->next)
 		{
 			PurpleConnection *gc = l->data;
@@ -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/imgstore.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/imgstore.c	Thu Jun 21 20:37:57 2007 +0000
@@ -25,6 +25,8 @@
 */
 
 #include <glib.h>
+#include "internal.h"
+
 #include "dbus-maybe.h"
 #include "debug.h"
 #include "imgstore.h"
--- a/libpurple/imgstore.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/imgstore.h	Thu Jun 21 20:37:57 2007 +0000
@@ -28,7 +28,6 @@
 
 #include <glib.h>
 
-struct _PurpleStoredImage;
 typedef struct _PurpleStoredImage PurpleStoredImage;
 
 #ifdef __cplusplus
--- a/libpurple/internal.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/internal.h	Thu Jun 21 20:37:57 2007 +0000
@@ -112,15 +112,17 @@
 #endif
 
 #ifndef MAXPATHLEN
-# define MAXPATHLEN 1024
+# ifdef PATH_MAX
+#  define MAXPATHLEN PATH_MAX
+# else
+#  define MAXPATHLEN 1024
+# endif
 #endif
 
 #ifndef HOST_NAME_MAX
 # define HOST_NAME_MAX 255
 #endif
 
-#define PATHSIZE 1024
-
 #include <glib.h>
 #if !GLIB_CHECK_VERSION(2,4,0)
 #	define G_MAXUINT32 ((guint32) 0xffffffff)
@@ -176,6 +178,14 @@
 #	endif
 #endif
 
+#ifndef G_GNUC_NULL_TERMINATED
+#	if     __GNUC__ >= 4
+#		define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#	else
+#		define G_GNUC_NULL_TERMINATED
+#	endif
+#endif
+
 /* Safer ways to work with static buffers. When using non-static
  * buffers, either use g_strdup_* functions (preferred) or use
  * g_strlcpy/g_strlcpy directly. */
--- a/libpurple/log.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/log.c	Thu Jun 21 20:37:57 2007 +0000
@@ -406,6 +406,9 @@
 	if (g_slist_find(loggers, logger))
 		return;
 	loggers = g_slist_append(loggers, logger);
+	if (strcmp(purple_prefs_get_string("/purple/logging/format"), logger->id) == 0) {
+		purple_prefs_trigger_callback("/purple/logging/format");
+	}
 }
 
 void purple_log_logger_remove (PurpleLogLogger *logger)
@@ -982,7 +985,7 @@
 		GDir *protocol_dir;
 		const gchar *username;
 		gchar *protocol_unescaped;
-		const GList *account_iter;
+		GList *account_iter;
 		GList *accounts = NULL;
 
 		if ((protocol_dir = g_dir_open(protocol_path, 0, NULL)) == NULL) {
--- a/libpurple/mime.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/mime.c	Thu Jun 21 20:37:57 2007 +0000
@@ -29,6 +29,8 @@
 #include <glib/glist.h>
 #include <glib/gstring.h>
 
+#include "internal.h"
+
 /* this should become "util.h" if we ever get this into purple proper */
 #include "debug.h"
 #include "mime.h"
@@ -277,7 +279,7 @@
 }
 
 
-const GList *
+GList *
 purple_mime_part_get_fields(PurpleMimePart *part)
 {
 	g_return_val_if_fail(part != NULL, NULL);
@@ -513,7 +515,7 @@
 }
 
 
-const GList *
+GList *
 purple_mime_document_get_fields(PurpleMimeDocument *doc)
 {
 	g_return_val_if_fail(doc != NULL, NULL);
@@ -537,7 +539,7 @@
 }
 
 
-const GList *
+GList *
 purple_mime_document_get_parts(PurpleMimeDocument *doc)
 {
 	g_return_val_if_fail(doc != NULL, NULL);
--- a/libpurple/mime.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/mime.h	Thu Jun 21 20:37:57 2007 +0000
@@ -90,10 +90,10 @@
  *
  * @param doc The MIME document.
  *
- * @returns   A list of strings indicating the fields (but not the values of
- *            the fields) in the header of doc.
+ * @constreturn A list of strings indicating the fields (but not the values
+ *              of the fields) in the header of doc.
  */
-const GList *purple_mime_document_get_fields(PurpleMimeDocument *doc);
+GList *purple_mime_document_get_fields(PurpleMimeDocument *doc);
 
 /**
  * Get the value of a specific field in the header of a document.
@@ -125,9 +125,9 @@
  *
  * @param doc The MIME document.
  *
- * @returns   List of PurpleMimePart contained within doc.
+ * @constreturn   List of PurpleMimePart contained within doc.
  */
-const GList *purple_mime_document_get_parts(PurpleMimeDocument *doc);
+GList *purple_mime_document_get_parts(PurpleMimeDocument *doc);
 
 /**
  * Create and insert a new part into a MIME document.
@@ -142,10 +142,10 @@
  *
  * @param part The MIME document part.
  *
- * @returns    List of strings indicating the fields (but not the values
- *             of the fields) in the header of part.
+ * @constreturn List of strings indicating the fields (but not the values
+ *              of the fields) in the header of part.
  */
-const GList *purple_mime_part_get_fields(PurpleMimePart *part);
+GList *purple_mime_part_get_fields(PurpleMimePart *part);
 
 
 /**
--- a/libpurple/notify.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/notify.c	Thu Jun 21 20:37:57 2007 +0000
@@ -530,7 +530,7 @@
 	g_free(user_info);
 }
 
-const GList *
+GList *
 purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info)
 {
 	g_return_val_if_fail(user_info != NULL, NULL);
@@ -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/notify.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/notify.h	Thu Jun 21 20:37:57 2007 +0000
@@ -456,9 +456,9 @@
  *
  * @param user_info          The PurpleNotifyUserInfo
  *
- * @result                   A GList of PurpleNotifyUserInfoEntry objects
+ * @constreturn              A GList of PurpleNotifyUserInfoEntry objects
  */
-const GList *purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info);
+GList *purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info);
 
 /**
  * Create a textual representation of a PurpleNotifyUserInfo, separating entries with newline
--- a/libpurple/ntlm.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/ntlm.c	Thu Jun 21 20:37:57 2007 +0000
@@ -25,6 +25,8 @@
 
 #include <glib.h>
 #include <stdlib.h>
+#include "internal.h"
+
 #include "util.h"
 #include "ntlm.h"
 #include "cipher.h"
--- a/libpurple/plugins/Makefile.mingw	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Thu Jun 21 20:37:57 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/joinpart.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Thu Jun 21 20:37:57 2007 +0000
@@ -86,7 +86,7 @@
 	/* If the room is small, don't bother. */
 	chat = PURPLE_CONV_CHAT(conv);
 	threshold = purple_prefs_get_int(THRESHOLD_PREF);
-	if (g_list_length((GList *)purple_conv_chat_get_users(chat)) < threshold)
+	if (g_list_length(purple_conv_chat_get_users(chat)) < threshold)
 		return FALSE;
 
 	/* We always care about our buddies! */
--- a/libpurple/plugins/log_reader.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/newline.c	Thu Jun 21 20:37:57 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/plugins/perl/common/Account.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/Account.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -184,7 +184,7 @@
 purple_account_get_status_types(account)
     Purple::Account account
 PREINIT:
-    const GList *l;
+    GList *l;
 PPCODE:
     for (l = purple_account_get_status_types(account); l != NULL; l = l->next) {
         XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::StatusType")));
@@ -290,7 +290,7 @@
 void
 purple_accounts_get_all()
 PREINIT:
-    const GList *l;
+    GList *l;
 PPCODE:
     for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
         XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Account")));
--- a/libpurple/plugins/perl/common/AccountOpts.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/AccountOpts.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -88,7 +88,7 @@
 purple_account_option_get_list(option)
 	Purple::Account::Option option
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_account_option_get_list(option); l != NULL; l = l->next) {
 		/* XXX These are actually PurpleKeyValuePairs but we don't have a
--- a/libpurple/plugins/perl/common/Connection.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/Connection.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -72,7 +72,7 @@
 void
 purple_connections_get_all()
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_connections_get_all(); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection")));
@@ -81,7 +81,7 @@
 void
 purple_connections_get_connecting()
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_connections_get_connecting(); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection")));
--- a/libpurple/plugins/perl/common/Conversation.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/Conversation.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -62,6 +62,7 @@
 		const_iv(RAW),
 		const_iv(IMAGES),
 		const_iv(NOTIFY),
+		const_iv(NO_LINKIFY),
 	};
 	static const constiv cbflags_const_iv[] = {
 #undef const_iv
@@ -93,7 +94,7 @@
 void
 purple_get_ims()
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_get_ims(); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation")));
@@ -102,7 +103,7 @@
 void
 purple_get_conversations()
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_get_conversations(); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation")));
@@ -111,7 +112,7 @@
 void
 purple_get_chats()
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_get_chats(); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation")));
@@ -354,7 +355,7 @@
 purple_conv_chat_get_users(chat)
 	Purple::Conversation::Chat chat
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_conv_chat_get_users(chat); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
@@ -394,7 +395,7 @@
 purple_conv_chat_get_ignored(chat)
 	Purple::Conversation::Chat chat
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_conv_chat_get_ignored(chat); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
--- a/libpurple/plugins/perl/common/Notify.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/Notify.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -140,7 +140,7 @@
 purple_notify_user_info_get_entries(user_info)
 	Purple::NotifyUserInfo user_info
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	l = purple_notify_user_info_get_entries(user_info);
 	for (; l != NULL; l = l->next) {
--- a/libpurple/plugins/perl/common/Request.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/Request.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -396,7 +396,7 @@
 purple_request_field_list_get_items(field)
 	Purple::Request::Field field
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_request_field_list_get_items(field); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
@@ -410,7 +410,7 @@
 purple_request_field_list_get_selected(field)
 	Purple::Request::Field field
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_request_field_list_get_selected(field); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
@@ -625,7 +625,7 @@
 purple_request_fields_get_required(fields)
 	Purple::Request::Fields fields
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_request_fields_get_required(fields); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Request::Field")));
--- a/libpurple/plugins/perl/common/SavedStatuses.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/SavedStatuses.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -130,7 +130,7 @@
 void
 purple_savedstatuses_get_all()
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_savedstatuses_get_all(); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
@@ -140,7 +140,7 @@
 purple_savedstatuses_get_popular(how_many)
 	unsigned int how_many
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_savedstatuses_get_popular(how_many); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
--- a/libpurple/plugins/perl/common/Status.xs	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/common/Status.xs	Thu Jun 21 20:37:57 2007 +0000
@@ -142,7 +142,7 @@
 purple_presence_get_statuses(presence)
 	Purple::Presence presence
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_presence_get_statuses(presence); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Status")));
@@ -392,7 +392,7 @@
 purple_status_type_get_attrs(status_type)
 	Purple::StatusType status_type
 PREINIT:
-	const GList *l;
+	GList *l;
 PPCODE:
 	for (l = purple_status_type_get_attrs(status_type); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::StatusAttr")));
--- a/libpurple/plugins/perl/perl-common.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/perl-common.h	Thu Jun 21 20:37:57 2007 +0000
@@ -9,6 +9,9 @@
 #include <EXTERN.h>
 #include <perl.h>
 
+/* XXX: perl defines it's own _ but I think it's safe to undef it */
+#undef _
+#include "internal.h"
 #include "plugin.h"
 #include "value.h"
 
--- a/libpurple/plugins/perl/perl-handlers.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/perl/perl-handlers.c	Thu Jun 21 20:37:57 2007 +0000
@@ -214,6 +214,7 @@
 perl_timeout_cb(gpointer data)
 {
 	PurplePerlTimeoutHandler *handler = (PurplePerlTimeoutHandler *)data;
+	gboolean ret = FALSE;
 
 	dSP;
 	ENTER;
@@ -224,16 +225,16 @@
 	call_sv(handler->callback, G_EVAL | G_SCALAR);
 	SPAGAIN;
 
+	ret = POPi;
+
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
 
-	/* We're returning FALSE, so no need to manually remove the source */
-	handler->iotag = 0;
+	if (ret == FALSE)
+		destroy_timeout_handler(handler);
 
-	destroy_timeout_handler(handler);
-
-	return FALSE;
+	return ret;
 }
 
 typedef void *DATATYPE;
--- a/libpurple/plugins/startup.py	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/startup.py	Thu Jun 21 20:37:57 2007 +0000
@@ -25,6 +25,13 @@
 import dbus
 import os
 
+if len(sys.argv) == 1:
+	print "Usage:", sys.argv[0], """<purple-client> [arguments]
+
+Example:
+	""", sys.argv[0], "pidgin -d -c /my/home"
+	sys.exit(1)
+
 home = os.path.expanduser('~/.purple/')
 for arg in range(1, len(sys.argv[1:])):
 	if sys.argv[arg] == "-c":
--- a/libpurple/plugins/tcl/tcl_cmds.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_cmds.c	Thu Jun 21 20:37:57 2007 +0000
@@ -43,7 +43,7 @@
 static PurpleAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp)
 {
 	PurpleAccount *account;
-	const GList *cur;
+	GList *cur;
 
 	account = purple_tcl_ref_get(interp, obj, PurpleTclRefAccount);
 
@@ -62,7 +62,7 @@
 static PurpleConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp)
 {
 	PurpleConversation *convo;
-	const GList *cur;
+	GList *cur;
 
 	convo = purple_tcl_ref_get(interp, obj, PurpleTclRefConversation);
 
@@ -81,7 +81,7 @@
 static PurpleConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp)
 {
 	PurpleConnection *gc;
-	const GList *cur;
+	GList *cur;
 
 	gc = purple_tcl_ref_get(interp, obj, PurpleTclRefConnection);
 
@@ -113,7 +113,7 @@
 	const char *listopts[] = { "-all", "-online", NULL };
 	enum { CMD_ACCOUNTLIST_ALL, CMD_ACCOUNTLIST_ONLINE } listopt;
 	const char *alias;
-	const GList *cur;
+	GList *cur;
 	PurpleAccount *account;
 	PurpleStatus *status;
 	PurpleStatusType *status_type;
@@ -612,7 +612,7 @@
 	const char *cmds[] = { "account", "displayname", "handle", "list", NULL };
 	enum { CMD_CONN_ACCOUNT, CMD_CONN_DISPLAYNAME, CMD_CONN_HANDLE, CMD_CONN_LIST } cmd;
 	int error;
-	const GList *cur;
+	GList *cur;
 	PurpleConnection *gc;
 
 	if (objc < 2) {
@@ -680,7 +680,7 @@
 	PurpleConversation *convo;
 	PurpleAccount *account;
 	PurpleConversationType type;
-	const GList *cur;
+	GList *cur;
 	char *opt, *from, *what;
 	int error, argsused, flags = 0;
 
@@ -1082,7 +1082,7 @@
 	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	Tcl_Obj *list, *elem;
 	PurplePresence *presence;
-	const GList *cur;
+	GList *cur;
 	int error, idle, idle_time, login_time;
 
 	if (objc < 2) {
@@ -1524,7 +1524,7 @@
 	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	PurpleStatusType *status_type;
 	Tcl_Obj *list, *elem;
-	const GList *cur;
+	GList *cur;
 	int error;
 
 	if (objc < 2) {
--- a/libpurple/pounce.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/pounce.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1014,6 +1014,20 @@
 	return pounces;
 }
 
+GList *purple_pounces_get_all_for_ui(const char *ui)
+{
+	GList *list = NULL, *iter;
+	g_return_val_if_fail(ui != NULL, NULL);
+
+	for (iter = pounces; iter; iter = iter->next) {
+		PurplePounce *pounce = iter->data;
+		if (pounce->ui_type && strcmp(pounce->ui_type, ui) == 0)
+			list = g_list_prepend(list, pounce);
+	}
+	list = g_list_reverse(list);
+	return list;
+}
+
 static void
 free_pounce_handler(gpointer user_data)
 {
--- a/libpurple/pounce.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/pounce.h	Thu Jun 21 20:37:57 2007 +0000
@@ -343,6 +343,17 @@
 GList *purple_pounces_get_all(void);
 
 /**
+ * Returns a list of registered buddy pounces for the ui-type.
+ *
+ * @param ui  The ID of the UI using the core.
+ *
+ * @return The list of buddy pounces. The list should be freed by
+ *         the caller when it's no longer used.
+ * @since  2.1.0
+ */
+GList *purple_pounces_get_all_for_ui(const char *ui);
+
+/**
  * Returns the buddy pounce subsystem handle.
  *
  * @return The subsystem handle.
--- a/libpurple/prefs.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/prefs.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1355,7 +1355,6 @@
 	purple_prefs_remove("/plugins/core/autorecon/hide_reconnecting_dialog");
 	purple_prefs_remove("/plugins/core/autorecon/restore_state");
 	purple_prefs_remove("/plugins/core/autorecon");
-	purple_prefs_remove("/purple/debug/timestamps");
 
 	/* Convert old sounds while_away pref to new 3-way pref. */
 	if (purple_prefs_exists("/purple/sound/while_away") &&
--- a/libpurple/protocols/Makefile.mingw	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/Makefile.mingw	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Thu Jun 21 20:37:57 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/gg/gg.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/gg/gg.c	Thu Jun 21 20:37:57 2007 +0000
@@ -823,7 +823,7 @@
 {
 	GGPInfo *info = gc->proto_data;
 	PurpleRequestField *field;
-	const GList *sel;
+	GList *sel;
 
 	field = purple_request_fields_get_field(fields, "name");
 	sel = purple_request_field_list_get_selected(field);
--- a/libpurple/protocols/gg/gg.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/gg/gg.h	Thu Jun 21 20:37:57 2007 +0000
@@ -25,6 +25,7 @@
 #define _PURPLE_GG_H
 
 #include <libgadu.h>
+#include "internal.h"
 #include "search.h"
 #include "connection.h"
 
--- a/libpurple/protocols/irc/irc.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/irc/irc.c	Thu Jun 21 20:37:57 2007 +0000
@@ -592,7 +592,7 @@
 	struct irc_conn *irc = gc->proto_data;
 	int len;
 
-	if(!g_list_find((GList *)purple_connections_get_all(), gc)) {
+	if(!g_list_find(purple_connections_get_all(), gc)) {
 		purple_ssl_close(gsc);
 		return;
 	}
--- a/libpurple/protocols/jabber/buddy.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Thu Jun 21 20:37:57 2007 +0000
@@ -385,6 +385,11 @@
 	xmlnode *vc_node;
 	struct tag_attr *tag_attr;
 
+	/* if we have't grabbed the remote vcard yet, we can't
+	 * assume that what we have here is correct */
+	if(!js->vcard_fetched)
+		return;
+
 	g_free(js->avatar_hash);
 	js->avatar_hash = NULL;
 
@@ -443,14 +448,9 @@
 
 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 {
-	PurplePresence *gpresence;
-	PurpleStatus *status;
-
 	jabber_set_info(gc, purple_account_get_user_info(gc->account));
 
-	gpresence = purple_account_get_presence(gc->account);
-	status = purple_presence_get_active_status(gpresence);
-	jabber_presence_send(gc->account, status);
+	jabber_presence_send(gc->account, NULL);
 }
 
 /*
@@ -739,6 +739,40 @@
 	}
 }
 
+static void jabber_vcard_save_mine(JabberStream *js, xmlnode *packet, gpointer data)
+{
+	xmlnode *vcard;
+	char *txt;
+	PurpleStoredImage *img;
+
+	if((vcard = xmlnode_get_child(packet, "vCard")) ||
+			(vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp")))
+	{
+		txt = xmlnode_to_str(vcard, NULL);
+		purple_account_set_user_info(purple_connection_get_account(js->gc), txt);
+
+		g_free(txt);
+	} else {
+		/* if we have no vCard, then lets not overwrite what we might have locally */
+	}
+
+	js->vcard_fetched = TRUE;
+
+	if(NULL != (img = purple_buddy_icons_find_account_icon(js->gc->account))) {
+		jabber_set_buddy_icon(js->gc, img);
+		purple_imgstore_unref(img);
+	}
+}
+
+void jabber_vcard_fetch_mine(JabberStream *js)
+{
+	JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, "vcard-temp");
+
+	jabber_iq_set_callback(iq, jabber_vcard_save_mine, NULL);
+
+	jabber_iq_send(iq);
+}
+
 static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 {
 	const char *id, *from;
--- a/libpurple/protocols/jabber/buddy.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.h	Thu Jun 21 20:37:57 2007 +0000
@@ -103,4 +103,6 @@
 
 void jabber_buddy_remove_all_pending_buddy_info_requests(JabberStream *js);
 
+void jabber_vcard_fetch_mine(JabberStream *js);
+
 #endif /* _PURPLE_JABBER_BUDDY_H_ */
--- a/libpurple/protocols/jabber/disco.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/disco.c	Thu Jun 21 20:37:57 2007 +0000
@@ -96,6 +96,7 @@
 			SUPPORT_FEATURE("http://jabber.org/protocol/si")
 			SUPPORT_FEATURE("http://jabber.org/protocol/si/profile/file-transfer")
 			SUPPORT_FEATURE("http://jabber.org/protocol/xhtml-im")
+			SUPPORT_FEATURE("urn:xmpp:ping")
 		} else {
 			xmlnode *error, *inf;
 
@@ -217,18 +218,15 @@
 static void
 jabber_disco_finish_server_info_result_cb(JabberStream *js)
 {
-	PurplePresence *gpresence;
-	PurpleStatus *status;
+
+	jabber_vcard_fetch_mine(js);
 
 	if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
 		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
 		jabber_roster_request(js);
 	}
 
-	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
-	gpresence = purple_account_get_presence(js->gc->account);
-	status = purple_presence_get_active_status(gpresence);
-	jabber_presence_send(js->gc->account, status);
+	/* when we get the roster back, we'll send our initial presence */
 }
 
 static void
--- a/libpurple/protocols/jabber/google.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/google.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1,4 +1,3 @@
-
 /**
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
@@ -30,7 +29,7 @@
 #include "presence.h"
 #include "iq.h"
 
-static void 
+static void
 jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
 {
 	const char *type = xmlnode_get_attrib(packet, "type");
@@ -40,57 +39,57 @@
 	const char *in_str;
 	char *to_name;
 	int i, count = 1, returned_count;
-	
+
 	const char **tos, **froms, **subjects, **urls;
-	
+
 	if (strcmp(type, "result"))
 		return;
-	
+
 	child = xmlnode_get_child(packet, "mailbox");
 	if (!child)
 		return;
 
 	in_str = xmlnode_get_attrib(child, "total-matched");
-	if (in_str && *in_str) 
+	if (in_str && *in_str)
 		count = atoi(in_str);
- 
-	if (count == 0) 
+
+	if (count == 0)
 		return;
 
 	message = xmlnode_get_child(child, "mail-thread-info");
-	
+
 	/* Loop once to see how many messages were returned so we can allocate arrays
 	 * accordingly */
-	if (!message) 
+	if (!message)
 		return;
 	for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
-	
+
 	froms    = g_new0(const char* , returned_count);
 	tos      = g_new0(const char* , returned_count);
 	subjects = g_new0(const char* , returned_count);
 	urls     = g_new0(const char* , returned_count);
-	
+
 	to = xmlnode_get_attrib(packet, "to");
 	to_name = jabber_get_bare_jid(to);
 	url = xmlnode_get_attrib(child, "url");
 	if (!url || !*url)
 		url = "http://www.gmail.com";
-	
+
 	message= xmlnode_get_child(child, "mail-thread-info");
 	for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
 		subject_node = xmlnode_get_child(message, "subject");
 		sender_node  = xmlnode_get_child(message, "senders");
 		sender_node  = xmlnode_get_child(sender_node, "sender");
 
-		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") || 
+		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
 		       !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
 			sender_node = xmlnode_get_next_twin(sender_node);
-		
+
 		if (!sender_node) {
 			i--;
 			continue;
 		}
-			
+
 		from = xmlnode_get_attrib(sender_node, "name");
 		if (!from || !*from)
 			from = xmlnode_get_attrib(sender_node, "address");
@@ -102,18 +101,18 @@
 		froms[i] = (from != NULL ?  from : "");
 		subjects[i] = (subject != NULL ? subject : "");
 		urls[i] = (url != NULL ? url : "");
-		
+
 		tid = xmlnode_get_attrib(message, "tid");
-		if (tid && 
+		if (tid &&
 		    (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
 			g_free(js->gmail_last_tid);
 			js->gmail_last_tid = g_strdup(tid);
 		}
 	}
 
-	if (i>0) 
-		purple_notify_emails(js->gc, count, count == returned_count, subjects, froms, tos, 
-				   	   urls, NULL, NULL);
+	if (i>0)
+		purple_notify_emails(js->gc, count, count == returned_count, subjects, froms, tos,
+				urls, NULL, NULL);
 
 	g_free(to_name);
 	g_free(tos);
@@ -128,19 +127,19 @@
 	}
 }
 
-void 
-jabber_gmail_poke(JabberStream *js, xmlnode *packet) 
+void
+jabber_gmail_poke(JabberStream *js, xmlnode *packet)
 {
 	const char *type;
 	xmlnode *query;
 	JabberIq *iq;
-	
+
 	/* bail if the user isn't interested */
 	if (!purple_account_get_check_mail(js->gc->account))
 		return;
 
 	type = xmlnode_get_attrib(packet, "type");
-	
+
 
 	/* Is this an initial incoming mail notification? If so, send a request for more info */
 	if (strcmp(type, "set") || !xmlnode_get_child(packet, "new-mail"))
@@ -165,7 +164,7 @@
 void jabber_gmail_init(JabberStream *js) {
 	JabberIq *iq;
 
-	if (!purple_account_get_check_mail(js->gc->account)) 
+	if (!purple_account_get_check_mail(js->gc->account))
 		return;
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
@@ -180,7 +179,7 @@
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
 	query = xmlnode_get_child(iq->node, "query");
-	
+
 	xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
 	xmlnode_set_attrib(query, "gr:ext", "2");
 
@@ -218,14 +217,14 @@
 
 	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster");
 	const char *subscription = xmlnode_get_attrib(item, "subscription");
-	
+
 	if (!subscription || !strcmp(subscription, "none")) {
 		/* The Google Talk servers will automatically add people from your Gmail address book
 		 * with subscription=none. If we see someone with subscription=none, ignore them.
 		 */
 		return FALSE;
 	}
-	
+
 	while (list) {
 		if (!strcmp(jid_norm, (char*)list->data)) {
 			on_block_list = TRUE;
@@ -233,13 +232,13 @@
 		}
 		list = list->next;
 	}
-	
+
 	if (grt && (*grt == 'H' || *grt == 'h')) {
 		PurpleBuddy *buddy = purple_find_buddy(account, jid_norm);
 		purple_blist_remove_buddy(buddy);
 		return FALSE;
 	}
-	
+
 	if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
 		purple_debug_info("jabber", "Blocking %s\n", jid_norm);
 		purple_privacy_deny_add(account, jid_norm, TRUE);
@@ -250,7 +249,7 @@
 	return TRUE;
 }
 
-void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who) 
+void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who)
 {
 	JabberStream *js;
 	GSList *buddies;
@@ -262,7 +261,7 @@
 	JabberBuddy *jb;
 
 	js = (JabberStream*)(gc->proto_data);
-	
+
 	if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 		return;
 
@@ -271,11 +270,11 @@
 	buddies = purple_find_buddies(js->gc->account, who);
 	if(!buddies)
 		return;
-	
+
 	b = buddies->data;
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-	
+
 	query = xmlnode_get_child(iq->node, "query");
 	item = xmlnode_new_child(query, "item");
 
@@ -287,7 +286,7 @@
 
 		group = xmlnode_new_child(item, "group");
 		xmlnode_insert_data(group, g->name, -1);
-		
+
 		buddies = buddies->next;
 	}
 
@@ -333,20 +332,20 @@
 
 	g_return_if_fail(gc != NULL);
 	g_return_if_fail(who != NULL);
-	
+
 	js = (JabberStream*)(gc->proto_data);
-	
+
 	if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 		return;
-	
+
 	buddies = purple_find_buddies(js->gc->account, who);
 	if(!buddies)
 		return;
-	
+
 	b = buddies->data;
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-	
+
 	query = xmlnode_get_child(iq->node, "query");
 	item = xmlnode_new_child(query, "item");
 
@@ -358,7 +357,7 @@
 
 		group = xmlnode_new_child(item, "group");
 		xmlnode_insert_data(group, g->name, -1);
-		
+
 		buddies = buddies->next;
 	}
 
@@ -440,15 +439,15 @@
 
 	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
 		gunichar c = g_utf8_get_char(p);
- 
+
 		if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
 			g_string_append(str, p);
 			return g_string_free(str, FALSE);
 		}
 
-		
+
 		if (c == '*' && !in_tag) {
-			if (in_bold && 
+			if (in_bold &&
 			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
 				str = g_string_append(str, "</b>");
 				in_bold = FALSE;
@@ -490,6 +489,6 @@
 		} else {
 			str = g_string_append_unichar(str, c);
 		}
-	}	
+	}
 	return g_string_free(str, FALSE);
 }
--- a/libpurple/protocols/jabber/iq.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/iq.c	Thu Jun 21 20:37:57 2007 +0000
@@ -201,6 +201,29 @@
 		xmlnode_insert_data(xmlnode_new_child(query, "display"), date, -1);
 
 		jabber_iq_send(iq);
+	} else {
+		/* XXX: error */
+	}
+}
+
+static void urn_xmpp_ping_parse(JabberStream *js, xmlnode *packet)
+{
+	const char *type, *id, *from;
+	JabberIq *iq;
+
+	type = xmlnode_get_attrib(packet, "type");
+	from = xmlnode_get_attrib(packet, "from");
+	id = xmlnode_get_attrib(packet, "id");
+
+	if(type && !strcmp(type, "get")) {
+		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, "urn:xmpp:ping");
+
+		jabber_iq_set_id(iq, id);
+		xmlnode_set_attrib(iq->node, "to", from);
+
+		jabber_iq_send(iq);
+	} else {
+		/* XXX: error */
 	}
 }
 
@@ -232,7 +255,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);
@@ -327,6 +351,7 @@
 	jabber_iq_register_handler("http://jabber.org/protocol/disco#info", jabber_disco_info_parse);
 	jabber_iq_register_handler("http://jabber.org/protocol/disco#items", jabber_disco_items_parse);
 	jabber_iq_register_handler("jabber:iq:register", jabber_register_parse);
+	jabber_iq_register_handler("urn:xmpp:ping", urn_xmpp_ping_parse);
 }
 
 void jabber_iq_uninit(void)
--- a/libpurple/protocols/jabber/jabber.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1038,8 +1038,6 @@
 
 void jabber_stream_set_state(JabberStream *js, JabberStreamState state)
 {
-	PurpleStoredImage *img;
-
 	js->state = state;
 	switch(state) {
 		case JABBER_STREAM_OFFLINE:
@@ -1071,14 +1069,6 @@
 
 			break;
 		case JABBER_STREAM_CONNECTED:
-			/* lets make sure our buddy icon is up to date
-			 * before we go letting people know we're here */
-			img = purple_buddy_icons_find_account_icon(js->gc->account);
-			if(NULL != img) {
-				jabber_set_buddy_icon(js->gc, img);
-				purple_imgstore_unref(img);
-			}
-
 			/* now we can alert the core that we're ready to send status */
 			purple_connection_set_state(js->gc, PURPLE_CONNECTED);
 			jabber_disco_items_server(js);
--- a/libpurple/protocols/jabber/jabber.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Thu Jun 21 20:37:57 2007 +0000
@@ -142,11 +142,17 @@
 #ifdef HAVE_CYRUS_SASL
 	sasl_conn_t *sasl;
 	sasl_callback_t *sasl_cb;
+#else /* keep the struct the same size */
+	void *sasl;
+	void *sasl_cb;
+#endif
+
 	int sasl_state;
 	int sasl_maxbuf;
 	GString *sasl_mechs;
 	char *serverFQDN;
-#endif
+
+	gboolean vcard_fetched;
 
 } JabberStream;
 
--- a/libpurple/protocols/jabber/jutil.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Thu Jun 21 20:37:57 2007 +0000
@@ -221,7 +221,7 @@
 jabber_find_unnormalized_conv(const char *name, PurpleAccount *account)
 {
 	PurpleConversation *c = NULL;
-	const GList *cnv;
+	GList *cnv;
 
 	g_return_val_if_fail(name != NULL, NULL);
 
--- a/libpurple/protocols/jabber/libxmpp.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Thu Jun 21 20:37:57 2007 +0000
@@ -25,8 +25,9 @@
  * share code.
  */
 
+#include "internal.h"
+
 #include "accountopt.h"
-#include "internal.h"
 #include "version.h"
 
 #include "iq.h"
@@ -66,7 +67,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	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu Jun 21 20:37:57 2007 +0000
@@ -102,6 +102,11 @@
 	JabberBuddyState state;
 	int priority;
 
+	if(NULL == status) {
+		PurplePresence *gpresence = purple_account_get_presence(account);
+		status = purple_presence_get_active_status(gpresence);
+	}
+
 	if(!purple_status_is_active(status))
 		return;
 
@@ -115,6 +120,12 @@
 	gc = purple_account_get_connection(account);
 	js = gc->proto_data;
 
+	/* we don't want to send presence before we've gotten our roster */
+	if(!js->roster_parsed) {
+		purple_debug_info("jabber", "attempt to send presence before roster retrieved\n");
+		return;
+	}
+
 	purple_status_to_jabber(status, &state, &stripped, &priority);
 
 
@@ -379,8 +390,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 +419,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 +435,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 +518,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 +575,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 +614,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/jabber/roster.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/roster.c	Thu Jun 21 20:37:57 2007 +0000
@@ -153,8 +153,6 @@
 	if(!query)
 		return;
 
-	js->roster_parsed = TRUE;
-
 	for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item))
 	{
 		const char *jid, *name, *subscription, *ask;
@@ -232,6 +230,14 @@
 			add_purple_buddies_to_groups(js, jid, name, groups);
 		}
 	}
+
+	/* if we're just now parsing the roster for the first time,
+	 * then now would be the time to send our initial presence */
+	if(!js->roster_parsed) {
+		js->roster_parsed = TRUE;
+
+		jabber_presence_send(js->gc->account, NULL);
+	}
 }
 
 static void jabber_roster_update(JabberStream *js, const char *name,
--- a/libpurple/protocols/jabber/si.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/si.c	Thu Jun 21 20:37:57 2007 +0000
@@ -20,9 +20,9 @@
  *
  */
 
-#include "blist.h"
+#include "internal.h"
 
-#include "internal.h"
+#include "blist.h"
 #include "cipher.h"
 #include "debug.h"
 #include "ft.h"
--- a/libpurple/protocols/jabber/xdata.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Thu Jun 21 20:37:57 2007 +0000
@@ -93,7 +93,7 @@
 				case JABBER_X_DATA_LIST_SINGLE:
 				case JABBER_X_DATA_LIST_MULTI:
 					{
-					const GList *selected = purple_request_field_list_get_selected(field);
+					GList *selected = purple_request_field_list_get_selected(field);
 					char *value;
 					fieldnode = xmlnode_new_child(result, "field");
 					xmlnode_set_attrib(fieldnode, "var", id);
--- a/libpurple/protocols/msn/msn.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1463,7 +1463,7 @@
 	purple_debug_info("msn", "In msn_got_info\n");
 
 	/* Make sure the connection is still valid */
-	if (g_list_find((GList *)purple_connections_get_all(), info_data->gc) == NULL)
+	if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL)
 	{
 		purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n");
 		g_free(info_data->name);
@@ -1883,7 +1883,7 @@
 
 	/* Make sure the connection is still valid if we got here by fetching a photo url */
 	if (url_text && (error_message != NULL ||
-					 g_list_find((GList *)purple_connections_get_all(), info_data->gc) == NULL))
+					 g_list_find(purple_connections_get_all(), info_data->gc) == NULL))
 	{
 		purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
 		g_free(stripped);
@@ -1982,7 +1982,7 @@
 		if (acct && !purple_account_is_connected(acct))
 			acct = NULL;
 	} else { /* Otherwise find an active account for the protocol */
-		const GList *l = purple_accounts_get_all();
+		GList *l = purple_accounts_get_all();
 		while (l) {
 			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
 					&& purple_account_is_connected(l->data)) {
--- a/libpurple/protocols/msn/notification.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/msn/servconn.c	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Thu Jun 21 20:37:57 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/msn/switchboard.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Thu Jun 21 20:37:57 2007 +0000
@@ -422,7 +422,7 @@
 					break;
 				case MSN_SB_ERROR_AUTHFAILED:
 					str_reason = _("Message could not be sent "
-								   "because we wer unable to establish a "
+								   "because we were unable to establish a "
 								   "session with the server. This is "
 								   "likely a server problem, try again in "
 								   "a few minutes:");
--- a/libpurple/protocols/oscar/oscar.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu Jun 21 20:37:57 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);
@@ -2809,6 +2827,7 @@
 	va_list ap;
 	guint16 reason;
 	char *destn;
+	PurpleNotifyUserInfo *user_info;
 
 	va_start(ap, fr);
 	reason = (guint16) va_arg(ap, unsigned int);
@@ -2818,12 +2837,12 @@
 	if (destn == NULL)
 		return 1;
 
+	user_info = purple_notify_user_info_new();
 	buf = g_strdup_printf(_("User information not available: %s"), (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason."));
-	if (!purple_conv_present_error(destn, purple_connection_get_account((PurpleConnection*)od->gc), buf)) {
-		g_free(buf);
-		buf = g_strdup_printf(_("User information for %s unavailable:"), destn);
-		purple_notify_error(od->gc, NULL, buf, (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason."));
-	}
+	purple_notify_user_info_add_pair(user_info, NULL, buf);
+	purple_notify_userinfo(od->gc, destn, user_info, NULL, NULL);
+	purple_notify_user_info_destroy(user_info);
+	purple_conv_present_error(destn, purple_connection_get_account(od->gc), buf);
 	g_free(buf);
 
 	return 1;
@@ -2849,12 +2868,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 +2895,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 +2916,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 +2931,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 +2952,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 +2965,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 +2985,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 +3183,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 +3202,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 +4192,7 @@
 	PeerConnection *conn;
 	int ret;
 	char *tmp1, *tmp2;
+	gboolean is_html;
 
 	od = (OscarData *)gc->proto_data;
 	account = purple_connection_get_account(gc);
@@ -4185,7 +4211,6 @@
 	} else {
 		struct buddyinfo *bi;
 		struct aim_sendimext_args args;
-		gsize len;
 		PurpleConversation *conv;
 		PurpleStoredImage *img;
 
@@ -4276,22 +4301,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 +5369,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 +5381,6 @@
 		return -EINVAL;
 
 	buf = purple_strdup_withhtml(message);
-	len = strlen(buf);
 
 	if (strstr(buf, "<IMG "))
 		purple_conversation_write(conv, "",
@@ -5349,8 +5394,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 +5426,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;
 }
@@ -5507,7 +5573,7 @@
 	status = purple_presence_get_active_status(presence);
 	id = purple_status_get_id(status);
 
-	if (!purple_presence_is_online(presence))
+	if ((od != NULL) && !purple_presence_is_online(presence))
 	{
 		char *gname = aim_ssi_itemlist_findparentname(od->ssi.local, b->name);
 		if (aim_ssi_waitingforauth(od->ssi.local, gname, b->name))
@@ -6493,7 +6559,7 @@
 		if (acct && !purple_account_is_connected(acct))
 			acct = NULL;
 	} else { /* Otherwise find an active account for the protocol */
-		const GList *l = purple_accounts_get_all();
+		GList *l = purple_accounts_get_all();
 		while (l) {
 			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
 					&& purple_account_is_connected(l->data)) {
--- a/libpurple/protocols/oscar/oscar.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Thu Jun 21 20:37:57 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/Makefile.am	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Thu Jun 21 20:37:57 2007 +0000
@@ -34,8 +34,6 @@
 	group_info.h \
 	group_join.c \
 	group_join.h \
-	group_misc.c \
-	group_misc.h \
 	group_network.c \
 	group_network.h \
 	group_opt.c \
--- a/libpurple/protocols/qq/buddy_list.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/buddy_list.c	Thu Jun 21 20:37:57 2007 +0000
@@ -23,8 +23,10 @@
  */
 
 #include <string.h>
+
+#include "qq.h"
+
 #include "debug.h"
-
 #include "notify.h"
 #include "utils.h"
 #include "packet_parse.h"
@@ -35,9 +37,8 @@
 #include "char_conv.h"
 #include "crypt.h"
 #include "header_info.h"
-#include "keep_alive.h"	
+#include "keep_alive.h"
 #include "send_core.h"
-#include "qq.h"	
 #include "group.h"
 #include "group_find.h"
 #include "group_internal.h"
--- a/libpurple/protocols/qq/buddy_status.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/buddy_status.c	Thu Jun 21 20:37:57 2007 +0000
@@ -23,6 +23,7 @@
  */
 
 #include <string.h>
+#include "internal.h"
 #include "debug.h"
 #include "prefs.h"
 
--- a/libpurple/protocols/qq/file_trans.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/file_trans.c	Thu Jun 21 20:37:57 2007 +0000
@@ -26,6 +26,8 @@
 #define random rand
 #endif
 
+#include "internal.h"
+
 #include "debug.h"
 #include "ft.h"
 #include "cipher.h"
--- a/libpurple/protocols/qq/group_conv.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_conv.c	Thu Jun 21 20:37:57 2007 +0000
@@ -23,11 +23,12 @@
  */
 
 #include <glib.h>
+#include "qq.h"
+
 #include "conversation.h"
 
 #include "buddy_status.h"
 #include "group_conv.h"
-#include "qq.h"
 #include "utils.h"
 
 /* show group conversation window */
--- a/libpurple/protocols/qq/group_find.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_find.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,13 +22,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "qq.h"
+
 #include "conversation.h"
 #include "debug.h"
 #include "util.h"
 
 #include "group_find.h"
 #include "group_network.h"
-#include "qq.h"
 #include "utils.h"
 
 /* find the internal_group_id by the reply packet sequence
--- a/libpurple/protocols/qq/group_free.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_free.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 
 #include "buddy_status.h"
--- a/libpurple/protocols/qq/group_im.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_im.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "conversation.h"
 #include "debug.h"
 #include "notify.h"
@@ -341,7 +343,7 @@
 	read_packet_dw(data, cursor, data_len, &(im_group->member_uid));
 	read_packet_w(data, cursor, data_len, &unknown);	/* 0x0001? */
 	read_packet_w(data, cursor, data_len, &(im_group->msg_seq));
-	read_packet_dw(data, cursor, data_len, (guint32 *) & (im_group->send_time));
+	read_packet_time(data, cursor, data_len, &im_group->send_time);
 	read_packet_dw(data, cursor, data_len, &unknown4);	/* versionID */
 	/*
 	 * length includes font_attr
--- a/libpurple/protocols/qq/group_info.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_info.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "conversation.h"
 #include "debug.h"
 
--- a/libpurple/protocols/qq/group_internal.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_internal.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,13 +22,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
 #include "blist.h"
 #include "debug.h"
 
 #include "buddy_opt.h"
 #include "group_free.h"
 #include "group_internal.h"
-#include "group_misc.h"
 #include "utils.h"
 
 static gchar *_qq_group_set_my_status_desc(qq_group *group)
--- a/libpurple/protocols/qq/group_join.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_join.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 #include "notify.h"
 #include "request.h"
--- a/libpurple/protocols/qq/group_misc.c	Tue Jun 19 19:40:06 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/**
- * @file group_misc.c
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "debug.h"
-
-#include "buddy_status.h"
-#include "group_misc.h"
-#include "utils.h"
--- a/libpurple/protocols/qq/group_misc.h	Tue Jun 19 19:40:06 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/**
- * @file group_misc.h
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _QQ_GROUP_MISC_H_
-#define _QQ_GROUP_MISC_H_
-
-#include <glib.h>
-#include "group.h"
-
-#endif
--- a/libpurple/protocols/qq/group_network.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_network.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 #include "notify.h"
 
--- a/libpurple/protocols/qq/group_opt.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_opt.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "qq.h"
+
 #include "debug.h"
 #include "notify.h"
 #include "request.h"
@@ -35,7 +37,6 @@
 #include "group_network.h"
 #include "group_opt.h"
 #include "packet_parse.h"
-#include "qq.h"
 #include "utils.h"
 
 /* TODO: can't we use qsort here? */
--- a/libpurple/protocols/qq/group_search.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/group_search.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 
 #include "char_conv.h"
--- a/libpurple/protocols/qq/header_info.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/header_info.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "header_info.h"
 
 #define QQ_CLIENT_062E 0x062e	/* GB QQ2000c build 0630 */
--- a/libpurple/protocols/qq/header_info.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/header_info.h	Thu Jun 21 20:37:57 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/libpurple/protocols/qq/im.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/im.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "conversation.h"
 #include "debug.h"
 #include "internal.h"
--- a/libpurple/protocols/qq/keep_alive.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/keep_alive.c	Thu Jun 21 20:37:57 2007 +0000
@@ -28,6 +28,8 @@
  * Puzzlebird, Nov-Dec 2002
  */
 
+#include "internal.h"
+
 #include "debug.h"
 #include "server.h"
 
--- a/libpurple/protocols/qq/login_logout.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/login_logout.c	Thu Jun 21 20:37:57 2007 +0000
@@ -181,7 +181,7 @@
 	/* 031-032: server listening port */
 	bytes += read_packet_w(data, &cursor, len, &lrop.server_port);
 	/* 033-036: login time for current session */
-	bytes += read_packet_dw(data, &cursor, len, (guint32 *) &lrop.login_time);
+	bytes += read_packet_time(data, &cursor, len, &lrop.login_time);
 	/* 037-062: 26 bytes, unknown */
 	bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown1, 26);
 	/* 063-066: unknown server1 ip address */
@@ -203,7 +203,7 @@
 	/* 123-126: login IP of last session */
 	bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.last_client_ip, 4);
 	/* 127-130: login time of last session */
-	bytes += read_packet_dw(data, &cursor, len, (guint32 *) &lrop.last_login_time);
+	bytes += read_packet_time(data, &cursor, len, &lrop.last_login_time);
 	/* 131-138: 8 bytes unknown */
 	bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown6, 8);
 
--- a/libpurple/protocols/qq/packet_parse.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/packet_parse.c	Thu Jun 21 20:37:57 2007 +0000
@@ -65,6 +65,19 @@
 	}
 }
 
+/* read four bytes as "time_t" from buf,
+ * return the number of bytes read if succeeds, otherwise return -1
+ * This function is a wrapper around read_packet_dw() to avoid casting. */
+gint read_packet_time(guint8 *buf, guint8 **cursor, gint buflen, time_t *t)
+{
+	guint32 time;
+	gint ret = read_packet_dw(buf, cursor, buflen, &time);
+	if (ret != -1 ) {
+		*t = time;
+	}
+	return ret;
+}
+
 /* read datalen bytes from buf, 
  * return the number of bytes read if succeeds, otherwise return -1 */
 gint read_packet_data(guint8 *buf, guint8 **cursor, gint buflen, guint8 *data, gint datalen) {
--- a/libpurple/protocols/qq/packet_parse.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/packet_parse.h	Thu Jun 21 20:37:57 2007 +0000
@@ -26,6 +26,7 @@
 #define _QQ_PACKED_PARSE_H_
 
 #include <glib.h>
+#include <time.h>
 
 /* According to "UNIX Network Programming", all TCP/IP implementations
  * must support a minimum IP datagram size of 576 bytes, regardless of the MTU.
@@ -39,6 +40,7 @@
 gint read_packet_b(guint8 *buf, guint8 **cursor, gint buflen, guint8 *b);
 gint read_packet_w(guint8 *buf, guint8 **cursor, gint buflen, guint16 *w);
 gint read_packet_dw(guint8 *buf, guint8 **cursor, gint buflen, guint32 *dw);
+gint read_packet_time(guint8 *buf, guint8 **cursor, gint buflen, time_t *t);
 gint read_packet_data(guint8 *buf, guint8 **cursor, gint buflen, guint8 *data, gint datalen);
 gint create_packet_b(guint8 *buf, guint8 **cursor, guint8 b);
 gint create_packet_w(guint8 *buf, guint8 **cursor, guint16 w);
--- a/libpurple/protocols/qq/qq.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/qq.h	Thu Jun 21 20:37:57 2007 +0000
@@ -26,8 +26,8 @@
 #define _QQ_QQ_H_
 
 #include <glib.h>
+#include "internal.h"
 #include "ft.h"
-#include "internal.h"
 #include "proxy.h"
 #include "roomlist.h"
 
--- a/libpurple/protocols/qq/send_file.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/send_file.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "qq.h"
+
 #include "send_file.h"
 #include "debug.h"
 #include "network.h"
@@ -34,7 +36,6 @@
 #include "im.h"
 #include "keep_alive.h"
 #include "packet_parse.h"
-#include "qq.h"
 #include "send_core.h"
 #include "utils.h"
 
--- a/libpurple/protocols/qq/sendqueue.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/qq/sendqueue.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,9 +22,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "connection.h"
 #include "debug.h"
-#include "internal.h"
 #include "notify.h"
 #include "prefs.h"
 #include "request.h"
--- a/libpurple/protocols/sametime/sametime.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Thu Jun 21 20:37:57 2007 +0000
@@ -2660,7 +2660,7 @@
   GString *str;
 
   PurpleMimeDocument *doc;
-  const GList *parts;
+  GList *parts;
 
   img_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
   images = NULL;
@@ -3401,7 +3401,7 @@
 static void conf_select_prompt_invite(PurpleBuddy *buddy,
 				      PurpleRequestFields *fields) {
   PurpleRequestField *f;
-  const GList *l;
+  GList *l;
   const char *msg;
   
   f = purple_request_fields_get_field(fields, CHAT_KEY_INVITE);
@@ -5268,7 +5268,7 @@
 				       PurpleRequestFields *fields) {
   
   PurpleRequestField *f;
-  const GList *l;
+  GList *l;
 
   f = purple_request_fields_get_field(fields, "group");
   l = purple_request_field_list_get_items(f);
@@ -5334,7 +5334,7 @@
 static void remote_group_multi_cb(struct mwPurplePluginData *pd,
 				  PurpleRequestFields *fields) {
   PurpleRequestField *f;
-  const GList *l;
+  GList *l;
 
   f = purple_request_fields_get_field(fields, "group");
   l = purple_request_field_list_get_selected(f);
--- a/libpurple/protocols/silc/buddy.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/silc/buddy.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1117,7 +1117,7 @@
 silcpurple_add_buddy_select_cb(SilcPurpleBuddyRes r, PurpleRequestFields *fields)
 {
 	PurpleRequestField *f;
-	const GList *list;
+	GList *list;
 	SilcClientEntry client_entry;
 	SilcDList clients;
 
--- a/libpurple/protocols/silc/chat.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/silc/chat.c	Thu Jun 21 20:37:57 2007 +0000
@@ -291,7 +291,7 @@
 	SilcClient client = sg->client;
 	SilcClientConnection conn = sg->conn;
 	PurpleRequestField *f;
-	const GList *list;
+	GList *list;
 	SilcPublicKey public_key;
 	SilcBuffer chpks, pk, chidp;
 	SilcUInt16 c = 0, ct;
--- a/libpurple/protocols/silc/ft.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/silc/ft.c	Thu Jun 21 20:37:57 2007 +0000
@@ -111,7 +111,7 @@
 		} else if (error == SILC_CLIENT_FILE_TIMEOUT) {
 			purple_notify_error(gc, _("Secure File Transfer"),
 					  _("Error during file transfer"),
-					  _("Connection timedout"));
+					  _("Connection timed out"));
 		} else if (error == SILC_CLIENT_FILE_CONNECT_FAILED) {
 			purple_notify_error(gc, _("Secure File Transfer"),
 					  _("Error during file transfer"),
--- a/libpurple/protocols/silc10/buddy.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/silc10/buddy.c	Thu Jun 21 20:37:57 2007 +0000
@@ -1118,7 +1118,7 @@
 silcpurple_add_buddy_select_cb(SilcPurpleBuddyRes r, PurpleRequestFields *fields)
 {
 	PurpleRequestField *f;
-	const GList *list;
+	GList *list;
 	SilcClientEntry client_entry;
 
 	f = purple_request_fields_get_field(fields, "list");
--- a/libpurple/protocols/silc10/chat.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/silc10/chat.c	Thu Jun 21 20:37:57 2007 +0000
@@ -278,7 +278,7 @@
 	SilcClient client = sg->client;
 	SilcClientConnection conn = sg->conn;
 	PurpleRequestField *f;
-	const GList *list;
+	GList *list;
 	SilcPublicKey public_key;
 	SilcBuffer chpks, pk, chidp;
 	SilcUInt16 c = 0, ct;
--- a/libpurple/protocols/yahoo/yahoo.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Thu Jun 21 20:37:57 2007 +0000
@@ -3861,7 +3861,7 @@
 		if (acct && !purple_account_is_connected(acct))
 			acct = NULL;
 	} else { /* Otherwise find an active account for the protocol */
-		const GList *l = purple_accounts_get_all();
+		GList *l = purple_accounts_get_all();
 		while (l) {
 			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
 					&& purple_account_is_connected(l->data)) {
--- a/libpurple/protocols/yahoo/yahoo_auth.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_auth.c	Thu Jun 21 20:37:57 2007 +0000
@@ -7,6 +7,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "yahoo.h"
 #include "yahoo_auth.h"
 
--- a/libpurple/protocols/yahoo/yahoo_doodle.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c	Thu Jun 21 20:37:57 2007 +0000
@@ -491,7 +491,8 @@
 
 	/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
 
-	yahoo_doodle_command_send_shutdown(gc, wb->who);
+	if (gc)
+		yahoo_doodle_command_send_shutdown(gc, wb->who);
 
 	g_free(wb->proto_data);
 }
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Thu Jun 21 20:37:57 2007 +0000
@@ -20,8 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "prpl.h"
-#include "internal.h"
 #include "util.h"
 #include "debug.h"
 #include "notify.h"
--- a/libpurple/protocols/yahoo/yahoochat.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoochat.c	Thu Jun 21 20:37:57 2007 +0000
@@ -26,6 +26,8 @@
  *
  */
 
+#include "internal.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -37,7 +39,6 @@
 #include "conversation.h"
 #include "notify.h"
 #include "util.h"
-#include "internal.h"
 
 #include "yahoo.h"
 #include "yahoo_packet.h"
@@ -633,10 +634,10 @@
  * I think conference names are always ascii.
  */
 
-void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, const GList *who)
+void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who)
 {
 	struct yahoo_packet *pkt;
-	const GList *w;
+	GList *w;
 
 	purple_debug_misc("yahoo", "leaving conference %s\n", room);
 	
@@ -653,11 +654,11 @@
 }
 
 static int yahoo_conf_send(PurpleConnection *gc, const char *dn, const char *room,
-							const GList *members, const char *what)
+							GList *members, const char *what)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
-	const GList *who;
+	GList *who;
 	char *msg, *msg2;
 	int utf8 = 1;
 
@@ -714,7 +715,7 @@
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
-	const GList *members;
+	GList *members;
 	char *msg2 = NULL;
 
 	if (msg)
--- a/libpurple/protocols/yahoo/yahoochat.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoochat.h	Thu Jun 21 20:37:57 2007 +0000
@@ -50,7 +50,7 @@
 char *yahoo_get_chat_name(GHashTable *data);
 void yahoo_c_invite(PurpleConnection *gc, int id, const char *msg, const char *name);
 
-void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, const GList *who);
+void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who);
 
 void yahoo_chat_goto(PurpleConnection *gc, const char *name);
 
--- a/libpurple/protocols/zephyr/ZLocations.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/zephyr/ZLocations.c	Thu Jun 21 20:37:57 2007 +0000
@@ -36,7 +36,8 @@
     return (Z_SendLocation(LOGIN_CLASS, LOGIN_USER_FLUSH, ZAUTH, ""));
 }
 
-static char host[MAXHOSTNAMELEN], mytty[MAXPATHLEN];
+static char host[MAXHOSTNAMELEN];
+static char *mytty = NULL;
 static int reenter = 0;
 
 Code_t Z_SendLocation(class, opcode, auth, format)
@@ -87,21 +88,20 @@
 	    }
 #ifndef X_DISPLAY_MISSING
 	    if ((display = getenv("DISPLAY")) && *display) {
-		    (void) strncpy(mytty, display, sizeof(mytty));
+		    mytty = g_strdup(display);
 	    } else {
 #endif
 #ifdef WIN32
-              	    strncpy(mytty, "WinPurple", sizeof(mytty));
+		    mytty = g_strdup("WinPurple");
 #else
 		    ttyp = ttyname(0);
 		    if (ttyp && *ttyp) {
 			p = strchr(ttyp + 1, '/');
-			strcpy(mytty, (p) ? p + 1 : ttyp);
+			mytty = g_strdup((p) ? p + 1 : ttyp);
 		    } else {
-			strncpy(mytty, "unknown", sizeof(mytty));
+			mytty = g_strdup("unknown");
 		    }
 #endif
-		    mytty[sizeof(mytty)-1] = '\0';
 #ifndef X_DISPLAY_MISSING
 	    }
 #endif
@@ -114,7 +114,6 @@
     bptr[1][strlen(bptr[1])-1] = '\0';
     bptr[2] = mytty;
 
-	
     if ((retval = ZSendList(&notice, bptr, 3, auth)) != ZERR_NONE)
 	return (retval);
 
--- a/libpurple/protocols/zephyr/ZVariables.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/protocols/zephyr/ZVariables.c	Thu Jun 21 20:37:57 2007 +0000
@@ -9,6 +9,7 @@
  *	"mit-copyright.h". 
  */
 
+#include "libpurple/internal.h"
 #include "internal.h"
 #include "util.h"
 
--- a/libpurple/prpl.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/prpl.c	Thu Jun 21 20:37:57 2007 +0000
@@ -83,44 +83,50 @@
 purple_prpl_got_user_idle(PurpleAccount *account, const char *name,
 		gboolean idle, time_t idle_time)
 {
-	PurpleBuddy *buddy;
 	PurplePresence *presence;
+	GSList *list;
 
 	g_return_if_fail(account != NULL);
 	g_return_if_fail(name    != NULL);
 	g_return_if_fail(purple_account_is_connected(account));
 
-	if ((buddy = purple_find_buddy(account, name)) == NULL)
+	if ((list = purple_find_buddies(account, name)) == NULL)
 		return;
 
-	presence = purple_buddy_get_presence(buddy);
-
-	purple_presence_set_idle(presence, idle, idle_time);
+	while (list) {
+		presence = purple_buddy_get_presence(list->data);
+		list = g_slist_delete_link(list, list);
+		purple_presence_set_idle(presence, idle, idle_time);
+	}
 }
 
 void
 purple_prpl_got_user_login_time(PurpleAccount *account, const char *name,
 		time_t login_time)
 {
-	PurpleBuddy *buddy;
+	GSList *list;
 	PurplePresence *presence;
 
 	g_return_if_fail(account != NULL);
 	g_return_if_fail(name    != NULL);
 
-	if ((buddy = purple_find_buddy(account, name)) == NULL)
+	if ((list = purple_find_buddies(account, name)) == NULL)
 		return;
 
 	if (login_time == 0)
 		login_time = time(NULL);
 
-	presence = purple_buddy_get_presence(buddy);
+	while (list) {
+		PurpleBuddy *buddy = list->data;
+		presence = purple_buddy_get_presence(buddy);
+		list = g_slist_delete_link(list, list);
 
-	if (purple_presence_get_login_time(presence) != login_time)
-	{
-		purple_presence_set_login_time(presence, login_time);
+		if (purple_presence_get_login_time(presence) != login_time)
+		{
+			purple_presence_set_login_time(presence, login_time);
 
-		purple_signal_emit(purple_blist_get_handle(), "buddy-got-login-time", buddy);
+			purple_signal_emit(purple_blist_get_handle(), "buddy-got-login-time", buddy);
+		}
 	}
 }
 
@@ -259,7 +265,7 @@
 purple_prpl_get_statuses(PurpleAccount *account, PurplePresence *presence)
 {
 	GList *statuses = NULL;
-	const GList *l;
+	GList *l;
 	PurpleStatus *status;
 
 	g_return_val_if_fail(account  != NULL, NULL);
--- a/libpurple/prpl.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/prpl.h	Thu Jun 21 20:37:57 2007 +0000
@@ -378,7 +378,7 @@
  *                  beginning with the value for @a attr_id.
  */
 void purple_prpl_got_account_status(PurpleAccount *account,
-								  const char *status_id, ...);
+								  const char *status_id, ...) G_GNUC_NULL_TERMINATED;
 /**
  * Notifies Purple that a user's idle state and time have changed.
  *
@@ -418,7 +418,7 @@
  *                  beginning with the value for @a attr_id.
  */
 void purple_prpl_got_user_status(PurpleAccount *account, const char *name,
-							   const char *status_id, ...);
+							   const char *status_id, ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * Notifies libpurple that a user's status has been deactivated
--- a/libpurple/request.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/request.c	Thu Jun 21 20:37:57 2007 +0000
@@ -22,6 +22,8 @@
  * 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 "notify.h"
 #include "request.h"
 #include "debug.h"
@@ -111,7 +113,7 @@
 	return (g_hash_table_lookup(fields->fields, id) != NULL);
 }
 
-const GList *
+GList *
 purple_request_fields_get_required(const PurpleRequestFields *fields)
 {
 	g_return_val_if_fail(fields != NULL, NULL);
@@ -872,9 +874,9 @@
 }
 
 void
-purple_request_field_list_set_selected(PurpleRequestField *field, const GList *items)
+purple_request_field_list_set_selected(PurpleRequestField *field, GList *items)
 {
-	const GList *l;
+	GList *l;
 
 	g_return_if_fail(field != NULL);
 	g_return_if_fail(items != NULL);
@@ -883,7 +885,7 @@
 	purple_request_field_list_clear_selected(field);
 
 	if (!purple_request_field_list_get_multi_select(field) &&
-		g_list_length((GList*)items) > 1)
+		g_list_length(items) > 1)
 	{
 		purple_debug_warning("request",
 						   "More than one item added to non-multi-select "
@@ -913,7 +915,7 @@
 										item, NULL, NULL);
 }
 
-const GList *
+GList *
 purple_request_field_list_get_selected(const PurpleRequestField *field)
 {
 	g_return_val_if_fail(field != NULL, NULL);
@@ -922,7 +924,7 @@
 	return field->u.list.selected;
 }
 
-const GList *
+GList *
 purple_request_field_list_get_items(const PurpleRequestField *field)
 {
 	g_return_val_if_fail(field != NULL, NULL);
--- a/libpurple/request.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/request.h	Thu Jun 21 20:37:57 2007 +0000
@@ -285,9 +285,9 @@
  *
  * @param fields The fields list.
  *
- * @return The list of required fields.
+ * @constreturn The list of required fields.
  */
-const GList *purple_request_fields_get_required(const PurpleRequestFields *fields);
+GList *purple_request_fields_get_required(const PurpleRequestFields *fields);
 
 /**
  * Returns whether or not a field with the specified ID is required.
@@ -917,10 +917,10 @@
  * Sets a list of selected items in a list field.
  *
  * @param field The field.
- * @param items The list of selected items.
+ * @param items The list of selected items, which is not modified or freed.
  */
 void purple_request_field_list_set_selected(PurpleRequestField *field,
-										  const GList *items);
+										  GList *items);
 
 /**
  * Returns whether or not a particular item is selected in a list field.
@@ -941,9 +941,9 @@
  *
  * @param field The field.
  *
- * @return The list of selected items.
+ * @constreturn The list of selected items.
  */
-const GList *purple_request_field_list_get_selected(
+GList *purple_request_field_list_get_selected(
 	const PurpleRequestField *field);
 
 /**
@@ -951,9 +951,9 @@
  *
  * @param field The field.
  *
- * @return The list of items.
+ * @constreturn The list of items.
  */
-const GList *purple_request_field_list_get_items(const PurpleRequestField *field);
+GList *purple_request_field_list_get_items(const PurpleRequestField *field);
 
 /*@}*/
 
@@ -1228,7 +1228,7 @@
 						  const char *ok_text, GCallback ok_cb,
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  void *user_data, ...);
+						  void *user_data, ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * Prompts the user for multiple-choice input.
--- a/libpurple/roomlist.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/roomlist.c	Thu Jun 21 20:37:57 2007 +0000
@@ -25,6 +25,8 @@
 
 #include <glib.h>
 
+#include "internal.h"
+
 #include "account.h"
 #include "connection.h"
 #include "debug.h"
--- a/libpurple/savedstatuses.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/savedstatuses.c	Thu Jun 21 20:37:57 2007 +0000
@@ -29,6 +29,7 @@
 #include "notify.h"
 #include "savedstatuses.h"
 #include "dbus-maybe.h"
+#include "request.h"
 #include "status.h"
 #include "util.h"
 #include "xmlnode.h"
@@ -110,6 +111,7 @@
 	g_return_if_fail(substatus != NULL);
 
 	g_free(substatus->message);
+	purple_request_close_with_handle(substatus);
 	PURPLE_DBUS_UNREGISTER_POINTER(substatus);
 	g_free(substatus);
 }
@@ -128,7 +130,7 @@
 		status->substatuses = g_list_remove(status->substatuses, substatus);
 		free_saved_status_sub(substatus);
 	}
-
+	purple_request_close_with_handle(status);
 	PURPLE_DBUS_UNREGISTER_POINTER(status);
 	g_free(status);
 }
@@ -569,6 +571,9 @@
 
 	schedule_save();
 
+	purple_signal_emit(purple_savedstatuses_get_handle(), "savedstatus-added",
+		status);
+
 	return status;
 }
 
@@ -584,6 +589,9 @@
 	status->title = g_strdup(title);
 
 	schedule_save();
+
+	purple_signal_emit(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", status);
 }
 
 void
@@ -594,6 +602,8 @@
 	status->type = type;
 
 	schedule_save();
+	purple_signal_emit(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", status);
 }
 
 void
@@ -608,6 +618,9 @@
 		status->message = g_strdup(message);
 
 	schedule_save();
+
+	purple_signal_emit(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", status);
 }
 
 void
@@ -637,6 +650,8 @@
 	substatus->message = g_strdup(message);
 
 	schedule_save();
+	purple_signal_emit(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", saved_status);
 }
 
 void
@@ -660,6 +675,9 @@
 			return;
 		}
 	}
+
+	purple_signal_emit(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", saved_status);
 }
 
 /*
@@ -683,16 +701,12 @@
 	}
 }
 
-gboolean
-purple_savedstatus_delete(const char *title)
+void
+purple_savedstatus_delete_by_status(PurpleSavedStatus *status)
 {
-	PurpleSavedStatus *status;
 	time_t creation_time, current, idleaway;
 
-	status = purple_savedstatus_find(title);
-
-	if (status == NULL)
-		return FALSE;
+	g_return_if_fail(status != NULL);
 
 	saved_statuses = g_list_remove(saved_statuses, status);
 	creation_time = purple_savedstatus_get_creation_time(status);
@@ -713,10 +727,29 @@
 	if (idleaway == creation_time)
 		purple_prefs_set_int("/purple/savedstatus/idleaway", 0);
 
+	purple_signal_emit(purple_savedstatuses_get_handle(),
+			"savedstatus-deleted", status);
+}
+
+gboolean
+purple_savedstatus_delete(const char *title)
+{
+	PurpleSavedStatus *status;
+
+	status = purple_savedstatus_find(title);
+
+	if (status == NULL)
+		return FALSE;
+
+	if (purple_savedstatus_get_current() == status)
+		return FALSE;
+
+	purple_savedstatus_delete_by_status(status);
+
 	return TRUE;
 }
 
-const GList *
+GList *
 purple_savedstatuses_get_all(void)
 {
 	return saved_statuses;
@@ -1171,6 +1204,21 @@
 					 purple_value_new(PURPLE_TYPE_SUBTYPE,
 									PURPLE_SUBTYPE_SAVEDSTATUS));
 
+	purple_signal_register(handle, "savedstatus-added",
+		purple_marshal_VOID__POINTER, NULL, 1,
+		purple_value_new(PURPLE_TYPE_SUBTYPE,
+			PURPLE_SUBTYPE_SAVEDSTATUS));
+
+	purple_signal_register(handle, "savedstatus-deleted",
+		purple_marshal_VOID__POINTER, NULL, 1,
+		purple_value_new(PURPLE_TYPE_SUBTYPE,
+			PURPLE_SUBTYPE_SAVEDSTATUS));
+
+	purple_signal_register(handle, "savedstatus-modified",
+		purple_marshal_VOID__POINTER, NULL, 1,
+		purple_value_new(PURPLE_TYPE_SUBTYPE,
+			PURPLE_SUBTYPE_SAVEDSTATUS));
+
 	purple_signal_connect(purple_accounts_get_handle(), "account-removed",
 			handle,
 			PURPLE_CALLBACK(purple_savedstatus_unset_all_substatuses),
--- a/libpurple/savedstatuses.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/savedstatuses.h	Thu Jun 21 20:37:57 2007 +0000
@@ -149,11 +149,21 @@
 gboolean purple_savedstatus_delete(const char *title);
 
 /**
+ * Delete a saved status.  This removes the saved status from the list
+ * of saved statuses, and writes the revised list to status.xml.
+ *
+ * @param saved_status the status to delete, the pointer is invalid after
+ *        the call
+ *
+ */
+void purple_savedstatus_delete_by_status(PurpleSavedStatus *saved_status);
+
+/**
  * Returns all saved statuses.
  *
- * @return A list of saved statuses.
+ * @constreturn A list of saved statuses.
  */
-const GList *purple_savedstatuses_get_all(void);
+GList *purple_savedstatuses_get_all(void);
 
 /**
  * Returns the n most popular saved statuses.  "Popularity" is
--- a/libpurple/status.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/status.c	Thu Jun 21 20:37:57 2007 +0000
@@ -451,7 +451,7 @@
 	return NULL;
 }
 
-const GList *
+GList *
 purple_status_type_get_attrs(const PurpleStatusType *status_type)
 {
 	g_return_val_if_fail(status_type != NULL, NULL);
@@ -548,7 +548,7 @@
 purple_status_new(PurpleStatusType *status_type, PurplePresence *presence)
 {
 	PurpleStatus *status;
-	const GList *l;
+	GList *l;
 
 	g_return_val_if_fail(status_type != NULL, NULL);
 	g_return_val_if_fail(presence    != NULL, NULL);
@@ -719,10 +719,10 @@
 
 void
 purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
-									   const GList *attrs)
+									   GList *attrs)
 {
 	gboolean changed = FALSE;
-	const GList *l;
+	GList *l;
 	GList *specified_attr_ids = NULL;
 	PurpleStatusType *status_type;
 
@@ -1168,9 +1168,9 @@
 }
 
 void
-purple_presence_add_list(PurplePresence *presence, const GList *source_list)
+purple_presence_add_list(PurplePresence *presence, GList *source_list)
 {
-	const GList *l;
+	GList *l;
 
 	g_return_if_fail(presence    != NULL);
 	g_return_if_fail(source_list != NULL);
@@ -1396,7 +1396,7 @@
 	return presence->u.buddy.buddy;
 }
 
-const GList *
+GList *
 purple_presence_get_statuses(const PurplePresence *presence)
 {
 	g_return_val_if_fail(presence != NULL, NULL);
@@ -1408,7 +1408,7 @@
 purple_presence_get_status(const PurplePresence *presence, const char *status_id)
 {
 	PurpleStatus *status;
-	const GList *l = NULL;
+	GList *l = NULL;
 
 	g_return_val_if_fail(presence  != NULL, NULL);
 	g_return_val_if_fail(status_id != NULL, NULL);
@@ -1487,7 +1487,7 @@
 purple_presence_is_status_primitive_active(const PurplePresence *presence,
 		PurpleStatusPrimitive primitive)
 {
-	const GList *l;
+	GList *l;
 
 	g_return_val_if_fail(presence  != NULL,              FALSE);
 	g_return_val_if_fail(primitive != PURPLE_STATUS_UNSET, FALSE);
@@ -1535,7 +1535,7 @@
 	gboolean idle1, idle2;
 	time_t idle_time_1, idle_time_2;
 	int score1 = 0, score2 = 0;
-	const GList *l;
+	GList *l;
 
 	if (presence1 == presence2)
 		return 0;
--- a/libpurple/status.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/status.h	Thu Jun 21 20:37:57 2007 +0000
@@ -227,7 +227,7 @@
 												gboolean independent,
 												const char *attr_id,
 												const char *attr_name,
-												PurpleValue *attr_value, ...);
+												PurpleValue *attr_value, ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * Destroys a status type.
@@ -270,7 +270,7 @@
  * @param ...         Additional attribute information.
  */
 void purple_status_type_add_attrs(PurpleStatusType *status_type, const char *id,
-								const char *name, PurpleValue *value, ...);
+								const char *name, PurpleValue *value, ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * Adds multiple attributes to a status type using a va_list.
@@ -387,9 +387,9 @@
  *
  * @param status_type The status type.
  *
- * @return The list of attributes.
+ * @constreturn The list of attributes.
  */
-const GList *purple_status_type_get_attrs(const PurpleStatusType *status_type);
+GList *purple_status_type_get_attrs(const PurpleStatusType *status_type);
 
 /**
  * Find the PurpleStatusType with the given id.
@@ -515,10 +515,11 @@
  * @param active The active state.
  * @param attrs  A list of attributes to set on the status.  This list is
  *               composed of key/value pairs, where each key is a valid
- *               attribute name for this PurpleStatusType.
+ *               attribute name for this PurpleStatusType.  The list is
+ *               not modified or freed by this function.
  */
 void purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
-											const GList *attrs);
+											GList *attrs);
 
 /**
  * Sets the boolean value of an attribute in a status with the specified ID.
@@ -768,9 +769,10 @@
  * Adds a list of statuses to the presence.
  *
  * @param presence    The presence.
- * @param source_list The source list of statuses to add.
+ * @param source_list The source list of statuses to add, which is not
+ *                    modified or freed by this function.
  */
-void purple_presence_add_list(PurplePresence *presence, const GList *source_list);
+void purple_presence_add_list(PurplePresence *presence, GList *source_list);
 
 /**
  * Sets the active state of a status in a presence.
@@ -869,9 +871,9 @@
  *
  * @param presence The presence.
  *
- * @return The statuses.
+ * @constreturn The statuses.
  */
-const GList *purple_presence_get_statuses(const PurplePresence *presence);
+GList *purple_presence_get_statuses(const PurplePresence *presence);
 
 /**
  * Returns the status with the specified ID from a presence.
--- a/libpurple/util.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/util.c	Thu Jun 21 20:37:57 2007 +0000
@@ -66,8 +66,8 @@
 	unsigned long data_len;
 };
 
-static char custom_home_dir[MAXPATHLEN];
-static char home_dir[MAXPATHLEN] = "";
+static char *custom_user_dir = NULL;
+static char *home_dir = NULL;
 
 PurpleMenuAction *
 purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data,
@@ -2396,27 +2396,22 @@
 const char *
 purple_user_dir(void)
 {
-	if (custom_home_dir != NULL && *custom_home_dir) {
-		strcpy ((char*) &home_dir, (char*) &custom_home_dir);
-	} else if (!*home_dir) {
-		const gchar *hd = purple_home_dir();
-
-		if (hd) {
-			g_strlcpy((char*) &home_dir, hd, sizeof(home_dir));
-			g_strlcat((char*) &home_dir, G_DIR_SEPARATOR_S ".purple",
-					sizeof(home_dir));
-		}
-	}
+	if (custom_user_dir != NULL)
+		return custom_user_dir;
+	else if (!home_dir)
+		home_dir = g_build_filename(purple_home_dir(), ".purple", NULL);
 
 	return home_dir;
 }
 
 void purple_util_set_user_dir(const char *dir)
 {
-	if (dir != NULL && strlen(dir) > 0) {
-		g_strlcpy((char*) &custom_home_dir, dir,
-				sizeof(custom_home_dir));
-	}
+	g_free(custom_user_dir);
+
+	if (dir != NULL && *dir)
+		custom_user_dir = g_strdup(dir);
+	else
+		custom_user_dir = NULL;
 }
 
 int purple_build_dir (const char *path, int mode)
@@ -3135,7 +3130,7 @@
 char *
 purple_str_size_to_units(size_t size)
 {
-	static const char *size_str[4] = { "bytes", "KB", "MB", "GB" };
+	static const char *size_str[4] = { "bytes", "KiB", "MiB", "GiB" };
 	float size_mag;
 	int size_index = 0;
 
--- a/libpurple/whiteboard.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/libpurple/whiteboard.c	Thu Jun 21 20:37:57 2007 +0000
@@ -23,6 +23,7 @@
 
 #include <string.h>
 
+#include "internal.h"
 #include "whiteboard.h"
 #include "prpl.h"
 
--- a/pidgin/Makefile.am	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/Makefile.am	Thu Jun 21 20:37:57 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/gtkaccount.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkaccount.c	Thu Jun 21 20:37:57 2007 +0000
@@ -697,7 +697,7 @@
 	PurpleAccountOption *option;
 	PurpleAccount *account;
 	GtkWidget *frame, *vbox, *check, *entry, *combo, *menu, *item;
-	const GList *list, *node;
+	GList *list, *node;
 	gint i, idx, int_value;
 	GtkListStore *model;
 	GtkTreeIter iter;
@@ -1586,7 +1586,7 @@
 
 	account = purple_connection_get_account(gc);
 	model = GTK_TREE_MODEL(accounts_window->model);
-	index = g_list_index((GList *)purple_accounts_get_all(), account);
+	index = g_list_index(purple_accounts_get_all(), account);
 
 	if (gtk_tree_model_iter_nth_child(model, &iter, NULL, index))
 	{
@@ -1789,13 +1789,13 @@
 				case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
 					move_account_after(dialog->model, &dialog->drag_iter,
 									   &iter);
-					dest_index = g_list_index((GList *)purple_accounts_get_all(),
+					dest_index = g_list_index(purple_accounts_get_all(),
 											  account) + 1;
 					break;
 
 				case GTK_TREE_VIEW_DROP_BEFORE:
 				case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-					dest_index = g_list_index((GList *)purple_accounts_get_all(),
+					dest_index = g_list_index(purple_accounts_get_all(),
 											  account);
 
 					move_account_before(dialog->model, &dialog->drag_iter,
@@ -2094,7 +2094,7 @@
 static gboolean
 populate_accounts_list(AccountsWindow *dialog)
 {
-	const GList *l;
+	GList *l;
 	gboolean ret = FALSE;
 	GdkPixbuf *global_buddyicon = NULL;
 	const char *path;
@@ -2298,7 +2298,7 @@
 global_buddyicon_changed(const char *name, PurplePrefType type,
 			gconstpointer value, gpointer window)
 {
-	const GList *list;
+	GList *list;
 	for (list = purple_accounts_get_all(); list; list = list->next) {
 		account_modified_cb(list->data, window);
 	}
@@ -2429,7 +2429,7 @@
 {
 	PurpleConnection *gc = purple_account_get_connection(data->account);
 
-	if (g_list_find((GList *)purple_connections_get_all(), gc))
+	if (g_list_find(purple_connections_get_all(), gc))
 	{
 		purple_blist_request_add_buddy(data->account, data->username,
 									 NULL, data->alias);
@@ -2686,3 +2686,4 @@
 	purple_signals_unregister_by_instance(pidgin_account_get_handle());
 }
 
+
--- a/pidgin/gtkblist.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkblist.c	Thu Jun 21 20:37:57 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;
@@ -150,11 +151,7 @@
 	if (!gtkblist)
 		return "dim grey";
 	if (!dim_grey_string[0]) {
-		GtkStyle *style = gtk_widget_get_style(gtkblist->treeview);
-		snprintf(dim_grey_string, sizeof(dim_grey_string), "#%02x%02x%02x",
-			 style->text_aa[GTK_STATE_NORMAL].red >> 8,
-			 style->text_aa[GTK_STATE_NORMAL].green >> 8,
-			 style->text_aa[GTK_STATE_NORMAL].blue >> 8);
+		snprintf(dim_grey_string, sizeof(dim_grey_string), "%s", pidgin_get_dim_grey_string(gtkblist->treeview)); 
 	}
 	return dim_grey_string;
 }
@@ -294,15 +291,30 @@
 static void gtk_blist_join_chat(PurpleChat *chat)
 {
 	PurpleConversation *conv;
-
-	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
-											   purple_chat_get_name(chat),
+	PurplePluginProtocolInfo *prpl_info;
+	const char *name;
+	char *chat_name;
+
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(chat->account)));
+
+	if (prpl_info && prpl_info->get_chat_name)
+		chat_name = prpl_info->get_chat_name(chat->components);
+	else
+		chat_name = NULL;
+
+	if (chat_name)
+		name = chat_name;
+	else
+		name = purple_chat_get_name(chat);
+
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name,
 											   chat->account);
 
 	if (conv != NULL)
 		purple_conversation_present(conv);
 
 	serv_join_chat(chat->account->gc, chat->components);
+	g_free(chat_name);
 }
 
 static void gtk_blist_menu_join_cb(GtkWidget *w, PurpleChat *chat)
@@ -310,6 +322,13 @@
 	gtk_blist_join_chat(chat);
 }
 
+#if GTK_CHECK_VERSION(2,6,0)
+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 +365,12 @@
 		GtkEntry *entry = GTK_ENTRY (editable);
 		gtk_entry_set_text(entry, text);
 	}
-}
+	editing_blist = TRUE;
+}
+#endif
 
 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 +378,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 +423,7 @@
 		default:
 			break;
 	}
+	pidgin_blist_refresh(list);
 }
 
 static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node)
@@ -481,6 +504,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)
 {
@@ -681,7 +709,7 @@
 gboolean
 pidgin_blist_joinchat_is_showable()
 {
-	const GList *c;
+	GList *c;
 	PurpleConnection *gc;
 
 	for (c = purple_connections_get_all(); c != NULL; c = c->next) {
@@ -1536,7 +1564,7 @@
 add_buddies_from_vcard(const char *prpl_id, PurpleGroup *group, GList *list,
 					   const char *alias)
 {
-	const GList *l;
+	GList *l;
 	PurpleAccount *account = NULL;
 	PurpleConnection *gc;
 
@@ -2077,51 +2105,6 @@
 	}
 }
 
-static void
-roundify(GdkPixbuf *pixbuf) {
-	int width, height, rowstride;
-	guchar *pixels;
-
-	if (!gdk_pixbuf_get_has_alpha(pixbuf))
-		return;
-
-	width = gdk_pixbuf_get_width(pixbuf);
-	height = gdk_pixbuf_get_height(pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride(pixbuf);
-	pixels = gdk_pixbuf_get_pixels(pixbuf);
-
-	if (width < 6 || height < 6)
-		return;
-
-	/* Top left */
-	pixels[3] = 0;
-	pixels[7] = 0x80;
-	pixels[11] = 0xC0;
-	pixels[rowstride + 3] = 0x80;
-	pixels[rowstride * 2 + 3] = 0xC0;
-
-	/* Top right */
-	pixels[width * 4 - 1] = 0;
-	pixels[width * 4 - 5] = 0x80;
-	pixels[width * 4 - 9] = 0xC0;
-	pixels[rowstride + (width * 4) - 1] = 0x80;
-	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-
-	/* Bottom left */
-	pixels[(height - 1) * rowstride + 3] = 0;
-	pixels[(height - 1) * rowstride + 7] = 0x80;
-	pixels[(height - 1) * rowstride + 11] = 0xC0;
-	pixels[(height - 2) * rowstride + 3] = 0x80;
-	pixels[(height - 3) * rowstride + 3] = 0xC0;
-
-	/* Bottom right */
-	pixels[height * rowstride - 1] = 0;
-	pixels[(height - 1) * rowstride - 1] = 0x80;
-	pixels[(height - 2) * rowstride - 1] = 0xC0;
-	pixels[height * rowstride - 5] = 0x80;
-	pixels[height * rowstride - 9] = 0xC0;
-}
-
 /* Altered from do_colorshift in gnome-panel */
 static void
 do_alphashift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
@@ -2258,7 +2241,7 @@
 			gdk_pixbuf_fill(ret, 0x00000000);
 			gdk_pixbuf_scale(buf, ret, (32-scale_width)/2, (32-scale_height)/2, scale_width, scale_height, (32-scale_width)/2, (32-scale_height)/2, (double)scale_width/(double)orig_width, (double)scale_height/(double)orig_height, GDK_INTERP_BILINEAR);
 			if (pidgin_gdk_pixbuf_is_opaque(ret))
-				roundify(ret);
+				pidgin_gdk_pixbuf_make_round(ret);
 		} else {
 			ret = gdk_pixbuf_scale_simple(buf,scale_width,scale_height, GDK_INTERP_BILINEAR);
 		}
@@ -2845,7 +2828,6 @@
 	{ N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD },
 	{ N_("/Buddies/Add _Group..."), NULL, purple_blist_request_add_group, 0, "<StockItem>", GTK_STOCK_ADD },
 	{ "/Buddies/sep3", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Buddies/_About Pidgin"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
 	{ N_("/Buddies/_Quit"), "<CTL>Q", purple_core_quit, 0, "<StockItem>", GTK_STOCK_QUIT },
 
 	/* Accounts menu */
@@ -2862,9 +2844,13 @@
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL },
-	{ 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 },
 };
 
 /*********************************************************
@@ -2889,7 +2875,7 @@
 		prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account));
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 
-		if (g_list_length((GList *)purple_connections_get_all()) > 1)
+		if (g_list_length(purple_connections_get_all()) > 1)
 		{
 			tmp = g_markup_escape_text(chat->account->username, -1);
 			g_string_append_printf(str, _("\n<b>Account:</b> %s"), tmp);
@@ -2954,7 +2940,7 @@
 		user_info = purple_notify_user_info_new();
 
 		/* Account */
-		if (full && g_list_length((GList *)purple_connections_get_all()) > 1)
+		if (full && g_list_length(purple_connections_get_all()) > 1)
 		{
 			tmp = g_markup_escape_text(purple_account_get_username(
 									   purple_buddy_get_account(b)), -1);
@@ -2990,7 +2976,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);
 		}
@@ -3257,7 +3250,7 @@
 	return ret;
 }
 
-static gchar *pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected)
+gchar *pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased)
 {
 	const char *name;
 	char *esc, *text = NULL;
@@ -3282,15 +3275,19 @@
 	}
 
 	/* XXX Good luck cleaning up this crap */
-
-	contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
-	if(contact)
-		gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
-
-	if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
-		name = contact->alias;
-	else
-		name = purple_buddy_get_alias(b);
+	if (aliased) {
+		contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
+		if(contact)
+			gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
+
+		if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
+			name = contact->alias;
+		else
+			name = purple_buddy_get_alias(b);
+	} else {
+		name = b->name;
+	}
+	
 	esc = g_markup_escape_text(name, strlen(name));
 
 	presence = purple_buddy_get_presence(b);
@@ -3729,8 +3726,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);
 
@@ -4204,7 +4204,7 @@
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD }};
 	if (gtkblist && gtkblist->window) {
-		purple_blist_set_visible(TRUE);
+		purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
 		return;
 	}
 
@@ -4435,8 +4435,11 @@
 #endif
 										"markup", NAME_COLUMN,
 										NULL);
+#if GTK_CHECK_VERSION(2,6,0)
 	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);
+#endif
+	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 +4781,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 +4817,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 +4921,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);
 
@@ -4931,7 +4941,7 @@
 	}
 
 	emblem = pidgin_blist_get_emblem((PurpleBlistNode*) buddy);
-	mark = pidgin_blist_get_name_markup(buddy, selected);
+	mark = pidgin_blist_get_name_markup(buddy, selected, TRUE);
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time") &&
 		purple_presence_is_idle(presence) &&
@@ -4993,6 +5003,9 @@
 	PurpleBuddy *buddy;
 	struct _pidgin_blist_node *gtknode;
 
+	if (editing_blist)
+		return;
+
 	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
 		cnode = node->parent;
 	else
@@ -5089,6 +5102,9 @@
 
 	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);
 
@@ -5689,7 +5705,7 @@
 {
 	PidginAddChatData *data;
 	PidginBuddyList *gtkblist;
-	const GList *l;
+	GList *l;
 	PurpleConnection *gc;
 	GtkWidget *label;
 	GtkWidget *rowbox;
@@ -6456,8 +6472,7 @@
 {
 	GtkWidget *menuitem = NULL, *submenu = NULL;
 	GtkAccelGroup *accel_group = NULL;
-	GList *l = NULL;
-	const GList *accounts;
+	GList *l = NULL, *accounts = NULL;
 	gboolean disabled_accounts = FALSE;
 
 	if (accountmenu == NULL)
@@ -6694,3 +6709,4 @@
 	if (activeitem)
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(activeitem), TRUE);
 }
+
--- a/pidgin/gtkblist.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkblist.h	Thu Jun 21 20:37:57 2007 +0000
@@ -360,4 +360,14 @@
 void pidgin_blist_set_headline(const char *text, GdkPixbuf *pixbuf, GCallback callback, gpointer user_data,
 		GDestroyNotify destroy);
 
+/**
+ * Returns a buddy's Pango markup appropriate for setting in a GtkCellRenderer.
+ *
+ * @param buddy The buddy to return markup from
+ * @param selected  Whether this buddy is selected. If TRUE, the markup will not change the color.
+ * @param aliased  TRUE to return the appropriate alias of this buddy, FALSE to return its screenname
+ * @return The markup for this buddy
+ */
+gchar *pidgin_blist_get_name_markup(PurpleBuddy *buddy, gboolean selected, gboolean aliased);
+
 #endif /* _PIDGINBLIST_H_ */
--- a/pidgin/gtkconv.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkconv.c	Thu Jun 21 20:37:57 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"
@@ -81,6 +82,12 @@
 	PIDGIN_CONV_COLORIZE_TITLE		= 1 << 6
 }PidginConvFields;
 
+enum {
+	ICON_COLUMN,
+	TEXT_COLUMN,
+	NUM_COLUMNS
+} PidginInfopaneColumns;
+
 #define	PIDGIN_CONV_ALL	((1 << 7) - 1)
 
 #define SEND_COLOR "#204a87"
@@ -621,23 +628,10 @@
 static void chat_do_info(PidginConversation *gtkconv, const char *who)
 {
 	PurpleConversation *conv = gtkconv->active_conv;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 	PurpleConnection *gc;
 
 	if ((gc = purple_conversation_get_gc(conv))) {
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
-		/*
-		 * If there are special needs for getting info on users in
-		 * buddy chat "rooms"...
-		 */
-		if (prpl_info->get_cb_info != NULL)
-		{
-			prpl_info->get_cb_info(gc,
-				purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), who);
-		}
-		else
-			pidgin_retrieve_user_info(gc, who);
+		pidgin_retrieve_user_info_in_chat(gc, who, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)));
 	}
 }
 
@@ -1821,6 +1815,9 @@
 				if (!gtkconv->send_history)
 					break;
 
+				if (gtkconv->entry != entry)
+					break;
+
 				if (!gtkconv->send_history->prev) {
 					GtkTextIter start, end;
 
@@ -1869,6 +1866,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 +1972,8 @@
 		switch (event->keyval)
 		{
 			case GDK_Tab:
+				if (gtkconv->entry != entry)
+					break;
 				return tab_complete(conv);
 				break;
 
@@ -2048,6 +2050,9 @@
 	return TRUE;
 }
 
+static void
+regenerate_options_items(PidginWindow *win);
+
 void
 pidgin_conv_switch_active_conversation(PurpleConversation *conv)
 {
@@ -2148,6 +2153,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)));
@@ -2336,6 +2343,10 @@
 	gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->icon), status);
 	gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->menu_icon), status);
 
+	gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model), 
+			&(gtkconv->infopane_iter),
+			ICON_COLUMN, status, -1);
+
 	if (status != NULL)
 		g_object_unref(status);
 
@@ -2391,16 +2402,22 @@
 	gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL);
 	buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
 
-	pidgin_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
-			PURPLE_ICON_SCALE_DISPLAY, &scale_width, &scale_height);
-
-	/* this code is ugly, and scares me */
-	scale = gdk_pixbuf_scale_simple(buf,
-		MAX(gdk_pixbuf_get_width(buf) * scale_width /
-		    gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1),
-		MAX(gdk_pixbuf_get_height(buf) * scale_height /
-		    gdk_pixbuf_animation_get_height(gtkconv->u.im->anim), 1),
+ 	scale_width = gdk_pixbuf_get_width(buf);
+        scale_height = gdk_pixbuf_get_height(buf);
+        if (scale_width == scale_height) {
+		scale_width = scale_height = 32;
+	} else if (scale_height > scale_width) {
+                scale_width = 32 * scale_width / scale_height;
+                scale_height = 32;
+        } else {
+                scale_height = 32 * scale_height / scale_width;
+                scale_width = 32;
+        }
+
+	scale = gdk_pixbuf_scale_simple(buf, scale_width, scale_height,
 		GDK_INTERP_BILINEAR);
+	if (pidgin_gdk_pixbuf_is_opaque(scale))
+		pidgin_gdk_pixbuf_make_round(scale);
 
 	gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->u.im->icon), scale);
 	g_object_unref(G_OBJECT(scale));
@@ -2676,7 +2693,7 @@
 										gboolean hidden_only,
 										guint max_count)
 {
-	const GList *l;
+	GList *l;
 	GList *r = NULL;
 	guint c = 0;
 
@@ -2894,11 +2911,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)
@@ -3802,7 +3853,7 @@
 		g_list_free(list);
 	} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 		PurpleConvChat *chat = PURPLE_CONV_CHAT(conv);
-		const GList *l = purple_conv_chat_get_users(chat);
+		GList *l = purple_conv_chat_get_users(chat);
 		GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(PIDGIN_CONVERSATION(conv)->u.chat->list));
 		GtkTreeIter iter;
 		int f;
@@ -4213,11 +4264,9 @@
 		
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-		gtk_widget_show(hbox);
 
 		label = gtk_label_new(_("Topic:"));
 		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-		gtk_widget_show(label);
 
 		gtkchat->topic_text = gtk_entry_new();
 
@@ -4229,7 +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);
 	}
 }
 
@@ -4328,6 +4378,8 @@
 setup_common_pane(PidginConversation *gtkconv)
 {
 	GtkWidget *paned, *vbox, *frame, *imhtml_sw;
+	GtkCellRenderer *rend;
+	GtkTreePath *path;
 	PurpleConversation *conv = gtkconv->active_conv;
 	gboolean chat = (conv->type == PURPLE_CONV_TYPE_CHAT);
 	GtkPolicyType imhtml_sw_hscroll;
@@ -4340,6 +4392,37 @@
 	gtk_paned_pack1(GTK_PANED(paned), vbox, TRUE, TRUE);
 	gtk_widget_show(vbox);
 
+	/* Setup the info pane */
+	gtkconv->infopane_hbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), gtkconv->infopane_hbox, FALSE, FALSE, 0);
+	gtk_widget_show(gtkconv->infopane_hbox);
+
+	gtkconv->infopane = gtk_cell_view_new();
+	gtkconv->infopane_model = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+	gtk_cell_view_set_model(GTK_CELL_VIEW(gtkconv->infopane), 
+				GTK_TREE_MODEL(gtkconv->infopane_model));
+	gtk_list_store_append(gtkconv->infopane_model, &(gtkconv->infopane_iter));
+	gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), gtkconv->infopane, TRUE, TRUE, 0);
+	path = gtk_tree_path_new_from_string("0");
+	gtk_cell_view_set_displayed_row(GTK_CELL_VIEW(gtkconv->infopane), path);
+	gtk_tree_path_free(path);
+	gtk_widget_set_size_request(gtkconv->infopane, -1, 32);
+	gtk_widget_show(gtkconv->infopane);
+
+	rend = gtk_cell_renderer_pixbuf_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", ICON_COLUMN, NULL);
+	g_object_set(rend, "xalign", 0.0, "xpad", 6, "ypad", 0, NULL);
+
+	rend = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "markup", TEXT_COLUMN, NULL);
+	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);
+#endif
+
 	/* Setup the gtkimhtml widget */
 	frame = pidgin_create_imhtml(FALSE, &gtkconv->imhtml, NULL, &imhtml_sw);
 	if (chat) {
@@ -5396,7 +5479,7 @@
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
-	num_users = g_list_length((GList *)purple_conv_chat_get_users(chat));
+	num_users = g_list_length(purple_conv_chat_get_users(chat));
 
 	g_snprintf(tmp, sizeof(tmp),
 			   ngettext("%d person in room", "%d people in room",
@@ -5490,7 +5573,7 @@
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
-	num_users = g_list_length((GList *)purple_conv_chat_get_users(chat));
+	num_users = g_list_length(purple_conv_chat_get_users(chat));
 
 	for (l = users; l != NULL; l = l->next) {
 		model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
@@ -5931,8 +6014,10 @@
 			buttons = GTK_IMHTML_SMILEY | GTK_IMHTML_IMAGE;
 		}
 
-		if (!(prpl_info->options & OPT_PROTO_IM_IMAGE) ||
-				conv->features & PURPLE_CONNECTION_NO_IMAGES)
+		if (!(prpl_info->options & OPT_PROTO_IM_IMAGE))
+			conv->features |= PURPLE_CONNECTION_NO_IMAGES;
+
+		if(conv->features & PURPLE_CONNECTION_NO_IMAGES)
 			buttons &= ~GTK_IMHTML_IMAGE;
 
 		gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons);
@@ -5945,7 +6030,7 @@
 		gtk_widget_set_sensitive(win->menu.get_info, (prpl_info->get_info != NULL));
 		gtk_widget_set_sensitive(win->menu.invite, (prpl_info->chat_invite != NULL));
 		gtk_widget_set_sensitive(win->menu.insert_link, (conv->features & PURPLE_CONNECTION_HTML));
-		gtk_widget_set_sensitive(win->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE) && !(conv->features & PURPLE_CONNECTION_NO_IMAGES));
+		gtk_widget_set_sensitive(win->menu.insert_image, !(conv->features & PURPLE_CONNECTION_NO_IMAGES));
 
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 		{
@@ -6065,11 +6150,13 @@
 		pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
 
 	if ((fields & PIDGIN_CONV_COLORIZE_TITLE) ||
-			(fields & PIDGIN_CONV_SET_TITLE))
+			(fields & PIDGIN_CONV_SET_TITLE) ||
+    			(fields & PIDGIN_CONV_TOPIC))
 	{
 		char *title;
 		PurpleConvIm *im = NULL;
 		PurpleAccount *account = purple_conversation_get_account(conv);
+		char *markup = NULL;
 		AtkObject *accessibility_obj;
 		/* I think this is a little longer than it needs to be but I'm lazy. */
 		char style[51];
@@ -6085,6 +6172,25 @@
 		else
 			title = g_strdup(purple_conversation_get_title(conv));
 
+		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		 	PurpleBuddy *buddy = purple_find_buddy(account, conv->name);
+			if (buddy)
+				markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE);
+			else
+				markup = title;
+		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
+			PurpleConvChat *chat = PURPLE_CONV_CHAT(conv);
+			markup = g_strdup_printf("%s\n<span color='%s' size='smaller'>%s</span>",
+						purple_conversation_get_title(conv),
+						pidgin_get_dim_grey_string(gtkconv->infopane),
+						purple_conv_chat_get_topic(chat));
+		}
+		gtk_list_store_set(gtkconv->infopane_model, &(gtkconv->infopane_iter),
+				TEXT_COLUMN, markup, -1);
+	
+		if (title != markup)
+			g_free(markup);
+
 		*style = '\0';
 
 		if (!GTK_WIDGET_REALIZED(gtkconv->tab_label))
@@ -6244,7 +6350,6 @@
 	GdkPixbuf *buf;
 
 	GtkWidget *event;
-	GtkWidget *frame;
 	GdkPixbuf *scale;
 	int scale_width, scale_height;
 
@@ -6343,54 +6448,55 @@
 	}
 
 	if (gdk_pixbuf_animation_is_static_image(gtkconv->u.im->anim)) {
+		GdkPixbuf *stat;
 		gtkconv->u.im->iter = NULL;
-		buf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
+		stat = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
+		buf = gdk_pixbuf_add_alpha(stat, FALSE, 0, 0, 0);
 	} else {
+		GdkPixbuf *stat;
 		gtkconv->u.im->iter =
 			gdk_pixbuf_animation_get_iter(gtkconv->u.im->anim, NULL); /* LEAK */
-		buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
+		stat = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
+		buf = gdk_pixbuf_add_alpha(stat, FALSE, 0, 0, 0);
 		if (gtkconv->u.im->animate)
 			start_anim(NULL, gtkconv);
 	}
 
-	pidgin_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
-			PURPLE_ICON_SCALE_DISPLAY, &scale_width, &scale_height);
-	scale = gdk_pixbuf_scale_simple(buf,
-				MAX(gdk_pixbuf_get_width(buf) * scale_width /
-				    gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1),
-				MAX(gdk_pixbuf_get_height(buf) * scale_height /
-				    gdk_pixbuf_animation_get_height(gtkconv->u.im->anim), 1),
+	scale_width = gdk_pixbuf_get_width(buf);
+	scale_height = gdk_pixbuf_get_height(buf);
+	if (scale_width == scale_height) {
+		scale_width = scale_height = 32;
+	} else if (scale_height > scale_width) {
+		scale_width = 32 * scale_width / scale_height;
+		scale_height = 32;
+	} else {
+		scale_height = 32 * scale_height / scale_width;
+		scale_width = 32;
+	}
+	scale = gdk_pixbuf_scale_simple(buf, scale_width, scale_height,
 				GDK_INTERP_BILINEAR);
-
+	g_object_unref(buf);
+	if (pidgin_gdk_pixbuf_is_opaque(scale))
+		pidgin_gdk_pixbuf_make_round(scale);
 	gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
 
-	frame = gtk_frame_new(NULL);
-	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);
-	gtk_box_pack_start(GTK_BOX(gtkconv->u.im->icon_container), frame,
-					   FALSE, FALSE, 0);
-
 	event = gtk_event_box_new();
-	gtk_container_add(GTK_CONTAINER(frame), event);
+	gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
 	g_signal_connect(G_OBJECT(event), "button-press-event",
 					 G_CALLBACK(icon_menu), gtkconv);
 	gtk_widget_show(event);
 
 	gtkconv->u.im->icon = gtk_image_new_from_pixbuf(scale);
 	gtkconv->auto_resize = TRUE;
-	/* Reset the size request to allow the buddy icon to resize */
-	gtk_widget_set_size_request(gtkconv->lower_hbox, -1, -1);
-	g_idle_add(reset_auto_resize_cb, gtkconv);
-	gtk_widget_set_size_request(gtkconv->u.im->icon, scale_width, scale_height);
 	gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon);
 	gtk_widget_show(gtkconv->u.im->icon);
 
 	g_object_unref(G_OBJECT(scale));
 
-	gtk_box_pack_start(GTK_BOX(gtkconv->lower_hbox),
+	gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox),
 			   gtkconv->u.im->icon_container, FALSE, FALSE, 0);
 
 	gtk_widget_show(gtkconv->u.im->icon_container);
-	gtk_widget_show(frame);
 
 	/* The buddy icon code needs badly to be fixed. */
 	if(pidgin_conv_window_is_active_conversation(conv))
@@ -6487,7 +6593,7 @@
 close_on_tabs_pref_cb(const char *name, PurplePrefType type,
 					  gconstpointer value, gpointer data)
 {
-	const GList *l;
+	GList *l;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 
@@ -6511,7 +6617,7 @@
 				   gconstpointer value, gpointer data)
 {
 #ifdef USE_GTKSPELL
-	const GList *cl;
+	GList *cl;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	GtkSpell *spell;
@@ -6558,7 +6664,7 @@
 show_timestamps_pref_cb(const char *name, PurplePrefType type,
 						gconstpointer value, gpointer data)
 {
-	const GList *l;
+	GList *l;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	PidginWindow *win;
@@ -6586,7 +6692,7 @@
 show_formatting_toolbar_pref_cb(const char *name, PurplePrefType type,
 								gconstpointer value, gpointer data)
 {
-	const GList *l;
+	GList *l;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	PidginWindow *win;
@@ -6616,7 +6722,7 @@
 animate_buddy_icons_pref_cb(const char *name, PurplePrefType type,
 							gconstpointer value, gpointer data)
 {
-	const GList *l;
+	GList *l;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	PidginWindow *win;
@@ -6643,7 +6749,7 @@
 show_buddy_icons_pref_cb(const char *name, PurplePrefType type,
 						 gconstpointer value, gpointer data)
 {
-	const GList *l;
+	GList *l;
 
 	for (l = purple_get_conversations(); l != NULL; l = l->next) {
 		PurpleConversation *conv = l->data;
@@ -6769,7 +6875,7 @@
 static void
 account_signed_off_cb(PurpleConnection *gc, gpointer event)
 {
-	const GList *iter;
+	GList *iter;
 
 	for (iter = purple_get_conversations(); iter; iter = iter->next)
 	{
@@ -8363,7 +8469,7 @@
 	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, !tabs_side && !angle, TRUE, GTK_PACK_START);
 
 	/* show the widgets */
-	gtk_widget_show(gtkconv->icon);
+/* XXX	gtk_widget_show(gtkconv->icon); */
 	gtk_widget_show(gtkconv->tab_label);
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
 		gtk_widget_show(gtkconv->close);
--- a/pidgin/gtkconv.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkconv.h	Thu Jun 21 20:37:57 2007 +0000
@@ -158,6 +158,10 @@
 	} u;
 
 	time_t newday;
+	GtkWidget *infopane_hbox;
+	GtkWidget *infopane;
+	GtkListStore *infopane_model;
+	GtkTreeIter infopane_iter;
 };
 
 /*@}*/
--- a/pidgin/gtkdocklet-x11.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Thu Jun 21 20:37:57 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/gtkdocklet.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkdocklet.c	Thu Jun 21 20:37:57 2007 +0000
@@ -109,8 +109,7 @@
 static gboolean
 docklet_update_status()
 {
-	GList *convs;
-	const GList *l;
+	GList *convs, *l;
 	int count;
 	PurpleSavedStatus *saved_status;
 	PurpleStatusPrimitive newstatus = PURPLE_STATUS_OFFLINE;
@@ -214,7 +213,8 @@
 static gboolean
 online_account_supports_chat()
 {
-	const GList *c = purple_connections_get_all();
+	GList *c = NULL;
+	c = purple_connections_get_all();
 
 	while(c != NULL) {
 		PurpleConnection *gc = c->data;
--- a/pidgin/gtkft.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkft.c	Thu Jun 21 20:37:57 2007 +0000
@@ -130,7 +130,7 @@
 	kbps    = (elapsed > 0 ? (kb_sent / elapsed) : 0);
 
 	if (kbsec != NULL) {
-		*kbsec = g_strdup_printf(_("%.2f KB/s"), kbps);
+		*kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps);
 	}
 
 	if (time_elapsed != NULL)
@@ -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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkimhtml.c	Thu Jun 21 20:37:57 2007 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "pidgin.h"
+#include "internal.h"
 
 #include "debug.h"
 #include "util.h"
@@ -53,19 +54,6 @@
 #include <windows.h>
 #endif
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  define _(x) gettext(x)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define N_(String) (String)
-#  define _(x) (x)
-#endif
-
 #include <pango/pango-font.h>
 
 /* GTK+ < 2.4.x hack, see pidgin.h for details. */
@@ -3294,6 +3282,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 +3297,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 +3330,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 +3341,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 +3374,6 @@
 		gtk_widget_show(dialog);
 		g_error_free(error);
 	}
-
-	g_free(type);
 }
 
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
@@ -5020,10 +5024,24 @@
 
 void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags)
 {
+	GtkIMHtmlButtons buttons;
+
 	if (flags & PURPLE_CONNECTION_HTML) {
 		char color[8];
 		GdkColor fg_color, bg_color;
 
+		buttons = GTK_IMHTML_ALL;
+
+		if (flags & PURPLE_CONNECTION_NO_BGCOLOR)
+			buttons &= ~GTK_IMHTML_BACKCOLOR;
+		if (flags & PURPLE_CONNECTION_NO_FONTSIZE)
+		{
+			buttons &= ~GTK_IMHTML_GROW;
+			buttons &= ~GTK_IMHTML_SHRINK;
+		}
+		if (flags & PURPLE_CONNECTION_NO_URLDESC)
+			buttons &= ~GTK_IMHTML_LINKDESC;
+
 		gtk_imhtml_set_format_functions(imhtml, GTK_IMHTML_ALL);
 		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold") != imhtml->edit.bold)
 			gtk_imhtml_toggle_bold(imhtml);
@@ -5078,9 +5096,14 @@
 		else
 			gtk_imhtml_set_whole_buffer_formatting_only(imhtml, FALSE);
 	} else {
+		buttons = GTK_IMHTML_SMILEY | GTK_IMHTML_IMAGE;
 		imhtml_clear_formatting(imhtml);
-		gtk_imhtml_set_format_functions(imhtml, 0);
 	}
+
+	if (flags & PURPLE_CONNECTION_NO_IMAGES)
+		buttons &= ~GTK_IMHTML_IMAGE;
+
+	gtk_imhtml_set_format_functions(imhtml, buttons);
 }
 
 
--- a/pidgin/gtkimhtmltoolbar.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Thu Jun 21 20:37:57 2007 +0000
@@ -865,41 +865,21 @@
                     gboolean          *push_in,
                     gpointer          data)
 {
+	GtkWidget *widget = GTK_WIDGET(data);
 	GtkRequisition menu_req;
-	GtkTextDirection direction;
-	GdkRectangle monitor;
-	gint monitor_num;
-	GdkScreen *screen;
-	GtkWidget *widget = GTK_WIDGET(data);
-
-	gtk_widget_size_request (GTK_WIDGET (menu), &menu_req);
-
-	direction = gtk_widget_get_direction (widget);
-
-	screen = gtk_widget_get_screen (GTK_WIDGET (menu));
-	monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
-	if (monitor_num < 0)
-		monitor_num = 0;
-	gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+	gint ythickness = widget->style->ythickness;
+	int savy;
 
-	gdk_window_get_origin (widget->window, x, y);
+	gtk_widget_size_request(GTK_WIDGET (menu), &menu_req);
+	gdk_window_get_origin(widget->window, x, y);
 	*x += widget->allocation.x;
-	*y += widget->allocation.y;
-
-	if (direction == GTK_TEXT_DIR_LTR)
-		*x += MAX (widget->allocation.width - menu_req.width, 0);
-	else if (menu_req.width > widget->allocation.width)
-		*x -= menu_req.width - widget->allocation.width;
+	*y += widget->allocation.y + widget->allocation.height;
+	savy = *y;
 
-	if ((*y + widget->allocation.height + menu_req.height) <= monitor.y + monitor.height)
-		*y += widget->allocation.height;
-	else if ((*y - menu_req.height) >= monitor.y)
-		*y -= menu_req.height;
-	else if (monitor.y + monitor.height - (*y + widget->allocation.height) > *y)
-		*y += widget->allocation.height;
-	else
-		*y -= menu_req.height;
-	*push_in = FALSE;
+	pidgin_menu_position_func_helper(menu, x, y, push_in, data);
+
+	if (savy > *y + ythickness + 1)
+		*y -= widget->allocation.height;
 }
 
 static void pidgin_menu_clicked(GtkWidget *button, GtkMenu *menu)
@@ -1055,6 +1035,7 @@
 	GtkWidget *font_button;
 	GtkWidget *font_menu;
 	GtkWidget *insert_menu;
+	GtkWidget *menuitem;
 	GtkWidget *button;
 	GtkWidget *sep;
 	int i;
@@ -1108,7 +1089,7 @@
 	
 	for (i = 0; buttons[i].label; i++) {
 		GtkWidget *old = *buttons[i].button;
-		GtkWidget *menuitem = gtk_check_menu_item_new_with_mnemonic(buttons[i].label);
+		menuitem = gtk_check_menu_item_new_with_mnemonic(buttons[i].label);
 		g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
 				G_CALLBACK(gtk_button_clicked), old);
 		g_signal_connect_after(G_OBJECT(old), "toggled",
@@ -1160,17 +1141,23 @@
 
 	insert_menu = gtk_menu_new();
 
-	button = gtk_menu_item_new_with_mnemonic(_("_Smiley"));
-	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
-	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), button);
+	menuitem = gtk_menu_item_new_with_mnemonic(_("_Smiley"));
+	g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
+	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->smiley), "notify::sensitive",
+			G_CALLBACK(button_sensitiveness_changed), menuitem);
 
-	button = gtk_menu_item_new_with_mnemonic(_("_Image"));
-	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gtk_button_clicked), toolbar->image);
-	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), button);
+	menuitem = gtk_menu_item_new_with_mnemonic(_("_Image"));
+	g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->image);
+	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->image), "notify::sensitive",
+			G_CALLBACK(button_sensitiveness_changed), menuitem);
 
-	button = gtk_menu_item_new_with_mnemonic(_("_Link"));
-	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gtk_button_clicked), toolbar->link);
-	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), button);
+	menuitem = gtk_menu_item_new_with_mnemonic(_("_Link"));
+	g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->link);
+	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->link), "notify::sensitive",
+			G_CALLBACK(button_sensitiveness_changed), menuitem);
 
 	g_signal_connect(G_OBJECT(insert_button), "clicked", G_CALLBACK(pidgin_menu_clicked), insert_menu);
 	g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button);
--- a/pidgin/gtklog.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtklog.c	Thu Jun 21 20:37:57 2007 +0000
@@ -757,7 +757,7 @@
 
 void pidgin_syslog_show()
 {
-	const GList *accounts;
+	GList *accounts = NULL;
 	GList *logs = NULL;
 
 	if (syslog_viewer != NULL) {
--- a/pidgin/gtkmain.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Jun 21 20:37:57 2007 +0000
@@ -108,37 +108,32 @@
 };
 #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);
 	} else { /* no name given, use the first account */
-		const GList *accounts;
+		GList *accounts;
 
 		accounts = purple_accounts_get_all();
 		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
@@ -377,6 +372,7 @@
 		       "  -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"
+		       "  -m, --multiple      do not ensure single instance\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"
@@ -436,12 +432,12 @@
 	gboolean opt_login = FALSE;
 	gboolean opt_nologin = FALSE;
 	gboolean opt_version = FALSE;
+	gboolean opt_si = TRUE;     /* Check for single instance? */
 	char *opt_config_dir_arg = NULL;
 	char *opt_login_arg = NULL;
 	char *opt_session_arg = NULL;
-	int dologin_ret = -1;
 	char *search_path;
-	const GList *accounts;
+	GList *accounts;
 #ifdef HAVE_SIGNAL_H
 	int sig_indx;	/* for setting up signal catching */
 	sigset_t sigset;
@@ -463,6 +459,7 @@
 		{"debug",    no_argument,       NULL, 'd'},
 		{"help",     no_argument,       NULL, 'h'},
 		{"login",    optional_argument, NULL, 'l'},
+		{"multiple", no_argument,       NULL, 'm'},
 		{"nologin",  no_argument,       NULL, 'n'},
 		{"session",  required_argument, NULL, 's'},
 		{"version",  no_argument,       NULL, 'v'},
@@ -477,7 +474,7 @@
 
 	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
 	g_thread_init(NULL);
-	
+
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -499,7 +496,7 @@
 			"no fault of your own.\n\n"
 			"If you can reproduce the crash, please notify the developers\n"
 			"by reporting a bug at:\n"
-			"%snewticket/\n\n"
+			"%ssimpleticket/\n\n"
 			"Please make sure to specify what you were doing at the time\n"
 			"and post the backtrace from the core file.  If you do not know\n"
 			"how to get the backtrace, please read the instructions at\n"
@@ -576,7 +573,7 @@
 	opterr = 1;
 	while ((opt = getopt_long(argc, argv,
 #ifndef _WIN32
-				  "c:dhnl::s:v",
+				  "c:dhmnl::s:v",
 #else
 				  "c:dhnl::v",
 #endif
@@ -608,6 +605,9 @@
 		case 'v':	/* version */
 			opt_version = TRUE;
 			break;
+		case 'm':   /* do not ensure single instance. */
+			opt_si = FALSE;
+			break;
 		case '?':	/* show terse help */
 		default:
 			show_usage(argv[0], TRUE);
@@ -734,7 +734,7 @@
 		abort();
 	}
 
-	if (!purple_core_ensure_single_instance()) {
+	if (opt_si && !purple_core_ensure_single_instance()) {
 		purple_core_quit();
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
@@ -798,14 +798,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 +830,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"))
@@ -846,6 +855,7 @@
 	winpidgin_post_init();
 #endif
 
+	g_set_application_name(_("Pidgin"));
 	gtk_main();
 
 #ifdef HAVE_SIGNAL_H
--- a/pidgin/gtknotify.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtknotify.c	Thu Jun 21 20:37:57 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/gtkpounce.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkpounce.c	Thu Jun 21 20:37:57 2007 +0000
@@ -211,12 +211,12 @@
 static void
 populate_pounces_list(PouncesManager *dialog)
 {
-	const GList *pounces;
+	GList *pounces;
 
 	gtk_list_store_clear(dialog->model);
 
-	for (pounces = purple_pounces_get_all(); pounces != NULL;
-			pounces = g_list_next(pounces))
+	for (pounces = purple_pounces_get_all_for_ui(PIDGIN_UI); pounces != NULL;
+			pounces = g_list_delete_link(pounces, pounces))
 	{
 		add_pounce_to_treeview(dialog->model, pounces->data);
 	}
@@ -496,7 +496,7 @@
 	}
 	else
 	{
-		const GList *connections = purple_connections_get_all();
+		GList *connections = purple_connections_get_all();
 		PurpleConnection *gc;
 
 		if (connections != NULL)
--- a/pidgin/gtkprefs.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkprefs.c	Thu Jun 21 20:37:57 2007 +0000
@@ -949,7 +949,7 @@
 	label = gtk_label_new_with_mnemonic(_("Conversation _font:"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	font_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
-	font_button = gtk_font_button_new_with_font(purple_prefs_get_string(font_name ? font_name : NULL));
+	font_button = gtk_font_button_new_with_font(font_name ? font_name : NULL);
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(font_button), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), font_button, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -977,7 +977,7 @@
 
 	gtk_imhtml_append_text(GTK_IMHTML(imhtml), _("This is how your outgoing message text will appear when you use protocols that support formatting. :)"), 0);
 
-	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 
 	gtk_imhtml_setup_entry(GTK_IMHTML(imhtml), PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_FORMATTING_WBFO);
 
@@ -1214,9 +1214,10 @@
 	}
 
 	gtk_widget_show_all(ret);
-	if (proxy_info == NULL ||
+	/* Only hide table if not running gnome otherwise we hide the IP address table! */
+	if (!purple_running_gnome() && (proxy_info == NULL ||
 	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_NONE ||
-	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_ENVVAR)
+	    purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_ENVVAR))
 		gtk_widget_hide(table);
 	return ret;
 }
--- a/pidgin/gtkrequest.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkrequest.c	Thu Jun 21 20:37:57 2007 +0000
@@ -974,7 +974,7 @@
 	GtkTreeSelection *sel;
 	GtkTreeViewColumn *column;
 	GtkTreeIter iter;
-	const GList *l;
+	GList *l;
 
 	/* Create the scrolled window */
 	sw = gtk_scrolled_window_new(NULL, NULL);
--- a/pidgin/gtkroomlist.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkroomlist.c	Thu Jun 21 20:37:57 2007 +0000
@@ -343,7 +343,7 @@
 gboolean
 pidgin_roomlist_is_showable()
 {
-	const GList *c;
+	GList *c;
 	PurpleConnection *gc;
 
 	for (c = purple_connections_get_all(); c != NULL; c = c->next) {
--- a/pidgin/gtksavedstatuses.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Thu Jun 21 20:37:57 2007 +0000
@@ -23,8 +23,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "account.h"
-#include "internal.h"
 #include "notify.h"
 #include "request.h"
 #include "savedstatuses.h"
@@ -285,9 +286,11 @@
 
 	for (l = sel_titles; l != NULL; l = l->next) {
 		title = l->data;
-		if (status_window_find_savedstatus(&iter, title))
-			gtk_list_store_remove(status_window->model, &iter);
-		purple_savedstatus_delete(title);
+		if (purple_savedstatus_find(title) != purple_savedstatus_get_current()) {
+			if (status_window_find_savedstatus(&iter, title))
+				gtk_list_store_remove(status_window->model, &iter);
+			purple_savedstatus_delete(title);
+		}
 		g_free(title);
 	}
 	g_list_free(sel_titles);
@@ -302,6 +305,7 @@
 	GList *sel_paths, *l, *sel_titles = NULL;
 	GtkTreeModel *model = GTK_TREE_MODEL(dialog->model);
 	char *title;
+	gpointer handle;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
 #if GTK_CHECK_VERSION(2,2,0)
@@ -324,13 +328,16 @@
 	}
 	g_list_free(sel_paths);
 
-	if (g_list_length(sel_titles) == 1)
+	if (g_list_length(sel_titles) == 1) {
 		title = g_strdup_printf(_("Are you sure you want to delete %s?"),
 				(const gchar *)sel_titles->data);
-	else
+		handle = purple_savedstatus_find(sel_titles->data);
+	} else {
 		title = g_strdup(_("Are you sure you want to delete the selected saved statuses?"));
+		handle = dialog;
+	}
 
-	purple_request_action(dialog, NULL, title, NULL, 0,
+	purple_request_action(handle, NULL, title, NULL, 0,
 		 NULL, NULL, NULL,
 		 sel_titles, 2,
 		_("Delete"), status_window_delete_confirm_cb,
@@ -349,17 +356,39 @@
 status_selected_cb(GtkTreeSelection *sel, gpointer user_data)
 {
 	StatusWindow *dialog = user_data;
-	int num_selected = 0;
+	GList *sel_paths, *tmp;
+	gboolean can_use = TRUE, can_delete = TRUE;
+	int num_selected;
+	GtkTreeModel *model = GTK_TREE_MODEL(dialog->model);
 
 #if GTK_CHECK_VERSION(2,2,0)
-	num_selected = gtk_tree_selection_count_selected_rows(sel);
+	sel_paths = gtk_tree_selection_get_selected_rows(sel, NULL);
 #else
-	gtk_tree_selection_selected_foreach(sel, count_selected_helper, &num_selected);
+	gtk_tree_selection_selected_foreach(sel, list_selected_helper, &sel_paths);
 #endif
 
-	gtk_widget_set_sensitive(dialog->use_button, (num_selected == 1));
+	for (tmp = sel_paths, num_selected = 0; tmp; tmp = tmp->next, num_selected++) {
+		GtkTreeIter iter;
+		char *title;
+
+		if (gtk_tree_model_get_iter(model, &iter, tmp->data)) {
+			gtk_tree_model_get(model, &iter,
+					STATUS_WINDOW_COLUMN_TITLE, &title, -1);
+			if (purple_savedstatus_find(title) == purple_savedstatus_get_current()) {
+				can_use = can_delete = FALSE;
+			}
+
+			g_free(title);
+		}
+
+		gtk_tree_path_free(tmp->data);
+	}
+
+	gtk_widget_set_sensitive(dialog->use_button, (num_selected == 1) && can_use);
 	gtk_widget_set_sensitive(dialog->modify_button, (num_selected > 0));
-	gtk_widget_set_sensitive(dialog->delete_button, (num_selected > 0));
+	gtk_widget_set_sensitive(dialog->delete_button, can_delete);
+
+    g_list_free(sel_paths);
 }
 
 static void
@@ -389,7 +418,7 @@
 static void
 populate_saved_status_list(StatusWindow *dialog)
 {
-	const GList *saved_statuses;
+	GList *saved_statuses;
 
 	gtk_list_store_clear(dialog->model);
 
@@ -421,6 +450,12 @@
 	status_window_modify_cb(NULL, dialog);
 }
 
+static void
+saved_status_updated_cb(PurpleSavedStatus *status, StatusWindow *sw)
+{
+	populate_saved_status_list(sw);
+}
+
 static GtkWidget *
 create_saved_status_list(StatusWindow *dialog)
 {
@@ -529,6 +564,13 @@
 	return FALSE;
 }
 
+static void
+current_status_changed(PurpleSavedStatus *old, PurpleSavedStatus *new_status,
+		StatusWindow *dialog)
+{
+	status_selected_cb(gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)), dialog);
+}
+
 void
 pidgin_status_window_show(void)
 {
@@ -615,6 +657,20 @@
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(status_window_close_cb), dialog);
 
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-changed", dialog,
+			PURPLE_CALLBACK(current_status_changed), dialog);
+
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-added", dialog,
+			PURPLE_CALLBACK(saved_status_updated_cb), dialog);
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-deleted", dialog,
+			PURPLE_CALLBACK(saved_status_updated_cb), dialog);
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", dialog,
+			PURPLE_CALLBACK(saved_status_updated_cb), dialog);
+
 	gtk_widget_show_all(win);
 }
 
@@ -804,8 +860,10 @@
 	gtk_widget_destroy(dialog->window);
 	g_free(dialog->original_title);
 
+/*
 	if (status_window != NULL)
 	  add_status_to_saved_status_list(status_window->model, saved_status);
+*/
 
 	/* If they clicked on "Save & Use" or "Use," then activate the status */
 	if (button != dialog->save_button)
@@ -1012,7 +1070,7 @@
 static void
 status_editor_populate_list(StatusEditor *dialog, PurpleSavedStatus *saved_status)
 {
-	const GList *iter;
+	GList *iter;
 	PurpleSavedStatusSub *substatus;
 
 	gtk_list_store_clear(dialog->model);
@@ -1393,7 +1451,7 @@
 	GtkTreeIter iter;
 	GtkCellRenderer *rend;
 	const char *status_id = NULL;
-	const GList *list;
+	GList *list;
 	gboolean select = FALSE;
 
 	g_return_if_fail(status_editor != NULL);
--- a/pidgin/gtksound.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtksound.c	Thu Jun 21 20:37:57 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/gtkstatusbox.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Thu Jun 21 20:37:57 2007 +0000
@@ -41,12 +41,14 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "internal.h"
+
 #include "account.h"
 #include "buddyicon.h"
 #include "core.h"
-#include "internal.h"
 #include "imgstore.h"
 #include "network.h"
+#include "request.h"
 #include "savedstatuses.h"
 #include "status.h"
 #include "debug.h"
@@ -191,7 +193,7 @@
 static void
 update_to_reflect_account_status(PidginStatusBox *status_box, PurpleAccount *account, PurpleStatus *newstatus)
 {
-	const GList *l;
+	GList *l;
 	int status_no = -1;
 	const PurpleStatusType *statustype = NULL;
 	const char *message;
@@ -732,7 +734,7 @@
 static PurpleStatusType *
 find_status_type_by_index(const PurpleAccount *account, gint active)
 {
-	const GList *l = purple_account_get_status_types(account);
+	GList *l = purple_account_get_status_types(account);
 	gint i;
 
 	for (i = 0; l; l = l->next) {
@@ -941,7 +943,7 @@
 {
 	PurpleAccount *acct = NULL, *acct2;
 	GList *tmp, *tmp2, *active_accts = purple_accounts_get_all_active();
-	const GList *s, *s1, *s2;
+	GList *s, *s1, *s2;
 
 	for (tmp = active_accts; tmp; tmp = tmp->next) {
 		acct = tmp->data;
@@ -989,7 +991,7 @@
 add_account_statuses(PidginStatusBox *status_box, PurpleAccount *account)
 {
 	/* Per-account */
-	const GList *l;
+	GList *l;
 	GdkPixbuf *pixbuf;
 
 	for (l = purple_account_get_status_types(account); l != NULL; l = l->next)
@@ -1223,6 +1225,12 @@
 }
 
 static void
+saved_status_updated_cb(PurpleSavedStatus *status, PidginStatusBox *status_box)
+{
+	pidgin_status_box_regenerate(status_box);
+}
+
+static void
 spellcheck_prefs_cb(const char *name, PurplePrefType type,
 					gconstpointer value, gpointer data)
 {
@@ -1434,7 +1442,7 @@
 			}
 		}
 	} else {
-		const GList *accounts;
+		GList *accounts;
 		for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
 			PurpleAccount *account = accounts->data;
 			PurplePlugin *plug = purple_find_prpl(purple_account_get_protocol_id(account));
@@ -1514,6 +1522,56 @@
 	pidgin_status_box_changed(status_box);
 }
 
+static void tree_view_delete_current_selection_cb(gpointer data)
+{
+	PurpleSavedStatus *saved;
+
+	saved = purple_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data));
+	g_return_if_fail(saved != NULL);
+
+	if (purple_savedstatus_get_current() != saved)
+		purple_savedstatus_delete_by_status(saved);
+}
+
+static void
+tree_view_delete_current_selection(PidginStatusBox *status_box, GtkTreePath *path)
+{
+	GtkTreeIter iter;
+	gpointer data;
+	PurpleSavedStatus *saved;
+	gchar *msg;
+
+	if (status_box->active_row) {
+		/* don't delete active status */
+		if (gtk_tree_path_compare(path, gtk_tree_row_reference_get_path(status_box->active_row)) == 0)
+			return;
+	}
+
+	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL(status_box->dropdown_store), &iter, path))
+		return;
+
+	gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter,
+			   DATA_COLUMN, &data,
+			   -1);
+
+	saved = purple_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data));
+	g_return_if_fail(saved != NULL);
+	if (saved == purple_savedstatus_get_current())
+		return;
+
+	msg = g_strdup_printf(_("Are you sure you want to delete %s?"), purple_savedstatus_get_title(saved));
+
+	purple_request_action(saved, NULL, msg, NULL, 0,
+		NULL, NULL, NULL,
+		data, 2,
+		_("Delete"), tree_view_delete_current_selection_cb,
+		_("Cancel"), NULL);
+
+	g_free(msg);
+
+	pidgin_status_box_popdown(status_box);
+}
+
 static gboolean
 treeview_button_release_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *status_box)
 {
@@ -1561,18 +1619,25 @@
 		if (event->keyval == GDK_Escape) {
 			pidgin_status_box_popdown(box);
 			return TRUE;
-		} else if (event->keyval == GDK_Return) {
+		} else {
 			GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(box->tree_view));
 			GtkTreeIter iter;
 			GtkTreePath *path;
 
 			if (gtk_tree_selection_get_selected(sel, NULL, &iter)) {
+				gboolean ret = TRUE;
 				path = gtk_tree_model_get_path(GTK_TREE_MODEL(box->dropdown_store), &iter);
-				treeview_activate_current_selection(box, path);
+				if (event->keyval == GDK_Return) {
+					treeview_activate_current_selection(box, path);
+				} else if (event->keyval == GDK_Delete) {
+					tree_view_delete_current_selection(box, path);
+				} else
+					ret = FALSE;
+
 				gtk_tree_path_free (path);
-				return TRUE;
+				return ret;
 			}
-		}
+		} 
 	}
 	return FALSE;
 }
@@ -1742,6 +1807,15 @@
 						status_box,
 						PURPLE_CALLBACK(current_savedstatus_changed_cb),
 						status_box);
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-added", status_box,
+			PURPLE_CALLBACK(saved_status_updated_cb), status_box);
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-deleted", status_box,
+			PURPLE_CALLBACK(saved_status_updated_cb), status_box);
+	purple_signal_connect(purple_savedstatuses_get_handle(),
+			"savedstatus-modified", status_box,
+			PURPLE_CALLBACK(saved_status_updated_cb), status_box);
 	purple_signal_connect(purple_accounts_get_handle(), "account-enabled", status_box,
 						PURPLE_CALLBACK(account_enabled_cb),
 						status_box);
@@ -2223,7 +2297,7 @@
 		{
 			/* Manually find the appropriate transient acct */
 			if (status_box->token_status_account) {
-				const GList *iter = purple_savedstatuses_get_all();
+				GList *iter = purple_savedstatuses_get_all();
 				GList *tmp, *active_accts = purple_accounts_get_all_active();
 
 				for (; iter != NULL; iter = iter->next) {
--- a/pidgin/gtkthemes.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkthemes.c	Thu Jun 21 20:37:57 2007 +0000
@@ -237,7 +237,7 @@
 	}
 
 	if (load) {
-		const GList *cnv;
+		GList *cnv;
 
 		if (current_smiley_theme)
 			pidgin_themes_destroy_smiley_theme(current_smiley_theme);
--- a/pidgin/gtkutils.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkutils.c	Thu Jun 21 20:37:57 2007 +0000
@@ -525,7 +525,7 @@
 {
 	PurplePluginProtocolInfo *prpl_info;
 	const char *protoname = NULL;
-	char buf[MAXPATHLEN];
+	char *tmp;
 	char *filename = NULL;
 	GdkPixbuf *pixbuf;
 
@@ -541,12 +541,14 @@
 	 * Status icons will be themeable too, and then it will look up
 	 * protoname from the theme
 	 */
-	g_snprintf(buf, sizeof(buf), "%s.png", protoname);
+	tmp = g_strconcat(protoname, ".png", NULL);
 
 	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
 				    size == PIDGIN_PRPL_ICON_SMALL ? "16" :
 				    size == PIDGIN_PRPL_ICON_MEDIUM ? "22" : "48",
-				    buf, NULL);
+				    tmp, NULL);
+	g_free(tmp);
+
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
 
@@ -687,8 +689,8 @@
 	AopMenu *aop_menu = NULL;
 	PurpleAccount *account;
 	GdkPixbuf *pixbuf = NULL;
-	const GList *list;
-	const GList *p;
+	GList *list;
+	GList *p;
 	GtkSizeGroup *sg;
 	int i;
 	char buf[256];
@@ -911,15 +913,44 @@
 	g_free(filename);
 }
 
-void pidgin_retrieve_user_info(PurpleConnection *conn, const char *name)
+static void
+show_retrieveing_info(PurpleConnection *conn, const char *name)
 {
 	PurpleNotifyUserInfo *info = purple_notify_user_info_new();
 	purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
 	purple_notify_userinfo(conn, name, info, NULL, NULL);
 	purple_notify_user_info_destroy(info);
+}
+
+void pidgin_retrieve_user_info(PurpleConnection *conn, const char *name)
+{
+	show_retrieveing_info(conn, name);
 	serv_get_info(conn, name);
 }
 
+void pidgin_retrieve_user_info_in_chat(PurpleConnection *conn, const char *name, int chat)
+{
+	char *who = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
+
+	if (chat < 0) {
+		pidgin_retrieve_user_info(conn, name);
+		return;
+	}
+
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(conn->prpl);
+	if (prpl_info == NULL || prpl_info->get_cb_info == NULL) {
+		pidgin_retrieve_user_info(conn, name);
+		return;
+	}
+
+	if (prpl_info->get_cb_real_name)
+		who = prpl_info->get_cb_real_name(conn, chat, name);
+	show_retrieveing_info(conn, who ? who : name);
+	prpl_info->get_cb_info(conn, chat, name);
+	g_free(who);
+}
+
 gboolean
 pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 							PurpleAccount **ret_account, char **ret_protocol,
@@ -995,9 +1026,9 @@
 		/* Check for a compatible account. */
 		if (ret_account != NULL)
 		{
-			const GList *list;
+			GList *list;
 			PurpleAccount *account = NULL;
-			const GList *l;
+			GList *l;
 			const char *protoname;
 
 			if (all_accounts)
@@ -1139,14 +1170,14 @@
 	g_object_unref (relation);
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
-static void
-pidgin_menu_position_func(GtkMenu *menu,
+void
+pidgin_menu_position_func_helper(GtkMenu *menu,
 							gint *x,
 							gint *y,
 							gboolean *push_in,
 							gpointer data)
 {
+#if GTK_CHECK_VERSION(2,2,0)
 	GtkWidget *widget;
 	GtkRequisition requisition;
 	GdkScreen *screen;
@@ -1287,9 +1318,9 @@
 	{
 		*y = monitor.y;
 	}
+#endif
 }
 
-#endif
 
 void
 pidgin_treeview_popup_menu_position_func(GtkMenu *menu,
@@ -1311,9 +1342,7 @@
 
 	*x += rect.x+rect.width;
 	*y += rect.y+rect.height+ythickness;
-#if GTK_CHECK_VERSION(2,2,0)
-	pidgin_menu_position_func (menu, x, y, push_in, data);
-#endif
+	pidgin_menu_position_func_helper(menu, x, y, push_in, data);
 }
 
 enum {
@@ -2049,6 +2078,7 @@
 static void
 screenname_autocomplete_destroyed_cb(GtkWidget *widget, gpointer data)
 {
+	g_free(data);
 	purple_signals_disconnect_by_handle(widget);
 }
 
@@ -2130,7 +2160,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)
@@ -3065,6 +3095,65 @@
         return TRUE;
 }
 
+void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf) {
+	int width, height, rowstride;
+        guchar *pixels;
+        if (!gdk_pixbuf_get_has_alpha(pixbuf))
+                return;
+        width = gdk_pixbuf_get_width(pixbuf);
+        height = gdk_pixbuf_get_height(pixbuf);
+        rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+        pixels = gdk_pixbuf_get_pixels(pixbuf);
+
+        if (width < 6 || height < 6)
+                return;
+        /* Top left */
+        pixels[3] = 0;
+        pixels[7] = 0x80;
+        pixels[11] = 0xC0;
+        pixels[rowstride + 3] = 0x80;
+        pixels[rowstride * 2 + 3] = 0xC0;
+
+        /* Top right */
+        pixels[width * 4 - 1] = 0;
+        pixels[width * 4 - 5] = 0x80;
+        pixels[width * 4 - 9] = 0xC0;
+        pixels[rowstride + (width * 4) - 1] = 0x80;
+        pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+
+        /* Bottom left */
+        pixels[(height - 1) * rowstride + 3] = 0;
+        pixels[(height - 1) * rowstride + 7] = 0x80;
+        pixels[(height - 1) * rowstride + 11] = 0xC0;
+        pixels[(height - 2) * rowstride + 3] = 0x80;
+        pixels[(height - 3) * rowstride + 3] = 0xC0;
+
+        /* Bottom right */
+        pixels[height * rowstride - 1] = 0;
+        pixels[(height - 1) * rowstride - 1] = 0x80;
+        pixels[(height - 2) * rowstride - 1] = 0xC0;
+        pixels[height * rowstride - 5] = 0x80;
+        pixels[height * rowstride - 9] = 0xC0;
+}
+
+const char *pidgin_get_dim_grey_string(GtkWidget *widget) {
+	static char dim_grey_string[8] = "";
+	GtkStyle *style;
+
+	if (!widget)
+		return "dim grey";
+
+ 	style = gtk_widget_get_style(widget);
+	if (!style)
+		return "dim grey";
+	
+	snprintf(dim_grey_string, sizeof(dim_grey_string), "#%02x%02x%02x",
+	style->text_aa[GTK_STATE_NORMAL].red >> 8,
+	style->text_aa[GTK_STATE_NORMAL].green >> 8,
+	style->text_aa[GTK_STATE_NORMAL].blue >> 8);
+	return dim_grey_string;
+}
+
 #if !GTK_CHECK_VERSION(2,2,0)
 GtkTreePath *
 gtk_tree_path_new_from_indices (gint first_index, ...)
@@ -3089,3 +3178,4 @@
 	return path;
 }
 #endif
+
--- a/pidgin/gtkutils.h	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/gtkutils.h	Thu Jun 21 20:37:57 2007 +0000
@@ -329,6 +329,15 @@
 void pidgin_retrieve_user_info(PurpleConnection *conn, const char *name);
 
 /**
+ * Get information about a user in a chat. Show immediate feedback.
+ *
+ * @param conn   The connection to get information from.
+ * @param name   The user to get information about.
+ * @param chatid The chat id.
+ */
+void pidgin_retrieve_user_info_in_chat(PurpleConnection *conn, const char *name, int chatid);
+
+/**
  * Parses an application/x-im-contact MIME message and returns the
  * data inside.
  *
@@ -359,6 +368,21 @@
 void pidgin_set_accessible_label(GtkWidget *w, GtkWidget *l);
 
 /**
+ * A helper function for GtkMenuPositionFuncs. This ensures the menu will
+ * be kept on screen if possible.
+ *
+ * @param menu The menu we are positioning.
+ * @param x Address of the gint representing the horizontal position
+ *        where the menu shall be drawn. This is an output parameter.
+ * @param y Address of the gint representing the vertical position
+ *        where the menu shall be drawn. This is an output parameter.
+ * @param push_in This is an output parameter?
+ * @param user_data Not used by this particular position function.
+ */
+void pidgin_menu_position_func_helper(GtkMenu *menu, gint *x, gint *y,
+										gboolean *push_in, gpointer data);
+
+/**
  * A valid GtkMenuPositionFunc.  This is used to determine where 
  * to draw context menu's when the menu is activated with the 
  * keyboard (shift+F10).  If the menu is activated with the mouse, 
@@ -550,6 +574,22 @@
  */
 gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf);
 
+/**
+ * Rounds the corners of a 32x32 GdkPixbuf in place
+ *
+ * @param pixbuf  The buddy icon to transform
+ */
+void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf);
+
+/**
+ * Returns an HTML-style color string for use as a dim grey
+ * string
+ *
+ * @param widget  The widget to return dim grey for
+ * @return The dim grey string
+ */
+const char *pidgin_get_dim_grey_string(GtkWidget *widget);
+
 #if !GTK_CHECK_VERSION(2,2,0)
 /**
  * This is copied from Gtk to support Gtk 2.0
--- a/pidgin/pidginstock.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pidginstock.c	Thu Jun 21 20:37:57 2007 +0000
@@ -105,7 +105,7 @@
 	{ PIDGIN_STOCK_STATUS_AWAY, 	   "status", "away.png",	TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },
 	{ PIDGIN_STOCK_STATUS_BUSY, 	"status", "busy.png", 		TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },
 	{ PIDGIN_STOCK_STATUS_CHAT, 	"status", "chat.png",		TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-	{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png",	TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png",	TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
 	{ PIDGIN_STOCK_STATUS_XA, 	"status", "extended-away.png",	TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },
 	{ PIDGIN_STOCK_STATUS_LOGIN, 	"status", "log-in.png",		TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
 	{ PIDGIN_STOCK_STATUS_LOGOUT, 	"status", "log-out.png",	TRUE, TRUE, TRUE, TRUE, FALSE, FALSE , NULL },
@@ -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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pidginstock.h	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/icons/16/scalable/pidgin.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/icons/24/scalable/pidgin.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/icons/32/scalable/pidgin.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/icons/48/scalable/pidgin.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/available.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/away.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/busy.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/offline.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/22/scalable/available.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/22/scalable/away.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/22/scalable/offline.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/available.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/away.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/busy.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/status/32/scalable/offline.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/tray/16/scalable/tray-away.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/tray/16/scalable/tray-online.svg	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg	Thu Jun 21 20:37:57 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	Thu Jun 21 20:37:57 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	Thu Jun 21 20:37:57 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	Thu Jun 21 20:37:57 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	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/pixmaps/tray/Makefile.am	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Thu Jun 21 20:37:57 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 \
--- a/pidgin/plugins/gestures/gestures.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/gestures/gestures.c	Thu Jun 21 20:37:57 2007 +0000
@@ -176,7 +176,7 @@
 plugin_load(PurplePlugin *plugin)
 {
 	PurpleConversation *conv;
-	const GList *l;
+	GList *l;
 
 	for (l = purple_get_conversations(); l != NULL; l = l->next) {
 		conv = (PurpleConversation *)l->data;
@@ -199,7 +199,7 @@
 {
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	const GList *l;
+	GList *l;
 
 	for (l = purple_get_conversations(); l != NULL; l = l->next) {
 		conv = (PurpleConversation *)l->data;
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Thu Jun 21 20:37:57 2007 +0000
@@ -162,7 +162,7 @@
 		GList *list, const char *id)
 {
 	PurpleAccount *account = NULL;
-	const GList *l;
+	GList *l;
 	GtkTreeIter iter;
 	GdkPixbuf *pixbuf;
 
--- a/pidgin/plugins/gevolution/gevolution.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/gevolution/gevolution.c	Thu Jun 21 20:37:57 2007 +0000
@@ -69,8 +69,7 @@
 						const char *prpl_id, EContactField field)
 {
 	GList *ims = e_contact_get(contact, field);
-	const GList *l;
-	const GList *l2;
+	GList *l, *l2;
 
 	if (ims == NULL)
 		return;
@@ -119,9 +118,9 @@
 }
 
 static void
-contacts_changed_cb(EBookView *book_view, const GList *contacts)
+contacts_changed_cb(EBookView *book_view, GList *contacts)
 {
-	const GList *l;
+	GList *l;
 
 	if (purple_connections_get_all() == NULL)
 		return;
@@ -401,7 +400,7 @@
 	GtkCellRenderer *renderer;
 	GdkPixbuf *pixbuf;
 	GtkListStore *model;
-	const GList *l;
+	GList *l;
 
 	/* Outside container */
 	ret = gtk_vbox_new(FALSE, 18);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/plugins/gtkbuddynote.c	Thu Jun 21 20:37:57 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/plugins/notify.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/notify.c	Thu Jun 21 20:37:57 2007 +0000
@@ -624,7 +624,7 @@
 static void
 apply_method()
 {
-	const GList *convs;
+	GList *convs;
 	PidginWindow *purplewin = NULL;
 
 	for (convs = purple_get_conversations(); convs != NULL;
@@ -644,7 +644,7 @@
 static void
 apply_notify()
 {
-	const GList *convs = purple_get_conversations();
+	GList *convs = purple_get_conversations();
 
 	while (convs) {
 		PurpleConversation *conv = (PurpleConversation *)convs->data;
@@ -818,7 +818,7 @@
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
-	const GList *convs = purple_get_conversations();
+	GList *convs = purple_get_conversations();
 	void *conv_handle = purple_conversations_get_handle();
 	void *gtk_conv_handle = pidgin_conversations_get_handle();
 
@@ -860,7 +860,7 @@
 static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
-	const GList *convs = purple_get_conversations();
+	GList *convs = purple_get_conversations();
 
 	while (convs) {
 		PurpleConversation *conv = (PurpleConversation *)convs->data;
--- a/pidgin/plugins/pidginrc.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Thu Jun 21 20:37:57 2007 +0000
@@ -27,49 +27,49 @@
 
 static guint pref_callback;
 
-static const char *color_prefs[] = {
+static const gchar *color_prefs[] = {
 	"/plugins/gtk/purplerc/color/GtkWidget::cursor-color",
 	"/plugins/gtk/purplerc/color/GtkWidget::secondary-cursor-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::hyperlink-color"
 };
-static const char *color_prefs_set[] = {
+static const gchar *color_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/color/GtkWidget::cursor-color",
 	"/plugins/gtk/purplerc/set/color/GtkWidget::secondary-cursor-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::hyperlink-color"
 };
-static const char *color_names[] = {
+static const gchar *color_names[] = {
 	N_("Cursor Color"),
 	N_("Secondary Cursor Color"),
 	N_("Hyperlink Color")
 };
 static GtkWidget *color_widgets[G_N_ELEMENTS(color_prefs)];
 
-static const char *widget_size_prefs[] = {
+static const gchar *widget_size_prefs[] = {
 	"/plugins/gtk/purplerc/size/GtkTreeView::horizontal_separator"
 };
-static const char *widget_size_prefs_set[] = {
+static const gchar *widget_size_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/size/GtkTreeView::horizontal_separator"
 };
-static const char *widget_size_names[] = {
+static const gchar *widget_size_names[] = {
 	N_("GtkTreeView Horizontal Separation")
 };
 static GtkWidget *widget_size_widgets[G_N_ELEMENTS(widget_size_prefs)];
 
-static const char *font_prefs[] = {
+static const gchar *font_prefs[] = {
 	"/plugins/gtk/purplerc/font/*pidgin_conv_entry",
 	"/plugins/gtk/purplerc/font/*pidgin_conv_imhtml",
 	"/plugins/gtk/purplerc/font/*pidgin_log_imhtml",
 	"/plugins/gtk/purplerc/font/*pidgin_request_imhtml",
 	"/plugins/gtk/purplerc/font/*pidgin_notify_imhtml",
 };
-static const char *font_prefs_set[] = {
+static const gchar *font_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_entry",
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_imhtml",
 	"/plugins/gtk/purplerc/set/font/*pidgin_log_imhtml",
 	"/plugins/gtk/purplerc/set/font/*pidgin_request_imhtml",
 	"/plugins/gtk/purplerc/set/font/*pidgin_notify_imhtml",
 };
-static const char *font_names[] = {
+static const gchar *font_names[] = {
 	N_("Conversation Entry"),
 	N_("Conversation History"),
 	N_("Log Viewer"),
@@ -79,53 +79,56 @@
 static GtkWidget *font_widgets[G_N_ELEMENTS(font_prefs)];
 
 /*
-static const char *widget_bool_prefs[] = {
+static const gchar *widget_bool_prefs[] = {
 };
-static const char *widget_bool_prefs_set[] = {
+static const gchar *widget_bool_prefs_set[] = {
 };
-static const char *widget_bool_names[] = {
+static const gchar *widget_bool_names[] = {
 };
 static GtkWidget *widget_bool_widgets[G_N_ELEMENTS(widget_bool_prefs)];
 */
 
-static void
-purplerc_make_changes()
+static GString *
+make_gtkrc_string()
 {
-	int i;
-	char *prefbase = NULL;
-#if GTK_CHECK_VERSION(2,4,0)
-	GtkSettings *setting = NULL;
-#endif
+	gint i;
+	gchar *prefbase = NULL;
 	GString *style_string = g_string_new("");
 
 	if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name")) {
-		const char *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name");
+		const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name");
 
-		if (pref != NULL && strcmp(pref, ""))
-			g_string_append_printf(style_string, "gtk-font-name = \"%s\"\n", pref);
+		if (pref != NULL && strcmp(pref, "")) {
+			g_string_append_printf(style_string,
+			                       "gtk-font-name = \"%s\"\n",
+			                       pref);
+		}
 	}
 
 	if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name")) {
-		const char *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name");
+		const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name");
 
-		if (pref != NULL && strcmp(pref, ""))
-			g_string_append_printf(style_string, "gtk-key-theme-name = \"%s\"\n", pref);
+		if (pref != NULL && strcmp(pref, "")) {
+			g_string_append_printf(style_string,
+			                       "gtk-key-theme-name = \"%s\"\n",
+			                       pref);
+		}
 	}
 
-	g_string_append(style_string, "style \"purplerc_style\" {\n");
+	g_string_append(style_string, "style \"purplerc_style\"\n{");
 
 	for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) {
 		if (purple_prefs_get_bool(color_prefs_set[i])) {
-			const char *pref;
-
-			prefbase = g_path_get_basename(color_prefs[i]);
-			pref = purple_prefs_get_string(color_prefs[i]);
+			const gchar *pref;
 
-			if (pref != NULL && strcmp(pref, ""))
-			    g_string_append_printf(style_string,
-			                           "%s = \"%s\"\n",
-			                           prefbase, pref);
-			g_free(prefbase);
+			pref = purple_prefs_get_string(color_prefs[i]);
+			if (pref != NULL && strcmp(pref, "")) {
+				prefbase = g_path_get_basename(color_prefs[i]);
+				g_string_append_printf(style_string,
+				                       "\n\t%s = \"%s\"",
+				                       prefbase, pref);
+				g_free(prefbase);
+			}
 		}
 	}
 
@@ -133,7 +136,7 @@
 		if (purple_prefs_get_bool(widget_size_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_size_prefs[i]);
 			g_string_append_printf(style_string,
-			                       "%s = %d\n", prefbase,
+			                       "\n\t%s = %d", prefbase,
 			                       purple_prefs_get_int(widget_size_prefs[i]));
 			g_free(prefbase);
 		}
@@ -144,37 +147,47 @@
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
 			g_string_append_printf(style_string,
-			                       "%s = %d\n", prefbase,
+			                       "\t%s = %d\n", prefbase,
 			                       purple_prefs_get_bool(widget_bool_prefs[i]));
 			g_free(prefbase);
 		}
 	}
 	*/
 
-	g_string_append(style_string, "}");
-	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
+	g_string_append(style_string, "\n}\nwidget_class \"*\" style \"purplerc_style\"\n");
 
 	for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) {
 		if (purple_prefs_get_bool(font_prefs_set[i])) {
-			const char *pref;
-
-			prefbase = g_path_get_basename(font_prefs[i]);
-			pref = purple_prefs_get_string(font_prefs[i]);
+			const gchar *pref;
 
-			if (pref != NULL && strcmp(pref, ""))
+			pref = purple_prefs_get_string(font_prefs[i]);
+			if (pref != NULL && strcmp(pref, "")) {
+				prefbase = g_path_get_basename(font_prefs[i]);
 				g_string_append_printf(style_string,
-				                       "style \"%s_style\"\n"
-				                       "{font_name = \"%s\"}\n"
-				                       "widget \"%s\" "
+				                       "style \"%s_style\"\n{\n"
+				                       "\tfont_name = \"%s\"\n}"
+				                       "\nwidget \"%s\" "
 				                       "style \"%s_style\"\n",
 				                       prefbase, pref,
 				                       prefbase, prefbase);
-			g_free(prefbase);
+				g_free(prefbase);
+			}
 		}
 	}
 
-	gtk_rc_parse_string(style_string->str);
-	g_string_free(style_string, TRUE);
+	return style_string;
+}
+
+static void
+purplerc_make_changes()
+{
+	GString *str = make_gtkrc_string();
+#if GTK_CHECK_VERSION(2,4,0)
+	GtkSettings *setting = NULL;
+#endif
+
+	gtk_rc_parse_string(str->str);
+	g_string_free(str, TRUE);
 
 #if GTK_CHECK_VERSION(2,4,0)
 	setting = gtk_settings_get_default();
@@ -185,92 +198,10 @@
 static void
 purplerc_write(GtkWidget *widget, gpointer data)
 {
-	int i;
-	GString *style_string = g_string_new("");
-	char *prefbase = NULL;
-
-	if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name")) {
-		const char *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name");
-
-		if (pref != NULL && strcmp(pref, ""))
-			g_string_append_printf(style_string,
-			                       "gtk-font-name = \"%s\"\n",
-			                       pref);
-	}
-
-	if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name")) {
-		const char *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name");
-
-		if (pref != NULL && strcmp(pref, ""))
-			g_string_append_printf(style_string,
-			                       "gtk-key-theme-name = \"%s\"\n",
-			                       pref);
-	}
-
-	g_string_append(style_string, "style \"purplerc_style\" {\n");
-
-	for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) {
-		if (purple_prefs_get_bool(color_prefs_set[i])) {
-			const char *pref;
-
-			prefbase = g_path_get_basename(color_prefs[i]);
-			pref = purple_prefs_get_string(color_prefs[i]);
-
-			if (pref != NULL && strcmp(pref, ""))
-			    g_string_append_printf(style_string,
-			                           "%s = \"%s\"\n",
-			                           prefbase, pref);
-			g_free(prefbase);
-		}
-	}
-
-	for (i = 0; i < G_N_ELEMENTS(widget_size_prefs); i++) {
-		if (purple_prefs_get_bool(widget_size_prefs_set[i])) {
-			prefbase = g_path_get_basename(widget_size_prefs[i]);
-			g_string_append_printf(style_string,
-			                       "%s = %d\n", prefbase,
-			                       purple_prefs_get_int(widget_size_prefs[i]));
-			g_free(prefbase);
-		}
-	}
-
-	/*
-	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
-			prefbase = g_path_get_basename(widget_bool_prefs[i]);
-			g_string_append_printf(style_string,
-			                       "%s = %d\n", prefbase,
-			                       purple_prefs_get_bool(widget_bool_prefs[i]));
-			g_free(prefbase);
-		}
-	}
-	*/
-
-	g_string_append(style_string, "}");
-	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
-
-	for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) {
-		if (purple_prefs_get_bool(font_prefs_set[i])) {
-			const char *pref;
-
-			prefbase = g_path_get_basename(font_prefs[i]);
-			pref = purple_prefs_get_string(font_prefs[i]);
-
-			if (pref != NULL && strcmp(pref, ""))
-				g_string_append_printf(style_string,
-				                       "style \"%s_style\"\n"
-				                       "{font_name = \"%s\"}\n"
-				                       "widget \"%s\" "
-				                       "style \"%s_style\"\n",
-				                       prefbase, pref,
-				                       prefbase, prefbase);
-			g_free(prefbase);
-		}
-	}
-
-	purple_util_write_data_to_file("gtkrc-2.0", style_string->str, -1);
-
-	g_string_free(style_string, TRUE);
+	GString *str = make_gtkrc_string();
+	str = g_string_prepend(str, "# This file automatically written by the Pidgin GTK+ Theme Control plugin.\n# Any changes to this file will be overwritten by the plugin when told to\n# write the settings again.\n# The FAQ (http://developer.pidgin.im/wiki/FAQ) contains some further examples\n# of possible pidgin gtkrc settings.\n");
+	purple_util_write_data_to_file("gtkrc-2.0", str->str, -1);
+	g_string_free(str, TRUE);
 }
 
 static void
@@ -283,7 +214,7 @@
 
 static void
 purplerc_pref_changed_cb(const char *name, PurplePrefType type,
-                       gconstpointer value, gpointer data)
+                         gconstpointer value, gpointer data)
 {
 	purplerc_make_changes();
 }
@@ -291,12 +222,12 @@
 static void
 purplerc_color_response(GtkDialog *color_dialog, gint response, gpointer data)
 {
-	int subscript = GPOINTER_TO_INT(data);
+	gint subscript = GPOINTER_TO_INT(data);
 
 	if (response == GTK_RESPONSE_OK) {
+		GdkColor color;
+		gchar colorstr[8];
 		GtkWidget *colorsel = GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel;
-		GdkColor color;
-		char colorstr[8];
 
 		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(colorsel), &color);
 
@@ -311,11 +242,11 @@
 static void
 purplerc_set_color(GtkWidget *widget, gpointer data)
 {
+	GdkColor color;
+	gchar title[128];
+	const gchar *pref = NULL;
 	GtkWidget *color_dialog = NULL;
-	GdkColor color;
-	char title[128];
-	const char *pref = NULL;
-	int subscript = GPOINTER_TO_INT(data);
+	gint subscript = GPOINTER_TO_INT(data);
 
 	g_snprintf(title, sizeof(title), _("Select Color for %s"),
 	           _(color_names[GPOINTER_TO_INT(data)]));
@@ -337,14 +268,21 @@
 static void
 purplerc_font_response(GtkDialog *font_dialog, gint response, gpointer data)
 {
-	int subscript = GPOINTER_TO_INT(data);
+	const gchar *prefpath;
+	gint subscript = GPOINTER_TO_INT(data);
 
 	if (response == GTK_RESPONSE_OK) {
-		char *fontname = NULL;
+		gchar *fontname = NULL;
+
+		if (subscript == -1) {
+			prefpath = "/plugins/gtk/purplerc/gtk-font-name";
+		} else {
+			prefpath = font_prefs[subscript];
+		}
 
 		fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog));
 
-		purple_prefs_set_string(font_prefs[subscript], fontname);
+		purple_prefs_set_string(prefpath, fontname);
 		g_free(fontname);
 	}
 	gtk_widget_destroy(GTK_WIDGET(font_dialog));
@@ -353,53 +291,25 @@
 static void
 purplerc_set_font(GtkWidget *widget, gpointer data)
 {
+	gchar title[128];
 	GtkWidget *font_dialog = NULL;
-	char title[128];
-	const char *pref = NULL;
-	int subscript = GPOINTER_TO_INT(data);
+	gint subscript = GPOINTER_TO_INT(data);
+	const gchar *pref = NULL, *prefpath = NULL;
 
-	g_snprintf(title, sizeof(title), _("Select Font for %s"),
-	           _(font_names[subscript]));
+	if (subscript == -1) {
+		g_snprintf(title, sizeof(title), _("Select Interface Font"));
+		prefpath = "/plugins/gtk/purplerc/gtk-font-name";
+	} else {
+		g_snprintf(title, sizeof(title), _("Select Font for %s"),
+		           _(font_names[subscript]));
+		prefpath = font_prefs[subscript];
+	}
+
 	font_dialog = gtk_font_selection_dialog_new(title);
 	g_signal_connect(G_OBJECT(font_dialog), "response",
 	                 G_CALLBACK(purplerc_font_response), data);
 
-	pref = purple_prefs_get_string(font_prefs[subscript]);
-
-	if (pref != NULL && strcmp(pref, "")) {
-		gtk_font_selection_set_font_name(GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(font_dialog)->fontsel), pref);
-	}
-
-	gtk_window_present(GTK_WINDOW(font_dialog));
-}
-
-static void
-purplerc_font_response_special(GtkDialog *font_dialog, gint response,
-                             gpointer data)
-{
-	if (response == GTK_RESPONSE_OK) {
-		char *fontname = NULL;
-
-		fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog));
-
-		purple_prefs_set_string("/plugins/gtk/purplerc/gtk-font-name",
-		                      fontname);
-		g_free(fontname);
-	}
-	gtk_widget_destroy(GTK_WIDGET(font_dialog));
-}
-
-static void
-purplerc_set_font_special(GtkWidget *widget, gpointer data)
-{
-	GtkWidget *font_dialog = NULL;
-	const char *pref = NULL;
-
-	font_dialog = gtk_font_selection_dialog_new(_("Select Interface Font"));
-	g_signal_connect(G_OBJECT(font_dialog), "response",
-	                 G_CALLBACK(purplerc_font_response_special), NULL);
-
-	pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name");
+	pref = purple_prefs_get_string(prefpath);
 
 	if (pref != NULL && strcmp(pref, "")) {
 		gtk_font_selection_set_font_name(GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(font_dialog)->fontsel), pref);
@@ -413,8 +323,10 @@
 {
 	purplerc_make_changes();
 
-	pref_callback = purple_prefs_connect_callback(plugin, "/plugins/gtk/purplerc",
-	                                            purplerc_pref_changed_cb, NULL);
+	pref_callback = purple_prefs_connect_callback(plugin,
+	                                              "/plugins/gtk/purplerc",
+	                                              purplerc_pref_changed_cb,
+	                                              NULL);
 
 	return TRUE;
 }
@@ -433,17 +345,23 @@
 	/* Note: Intentionally not using the size group argument to the
 	 * pidgin_prefs_labeled_* functions they only add the text label to
 	 * the size group not the whole thing, which isn't what I want. */
-	int i;
-	char *tmp;
+	gint i;
+	gchar *tmp;
 	GtkWidget *check = NULL, *widget = NULL;
-	GtkSizeGroup *labelsg = NULL, *widgetsg = NULL;
-	GtkWidget *ret = NULL, *frame = NULL, *hbox = NULL, *vbox = NULL;
+	GtkWidget *ret = NULL, *hbox = NULL, *frame = NULL;
+	GtkSizeGroup *labelsg = NULL, *widgetsg = NULL, *buttonsg = NULL;
+#ifndef _WIN32
+	const gchar *homepath = "$HOME";
+#else
+	const gchar *homepath = "\%APPDATA\%";
+#endif
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
 
 	labelsg  = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	widgetsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+	buttonsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	frame = pidgin_make_frame(ret, _("General"));
 	/* interface font */
@@ -451,12 +369,12 @@
 	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
 	check = pidgin_prefs_checkbox(_("GTK+ Interface Font"),
-	                                "/plugins/gtk/purplerc/set/gtk-font-name",
-	                                hbox);
+	                              "/plugins/gtk/purplerc/set/gtk-font-name",
+	                              hbox);
 	gtk_size_group_add_widget(labelsg, check);
 
 	widget = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT,
-	                                       PIDGIN_BUTTON_HORIZONTAL);
+	                                         PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(widgetsg, widget);
 	gtk_widget_set_sensitive(widget,
@@ -464,20 +382,20 @@
 	g_signal_connect(G_OBJECT(check), "toggled",
 	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 	g_signal_connect(G_OBJECT(widget), "clicked",
-	                 G_CALLBACK(purplerc_set_font_special), NULL);
+	                 G_CALLBACK(purplerc_set_font), GINT_TO_POINTER(-1));
 
 	/* key theme name */
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
 	check = pidgin_prefs_checkbox(_("GTK+ Text Shortcut Theme"),
-	                                "/plugins/gtk/purplerc/set/gtk-key-theme-name",
-	                                hbox);
+	                              "/plugins/gtk/purplerc/set/gtk-key-theme-name",
+	                              hbox);
 	gtk_size_group_add_widget(labelsg, check);
 
 	widget = pidgin_prefs_labeled_entry(hbox, "",
-	                                      "/plugins/gtk/purplerc/gtk-key-theme-name",
-	                                      NULL);
+	                                    "/plugins/gtk/purplerc/gtk-key-theme-name",
+	                                    NULL);
 	/*
 	gtk_size_group_add_widget(widgetsg, widget);
 	*/
@@ -492,7 +410,7 @@
 		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);
+		                              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);
@@ -514,7 +432,7 @@
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
 		check = pidgin_prefs_checkbox(_(color_names[i]),
-		                                color_prefs_set[i], hbox);
+		                              color_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
 		color_widgets[i] = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_COLOR, PIDGIN_BUTTON_HORIZONTAL);
@@ -538,7 +456,7 @@
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
 		check = pidgin_prefs_checkbox(_(widget_size_names[i]),
-		                                widget_size_prefs_set[i], hbox);
+		                              widget_size_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
 		widget_size_widgets[i] = pidgin_prefs_labeled_spin_button(hbox, "", widget_size_prefs[i], 0, 50, NULL);
@@ -559,7 +477,7 @@
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
 		check = pidgin_prefs_checkbox(_(font_names[i]),
-		                                font_prefs_set[i], hbox);
+		                              font_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
 		font_widgets[i] = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT, PIDGIN_BUTTON_HORIZONTAL);
@@ -572,27 +490,29 @@
 		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 font_widgets[i]);
 		g_signal_connect(G_OBJECT(font_widgets[i]), "clicked",
-		                 G_CALLBACK(purplerc_set_font), GINT_TO_POINTER(i));
+		                 G_CALLBACK(purplerc_set_font),
+		                 GINT_TO_POINTER(i));
 	}
 
-	frame = pidgin_make_frame(ret, _("Tools"));
+	frame = pidgin_make_frame(ret, _("Gtkrc File Tools"));
 
-	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-	gtk_box_pack_start(GTK_BOX(frame), vbox, FALSE, FALSE, 0);
+	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-	tmp = g_strdup_printf(_("Write settings to %s%sgtkrc-2.0"), purple_user_dir(), G_DIR_SEPARATOR_S);
+	tmp = g_strdup_printf(_("Write settings to %s%sgtkrc-2.0"),
+	                      homepath, G_DIR_SEPARATOR_S);
 	check = gtk_button_new_with_label(tmp);
 	g_free(tmp);
-	gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
-	gtk_size_group_add_widget(labelsg, check);
-	g_signal_connect(G_OBJECT(check), "clicked", G_CALLBACK(purplerc_write),
-	                 NULL);
+	gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
+	gtk_size_group_add_widget(buttonsg, check);
+	g_signal_connect(G_OBJECT(check), "clicked",
+	                 G_CALLBACK(purplerc_write), NULL);
 
 	check = gtk_button_new_with_label(_("Re-read gtkrc files"));
-	gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
-	gtk_size_group_add_widget(labelsg, check);
-	g_signal_connect(G_OBJECT(check), "clicked", G_CALLBACK(purplerc_reread),
-	                 NULL);
+	gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
+	gtk_size_group_add_widget(buttonsg, check);
+	g_signal_connect(G_OBJECT(check), "clicked",
+	                 G_CALLBACK(purplerc_reread), NULL);
 
 	gtk_widget_show_all(ret);
 	return ret;
@@ -645,7 +565,7 @@
 static void
 purplerc_init(PurplePlugin *plugin)
 {
-	int i;
+	gint i;
 
 	purple_prefs_add_none("/plugins");
 	purple_prefs_add_none("/plugins/gtk");
--- a/pidgin/plugins/relnot.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/relnot.c	Thu Jun 21 20:37:57 2007 +0000
@@ -70,8 +70,9 @@
 	message = g_string_new("");
 	g_string_append_printf(message, _("You are using %s version %s.  The "
 			"current version is %s.  You can get it from "
-			"<a href=\"" PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</a><hr>"),
-			PIDGIN_NAME, purple_core_get_version(), cur_ver);
+			"<a href=\"%s\">%s</a><hr>"),
+			PIDGIN_NAME, purple_core_get_version(), cur_ver,
+			PURPLE_WEBSITE, PURPLE_WEBSITE);
 
 	if(*changelog) {
 		formatted = purple_strdup_withhtml(changelog);
--- a/pidgin/plugins/spellchk.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/spellchk.c	Thu Jun 21 20:37:57 2007 +0000
@@ -2118,7 +2118,7 @@
 plugin_load(PurplePlugin *plugin)
 {
 	void *conv_handle = purple_conversations_get_handle();
-	const GList *convs;
+	GList *convs;
 
 	load_conf();
 
@@ -2137,7 +2137,7 @@
 static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
-	const GList *convs;
+	GList *convs;
 
 	/* Detach from existing conversations */
 	for (convs = purple_get_conversations(); convs != NULL; convs = convs->next)
--- a/pidgin/plugins/timestamp.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/timestamp.c	Thu Jun 21 20:37:57 2007 +0000
@@ -77,7 +77,7 @@
 	time_t now = time(NULL) / interval * interval;
 	time_t then;
 
-	if (!g_list_find((GList *)purple_get_conversations(), conv))
+	if (!g_list_find(purple_get_conversations(), conv))
 		return FALSE;
 
 	then = GPOINTER_TO_INT(purple_conversation_get_data(
@@ -98,7 +98,7 @@
 	PidginConversation *gtk_conv = PIDGIN_CONVERSATION(conv);
 	GtkTextBuffer *buffer;
 
-	if (!g_list_find((GList *)purple_get_conversations(), conv))
+	if (!g_list_find(purple_get_conversations(), conv))
 		return;
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtk_conv->imhtml));
--- a/pidgin/plugins/xmppconsole.c	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/plugins/xmppconsole.c	Thu Jun 21 20:37:57 2007 +0000
@@ -731,7 +731,7 @@
 	GtkWidget *label;
 	GtkTextBuffer *buffer;
 	GtkWidget *toolbar;
-	const GList *connections;
+	GList *connections;
 #if GTK_CHECK_VERSION(2,4,0)
 	GtkToolItem *button;
 #endif
--- a/pidgin/win32/nsis/langmacros.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/afrikaans.nsh	Thu Jun 21 20:37:57 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 ge�nstalleerde weergawe van Pidgin verwyder nie. Die nuwe weergawe sal ge�nstalleer word sonder om die huidige een te verwyder."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/albanian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/albanian.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/bulgarian.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/catalan.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la p�gina web de Pidgin per Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nom�s esborrar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci� GTK+."
 !define GTK_BAD_INSTALL_PATH			"El directori que has introdu�t no pot �sser accedit o creat."
--- a/pidgin/win32/nsis/translations/czech.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/czech.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vit Windows Pidgin Web Page"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (odinstalovat)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba p�i instalaci GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan� cesta je nedostupn�, nebo ji nelze vytvo�it."
--- a/pidgin/win32/nsis/translations/danish.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/danish.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�g 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/dutch.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/english.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/finnish.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/french.nsh	Thu Jun 21 20:37:57 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 d�sinstaller la version de Pidgin en place. La nouvelle version sera install�e sans supprimer la version en place."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/galician.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/galician.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�xina Web de Pidgin Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (s�lo 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Thu Jun 21 20:37:57 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 gel�scht wird."
  
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldal�nak felkeres�se"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin (csak elt�vol�t�s)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"A Pidgin jelenleg telep�tett v�ltozata nem t�vol�that� el. Az �j verzi� a jelenleg telep�tett verzi� elt�vol�t�sa n�lk�l ker�l telep�t�sre. "
 
 
--- a/pidgin/win32/nsis/translations/italian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/japanese.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -38,9 +38,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Windows Pidgin��Web�y�[�W��K�������B"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (������)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+�����^�C����C���X�g�[����G���[��������B"
 !define GTK_BAD_INSTALL_PATH			"����������p�X��A�N�Z�X�����������B"
--- a/pidgin/win32/nsis/translations/korean.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/korean.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/kurdish.nsh	Thu Jun 21 20:37:57 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			"r�ya te niv�sand nay� gihi�tin an afirandin."
--- a/pidgin/win32/nsis/translations/lithuanian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh	Thu Jun 21 20:37:57 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 pa�alinti)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."
 !define GTK_BAD_INSTALL_PATH			"J�s� nurodytas katalogas neprieinamas ar negali b�ti sukurtas."
--- a/pidgin/win32/nsis/translations/norwegian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/norwegian.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/polish.nsh	Thu Jun 21 20:37:57 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			"B街d instalacji runtime-a GTK+."
 !define GTK_BAD_INSTALL_PATH			"Nie ma dost�pu do wybranej �cie�ki / �aty."
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -31,9 +31,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Uma vers�o antiga do ambiente de tempo de execu艫o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O $(^Name) poder� n�o funcionar a menos que voc� o fa�a."
 
-; 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 execu艫o do GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que voc� digitou n�o p�de ser acessado ou criado."
--- a/pidgin/win32/nsis/translations/portuguese.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a P�gina 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 execu艫o GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que digitou n�o pode ser acedido nem criado."
--- a/pidgin/win32/nsis/translations/romanian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/romanian.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -35,9 +35,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE               "Vizita�i 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/russian.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/serbian-latin.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -19,9 +19,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) mo�da ne�e raditi."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo uklanjanje)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
 !define GTK_BAD_INSTALL_PATH			"Putanja koju ste naveli se ne mo�e ni napraviti niti joj se mo�e pri�i."
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/simp-chinese.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovak.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vi� webstr�nku Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (len odstr�ni�)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri in�tal�cii GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan� cesta nie je pr�stupn� alebo ju nie je mo�n� vytvori�."
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Obi��ite spletno stran Windows Pidgin"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo odstrani)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Trenutno name��ene razli�ice Pidgina ni mogo�e odstraniti. Nova razli�ica bo name��ena brez odstranitve trenutno name��ene razli�ice."
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/spanish.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/spanish.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite la p�gina Web de Pidgin Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (s�lo 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/swedish.nsh	Thu Jun 21 20:37:57 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Pidgin hemsida"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (enbart f�r avinstallation)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Thu Jun 21 20:37:57 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	"�L�k仮娃ヘ�e�w�w庫� Pidgin�A�s�セ�N�bゼ�g仮娃詑�セ�院�p�U�i��w庫�C"
 
 ; GTK+ Section Prompts
--- a/pidgin/win32/nsis/translations/valencian.nsh	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/valencian.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/pidgin/win32/nsis/translations/vietnamese.nsh	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/ChangeLog	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/fi.po	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/lt.po	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/pt_BR.po	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/ru.po	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/stats.pl	Thu Jun 21 20:37:57 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	Tue Jun 19 19:40:06 2007 +0000
+++ b/po/zh_TW.po	Thu Jun 21 20:37:57 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 "����絎���絽活������羃����g���"
 
-#: ../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 ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
 #. 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 "�e��臂ょ�綏牙�絖���"
 
 # 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 ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
-#: ../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 腟����g���"
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s ��筝������腟���篋��g�鐚�\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "�g����"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "�g�"
+#: ../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 絨�筝�����荅������育�g���"
 
 #: ../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 "�g����"
+
 #: ../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 "��群膓���罩∵��篌堺�������g���"
 
-#: ../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 "�≧��ユ�狗�e�ョ���恰��荐����g�\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 篌堺����産腴��g���絎����決�筝㊤���"
@@ -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 "�g機篋�"
 
 #. 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 "�≧��h�� 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 "�≧����篁g��篌堺����┃絎�"
 
-#: ../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 "�g�筝�"
 
 # 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 "�≧��e�遺失����"
@@ -3593,12 +3633,12 @@
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX ��罩g����������≧��g��活�茘���������腴��羣���鐚�筝������g�紊掩����鐚�荀�筝�����腴�鐚�
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
 #: ../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 "羃����e���脂��"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "羃����e���脂��"
 
-#: ../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 "羃����e���援┗���脂��"
 
-#: ../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/鐚�篏����腴�緇��f�丈�沿タ
-#: ../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: ��恐筝�綛冗���亥�eぇ絖後����掩���ュ����鐚��上����箙�莊����㊥��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 ""
+"�≧���篌堺����産腴��g�:\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 "�¥�篏�罩g�緇�絨��壕�茘����"
 
-#: ../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/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
 #  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 "�g�綏臥�丈��"
 
 # 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 ������⑮鐚�茘�����緇��拷�蚊��筝���ソ�������鋋咲��罔e�鐚�紊ф�羃���紊�ぇ���馹�
 # 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 "�≧��g��活�茘���������腴��羣�"
 
 # 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 "�g�篌堺����"
 
@@ -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 " (篁g⊆ %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鐚����阪��合����羃����g�"
+
+#  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 ���d��� 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 "�≧��g��遺失������"
 
-#: ../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 "茹f�� 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 "篌堺���������g���"
 
 #: ../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 "�g��割失�������九�亥�≧����莖�����"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"�≧���篌堺����産腴��g�:\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 "����醇���㊥����筝㊥�潔�g���茫��� %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 "�≧���紮����g�"
 
-#: ../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 ��罩∫�g���"
 
-#: ../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 �����藝� (��綵≫��榊憟��)鐚� (絅遵���札��茘���荐��������e��??)
-#: ../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鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
-#: ../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 "�≧��渇���恰��荐���襲���荀��渇���恰��荐���襲���綽�����絨��合�贋・�g���"
 
-#: ../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 膓牙��g�"
 
-#: ../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 "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "�g�(_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 "������罩e���緇�筝���絅遵���茯�茘�"
 
-#: ../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 "�g�"
+
 #: ../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 "�御��罩g∈��篏睡����"
 
-#: ../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 ""
 "莇������篏睡����篏睡����筝����違��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
-#: ../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 @@
 "莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "�����g�"
 
@@ -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>�脂��荳�蚕薊�茘�篁g⊆ (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 "��腴�����g�"
+
+#: ../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 "�g�綏臥�丈��"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "�g�紊掩��"
+
+#: ../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 "��篌堺���������g�"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "�≧������g�"
 
-#: ../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 "�g��� 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 "�√奨�g�紊掩��鐚�茫��������育�g���綮榊��亥���g���"
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "篌堺����賢�隙��g�"
-
-#: ../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 "�咲�g��画�薊�茘�筝�"
 
-#: ../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 "紊掩��鐚���腴����吓産茘遺賢��荳�蚕薊�茘�篁g⊆ (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 "篌堺����賢�隙��g�"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "�g��� 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 "�√奨�g�紊掩��鐚�茫��������育�g���綮榊��亥���g���"
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "�g�紊掩��"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "�≧���紮��� SILC �����句��g�"
-
-#: ../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 "�g��� 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 "�≧�綮榊��g�"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "荐��狗�筝�紊�"
 
-# NOTE 薤�羝���絲����喝ぇ����鐚��亥�d査����筝����絲�����綣泣��筝�蕁�鐚�羝�査��荀���荀阪�緇����鐚��㊦�� :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 "�g��� 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 "�≧�綮榊��g�"
-
-#: ../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 "罩e幻"
 
-#: ../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 "莅�篁�篋阪�札緇��ユ��戎���d�膩�筝�����"
 
 #  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 "�����g�羃����檎�������ヨ���"
 
-#: ../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鐚������g�����綏ヤ����"
 
-#: ../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鐚����g���篌堺�������� 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 "紊掩��鐚���腴����吓産茘遺賢��荳�蚕薊�茘�篁g⊆ (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 �����句��g�"
+
+# NOTE 薤�羝���絲����喝ぇ����鐚��亥�d査����筝����絲�����綣泣��筝�蕁�鐚�羝�査��荀���荀阪�緇����鐚��㊦�� :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 "���ョ�����篁g⊆ %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 "�g����"
 
-#: ../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 箙������g�腦��銀賢��:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"�≧��� %s 綮榊��g�:\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 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "���ュソ��������������紊��"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
-#: ../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 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: ../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 "茹f�� %s ��筝㊦�主��篋����"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "�≧�茹f��筝紙�"
 
@@ -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 "�≧��g��違��%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 "�≧��g��� %s鐚�%s"
@@ -11567,59 +12130,75 @@
 msgstr "膤紫輝�f�劫��"
 
 #. 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 ��篁g��篌堺����┃絎�"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "篏睡��������篁g��篌堺����┃絎�"
 
 # NOTE ��札��篁g��篌堺�����罸�����
 # 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 "篁g��篌堺�����檎��"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_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 "茹i�ゅ���(_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 腟����g�"
 
-#: ../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 腟����g�鐚�%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 絨�筝�����荅������育�g���"
 
-#: ../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 "/篋よ�/茹i�ゅ���(_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 "/篋よ�/���ラ�g�(_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 "/篋よ�/茹i�ゅ���..."
 
-#: ../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 "/篋よ�/���ラ�g�..."
+
+#: ../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���ら���ヨ���緇�������ら�������莠����o���筝�綏牙���篋榊��
-#: ../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 �榊�g��筝㊤�����後��蕁�羈�篋������鎀у����罌�鐚�茘����鎀у������荅我�莠�絅純��
 #  NOTE����荀���Slovenian����
 #  NOTE 荐誌��� zh_TW �� zh_HK 罩e���絎駈��������医�茘����臂�ぇ����
-#: ../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�������������育�順��箴����罩e幻��茘��
 #  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 "罩i�筝㊥��"
 
 # 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 莖e����
 # NOTE ��篁ユ③腆榊��茘������������牙��罔∞�篏�����������罔∞������俄�����箙�蕁�����
 # NOTE 筝�����罔eソ���騌���蚕鐚���篁ョ浸�������援��罔∞�篏�������罸�莠�絅� :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 ��⑮��臂�轡篋阪�<��鐚�篏��f���篆�絎���茘��鐚�Pidgin �� Artist ����荐㊧���腓冴�����井�雁��篁��∝�膈���篋�緇��e����綏ヤ���篋削���篁ュ���¨����荐㊧��<��
-#: ../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 "�g�蕁��"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "馹�ず�g���������蕁�儸��"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "�g�蕁��"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "�嚱�藜�膓����g������g�蕁�儸��"
 
-#: ../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 "���頳遵��賢�����g�(_O)"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "茲�茖初�g�篏���(_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 "���ラ�g�"
 
-#: ../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 "���ラ�g�"
 
-#: ../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 "蕁�ず膤紫輝綏ヤ��e��腓�(_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 ""
 "�������罔f������絋���戎������絎���吚�弱���鐚����肴�����綣閞e���蕁�篌守��罧究��絖���"
 
-#: ../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 "�����荐����h�順���(_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 "篁g��篌堺����"
 
 # 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 "���頳遵��賢�����g�(_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 篁h;膓峨��)"
 
-#: ../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 篁h;罟���)"
 
-#: ../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 "�e��罟�罅�綏牙�絖���"
 
-#: ../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 "膈�緇�膓画君�g�..."
 
-#: ../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 "茫�����√����������御���g機篋削����医�筝����g機篋冴��"
 
+#: ../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 "茫��御���医�絅遵��渇�e江��絽活����"
 
@@ -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 �fァ��"
 
-#: ../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'>�����g��� 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 "罩e幻"
+
+#, 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 ��筝������腟���篋��g�鐚�\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 "/篋よ�/���ラ�g�(_k)..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/篋よ�/���ュ襲��(_E)..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/篋よ�/���ラ�g�..."
-
-#~ 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 "�g�綏臥�丈��鐚�"
-
 # TODO 茘�����緇��拷�� - 20061028
 #~ msgid "User info is not updated"
 #~ msgstr "�≧��贋�遺戎����莖�荐�"