# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1191011426 0
# Node ID bedd56240914f5b05664cb93fb13f74422bad719
# Parent  d94432a338ab0f3fda5ba040d04f5e8a00649a4a# Parent  d35d761ded1a1c2433738030b8fb2c5301bbf7ef
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 0a3d37418d9f633be9e197c09bf5b61d32dc5585)
            to branch 'im.pidgin.pidgin' (head bfad2fefb460d1ff0a1188cd3077334914f33810)

diff -r d94432a338ab -r bedd56240914 COPYRIGHT
--- a/COPYRIGHT	Fri Sep 28 20:30:07 2007 +0000
+++ b/COPYRIGHT	Fri Sep 28 20:30:26 2007 +0000
@@ -246,6 +246,7 @@
 Kevin Miller
 Paul Miller
 Arkadiusz Miskiewicz
+David Mohr
 Andrew Molloy
 Michael Monreal
 Benjamin Moody
@@ -278,6 +279,7 @@
 Eduardo Pérez
 Matt Perry
 Nathan Peterson
+Sebastián E. Peyrott
 Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
diff -r d94432a338ab -r bedd56240914 ChangeLog
--- a/ChangeLog	Fri Sep 28 20:30:07 2007 +0000
+++ b/ChangeLog	Fri Sep 28 20:30:26 2007 +0000
@@ -1,5 +1,37 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+Version 2.2.2:
+	http://developer.pidgin.im/query?status=closed&milestone=2.2.2
+		NOTE: Due to the backporting that happened for the 2.2.1
+		      release, it is possible bugs this release fixes bugs
+		      that were marked as fixed in 2.2.1.
+
+	libpurple:
+	* Real usernames are now shown in the system log.
+
+	Pidgin:
+	* If you alias a buddy to an alias that is already present within
+	  a particular group, we now offer to merge the buddies into the
+	  same contact.
+	* A music emblem is now displayed in the buddy list for a buddy if we
+	  know she is listening to some soothing music.
+	* Added a 'Move to' menu in buddy list context menu for moving buddies
+	  to other groups as an alternative to dragging.
+	* Group headings are now marked via an underline instead of a
+	  different color background.
+	* It is now possible to mark a chat on your buddy list as "Persistent"
+	  so you do not leave the chat when the window or tab is closed.
+	* The auto-join option for chats is now listed in the "Add Chat"
+	  dialog along with the new persistence option.
+	* Closing an IM no longer immediately closes your conversation.  It
+	  will now remain active for a short time so that if the conversation
+	  resumes, the history will be retained.  A preference has been added
+	  to toggle this behavior.
+	* The "Smiley" menu has been moved to the top-level of the toolbar.
+	* Pidgin's display is now saved with the command line for session
+	  restoration.  (David Mohr)
+	* ICQ Birthday notifications are shown as buddy list emblems
+
 Version 2.2.1:
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
 		NOTE: Due to the backporting that happened for the actual
@@ -2264,4 +2296,4 @@
 	* Fixed WindowMaker Appicon
 	* Version Number in About Box
 	* Gaim Slogan in about box :)
-	* Created Changelog File :)
+	* Created Changelog File :)
\ No newline at end of file
diff -r d94432a338ab -r bedd56240914 configure.ac
--- a/configure.ac	Fri Sep 28 20:30:07 2007 +0000
+++ b/configure.ac	Fri Sep 28 20:30:26 2007 +0000
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [2])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [2])
-m4_define([purple_micro_version], [1])
+m4_define([purple_micro_version], [2])
 m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@
 m4_define([gnt_lt_current], [2])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [2])
-m4_define([gnt_micro_version], [1])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
diff -r d94432a338ab -r bedd56240914 doc/funniest_home_convos.txt
--- a/doc/funniest_home_convos.txt	Fri Sep 28 20:30:07 2007 +0000
+++ b/doc/funniest_home_convos.txt	Fri Sep 28 20:30:26 2007 +0000
@@ -487,3 +487,21 @@
             established that
 19:03 <user> its functioning just fine
 
+--
+
+17:12 <a_user> I think I foundage a bug
+17:13 <a_user> I don't think blocking works correctly for the AIM protocol
+17:13 <a_user> because a girl attempted to block me in pidgin and I can still
+               talk to her
+17:14 <a_user> [screen name expunged]: I already told you yesterday. You don't
+               need me to ease your mind, you want me to change MY mind. Well,
+               you're out of luck. I don't know how you're still messaging me,
+               because I already blocked you, but I demand you stop immediately.
+               For now on, I will save every message that you send me as
+               evidence for the next time I decide to call the police. I did
+               call them yesterday, but I didn't have evidence. The more you
+               message me now, the more you're digging you're own grave, so I
+               advice you to stop.
+17:14 <a_user> see?
+17:16 <sadrul> I think blocking in pidgin not working is not your biggest
+               problem here.
diff -r d94432a338ab -r bedd56240914 finch/gntblist.c
--- a/finch/gntblist.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/finch/gntblist.c	Fri Sep 28 20:30:26 2007 +0000
@@ -1510,6 +1510,8 @@
 	} else if (strcmp(text, GNT_KEY_CTRL_O) == 0) {
 		purple_prefs_set_bool(PREF_ROOT "/showoffline",
 				!purple_prefs_get_bool(PREF_ROOT "/showoffline"));
+	} else if (strcmp(text, GNT_KEY_INS) == 0) {
+		purple_blist_request_add_buddy(NULL, NULL, NULL, NULL);
 	} else if (!gnt_tree_is_searching(GNT_TREE(ggblist->tree))) {
 		if (strcmp(text, "t") == 0) {
 			finch_blist_toggle_tag_buddy(gnt_tree_get_selection_data(GNT_TREE(ggblist->tree)));
@@ -2225,9 +2227,27 @@
 }
 
 static void
+menu_add_buddy_cb(GntMenuItem *item, gpointer null)
+{
+	purple_blist_request_add_buddy(NULL, NULL, NULL, NULL);
+}
+
+static void
+menu_add_chat_cb(GntMenuItem *item, gpointer null)
+{
+	purple_blist_request_add_chat(NULL, NULL, NULL, NULL);
+}
+
+static void
+menu_add_group_cb(GntMenuItem *item, gpointer null)
+{
+	purple_blist_request_add_group();
+}
+
+static void
 create_menu()
 {
-	GntWidget *menu, *sub;
+	GntWidget *menu, *sub, *subsub;
 	GntMenuItem *item;
 	GntWindow *window;
 
@@ -2248,29 +2268,57 @@
 	gnt_menu_add_item(GNT_MENU(sub), item);
 	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), send_im_select, NULL);
 
-	item = gnt_menuitem_check_new(_("Show empty groups"));
+	item = gnt_menuitem_new(_("Show"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	subsub = gnt_menu_new(GNT_MENU_POPUP);
+	gnt_menuitem_set_submenu(item, GNT_MENU(subsub));
+
+	item = gnt_menuitem_check_new(_("Empty groups"));
 	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
 				purple_prefs_get_bool(PREF_ROOT "/emptygroups"));
-	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menu_add_item(GNT_MENU(subsub), item);
 	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), toggle_pref_cb, PREF_ROOT "/emptygroups");
 	
-	item = gnt_menuitem_check_new(_("Show offline buddies"));
+	item = gnt_menuitem_check_new(_("Offline buddies"));
 	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
 				purple_prefs_get_bool(PREF_ROOT "/showoffline"));
-	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menu_add_item(GNT_MENU(subsub), item);
 	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), toggle_pref_cb, PREF_ROOT "/showoffline");
 
-	item = gnt_menuitem_new(_("Sort by status"));
+	item = gnt_menuitem_new(_("Sort"));
 	gnt_menu_add_item(GNT_MENU(sub), item);
+	subsub = gnt_menu_new(GNT_MENU_POPUP);
+	gnt_menuitem_set_submenu(item, GNT_MENU(subsub));
+
+	item = gnt_menuitem_new(_("By Status"));
+	gnt_menu_add_item(GNT_MENU(subsub), item);
 	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "status");
 
-	item = gnt_menuitem_new(_("Sort alphabetically"));
-	gnt_menu_add_item(GNT_MENU(sub), item);
+	item = gnt_menuitem_new(_("Alphabetically"));
+	gnt_menu_add_item(GNT_MENU(subsub), item);
 	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "text");
 
-	item = gnt_menuitem_new(_("Sort by log size"));
+	item = gnt_menuitem_new(_("By Log Size"));
+	gnt_menu_add_item(GNT_MENU(subsub), item);
+	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "log");
+
+	item = gnt_menuitem_new(_("Add"));
 	gnt_menu_add_item(GNT_MENU(sub), item);
-	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "log");
+
+	subsub = gnt_menu_new(GNT_MENU_POPUP);
+	gnt_menuitem_set_submenu(item, GNT_MENU(subsub));
+
+	item = gnt_menuitem_new("Buddy");
+	gnt_menu_add_item(GNT_MENU(subsub), item);
+	gnt_menuitem_set_callback(item, menu_add_buddy_cb, NULL);
+
+	item = gnt_menuitem_new("Chat");
+	gnt_menu_add_item(GNT_MENU(subsub), item);
+	gnt_menuitem_set_callback(item, menu_add_chat_cb, NULL);
+
+	item = gnt_menuitem_new("Group");
+	gnt_menu_add_item(GNT_MENU(subsub), item);
+	gnt_menuitem_set_callback(item, menu_add_group_cb, NULL);
 
 	reconstruct_accounts_menu();
 	gnt_menu_add_item(GNT_MENU(menu), ggblist->accounts);
diff -r d94432a338ab -r bedd56240914 finch/gntconn.c
--- a/finch/gntconn.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/finch/gntconn.c	Fri Sep 28 20:30:26 2007 +0000
@@ -105,10 +105,11 @@
 {
 	FinchAutoRecon *info;
 	PurpleAccount *account = purple_connection_get_account(gc);
-
-	info = g_hash_table_lookup(hash, account);
+	GList *list;
 
 	if (!gc->wants_to_die) {
+		info = g_hash_table_lookup(hash, account);
+
 		if (info == NULL) {
 			info = g_new0(FinchAutoRecon, 1);
 			g_hash_table_insert(hash, account, info);
@@ -141,6 +142,17 @@
 		g_free(secondary);
 		purple_account_set_enabled(account, FINCH_UI, FALSE);
 	}
+
+	/* If we have any open chats, we probably want to rejoin when we get back online. */
+	list = purple_get_chats();
+	while (list) {
+		PurpleConversation *conv = list->data;
+		list = list->next;
+		if (conv->account != account ||
+				purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv)))
+			continue;
+		purple_conversation_set_data(conv, "want-to-rejoin", GINT_TO_POINTER(TRUE));
+	}
 }
 
 static void
diff -r d94432a338ab -r bedd56240914 finch/gntconv.c
--- a/finch/gntconv.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/finch/gntconv.c	Fri Sep 28 20:30:26 2007 +0000
@@ -311,13 +311,40 @@
 static void
 account_signed_on_off(PurpleConnection *gc, gpointer null)
 {
-	GList *ims = purple_get_ims();
-	while (ims) {
-		PurpleConversation *conv = ims->data;
+	GList *list = purple_get_ims();
+	while (list) {
+		PurpleConversation *conv = list->data;
 		PurpleConversation *cc = find_conv_with_contact(conv->account, conv->name);
 		if (cc)
 			generate_send_to_menu(cc->ui_data);
-		ims = ims->next;
+		list = list->next;
+	}
+
+	if (PURPLE_CONNECTION_IS_CONNECTED(gc)) {
+		/* We just signed on. Let's see if there's any chat that we have open,
+		 * and hadn't left before the disconnect. */
+		list = purple_get_chats();
+		while (list) {
+			PurpleConversation *conv = list->data;
+			PurpleChat *chat;
+			GHashTable *comps = NULL;
+
+			list = list->next;
+			if (conv->account != gc->account ||
+					!purple_conversation_get_data(conv, "want-to-rejoin"))
+				continue;
+
+			chat = purple_blist_find_chat(conv->account, conv->name);
+			if (chat == NULL) {
+				if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
+					comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, conv->name);
+			} else {
+				comps = chat->components;
+			}
+			serv_join_chat(gc, comps);
+			if (chat == NULL && comps != NULL)
+				g_hash_table_destroy(comps);
+		}
 	}
 }
 
@@ -738,7 +765,8 @@
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
 					_("<AUTO-REPLY> "), GNT_TEXT_FLAG_BOLD);
 
-	if (who && *who && (flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)))
+	if (who && *who && (flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)) &&
+			!(flags & PURPLE_MESSAGE_NOTIFY))
 	{
 		char * name = NULL;
 
diff -r d94432a338ab -r bedd56240914 finch/gntdebug.c
--- a/finch/gntdebug.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/finch/gntdebug.c	Fri Sep 28 20:30:26 2007 +0000
@@ -28,12 +28,14 @@
 #include <gntbutton.h>
 #include <gntcheckbox.h>
 #include <gntentry.h>
+#include <gntfilesel.h>
 #include <gntlabel.h>
 #include <gntline.h>
 #include <gnttextview.h>
 
 #include "gntdebug.h"
 #include "finch.h"
+#include "notify.h"
 #include "util.h"
 
 #include <stdio.h>
@@ -220,9 +222,43 @@
 					(GDestroyNotify)g_source_remove);
 }
 
+static void
+file_save(GntFileSel *fs, const char *path, const char *file, GntTextView *tv)
+{
+	FILE *fp;
+
+	if ((fp = g_fopen(path, "w+")) == NULL) {
+		purple_notify_error(NULL, NULL, _("Unable to open file."), NULL);
+		return;
+	}
+
+	fprintf(fp, "Finch Debug Log : %s\n", purple_date_format_full(NULL));
+	fprintf(fp, tv->string->str);
+	fclose(fp);
+	gnt_widget_destroy(GNT_WIDGET(fs));
+}
+
+static void
+file_cancel(GntWidget *w, GntFileSel *fs)
+{
+	gnt_widget_destroy(GNT_WIDGET(fs));
+}
+
+static void
+save_debug_win(GntWidget *w, GntTextView *tv)
+{
+	GntWidget *window = gnt_file_sel_new();
+	GntFileSel *sel = GNT_FILE_SEL(window);
+	gnt_file_sel_set_current_location(sel, purple_home_dir());
+	gnt_file_sel_set_suggested_filename(sel, "debug.txt");
+	g_signal_connect(G_OBJECT(sel), "file_selected", G_CALLBACK(file_save), tv);
+	g_signal_connect(G_OBJECT(sel->cancel), "activate", G_CALLBACK(file_cancel), sel);
+	gnt_widget_show(window);
+}
+
 void finch_debug_window_show()
 {
-	GntWidget *wid, *box;
+	GntWidget *wid, *box, *label;
 
 	debug.paused = FALSE;
 	if (debug.window) {
@@ -258,8 +294,15 @@
 	GNT_WIDGET_SET_FLAGS(wid, GNT_WIDGET_GROW_Y);
 	gnt_box_add_widget(GNT_BOX(box), wid);
 
+	wid = gnt_button_new(_("Save"));
+	g_signal_connect(G_OBJECT(wid), "activate", G_CALLBACK(save_debug_win), debug.tview);
+	GNT_WIDGET_SET_FLAGS(wid, GNT_WIDGET_GROW_Y);
+	gnt_box_add_widget(GNT_BOX(box), wid);
+
 	debug.search = gnt_entry_new(purple_prefs_get_string(PREF_ROOT "/filter"));
-	gnt_box_add_widget(GNT_BOX(box), gnt_label_new(_("Filter: ")));
+	label = gnt_label_new(_("Filter:"));
+	GNT_WIDGET_UNSET_FLAGS(label, GNT_WIDGET_GROW_X);
+	gnt_box_add_widget(GNT_BOX(box), label);
 	gnt_box_add_widget(GNT_BOX(box), debug.search);
 	g_signal_connect(G_OBJECT(debug.search), "text_changed", G_CALLBACK(update_filter_string), NULL);
 
diff -r d94432a338ab -r bedd56240914 finch/gntnotify.c
--- a/finch/gntnotify.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/finch/gntnotify.c	Fri Sep 28 20:30:26 2007 +0000
@@ -352,14 +352,17 @@
 		gnt_box_add_widget(GNT_BOX(window),
 			gnt_label_new_with_format(secondary, GNT_TEXT_FLAG_NORMAL));
 
-	columns = purple_notify_searchresults_get_columns_count(results);
+	columns = g_list_length(results->columns);
 	tree = gnt_tree_new_with_columns(columns);
 	gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
 	gnt_box_add_widget(GNT_BOX(window), tree);
 
-	for (i = 0; i < columns; i++)
-		gnt_tree_set_column_title(GNT_TREE(tree), i, 
-				purple_notify_searchresults_column_get_title(results, i));
+	i = 0;
+	for (iter = results->columns; iter; iter = iter->next)
+	{
+		gnt_tree_set_column_title(GNT_TREE(tree), i, iter->data);
+		i++;
+	}
 
 	box = gnt_hbox_new(TRUE);
 
diff -r d94432a338ab -r bedd56240914 finch/libgnt/gntentry.c
--- a/finch/libgnt/gntentry.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/finch/libgnt/gntentry.c	Fri Sep 28 20:30:26 2007 +0000
@@ -100,6 +100,15 @@
 	return changed;
 }
 
+static int
+max_common_prefix(const char *s, const char *t)
+{
+	const char *f = s;
+	while (*f && *t && *f == *t++)
+		f++;
+	return f - s;
+}
+
 static gboolean
 show_suggest_dropdown(GntEntry *entry)
 {
@@ -110,6 +119,7 @@
 	GList *iter;
 	const char *text = NULL;
 	const char *sgst = NULL;
+	int max = -1;
 
 	if (entry->word)
 	{
@@ -121,14 +131,13 @@
 	else
 		suggest = g_strdup(entry->start);
 	len = strlen(suggest);  /* Don't need to use the utf8-function here */
-	
+
 	if (entry->ddown == NULL)
 	{
 		GntWidget *box = gnt_vbox_new(FALSE);
 		entry->ddown = gnt_tree_new();
 		gnt_tree_set_compare_func(GNT_TREE(entry->ddown), (GCompareFunc)g_utf8_collate);
 		gnt_box_add_widget(GNT_BOX(box), entry->ddown);
-		/* XXX: Connect to the "activate" signal for the dropdown tree */
 
 		GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
 
@@ -151,6 +160,10 @@
 					gnt_tree_create_row(GNT_TREE(entry->ddown), text),
 					NULL, NULL);
 			count++;
+			if (max == -1)
+				max = strlen(text) - len;
+			else if (max)
+				max = MIN(max, max_common_prefix(sgst + len, text + len));
 			sgst = text;
 		}
 	}
@@ -163,6 +176,17 @@
 		destroy_suggest(entry);
 		return complete_suggest(entry, sgst);
 	} else {
+		if (max > 0) {
+			GntWidget *ddown = entry->ddown;
+			char *match = g_strndup(sgst + len, max);
+			entry->ddown = NULL;
+			gnt_entry_key_pressed(GNT_WIDGET(entry), match);
+			g_free(match);
+			if (entry->ddown)
+				gnt_widget_destroy(ddown);
+			else
+				entry->ddown = ddown;
+		}
 		gnt_widget_draw(entry->ddown->parent);
 	}
 
diff -r d94432a338ab -r bedd56240914 libpurple/blist.c
--- a/libpurple/blist.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/blist.c	Fri Sep 28 20:30:26 2007 +0000
@@ -632,12 +632,13 @@
 			continue;
 
 		buddy = (PurpleBuddy*)bnode;
-
-		if (!purple_account_is_connected(buddy->account))
+		if (new_priority == NULL)
+		{
+			new_priority = buddy;
 			continue;
-		if (new_priority == NULL)
-			new_priority = buddy;
-		else
+		}
+
+		if (purple_account_is_connected(buddy->account))
 		{
 			int cmp;
 
@@ -1442,29 +1443,7 @@
 
 void purple_contact_set_alias(PurpleContact *contact, const char *alias)
 {
-	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
-	char *old_alias;
-
-	g_return_if_fail(contact != NULL);
-
-	if (!purple_strings_are_different(contact->alias, alias))
-		return;
-
-	old_alias = contact->alias;
-
-	if ((alias != NULL) && (*alias != '\0'))
-		contact->alias = g_strdup(alias);
-	else
-		contact->alias = NULL;
-
-	purple_blist_schedule_save();
-
-	if (ops && ops->update)
-		ops->update(purplebuddylist, (PurpleBlistNode*)contact);
-
-	purple_signal_emit(purple_blist_get_handle(), "blist-node-aliased",
-					 contact, old_alias);
-	g_free(old_alias);
+	purple_blist_alias_contact(contact,alias);
 }
 
 const char *purple_contact_get_alias(PurpleContact* contact)
diff -r d94432a338ab -r bedd56240914 libpurple/blist.h
--- a/libpurple/blist.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/blist.h	Fri Sep 28 20:30:26 2007 +0000
@@ -65,11 +65,11 @@
 
 typedef enum
 {
-	PURPLE_BLIST_NODE_FLAG_NO_SAVE = 1 /**< node should not be saved with the buddy list */
+	PURPLE_BLIST_NODE_FLAG_NO_SAVE      = 1 << 0, /**< node should not be saved with the buddy list */
 
 } PurpleBlistNodeFlags;
 
-#define PURPLE_BLIST_NODE_HAS_FLAG(b, f) ((b)->flags & (f))
+#define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (((PurpleBlistNode*)(b))->flags & (f))
 #define PURPLE_BLIST_NODE_SHOULD_SAVE(b) (! PURPLE_BLIST_NODE_HAS_FLAG(b, PURPLE_BLIST_NODE_FLAG_NO_SAVE))
 
 #define PURPLE_BLIST_NODE_NAME(n) ((n)->type == PURPLE_BLIST_CHAT_NODE  ? purple_chat_get_name((PurpleChat*)n) :        \
@@ -488,6 +488,8 @@
  *
  * @param contact  The contact
  * @param alias    The alias to set, or NULL to unset
+ *
+ * @deprecated Use purple_blist_alias_contact() instead.
  */
 void purple_contact_set_alias(PurpleContact *contact, const char *alias);
 
diff -r d94432a338ab -r bedd56240914 libpurple/cmds.h
--- a/libpurple/cmds.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/cmds.h	Fri Sep 28 20:30:26 2007 +0000
@@ -67,10 +67,20 @@
 	PURPLE_CMD_P_VERY_HIGH =  6000,
 };
 
+/** Flags used to set various properties of commands.  Every command should
+ *  have at least one of #PURPLE_CMD_FLAG_IM and #PURPLE_CMD_FLAG_CHAT set in
+ *  order to be even slighly useful.
+ *
+ *  @see purple_cmd_register
+ */
 enum _PurpleCmdFlag {
+	/** Command is usable in IMs. */
 	PURPLE_CMD_FLAG_IM               = 0x01,
+	/** Command is usable in multi-user chats. */
 	PURPLE_CMD_FLAG_CHAT             = 0x02,
+	/** Command is usable only for a particular prpl. */
 	PURPLE_CMD_FLAG_PRPL_ONLY        = 0x04,
+	/** Incorrect arguments to this command should be accepted anyway. */
 	PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08,
 };
 
@@ -92,36 +102,49 @@
  * The command will only happen if commands are enabled,
  * which is a UI pref. UIs don't have to support commands at all.
  *
- * @param cmd The command. This should be a UTF8 (or ASCII) string, with no spaces
+ * @param cmd The command. This should be a UTF-8 (or ASCII) string, with no spaces
  *            or other white space.
- * @param args This tells Purple how to parse the arguments to the command for you.
- *             If what the user types doesn't match, Purple will keep looking for another
- *             command, unless the flag @c PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS is passed in f.
- *             This string contains no whitespace, and uses a single character for each argument.
- *             The recognized characters are:
- *               'w' Matches a single word.
- *               'W' Matches a single word, with formatting.
- *               's' Matches the rest of the arguments after this point, as a single string.
- *               'S' Same as 's' but with formatting.
+ * @param args A string of characters describing to libpurple how to parse this
+ *             command's arguments.  If what the user types doesn't match this
+ *             pattern, libpurple will keep looking for another command, unless
+ *             the flag #PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS is passed in @a f.
+ *             This string should contain no whitespace, and use a single
+ *             character for each argument.  The recognized characters are:
+ *             <ul>
+ *               <li><tt>'w'</tt>: Matches a single word.</li>
+ *               <li><tt>'W'</tt>: Matches a single word, with formatting.</li>
+ *               <li><tt>'s'</tt>: Matches the rest of the arguments after this
+ *                                 point, as a single string.</li>
+ *               <li><tt>'S'</tt>: Same as <tt>'s'</tt> but with formatting.</li>
+ *             </ul>
  *             If args is the empty string, then the command accepts no arguments.
- *             The args passed to callback func will be a @c NULL terminated array of null
- *             terminated strings, and will always match the number of arguments asked for,
- *             unless PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS is passed.
- * @param p This is the priority. Higher priority commands will be run first, and usually the
- *          first command will stop any others from being called.
- * @param f These are the flags. You need to at least pass one of PURPLE_CMD_FLAG_IM or
- *          PURPLE_CMD_FLAG_CHAT (can may pass both) in order for the command to ever actually
- *          be called.
- * @param prpl_id This is the prpl's id string. This is only meaningful if the proper flag is set.
+ *             The args passed to the callback @a func will be a @c NULL
+ *             terminated array of @c NULL terminated strings, and will always
+ *             match the number of arguments asked for, unless
+ *             #PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS is passed.
+ * @param p This is the priority. Higher priority commands will be run first,
+ *          and usually the first command will stop any others from being
+ *          called.
+ * @param f Flags specifying various options about this command, combined with
+ *          <tt>|</tt> (bitwise OR). You need to at least pass one of
+ *          #PURPLE_CMD_FLAG_IM or #PURPLE_CMD_FLAG_CHAT (you may pass both) in
+ *          order for the command to ever actually be called.
+ * @param prpl_id If the #PURPLE_CMD_FLAG_PRPL_ONLY flag is set, this is the id
+ *                of the prpl to which the command applies (such as
+ *                <tt>"prpl-msn"</tt>). If the flag is not set, this parameter
+ *                is ignored; pass @c NULL (or a humourous string of your
+ *                choice!).
  * @param func This is the function to call when someone enters this command.
- * @param helpstr This is a whitespace sensitive, UTF-8, HTML string describing how to use the command.
- *                The preferred format of this string shall be the commands name, followed by a space
- *                and any arguments it accepts (if it takes any arguments, otherwise no space), followed
- *                by a colon, two spaces, and a description of the command in sentence form. No slash
- *                before the command name.
- * @param data User defined data to pass to the PurpleCmdFunc
- * @return A PurpleCmdId. This is only used for calling purple_cmd_unregister.
- *         Returns 0 on failure.
+ * @param helpstr a whitespace sensitive, UTF-8, HTML string describing how to
+ *                use the command.  The preferred format of this string is the
+ *                command's name, followed by a space and any arguments it
+ *                accepts (if it takes any arguments, otherwise no space),
+ *                followed by a colon, two spaces, and a description of the
+ *                command in sentence form.  Do not include a slash before the
+ *                command name.
+ * @param data User defined data to pass to the #PurpleCmdFunc @a f.
+ * @return A #PurpleCmdId, which is only used for calling
+ *         #purple_cmd_unregister, or @a 0 on failure.
  */
 PurpleCmdId purple_cmd_register(const gchar *cmd, const gchar *args, PurpleCmdPriority p, PurpleCmdFlag f,
                              const gchar *prpl_id, PurpleCmdFunc func, const gchar *helpstr, void *data);
@@ -133,7 +156,7 @@
  * or something else that might go away. Normally this is called when the plugin
  * unloads itself.
  *
- * @param id The PurpleCmdId to unregister.
+ * @param id The #PurpleCmdId to unregister, as returned by #purple_cmd_register.
  */
 void purple_cmd_unregister(PurpleCmdId id);
 
@@ -153,7 +176,7 @@
  *               include both the default formatting and any extra manual formatting.
  * @param errormsg If the command failed errormsg is filled in with the appropriate error
  *                 message. It must be freed by the caller with g_free().
- * @return A PurpleCmdStatus indicated if the command succeeded or failed.
+ * @return A #PurpleCmdStatus indicated if the command succeeded or failed.
  */
 PurpleCmdStatus purple_cmd_do_command(PurpleConversation *conv, const gchar *cmdline,
                                   const gchar *markup, gchar **errormsg);
@@ -161,13 +184,15 @@
 /**
  * List registered commands.
  *
- * Returns a GList (which must be freed by the caller) of all commands
- * that are valid in the context of conv, or all commands, if conv is
- * @c NULL. Don't keep this list around past the main loop, or anything else
- * that might unregister a command, as the char*'s used get freed then.
+ * Returns a <tt>GList</tt> (which must be freed by the caller) of all commands
+ * that are valid in the context of @a conv, or all commands, if @a conv is @c
+ * NULL.  Don't keep this list around past the main loop, or anything else that
+ * might unregister a command, as the <tt>const char *</tt>'s used get freed
+ * then.
  *
  * @param conv The conversation, or @c NULL.
- * @return A GList of const char*, which must be freed with g_list_free().
+ * @return A @c GList of <tt>const char *</tt>, which must be freed with
+ *         <tt>g_list_free()</tt>.
  */
 GList *purple_cmd_list(PurpleConversation *conv);
 
@@ -180,7 +205,7 @@
  * @param conv The conversation, or @c NULL for no context.
  * @param cmd The command. No wildcards accepted, but returns help for all
  *            commands if @c NULL.
- * @return A GList of const char*s, which is the help string
+ * @return A <tt>GList</tt> of <tt>const char *</tt>s, which is the help string
  *         for that command.
  */
 GList *purple_cmd_help(PurpleConversation *conv, const gchar *cmd);
diff -r d94432a338ab -r bedd56240914 libpurple/conversation.c
--- a/libpurple/conversation.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/conversation.c	Fri Sep 28 20:30:26 2007 +0000
@@ -2348,7 +2348,7 @@
 
 	purple_signal_register(handle, "chat-invited",
 						 purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER,
-						 NULL, 5,
+						 purple_value_new(PURPLE_TYPE_INT), 5,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_ACCOUNT),
 						 purple_value_new(PURPLE_TYPE_STRING),
diff -r d94432a338ab -r bedd56240914 libpurple/internal.h
--- a/libpurple/internal.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/internal.h	Fri Sep 28 20:30:26 2007 +0000
@@ -80,6 +80,7 @@
 #ifndef _WIN32
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <sys/time.h>
 #endif
 #include <ctype.h>
 #include <errno.h>
diff -r d94432a338ab -r bedd56240914 libpurple/notify.h
--- a/libpurple/notify.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/notify.h	Fri Sep 28 20:30:26 2007 +0000
@@ -293,7 +293,17 @@
 
 /**
  * Returns a number of the rows in the search results object.
- * 
+ *
+ * @deprecated This function will be removed in Pidgin 3.0.0 unless
+ *             there is sufficient demand to keep it.  Using this
+ *             function encourages looping through the results
+ *             inefficiently.  Instead of using this function you
+ *             should iterate through the results using a loop
+ *             similar to this:
+ *                for (l = results->rows; l != NULL; l = l->next)
+ *             If you really need to get the number of rows you
+ *             can use g_list_length(results->rows).
+ *
  * @param results The search results object.
  *
  * @return Number of the result rows.
@@ -303,6 +313,16 @@
 /**
  * Returns a number of the columns in the search results object.
  *
+ * @deprecated This function will be removed in Pidgin 3.0.0 unless
+ *             there is sufficient demand to keep it.  Using this
+ *             function encourages looping through the columns
+ *             inefficiently.  Instead of using this function you
+ *             should iterate through the columns using a loop
+ *             similar to this:
+ *                for (l = results->columns; l != NULL; l = l->next)
+ *             If you really need to get the number of columns you
+ *             can use g_list_length(results->columns).
+ *
  * @param results The search results object.
  *
  * @return Number of the columns.
@@ -312,6 +332,16 @@
 /**
  * Returns a row of the results from the search results object.
  *
+ * @deprecated This function will be removed in Pidgin 3.0.0 unless
+ *             there is sufficient demand to keep it.  Using this
+ *             function encourages looping through the results
+ *             inefficiently.  Instead of using this function you
+ *             should iterate through the results using a loop
+ *             similar to this:
+ *                for (l = results->rows; l != NULL; l = l->next)
+ *             If you really need to get the data for a particular
+ *             row you can use g_list_nth_data(results->rows, row_id).
+ *
  * @param results The search results object.
  * @param row_id  Index of the row to be returned.
  *
@@ -322,7 +352,15 @@
 
 /**
  * Returns a title of the search results object's column.
- * 
+ *
+ * @deprecated This function will be removed in Pidgin 3.0.0 unless
+ *             there is sufficient demand to keep it.  Using this
+ *             function encourages looping through the columns
+ *             inefficiently.  Instead of using this function you
+ *             should iterate through the name of a particular
+ *             column you can use
+ *             g_list_nth_data(results->columns, row_id).
+ *
  * @param results   The search results object.
  * @param column_id Index of the column.
  *
diff -r d94432a338ab -r bedd56240914 libpurple/plugins/tcl/tcl.c
--- a/libpurple/plugins/tcl/tcl.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/plugins/tcl/tcl.c	Fri Sep 28 20:30:26 2007 +0000
@@ -60,6 +60,7 @@
 PurpleStringref *PurpleTclRefStatusAttr;
 PurpleStringref *PurpleTclRefStatusType;
 PurpleStringref *PurpleTclRefXfer;
+PurpleStringref *PurpleTclRefHandle;
 
 static GHashTable *tcl_plugins = NULL;
 
@@ -363,6 +364,7 @@
 	PurpleTclRefStatusAttr = purple_stringref_new("StatusAttr");
 	PurpleTclRefStatusType = purple_stringref_new("StatusType");
 	PurpleTclRefXfer = purple_stringref_new("Xfer");
+	PurpleTclRefHandle = purple_stringref_new("Handle");
 
 	tcl_plugins = g_hash_table_new(g_direct_hash, g_direct_equal);
 
diff -r d94432a338ab -r bedd56240914 libpurple/plugins/tcl/tcl_cmds.c
--- a/libpurple/plugins/tcl/tcl_cmds.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_cmds.c	Fri Sep 28 20:30:26 2007 +0000
@@ -55,7 +55,7 @@
 			return account;
 	}
 	if (interp != NULL)
-		Tcl_SetStringObj(Tcl_GetObjResult(interp), "invalid account", -1);
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("invalid account", -1));
 	return NULL;
 }
 
@@ -74,7 +74,7 @@
 			return convo;
 	}
 	if (interp != NULL)
-		Tcl_SetStringObj(Tcl_GetObjResult(interp), "invalid conversation", -1);
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("invalid conversation", -1));
 	return NULL;
 }
 
@@ -97,7 +97,7 @@
 
 int tcl_cmd_account(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *result = Tcl_GetObjResult(interp), *list, *elem;
+	Tcl_Obj *result, *list, *elem;
 	const char *cmds[] = { "alias", "connect", "connection", "disconnect",
 	                       "enabled", "find", "handle", "isconnected",
 	                       "list", "presence", "protocol", "status",
@@ -139,7 +139,7 @@
 		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		alias = purple_account_get_alias(account);
-		Tcl_SetStringObj(result, alias ? (char *)alias : "", -1);
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(alias ? (char *)alias : "", -1));
 		break;
 	case CMD_ACCOUNT_CONNECT:
 		if (objc != 3) {
@@ -164,7 +164,7 @@
 			return TCL_ERROR;
 		Tcl_SetObjResult(interp,
 		                 purple_tcl_ref_new(PurpleTclRefConnection,
-		                                  purple_account_get_connection(account)));
+						    purple_account_get_connection(account)));
 		break;
 	case CMD_ACCOUNT_DISCONNECT:
 		if (objc != 3) {
@@ -183,9 +183,10 @@
 		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		if (objc == 3) {
-			Tcl_SetBooleanObj(result,
-					  purple_account_get_enabled(account,
-								   purple_core_get_ui()));
+			Tcl_SetObjResult(interp, 
+					 Tcl_NewBooleanObj(
+						 purple_account_get_enabled(account,
+									    purple_core_get_ui())));
 		} else {
 			if ((error = Tcl_GetBooleanFromObj(interp, objv[3], &b)) != TCL_OK)
 				return TCL_ERROR;
@@ -207,7 +208,9 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_accounts_get_handle());
+		Tcl_SetObjResult(interp, 
+				 purple_tcl_ref_new(PurpleTclRefHandle,
+						    purple_accounts_get_handle()));
 		break;
 	case CMD_ACCOUNT_ISCONNECTED:
 		if (objc != 3) {
@@ -216,7 +219,9 @@
 		}
 		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_account_is_connected(account));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(
+					 purple_account_is_connected(account)));
 		break;
 	case CMD_ACCOUNT_LIST:
 		listopt = CMD_ACCOUNTLIST_ALL;
@@ -255,7 +260,7 @@
 		}
 		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, (char *)purple_account_get_protocol_id(account), -1);
+		Tcl_SetObjResult(interp, Tcl_NewStringObj((char *)purple_account_get_protocol_id(account), -1));
 		break;
 	case CMD_ACCOUNT_STATUS:
 		if (objc < 3) {
@@ -271,19 +276,19 @@
 		} else {
 			GList *l = NULL;
 			if (objc % 2) {
-				Tcl_SetStringObj(result, "name without value setting status", -1);
+				Tcl_SetObjResult(interp, Tcl_NewStringObj("name without value setting status", -1));
 				return TCL_ERROR;
 			}
 			status = purple_account_get_status(account, Tcl_GetString(objv[3]));
 			if (status == NULL) {
-				Tcl_SetStringObj(result, "invalid status for account", -1);
+				Tcl_SetObjResult(interp, Tcl_NewStringObj("invalid status for account", -1));
 				return TCL_ERROR;
 			}
 			for (i = 4; i < objc; i += 2) {
 				attr_id = Tcl_GetString(objv[i]);
 				value = purple_status_get_attr_value(status, attr_id);
 				if (value == NULL) {
-					Tcl_SetStringObj(result, "invalid attribute for account", -1);
+					Tcl_SetObjResult(interp, Tcl_NewStringObj("invalid attribute for account", -1));
 					return TCL_ERROR;
 				}
 				switch (purple_value_get_type(value)) {
@@ -306,7 +311,7 @@
 					l = g_list_append(l, Tcl_GetString(objv[i + 1]));
 					break;
 				default:
-					Tcl_SetStringObj(result, "unknown PurpleValue type", -1);
+					Tcl_SetObjResult(interp, Tcl_NewStringObj("unknown PurpleValue type", -1));
 					return TCL_ERROR;
 				}
 			}
@@ -327,10 +332,10 @@
 		} else {
 			PurpleStatusPrimitive primitive;
 			if (strcmp(Tcl_GetString(objv[3]), "-primitive")) {
-				Tcl_SetStringObj(result, "bad option \"", -1);
+				result = Tcl_NewStringObj("bad option \"", -1);
 				Tcl_AppendObjToObj(result, objv[3]);
-				Tcl_AppendToObj(result,
-						"\": should be -primitive", -1);
+				Tcl_AppendToObj(result, "\": should be -primitive", -1);
+				Tcl_SetObjResult(interp,result);
 				return TCL_ERROR;
 			}
 			primitive = purple_primitive_get_type_from_id(Tcl_GetString(objv[4]));
@@ -338,7 +343,7 @@
 										  primitive);
 		}
 		if (status_type == NULL) {
-			Tcl_SetStringObj(result, "status type not found", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("status type not found", -1));
 			return TCL_ERROR;
 		}
 		Tcl_SetObjResult(interp,
@@ -368,7 +373,8 @@
 		}
 		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, (char *)purple_account_get_username(account), -1);
+		Tcl_SetObjResult(interp, 
+				 Tcl_NewStringObj((char *)purple_account_get_username(account), -1));
 		break;
 	}
 
@@ -383,7 +389,8 @@
 	char *type;
 
 	if (count < 3) {
-		Tcl_SetStringObj(Tcl_GetObjResult(interp), "list too short", -1);
+		Tcl_SetObjResult(interp,
+                                 Tcl_NewStringObj("list too short", -1));
 		return NULL;
 	}
 
@@ -420,8 +427,6 @@
 	if ((error = Tcl_GetIndexFromObj(interp, objv[1], cmds, "subcommand", 0, (int *)&cmd)) != TCL_OK)
 		return error;
 
-	result = Tcl_GetObjResult(interp);
-
 	switch (cmd) {
 	case CMD_BUDDY_ALIAS:
 		if (objc != 3) {
@@ -433,9 +438,11 @@
 		if ((node = tcl_list_to_buddy(interp, count, elems)) == NULL)
 			return TCL_ERROR;
 		if (node->type == PURPLE_BLIST_CHAT_NODE)
-			Tcl_SetStringObj(result, ((PurpleChat *)node)->alias, -1);
+			Tcl_SetObjResult(interp,
+					 Tcl_NewStringObj(((PurpleChat *)node)->alias, -1));
 		else if (node->type == PURPLE_BLIST_BUDDY_NODE)
-			Tcl_SetStringObj(result, (char *)purple_buddy_get_alias((PurpleBuddy *)node), -1);
+			Tcl_SetObjResult(interp,
+                                         Tcl_NewStringObj((char *)purple_buddy_get_alias((PurpleBuddy *)node), -1));
 		return TCL_OK;
 		break;
 	case CMD_BUDDY_HANDLE:
@@ -443,7 +450,9 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_blist_get_handle());
+		Tcl_SetObjResult(interp,
+				 purple_tcl_ref_new(PurpleTclRefHandle,
+						    purple_blist_get_handle()));
 		break;
 	case CMD_BUDDY_INFO:
 		if (objc != 3 && objc != 4) {
@@ -454,11 +463,13 @@
 			if ((error = Tcl_ListObjGetElements(interp, objv[2], &count, &elems)) != TCL_OK)
 				return error;
 			if (count < 3) {
-				Tcl_SetStringObj(result, "buddy too short", -1);
+				Tcl_SetObjResult(interp,
+						 Tcl_NewStringObj("buddy too short", -1));
 				return TCL_ERROR;
 			}
 			if (strcmp("buddy", Tcl_GetString(elems[0]))) {
-				Tcl_SetStringObj(result, "invalid buddy", -1);
+				Tcl_SetObjResult(interp,
+						 Tcl_NewStringObj("invalid buddy", -1));
 				return TCL_ERROR;
 			}
 			if ((account = tcl_validate_account(elems[2], interp)) == NULL)
@@ -475,8 +486,9 @@
 			if (!strcmp("-all", Tcl_GetString(objv[2]))) {
 				all = 1;
 			} else {
-				Tcl_SetStringObj(result, "", -1);
+				result = Tcl_NewStringObj("",-1);
 				Tcl_AppendStringsToObj(result, "unknown option: ", Tcl_GetString(objv[2]), NULL);
+				Tcl_SetObjResult(interp,result);
 				return TCL_ERROR;
 			}
 		}
@@ -547,7 +559,7 @@
 	const char *cmds[] = { "do", "help", "list", "register", "unregister", NULL };
 	enum { CMD_CMD_DO, CMD_CMD_HELP, CMD_CMD_LIST, CMD_CMD_REGISTER, CMD_CMD_UNREGISTER } cmd;
 	struct tcl_cmd_handler *handler;
-	Tcl_Obj *list, *elem, *result = Tcl_GetObjResult(interp);
+	Tcl_Obj *list, *elem;
 	PurpleConversation *convo;
 	PurpleCmdId id;
 	PurpleCmdStatus status;
@@ -575,7 +587,8 @@
 		status = purple_cmd_do_command(convo, Tcl_GetString(objv[3]),
 				escaped, &errstr);
 		g_free(escaped);
-		Tcl_SetStringObj(result, errstr ? (char *)errstr : "", -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(errstr ? (char *)errstr : "", -1));
 		g_free(errstr);
 		if (status != PURPLE_CMD_STATUS_OK) {
 			return TCL_ERROR;
@@ -640,10 +653,10 @@
 		handler->interp = interp;
 		if ((id = tcl_cmd_register(handler)) == 0) {
 			tcl_cmd_handler_free(handler);
-			Tcl_SetIntObj(result, 0);
+			Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
 		} else {
 			handler->id = id;
-			Tcl_SetIntObj(result, id);
+			Tcl_SetObjResult(interp, Tcl_NewIntObj(id));
 		}
 		break;
 	case CMD_CMD_UNREGISTER:
@@ -663,7 +676,7 @@
 
 int tcl_cmd_connection(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *result = Tcl_GetObjResult(interp), *list, *elem;
+	Tcl_Obj *list, *elem;
 	const char *cmds[] = { "account", "displayname", "handle", "list", NULL };
 	enum { CMD_CONN_ACCOUNT, CMD_CONN_DISPLAYNAME, CMD_CONN_HANDLE, CMD_CONN_LIST } cmd;
 	int error;
@@ -697,14 +710,16 @@
 		}
 		if ((gc = tcl_validate_gc(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, (char *)purple_connection_get_display_name(gc), -1);
+		Tcl_SetObjResult(interp,
+                                 Tcl_NewStringObj(purple_connection_get_display_name(gc), -1));
 		break;
 	case CMD_CONN_HANDLE:
 		if (objc != 2) {
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_connections_get_handle());
+		Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefHandle,
+							    purple_connections_get_handle()));
 		break;
 	case CMD_CONN_LIST:
 		if (objc != 2) {
@@ -725,7 +740,7 @@
 
 int tcl_cmd_conversation(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *list, *elem, *result = Tcl_GetObjResult(interp);
+	Tcl_Obj *list, *elem;
 	const char *cmds[] = { "find", "handle", "list", "new", "write", "name", "title", "send", NULL };
 	enum { CMD_CONV_FIND, CMD_CONV_HANDLE, CMD_CONV_LIST, CMD_CONV_NEW, CMD_CONV_WRITE , CMD_CONV_NAME, CMD_CONV_TITLE, CMD_CONV_SEND } cmd;
 	const char *styles[] = { "send", "recv", "system", NULL };
@@ -766,7 +781,9 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_conversations_get_handle());
+		Tcl_SetObjResult(interp,
+		                 purple_tcl_ref_new(PurpleTclRefHandle,
+						    purple_conversations_get_handle()));
 		break;
 	case CMD_CONV_LIST:
 		list = Tcl_NewListObj(0, NULL);
@@ -847,7 +864,8 @@
 
 		if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, (char *)purple_conversation_get_name(convo), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj((char *)purple_conversation_get_name(convo), -1));
 		break;
 	case CMD_CONV_TITLE:
 		if (objc != 3) {
@@ -857,7 +875,8 @@
 
 		if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, (char *)purple_conversation_get_title(convo), -1);
+		Tcl_SetObjResult(interp,
+                                 Tcl_NewStringObj((char *)purple_conversation_get_title(convo), -1));
 		break;
 	case CMD_CONV_SEND:
 		if (objc != 4) {
@@ -879,7 +898,6 @@
 
 int tcl_cmd_core(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	const char *cmds[] = { "handle", "quit", NULL };
 	enum { CMD_CORE_HANDLE, CMD_CORE_QUIT } cmd;
 	int error;
@@ -898,7 +916,9 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_get_core());
+		Tcl_SetObjResult(interp,
+                                 purple_tcl_ref_new(PurpleTclRefHandle,
+						    purple_get_core()));
 		break;
 	case CMD_CORE_QUIT:
 		if (objc != 2) {
@@ -970,7 +990,6 @@
 
 int tcl_cmd_plugins(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	const char *cmds[] = { "handle", NULL };
 	enum { CMD_PLUGINS_HANDLE } cmd;
 	int error;
@@ -989,7 +1008,9 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_plugins_get_handle());
+		Tcl_SetObjResult(interp,
+				purple_tcl_ref_new(PurpleTclRefHandle,
+						   purple_plugins_get_handle()));
 		break;
 	}
 
@@ -998,7 +1019,7 @@
 
 int tcl_cmd_prefs(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *result, *list, *elem, **elems;
+	Tcl_Obj *list, *elem, **elems;
 	const char *cmds[] = { "get", "set", "type", NULL };
 	enum { CMD_PREFS_GET, CMD_PREFS_SET, CMD_PREFS_TYPE } cmd;
 	/* char *types[] = { "none", "boolean", "int", "string", "stringlist", NULL }; */
@@ -1015,7 +1036,6 @@
 	if ((error = Tcl_GetIndexFromObj(interp, objv[1], cmds, "subcommand", 0, (int *)&cmd)) != TCL_OK)
 		return error;
 
-	result = Tcl_GetObjResult(interp);
 	switch (cmd) {
 	case CMD_PREFS_GET:
 		if (objc != 3) {
@@ -1025,17 +1045,21 @@
 		preftype = purple_prefs_get_type(Tcl_GetString(objv[2]));
 		switch (preftype) {
 		case PURPLE_PREF_NONE:
-			Tcl_SetStringObj(result, "pref type none", -1);
+			Tcl_SetObjResult(interp,
+					 Tcl_NewStringObj("pref type none", -1));
 			return TCL_ERROR;
 			break;
 		case PURPLE_PREF_BOOLEAN:
-			Tcl_SetBooleanObj(result, purple_prefs_get_bool(Tcl_GetString(objv[2])));
+			Tcl_SetObjResult(interp,
+					 Tcl_NewBooleanObj(
+						 purple_prefs_get_bool(Tcl_GetString(objv[2]))));
 			break;
 		case PURPLE_PREF_INT:
-			Tcl_SetIntObj(result, purple_prefs_get_int(Tcl_GetString(objv[2])));
+			Tcl_SetObjResult(interp, Tcl_NewIntObj(purple_prefs_get_int(Tcl_GetString(objv[2]))));
 			break;
 		case PURPLE_PREF_STRING:
-			Tcl_SetStringObj(result, (char *)purple_prefs_get_string(Tcl_GetString(objv[2])), -1);
+			Tcl_SetObjResult(interp,
+					 Tcl_NewStringObj((char *)purple_prefs_get_string(Tcl_GetString(objv[2])), -1));
 			break;
 		case PURPLE_PREF_STRING_LIST:
 			cur = purple_prefs_get_string_list(Tcl_GetString(objv[2]));
@@ -1049,7 +1073,8 @@
 			break;
 		default:
 			purple_debug(PURPLE_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype);
-			Tcl_SetStringObj(result, "unknown pref type", -1);
+			Tcl_SetObjResult(interp,
+					 Tcl_NewStringObj("unknown pref type", -1));
 			return TCL_ERROR;
 		}
 		break;
@@ -1061,7 +1086,8 @@
 		preftype = purple_prefs_get_type(Tcl_GetString(objv[2]));
 		switch (preftype) {
 		case PURPLE_PREF_NONE:
-			Tcl_SetStringObj(result, "bad path or pref type none", -1);
+			Tcl_SetObjResult(interp,
+					 Tcl_NewStringObj("bad path or pref type none", -1));
 			return TCL_ERROR;
 			break;
 		case PURPLE_PREF_BOOLEAN:
@@ -1100,23 +1126,23 @@
 		preftype = purple_prefs_get_type(Tcl_GetString(objv[2]));
 		switch (preftype) {
 		case PURPLE_PREF_NONE:
-			Tcl_SetStringObj(result, "none", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
 			break;
 		case PURPLE_PREF_BOOLEAN:
-			Tcl_SetStringObj(result, "boolean", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("boolean", -1));
 			break;
 		case PURPLE_PREF_INT:
-			Tcl_SetStringObj(result, "int", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("int", -1));
 			break;
 		case PURPLE_PREF_STRING:
-			Tcl_SetStringObj(result, "string", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("string", -1));
 			break;
 		case PURPLE_PREF_STRING_LIST:
-			Tcl_SetStringObj(result, "stringlist", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("stringlist", -1));
 			break;
 		default:
 			purple_debug(PURPLE_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype);
-			Tcl_SetStringObj(result, "unknown", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("unknown", -1));
 		}
 		break;
 	}
@@ -1134,7 +1160,7 @@
 	       CMD_PRESENCE_CONTEXT, CMD_PRESENCE_CONVERSATION,
 	       CMD_PRESENCE_IDLE, CMD_PRESENCE_LOGIN, CMD_PRESENCE_ONLINE,
 	       CMD_PRESENCE_STATUS, CMD_PRESENCE_STATUSES } cmd;
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	Tcl_Obj *result;
 	Tcl_Obj *list, *elem;
 	PurplePresence *presence;
 	GList *cur;
@@ -1171,25 +1197,30 @@
 					 purple_tcl_ref_new(PurpleTclRefStatus,
 							  purple_presence_get_active_status(presence)));
 		} else if (objc == 4) {
-			Tcl_SetBooleanObj(result,
-					  purple_presence_is_status_active(presence,
-									 Tcl_GetString(objv[3])));
+			Tcl_SetObjResult(interp,
+                                         Tcl_NewBooleanObj(
+						 purple_presence_is_status_active(presence,
+										  Tcl_GetString(objv[3]))));
 		} else {
 			PurpleStatusPrimitive primitive;
 			if (strcmp(Tcl_GetString(objv[3]), "-primitive")) {
-				Tcl_SetStringObj(result, "bad option \"", -1);
+				result = Tcl_NewStringObj("bad option \"", -1);
 				Tcl_AppendObjToObj(result, objv[3]);
 				Tcl_AppendToObj(result,
 						"\": should be -primitive", -1);
+				Tcl_SetObjResult(interp,result);
 				return TCL_ERROR;
 			}
 			primitive = purple_primitive_get_type_from_id(Tcl_GetString(objv[4]));
 			if (primitive == PURPLE_STATUS_UNSET) {
-				Tcl_SetStringObj(result, "invalid primitive ", -1);
+				result = Tcl_NewStringObj("invalid primitive ", -1);
 				Tcl_AppendObjToObj(result, objv[4]);
+				Tcl_SetObjResult(interp,result);
 				return TCL_ERROR;
 			}
-			Tcl_SetBooleanObj(result, purple_presence_is_status_primitive_active(presence, primitive));
+			Tcl_SetObjResult(interp,
+                                         Tcl_NewBooleanObj(
+						 purple_presence_is_status_primitive_active(presence, primitive)));
 			break;
 		}
 		break;
@@ -1200,7 +1231,8 @@
 		}
 		if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_presence_is_available(presence));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(purple_presence_is_available(presence)));
 		break;
 	case CMD_PRESENCE_CHAT_USER:
 		if (objc != 3) {
@@ -1209,7 +1241,8 @@
 		}
 		if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_presence_get_chat_user(presence), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_presence_get_chat_user(presence), -1));
 		break;
 	case CMD_PRESENCE_CONTEXT:
 		if (objc != 3) {
@@ -1220,16 +1253,16 @@
 			return TCL_ERROR;
 		switch (purple_presence_get_context(presence)) {
 		case PURPLE_PRESENCE_CONTEXT_UNSET:
-			Tcl_SetStringObj(result, "unset", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("unset", -1));
 			break;
 		case PURPLE_PRESENCE_CONTEXT_ACCOUNT:
-			Tcl_SetStringObj(result, "account", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("account", -1));
 			break;
 		case PURPLE_PRESENCE_CONTEXT_CONV:
-			Tcl_SetStringObj(result, "conversation", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("conversation", -1));
 			break;
 		case PURPLE_PRESENCE_CONTEXT_BUDDY:
-			Tcl_SetStringObj(result, "buddy", -1);
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("buddy", -1));
 			break;
 		}
 		break;
@@ -1253,7 +1286,7 @@
 		if (objc == 3) {
 			if (purple_presence_is_idle(presence)) {
 				idle_time = purple_presence_get_idle_time (presence);
-				Tcl_SetIntObj(result, idle_time);
+				Tcl_SetObjResult(interp, Tcl_NewIntObj(idle_time));
 			} else {
 				result = Tcl_NewListObj(0, NULL);
 				Tcl_SetObjResult(interp, result);
@@ -1280,7 +1313,7 @@
 		if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL)
 			return TCL_ERROR;
 		if (objc == 3) {
-			Tcl_SetIntObj(result, purple_presence_get_login_time(presence));
+			Tcl_SetObjResult(interp, Tcl_NewIntObj(purple_presence_get_login_time(presence)));
 		} else {
 			if ((error == Tcl_GetIntFromObj(interp,
 			                                objv[3],
@@ -1296,7 +1329,9 @@
 		}
 		if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_presence_is_online(presence));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(
+					 purple_presence_is_online(presence)));
 		break;
 	case CMD_PRESENCE_STATUS:
 		if (objc != 4) {
@@ -1332,7 +1367,7 @@
 
 int tcl_cmd_savedstatus(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	Tcl_Obj *result;
 	const char *cmds[] = { "current", "handle", NULL };
 	enum { CMD_SAVEDSTATUS_CURRENT, CMD_SAVEDSTATUS_HANDLE } cmd;
 	int error;
@@ -1354,16 +1389,20 @@
 		}
 		if ((saved_status = purple_savedstatus_get_current()) == NULL)
 			return TCL_ERROR;
+		result = Tcl_NewListObj(0, NULL);
 		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(purple_savedstatus_get_title(saved_status), -1));
 		Tcl_ListObjAppendElement(interp, result, Tcl_NewIntObj(purple_savedstatus_get_type(saved_status)));
 		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(purple_savedstatus_get_message(saved_status), -1));
+		Tcl_SetObjResult(interp,result);
 		break;
 	case CMD_SAVEDSTATUS_HANDLE:
 		if (objc != 2) {
 			Tcl_WrongNumArgs(interp, 2, objv, "");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)purple_savedstatuses_get_handle());
+		Tcl_SetObjResult(interp, 
+				 purple_tcl_ref_new(PurpleTclRefHandle,
+						    purple_savedstatuses_get_handle()));
 		break;
 	}
 
@@ -1396,7 +1435,6 @@
 	const char *cmds[] = { "connect", "disconnect", NULL };
 	enum { CMD_SIGNAL_CONNECT, CMD_SIGNAL_DISCONNECT } cmd;
 	struct tcl_signal_handler *handler;
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	void *instance;
 	int error;
 
@@ -1415,7 +1453,7 @@
 			return TCL_ERROR;
 		}
 		handler = g_new0(struct tcl_signal_handler, 1);
-		if ((error = Tcl_GetIntFromObj(interp, objv[2], (int *)&handler->instance)) != TCL_OK) {
+		if ((handler->instance = purple_tcl_ref_get(interp, objv[2],PurpleTclRefHandle)) == NULL) {
 			g_free(handler);
 			return error;
 		}
@@ -1426,9 +1464,9 @@
 		handler->interp = interp;
 		if (!tcl_signal_connect(handler)) {
 			tcl_signal_handler_free(handler);
-			Tcl_SetIntObj(result, 1);
+			Tcl_SetObjResult(interp, Tcl_NewIntObj(1));
 		} else {
-			Tcl_SetIntObj(result, 0);
+			Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
 		}
 		break;
 	case CMD_SIGNAL_DISCONNECT:
@@ -1436,7 +1474,7 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "instance signal");
 			return TCL_ERROR;
 		}
-		if ((error = Tcl_GetIntFromObj(interp, objv[2], (int *)&instance)) != TCL_OK)
+		if ((instance = purple_tcl_ref_get(interp, objv[2],PurpleTclRefHandle)) == NULL)
 			return error;
 		tcl_signal_disconnect(instance, Tcl_GetString(objv[3]), interp);
 		break;
@@ -1449,7 +1487,6 @@
 {
 	const char *cmds[] = { "attr", "type", NULL };
 	enum { CMD_STATUS_ATTR, CMD_STATUS_TYPE } cmd;
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	PurpleStatus *status;
 	PurpleStatusType *status_type;
 	PurpleValue *value;
@@ -1475,13 +1512,15 @@
 		attr = Tcl_GetString(objv[3]);
 		value = purple_status_get_attr_value(status, attr);
 		if (value == NULL) {
-			Tcl_SetStringObj(result, "no such attribute", -1);
+			Tcl_SetObjResult(interp,
+					 Tcl_NewStringObj("no such attribute", -1));
 			return TCL_ERROR;
 		}
 		switch (purple_value_get_type(value)) {
 		case PURPLE_TYPE_BOOLEAN:
 			if (objc == 4) {
-				Tcl_SetBooleanObj(result, purple_value_get_boolean(value));
+				Tcl_SetObjResult(interp,
+						 Tcl_NewBooleanObj(purple_value_get_boolean(value)));
 			} else {
 				if ((error = Tcl_GetBooleanFromObj(interp, objv[4], &v)) != TCL_OK)
 					return error;
@@ -1490,7 +1529,7 @@
 			break;
 		case PURPLE_TYPE_INT:
 			if (objc == 4) {
-				Tcl_SetIntObj(result, purple_value_get_int(value));
+				Tcl_SetObjResult(interp, Tcl_NewIntObj(purple_value_get_int(value)));
 			} else {
 				if ((error = Tcl_GetIntFromObj(interp, objv[4], &v)) != TCL_OK)
 					return error;
@@ -1499,12 +1538,14 @@
 			break;
 		case PURPLE_TYPE_STRING:
 			if (objc == 4)
-				Tcl_SetStringObj(result, purple_value_get_string(value), -1);
+				Tcl_SetObjResult(interp,
+						 Tcl_NewStringObj(purple_value_get_string(value), -1));
 			else
 				purple_status_set_attr_string(status, attr, Tcl_GetString(objv[4]));
 			break;
 		default:
-			Tcl_SetStringObj(result, "attribute has unknown type", -1);
+			Tcl_SetObjResult(interp,
+                                         Tcl_NewStringObj("attribute has unknown type", -1));
 			return TCL_ERROR;
 		}
 		break;
@@ -1528,7 +1569,6 @@
 {
 	const char *cmds[] = { "id", "name", NULL };
 	enum { CMD_STATUS_ATTR_ID, CMD_STATUS_ATTR_NAME } cmd;
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	PurpleStatusAttr *attr;
 	int error;
 
@@ -1548,7 +1588,8 @@
 		}
 		if ((attr = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusAttr)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_status_attr_get_id(attr), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_status_attr_get_id(attr), -1));
 		break;
 	case CMD_STATUS_ATTR_NAME:
 		if (objc != 3) {
@@ -1557,7 +1598,8 @@
 		}
 		if ((attr = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusAttr)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_status_attr_get_name(attr), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_status_attr_get_name(attr), -1));
 		break;
 	}
 
@@ -1576,7 +1618,6 @@
 	       CMD_STATUS_TYPE_NAME, CMD_STATUS_TYPE_PRIMARY_ATTR,
 	       CMD_STATUS_TYPE_PRIMITIVE, CMD_STATUS_TYPE_SAVEABLE,
 	       CMD_STATUS_TYPE_USER_SETTABLE } cmd;
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	PurpleStatusType *status_type;
 	Tcl_Obj *list, *elem;
 	GList *cur;
@@ -1598,7 +1639,8 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_status_type_is_available(status_type));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(purple_status_type_is_available(status_type)));
 		break;
 	case CMD_STATUS_TYPE_ATTR:
 		if (objc != 4) {
@@ -1634,7 +1676,8 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_status_type_is_exclusive(status_type));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(purple_status_type_is_exclusive(status_type)));
 		break;
 	case CMD_STATUS_TYPE_ID:
 		if (objc != 3) {
@@ -1643,7 +1686,8 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_status_type_get_id(status_type), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_status_type_get_id(status_type), -1));
 		break;
 	case CMD_STATUS_TYPE_INDEPENDENT:
 		if (objc != 3) {
@@ -1652,7 +1696,8 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_status_type_is_independent(status_type));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(purple_status_type_is_independent(status_type)));
 		break;
 	case CMD_STATUS_TYPE_NAME:
 		if (objc != 3) {
@@ -1661,7 +1706,8 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_status_type_get_name(status_type), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_status_type_get_name(status_type), -1));
 		break;
 	case CMD_STATUS_TYPE_PRIMITIVE:
 		if (objc != 3) {
@@ -1670,7 +1716,9 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_primitive_get_id_from_type(purple_status_type_get_primitive(status_type)), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_primitive_get_id_from_type
+						  (purple_status_type_get_primitive(status_type)), -1));
 		break;
 	case CMD_STATUS_TYPE_PRIMARY_ATTR:
 		if (objc != 3) {
@@ -1679,7 +1727,8 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetStringObj(result, purple_status_type_get_primary_attr(status_type), -1);
+		Tcl_SetObjResult(interp,
+				 Tcl_NewStringObj(purple_status_type_get_primary_attr(status_type), -1));
 		break;
 	case CMD_STATUS_TYPE_SAVEABLE:
 		if (objc != 3) {
@@ -1688,7 +1737,9 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_status_type_is_saveable(status_type));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(
+					 purple_status_type_is_saveable(status_type)));
 		break;
 	case CMD_STATUS_TYPE_USER_SETTABLE:
 		if (objc != 3) {
@@ -1697,7 +1748,9 @@
 		}
 		if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetBooleanObj(result, purple_status_type_is_user_settable(status_type));
+		Tcl_SetObjResult(interp,
+				 Tcl_NewBooleanObj(
+					 purple_status_type_is_user_settable(status_type)));
 		break;
 	}
 
diff -r d94432a338ab -r bedd56240914 libpurple/plugins/tcl/tcl_purple.h
--- a/libpurple/plugins/tcl/tcl_purple.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_purple.h	Fri Sep 28 20:30:26 2007 +0000
@@ -76,6 +76,7 @@
 extern PurpleStringref *PurpleTclRefStatusAttr;
 extern PurpleStringref *PurpleTclRefStatusType;
 extern PurpleStringref *PurpleTclRefXfer;
+extern PurpleStringref *PurpleTclRefHandle;
 
 PurplePlugin *tcl_interp_get_plugin(Tcl_Interp *interp);
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/adhoccommands.c
--- a/libpurple/protocols/jabber/adhoccommands.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c	Fri Sep 28 20:30:26 2007 +0000
@@ -151,8 +151,11 @@
 		/* display result */
 		xmlnode *note = xmlnode_get_child(command,"note");
 		
-		if(note)
-			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL);
+		if(note) {
+			char *data = xmlnode_get_data(note);
+			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL);
+			g_free(data);
+		}
 		
 		if(xdata)
 			jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Fri Sep 28 20:30:26 2007 +0000
@@ -1455,10 +1455,13 @@
 		return;
 	
 	img = purple_base64_decode(b64data, &size);
-	if(!img)
+	if(!img) {
+		g_free(b64data);
 		return;
+	}
 	
 	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+	g_free(b64data);
 }
 
 void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Fri Sep 28 20:30:26 2007 +0000
@@ -814,7 +814,7 @@
 		if(account->registration_cb)
 			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 		jabber_connection_schedule_close(cbdata->js);
-}
+	}
 	g_free(cbdata->who);
 	g_free(cbdata);
 }
@@ -883,12 +883,12 @@
 				if((href = xmlnode_get_data(url))) {
 					purple_notify_uri(NULL, href);
 					g_free(href);
-				if(js->registration) {
-					js->gc->wants_to_die = TRUE;
-					if(account->registration_cb) /* succeeded, but we have no login info */
-						(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
-					jabber_connection_schedule_close(js);
-				}
+					if(js->registration) {
+						js->gc->wants_to_die = TRUE;
+						if(account->registration_cb) /* succeeded, but we have no login info */
+							(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+						jabber_connection_schedule_close(js);
+					}
 					return;
 				}
 			}
@@ -988,14 +988,14 @@
 		purple_request_field_group_add_field(group, field);
 	}
 
-		if((y = xmlnode_get_child(query, "instructions")))
-			instructions = xmlnode_get_data(y);
+	if((y = xmlnode_get_child(query, "instructions")))
+		instructions = xmlnode_get_data(y);
 	else if(registered)
 		instructions = g_strdup(_("Please fill out the information below "
 					"to change your account registration."));
-		else
-			instructions = g_strdup(_("Please fill out the information below "
-						"to register your new account."));
+	else
+		instructions = g_strdup(_("Please fill out the information below "
+					"to register your new account."));
 
 	cbdata = g_new0(JabberRegisterCBData, 1);
 	cbdata->js = js;
@@ -1020,8 +1020,8 @@
 		g_free(title);
 	}
 
-		g_free(instructions);
-	}
+	g_free(instructions);
+}
 
 void jabber_register_start(JabberStream *js)
 {
@@ -1532,15 +1532,15 @@
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
 			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
 			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
@@ -1555,15 +1555,15 @@
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
 			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
 			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
@@ -1578,15 +1578,15 @@
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
 			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
 			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
@@ -1601,15 +1601,15 @@
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
 			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
 			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
@@ -1624,15 +1624,15 @@
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
 			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
 			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
-			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
-			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
@@ -2240,6 +2240,44 @@
 	return PURPLE_CMD_RET_FAILED;
 }
 
+GList *jabber_attention_types(PurpleAccount *account)
+{
+	static GList *types = NULL;
+	PurpleAttentionType *attn;
+
+	if (!types) {
+		attn = g_new0(PurpleAttentionType, 1);
+		attn->name = _("Buzz");
+		attn->incoming_description = _("%s has buzzed you!");
+		attn->outgoing_description = _("Buzzing %s...");
+		types = g_list_append(types, attn);
+	}
+
+	return types;
+}
+
+gboolean jabber_send_attention(PurpleConnection *gc, const char *username, guint code)
+{
+	PurpleConversation *conv;
+	char *error;
+	char *args[1];
+	PurpleCmdRet ret;
+
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, username, gc->account);
+
+	args[0] = (char *)username;
+
+	ret = jabber_cmd_buzz(conv, "buzz", args, &error, NULL);
+
+	if (ret == PURPLE_CMD_RET_FAILED) {
+		purple_debug_error("jabber", "jabber_send_attention: jabber_cmd_buzz failed with error: %s\n", error ? error : "(NULL)");
+		return FALSE;
+	} else {
+		return TRUE;
+	}
+}
+
+
 gboolean jabber_offline_message(const PurpleBuddy *buddy)
 {
 	return TRUE;
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/jabber.h
--- a/libpurple/protocols/jabber/jabber.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Fri Sep 28 20:30:26 2007 +0000
@@ -66,6 +66,9 @@
 
 #define CAPS0115_NODE "http://pidgin.im/caps"
 
+/* Index into attention_types list */
+#define JABBER_BUZZ 0
+
 typedef enum {
 	JABBER_STREAM_OFFLINE,
 	JABBER_STREAM_CONNECTING,
@@ -231,6 +234,8 @@
 void jabber_register_gateway(JabberStream *js, const char *gateway);
 void jabber_register_account(PurpleAccount *account);
 void jabber_unregister_account(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data);
+gboolean jabber_send_attention(PurpleConnection *gc, const char *username, guint code);
+GList *jabber_attention_types(PurpleAccount *account);
 void jabber_convo_closed(PurpleConnection *gc, const char *who);
 PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name);
 gboolean jabber_offline_message(const PurpleBuddy *buddy);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Fri Sep 28 20:30:26 2007 +0000
@@ -113,10 +113,10 @@
 	jabber_prpl_send_raw,			/* send_raw */
 	jabber_roomlist_room_serialize, /* roomlist_room_serialize */
 	jabber_unregister_account,		/* unregister_user */
+	jabber_send_attention,			/* send_attention */
+	jabber_attention_types,			/* attention_types */
 
 	/* padding */
-	NULL,
-	NULL,
 	NULL
 };
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Fri Sep 28 20:30:26 2007 +0000
@@ -327,7 +327,7 @@
 	if(type) {
 		if(!strcmp(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-	else if(!strcmp(type, "chat"))
+		else if(!strcmp(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
 		else if(!strcmp(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Fri Sep 28 20:30:26 2007 +0000
@@ -192,16 +192,11 @@
 		jabber_tune_set(js->gc, &tuneinfo);
 		
 		/* update old values */
-		if(js->old_artist)
-			g_free(js->old_artist);
-		if(js->old_title)
-			g_free(js->old_title);
-		if(js->old_source)
-			g_free(js->old_source);
-		if(js->old_uri)
-			g_free(js->old_uri);
-		if(js->old_track)
-			g_free(js->old_track);
+		g_free(js->old_artist);
+		g_free(js->old_title);
+		g_free(js->old_source);
+		g_free(js->old_uri);
+		g_free(js->old_track);
 		js->old_artist = g_strdup(artist);
 		js->old_title = g_strdup(title);
 		js->old_source = g_strdup(source);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/usernick.c
--- a/libpurple/protocols/jabber/usernick.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/usernick.c	Fri Sep 28 20:30:26 2007 +0000
@@ -33,7 +33,7 @@
 	xmlnode *item = xmlnode_get_child(items, "item");
 	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
 	xmlnode *nick;
-	const char *nickname = NULL;
+	char *nickname = NULL;
 	
 	/* ignore the tune of people not on our buddy list */
 	if (!buddy || !item)
@@ -43,8 +43,8 @@
 	if (!nick)
 		return;
 	nickname = xmlnode_get_data(nick);
-
 	serv_got_alias(js->gc, from, nickname);
+	g_free(nickname);
 }
 
 static void do_nick_set(JabberStream *js, const char *nick) {
@@ -64,7 +64,7 @@
 }
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
-	const char *oldnickname = NULL;
+	char *oldnickname = NULL;
 	xmlnode *item = xmlnode_get_child(items,"item");
 	
 	if(item) {
@@ -77,6 +77,7 @@
 		_("This information is visible to all contacts on your contact list, so choose something appropriate."),
 		oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,
 		purple_connection_get_account(js->gc), NULL, NULL, js);
+	g_free(oldnickname);
 }
 
 static void do_nick_set_nick(PurplePluginAction *action) {
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/jabber/usertune.c
--- a/libpurple/protocols/jabber/usertune.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/jabber/usertune.c	Fri Sep 28 20:30:26 2007 +0000
@@ -41,48 +41,61 @@
 	if (!buddy || !item)
 		return;
 	
-	tuneinfodata.artist = "";
-	tuneinfodata.title = "";
-	tuneinfodata.album = "";
-	tuneinfodata.track = "";
+	tuneinfodata.artist = NULL;
+	tuneinfodata.title = NULL;
+	tuneinfodata.album = NULL;
+	tuneinfodata.track = NULL;
 	tuneinfodata.time = -1;
-	tuneinfodata.url = "";
-	
+	tuneinfodata.url = NULL;
+
 	tune = xmlnode_get_child_with_namespace(item, "tune", "http://jabber.org/protocol/tune");
 	if (!tune)
 		return;
+	resource = jabber_buddy_find_resource(buddy, NULL);
+	if(!resource)
+		return; /* huh? */
 	for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) {
 		if (tuneinfo->type == XMLNODE_TYPE_TAG) {
 			if (!strcmp(tuneinfo->name, "artist")) {
-				if (tuneinfodata.artist[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.artist == NULL) /* only pick the first one */
 					tuneinfodata.artist = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "length")) {
 				if (tuneinfodata.time == -1) {
 					char *length = xmlnode_get_data(tuneinfo);
 					if (length)
 						tuneinfodata.time = strtol(length, NULL, 10);
+					g_free(length);
 				}
 			} else if (!strcmp(tuneinfo->name, "source")) {
-				if (tuneinfodata.album[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.album == NULL) /* only pick the first one */
 					tuneinfodata.album = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "title")) {
-				if (tuneinfodata.title[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.title == NULL) /* only pick the first one */
 					tuneinfodata.title = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "track")) {
-				if (tuneinfodata.track[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.track == NULL) /* only pick the first one */
 					tuneinfodata.track = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "uri")) {
-				if (tuneinfodata.url[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.url == NULL) /* only pick the first one */
 					tuneinfodata.url = xmlnode_get_data(tuneinfo);
 			}
 		}
 	}
-	resource = jabber_buddy_find_resource(buddy, NULL);
-	if(!resource)
-		return; /* huh? */
 	status_id = jabber_buddy_state_get_status_id(resource->state);
 
-	purple_prpl_got_user_status(js->gc->account, from, status_id, PURPLE_TUNE_ARTIST, tuneinfodata.artist, PURPLE_TUNE_TITLE, tuneinfodata.title, PURPLE_TUNE_ALBUM, tuneinfodata.album, PURPLE_TUNE_TRACK, tuneinfodata.track, PURPLE_TUNE_TIME, tuneinfodata.time, PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+	purple_prpl_got_user_status(js->gc->account, from, status_id,
+			PURPLE_TUNE_ARTIST, tuneinfodata.artist,
+			PURPLE_TUNE_TITLE, tuneinfodata.title,
+			PURPLE_TUNE_ALBUM, tuneinfodata.album,
+			PURPLE_TUNE_TRACK, tuneinfodata.track,
+			PURPLE_TUNE_TIME, tuneinfodata.time,
+			PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+
+	g_free(tuneinfodata.artist);
+	g_free(tuneinfodata.title);
+	g_free(tuneinfodata.album);
+	g_free(tuneinfodata.track);
+	g_free(tuneinfodata.url);
 }
 
 void jabber_tune_init(void) {
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/Makefile.am
--- a/libpurple/protocols/msn/Makefile.am	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.am	Fri Sep 28 20:30:26 2007 +0000
@@ -1,4 +1,6 @@
 EXTRA_DIST = \
+		directconn.c \
+		directconn.h \
 		Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -8,10 +10,10 @@
 	cmdproc.h \
 	command.c \
 	command.h \
+	contact.c\
+	contact.h\
 	dialog.c \
 	dialog.h \
-	directconn.c \
-	directconn.h \
 	error.c \
 	error.h \
 	group.c \
@@ -30,6 +32,8 @@
 	notification.h \
 	object.c \
 	object.h \
+	oim.c\
+	oim.h\
 	page.c \
 	page.h \
 	servconn.c \
@@ -46,6 +50,8 @@
 	slpmsg.h \
 	slpsession.c \
 	slpsession.h \
+	soap.c\
+	soap.h\
 	state.c \
 	state.h \
 	switchboard.c \
@@ -60,8 +66,8 @@
 	user.h \
 	userlist.c \
 	userlist.h \
-	msn-utils.c \
-	msn-utils.h
+	msnutils.c \
+	msnutils.h
 
 AM_CFLAGS = $(st)
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/Makefile.mingw
--- a/libpurple/protocols/msn/Makefile.mingw	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Fri Sep 28 20:30:26 2007 +0000
@@ -39,6 +39,7 @@
 ##
 C_SRC =			cmdproc.c \
 			command.c \
+			contact.c\
 			dialog.c \
 			directconn.c \
 			error.c \
@@ -50,6 +51,7 @@
 			nexus.c \
 			notification.c \
 			object.c \
+			oim.c\
 			page.c \
 			servconn.c \
 			session.c \
@@ -58,6 +60,7 @@
 			slplink.c \
 			slpmsg.c \
 			slpsession.c \
+			soap.c\
 			state.c \
 			switchboard.c \
 			sync.c \
@@ -65,7 +68,7 @@
 			transaction.c \
 			user.c \
 			userlist.c \
-			msn-utils.c
+			msnutils.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/README	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,55 @@
+MSNP14 Implementation
+by Ma Yuan<mayuan2006@gmail.com>
+
+1. Introduction
+-------------
+
+MSNP14 Protocol, proposed by Windows Live Messenger, is new, and there is no available implementation except the official one on Windows Platform.
+
+It has introduced many new features attractable to many users, such as:
+* Offline Instant Message
+	You can send the offline Message to the offline User,
+	The message will be posted to that user the next time when he is online.
+
+* Communicate with Yahoo User
+	U can chat with the Yahoo User in MSN, That's Fantastic! Till now ,
+	you can send text/Nudge to Yahoo User.
+
+* Windows Live ID authentition
+	WLM use the Window Live ID Authentication process,Known as Passport 3.0,
+	The procedure is totally different to the previous Passport 2.0
+
+* Video/Audio Conversation
+	U can communicate with other's via Video/Audio.
+(Though very interesting, not implemented in this version)
+
+2.New Features Added
+-----------------
+
+Till now, This project has implemented the following Feature:
+* Windows Live ID authentication.
+
+* Offline Instant Message
+Now can send and receive the Offline Instant Message to MSN user and Yahoo User.
+
+*contact management
+Can add/delete Contact
+Can add/delete Group
+
+* Communicate with Yahoo User
+Can send/receive Message/Nudge to Yahoo User.
+
+*. Changes to made to fit MSNP14 Protocol
+
+3. Reference
+-------------
+
+The very useful sites of MSN Protocol:
+MSNpiki site:
+reverse engineer of MSN Protocol.up to dated.
+http://msnpiki.msnfanatic.com/index.php/MSN_Protocol_Version_13
+
+hypothetic site:
+old MSN Protocol Introduction,but very useful for basic idea of MSN protocol
+http://www.hypothetic.org/docs/msn/index.php
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/cmdproc.c
--- a/libpurple/protocols/msn/cmdproc.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Fri Sep 28 20:30:26 2007 +0000
@@ -258,8 +258,10 @@
 		trans = msn_history_find(cmdproc->history, cmd->trId);
 
 	if (trans != NULL)
-		if (trans->timer)
+		if (trans->timer) {
 			purple_timeout_remove(trans->timer);
+			trans->timer = 0;
+		}
 
 	if (g_ascii_isdigit(cmd->command[0]))
 	{
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/command.c
--- a/libpurple/protocols/msn/command.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/command.c	Fri Sep 28 20:30:26 2007 +0000
@@ -36,6 +36,50 @@
 	return TRUE;
 }
 
+/*
+ * check the command is the command with payload content
+ *  if it is	return TRUE
+ *  else 		return FALSE
+ */
+static gboolean
+msn_check_payload_cmd(char *str)
+{
+	if( (!strcmp(str,"ADL")) ||
+		(!strcmp(str,"GCF")) ||
+		(!strcmp(str,"SG")) ||
+		(!strcmp(str,"MSG")) ||
+		(!strcmp(str,"RML")) ||
+		(!strcmp(str,"UBX")) ||
+		(!strcmp(str,"UBN")) ||
+		(!strcmp(str,"UUM")) ||
+		(!strcmp(str,"UBM")) ||
+		(!strcmp(str,"FQY")) ||
+		(!strcmp(str,"UUN")) ||
+		(!strcmp(str,"UUX")) ||
+		(is_num(str))){
+			return TRUE;
+		}
+
+	return FALSE;
+}
+
+/*
+ * set command Payload length
+ */
+static void
+msn_set_payload_len(MsnCommand *cmd)
+{
+	char *param;
+	int len = 0;
+
+	if (msn_check_payload_cmd(cmd->command) && (cmd->param_count > 0)){
+		param = cmd->params[cmd->param_count - 1];
+		len = is_num(param) ? atoi(param) : 0;
+	}
+
+	cmd->payload_len = len;
+}
+
 MsnCommand *
 msn_command_from_string(const char *string)
 {
@@ -70,7 +114,13 @@
 		cmd->trId = is_num(param) ? atoi(param) : 0;
 	}
 	else
+	{
 		cmd->trId = 0;
+	}
+
+	/*add payload Length checking*/
+	msn_set_payload_len(cmd);
+	purple_debug_info("MSNP14","get payload len:%d\n",cmd->payload_len);
 
 	msn_command_ref(cmd);
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/contact.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/contact.c	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,1897 @@
+/**
+ * @file contact.c 
+ * 	get MSN contacts via SOAP request
+ *	created by MaYuan<mayuan2006@gmail.com>
+ *
+ * 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 "msn.h"
+#include "contact.h"
+#include "xmlnode.h"
+#include "group.h"
+
+const char *MsnSoapPartnerScenarioText[] =
+{
+	"Initial",
+	"ContactSave",
+	"MessengerPendingList",
+	"ContactMsgrAPI",
+	"BlockUnblock"
+};
+
+const char *MsnMemberRole[] =
+{
+	"Forward",
+	"Allow",
+	"Block",
+	"Reverse",
+	"Pending"
+};
+
+/* new a contact */
+MsnContact *
+msn_contact_new(MsnSession *session)
+{
+	MsnContact *contact;
+
+	contact = g_new0(MsnContact, 1);
+	contact->session = session;
+	contact->soapconn = msn_soap_new(session,contact,1);
+
+	return contact;
+}
+
+/* destroy the contact */
+void
+msn_contact_destroy(MsnContact *contact)
+{
+	msn_soap_destroy(contact->soapconn);
+	g_free(contact);
+}
+
+MsnCallbackState *
+msn_callback_state_new(void)
+{
+	return g_new0(MsnCallbackState, 1);
+}
+
+void
+msn_callback_state_free(MsnCallbackState *state)
+{
+	if (state == NULL)
+		return;
+
+	g_free(state->who);
+	g_free(state->uid);
+	g_free(state->old_group_name);
+	g_free(state->new_group_name);
+	g_free(state->guid);
+
+	g_free(state);
+}
+
+void
+msn_callback_state_set_who(MsnCallbackState *state, const gchar *who)
+{
+	gchar *new_str = NULL;
+
+	g_return_if_fail(state != NULL);
+
+	if (who != NULL)
+		new_str = g_strdup(who);
+
+	g_free(state->who);
+	state->who = new_str;
+}
+
+void
+msn_callback_state_set_uid(MsnCallbackState *state, const gchar *uid)
+{
+	gchar *new_str = NULL;
+
+	g_return_if_fail(state != NULL);
+
+	if (uid != NULL)
+		new_str = g_strdup(uid);
+
+	g_free(state->uid);
+	state->uid = new_str;
+}
+
+void
+msn_callback_state_set_old_group_name(MsnCallbackState *state, const gchar *old_group_name)
+{
+	gchar *new_str = NULL;
+
+	g_return_if_fail(state != NULL);
+
+	if (old_group_name != NULL)
+		new_str = g_strdup(old_group_name);
+
+	g_free(state->old_group_name);
+	state->old_group_name = new_str;
+}
+
+void
+msn_callback_state_set_new_group_name(MsnCallbackState *state, const gchar *new_group_name)
+{
+	gchar *new_str = NULL;
+
+	g_return_if_fail(state != NULL);
+
+	if (new_group_name != NULL)
+		new_str = g_strdup(new_group_name);
+
+	g_free(state->new_group_name);
+	state->new_group_name = new_str;
+}
+
+void
+msn_callback_state_set_guid(MsnCallbackState *state, const gchar *guid)
+{
+	gchar *new_str = NULL;
+
+	g_return_if_fail(state != NULL);
+
+	if (guid != NULL)
+		new_str = g_strdup(guid);
+
+	g_free(state->guid);
+	state->guid = new_str;
+}
+
+
+void
+msn_callback_state_set_list_id(MsnCallbackState *state, MsnListId list_id)
+{
+	g_return_if_fail(state != NULL);
+
+	state->list_id = list_id;
+}
+
+void
+msn_callback_state_set_action(MsnCallbackState *state, MsnCallbackAction action)
+{
+	g_return_if_fail(state != NULL);
+
+	state->action |= action;
+}
+
+/*contact SOAP server login error*/
+static void
+msn_contact_login_error_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc, PurpleSslErrorType error)
+{
+	MsnSession *session;
+
+	session = soapconn->session;
+	g_return_if_fail(session != NULL);
+
+	msn_session_set_error(session, MSN_ERROR_SERV_DOWN, _("Unable to connect to contact server"));
+}
+
+/*msn contact SOAP server connect process*/
+static gboolean
+msn_contact_login_connect_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc)
+{
+	MsnSession * session;
+	MsnContact *contact;
+
+	contact = soapconn->parent;
+	g_return_val_if_fail(contact != NULL, TRUE);
+
+	session = contact->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+
+	/*login ok!We can retrieve the contact list*/
+//	msn_get_contact_list(contact, MSN_PS_INITIAL, NULL);
+	return TRUE;
+}
+
+/*get MSN member role utility*/
+static MsnListId
+msn_get_memberrole(char *role)
+{
+	g_return_val_if_fail(role != NULL, 0);
+
+	if (!strcmp(role,"Allow")) {
+		return MSN_LIST_AL;
+	} else if (!strcmp(role,"Block")) {
+		return MSN_LIST_BL;
+	} else if (!strcmp(role,"Reverse")) {
+		return MSN_LIST_RL;
+	} else if (!strcmp(role,"Pending")) {
+		return MSN_LIST_PL;
+	}
+	return 0;
+}
+
+/*get User Type*/
+static int
+msn_get_user_type(char *type)
+{
+	g_return_val_if_fail(type != NULL, 0);
+
+	if (!strcmp(type,"Regular")) {
+		return MSN_USER_TYPE_PASSPORT;
+	}
+	if (!strcmp(type,"Live")) {
+		return MSN_USER_TYPE_PASSPORT;
+	}
+	if (!strcmp(type,"LivePending")) {
+		return MSN_USER_TYPE_PASSPORT;
+	}
+
+	return MSN_USER_TYPE_UNKNOWN;
+}
+
+/* Create the AddressBook in the server, if we don't have one */
+static gboolean
+msn_create_address_cb(MsnSoapConn *soapconn)
+{
+	MsnContact *contact;
+
+	if (soapconn->body == NULL)
+		return TRUE;
+
+	contact = soapconn->parent;
+	g_return_val_if_fail(contact != NULL, TRUE);
+
+	purple_debug_info("MSN AddressBook", "Address Book successfully created!\n");
+	msn_get_address_book(contact, MSN_PS_INITIAL, NULL, NULL);
+
+//	msn_soap_free_read_buf(soapconn);
+	return TRUE;
+}
+
+static void
+msn_create_address_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN AddressBook","AddressBookAdd written\n");
+	soapconn->read_cb = msn_create_address_cb;
+
+	return;
+}
+
+static void
+msn_create_address_book(MsnContact * contact)
+{
+	MsnSoapReq *soap_request;
+	gchar *body;
+
+	g_return_if_fail(contact != NULL);
+	g_return_if_fail(contact->session != NULL);
+	g_return_if_fail(contact->session->user != NULL);
+	g_return_if_fail(contact->session->user->passport != NULL);
+	
+	purple_debug_info("MSN AddressBook","Creating an Address Book.\n");
+
+	body = g_strdup_printf(MSN_ADD_ADDRESSBOOK_TEMPLATE, contact->session->user->passport);
+
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,MSN_ADD_ADDRESSBOOK_SOAP_ACTION,
+					body,
+					NULL,
+					msn_create_address_cb,
+					msn_create_address_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn, soap_request);
+
+	g_free(body);
+	
+	return;
+}
+
+/*parse contact list*/
+static void
+msn_parse_contact_list(MsnContact * contact)
+{
+	MsnSession * session;
+	MsnListOp list_op = 0;
+	MsnListId list;
+	char * passport, *typedata;
+	xmlnode *fault, *faultstringnode, *faultdetail, *errorcode;
+	xmlnode *node, *body, *response, *result, *services;
+	xmlnode *service, *memberships, *info, *handle, *handletype;
+	xmlnode *membershipnode, *members, *member, *passportNode;
+
+	session = contact->session;
+	node = xmlnode_from_str(contact->soapconn->body, contact->soapconn->body_len);
+
+	if (node == NULL) {
+		purple_debug_error("MSNCL","Unable to parse SOAP data!\n");
+		return;
+	}
+
+	purple_debug_misc("MSNCL","Parsing contact list with size %d\n", contact->soapconn->body_len);
+
+	purple_debug_misc("MSNCL","Root node @ %p: Name: '%s', child: '%s', lastchild: '%s'\n", node,
+		node->name ? node->name : "(null)",
+		(node->child && node->child->name) ? node->child->name : "(null)",
+		(node->lastchild && node->lastchild->name) ? node->lastchild->name : "(null)");
+
+	body = xmlnode_get_child(node, "Body");
+
+	if (body == NULL) {
+		purple_debug_warning("MSNCL", "Failed to parse contact list Body node\n");
+		xmlnode_free(node);
+		return;
+	}
+	purple_debug_info("MSNCL","Body @ %p:  Name: '%s'\n",body,body->name);
+
+	/* Did we receive a <Fault> ? */
+	if ( (fault = xmlnode_get_child(body, "Fault")) != NULL) {
+	        purple_debug_info("MSNCL","Fault received from SOAP server!\n");
+
+		if ( (faultstringnode = xmlnode_get_child(fault, "faultstring")) != NULL ) {
+			gchar * faultstring = xmlnode_get_data(faultstringnode);
+			purple_debug_info("MSNCL", "Faultstring: %s\n", faultstring ? faultstring : "(null)");
+			g_free(faultstring);
+		}
+		if ( (faultdetail = xmlnode_get_child(fault, "detail")) != NULL ) {
+			purple_debug_info("MSNCL","detail @ %p, name: %s\n",faultdetail, faultdetail->name);
+
+			if ( (errorcode = xmlnode_get_child(faultdetail, "errorcode")) != NULL ) {
+				purple_debug_info("MSNCL","errorcode @ %p, name: %s\n", errorcode, errorcode->name);
+
+				if (errorcode->child != NULL) {
+					gchar *errorcodestring = xmlnode_get_data(errorcode);
+					purple_debug_info("MSNCL", "Error Code: %s\n", errorcodestring ? errorcodestring : "(null)");
+
+					if (errorcodestring && !strncmp(errorcodestring, "ABDoesNotExist", 14) ) {
+						xmlnode_free(node);
+						g_free(errorcodestring);
+						msn_create_address_book(contact);
+						return;
+					}
+					g_free(errorcodestring);
+				}
+			}
+		}
+		xmlnode_free(node);
+		msn_get_contact_list(contact, MSN_PS_INITIAL, NULL);
+		return;
+	}
+
+	response = xmlnode_get_child(body,"FindMembershipResponse");
+
+	if (response == NULL) {
+		/* we may get a response if our cache data is too old:
+		 *
+		 * <faultstring>Need to do full sync. Can't sync deltas Client
+		 * has too old a copy for us to do a delta sync</faultstring>
+		 */
+		xmlnode_free(node);
+		msn_get_contact_list(contact, MSN_PS_INITIAL, NULL);
+		return;
+	}
+	purple_debug_info("MSNCL","FindMembershipResponse @ %p: Name: '%s'\n",response,response->name);
+
+	result = xmlnode_get_child(response,"FindMembershipResult");
+	if (result == NULL) {
+		purple_debug_warning("MSNCL","Received No Update!\n");
+		xmlnode_free(node);
+		return;
+	}
+	purple_debug_info("MSNCL","Result @ %p: Name: '%s'\n", result, result->name);
+
+	if ( (services = xmlnode_get_child(result,"Services")) == NULL) {
+		purple_debug_misc("MSNCL","No <Services> received.\n");
+		xmlnode_free(node);
+		return;
+	}
+
+	purple_debug_info("MSNCL","Services @ %p\n",services);
+	
+	for (service = xmlnode_get_child(services, "Service"); service;
+	                                service = xmlnode_get_next_twin(service)) {
+		purple_debug_info("MSNCL","Service @ %p\n",service);
+
+		if ( (info = xmlnode_get_child(service,"Info")) == NULL ) {
+			purple_debug_error("MSNCL","Error getting 'Info' child node\n");
+			continue;
+		}
+		if ( (handle = xmlnode_get_child(info,"Handle")) == NULL ) {
+			purple_debug_error("MSNCL","Error getting 'Handle' child node\n");
+			continue;
+		}
+		if ( (handletype = xmlnode_get_child(handle,"Type")) == NULL ) {
+			purple_debug_error("MSNCL","Error getting 'Type' child node\n");
+			continue;
+		}
+
+		if ( (typedata = xmlnode_get_data(handletype)) == NULL) {
+			purple_debug_error("MSNCL","Error retrieving data from 'Type' child node\n");
+			continue;
+		}
+
+		purple_debug_info("MSNCL","processing '%s' Service\n", typedata);
+
+		if ( !g_strcasecmp(typedata, "Profile") ) {
+			/* Process Windows Live 'Messenger Roaming Identity' */
+			g_free(typedata);
+			continue;
+		}
+
+		if ( !g_strcasecmp(typedata, "Messenger") ) {
+			char *LastChangeStr = NULL;
+			xmlnode *LastChangeNode;
+
+			/*Last Change Node*/
+			if ((LastChangeNode = xmlnode_get_child(service, "LastChange")))
+				LastChangeStr = xmlnode_get_data(LastChangeNode);
+			purple_debug_info("MSNCL","LastChangeNode: '%s'\n",LastChangeStr ? LastChangeStr : "(null)");
+			purple_account_set_string(session->account, "CLLastChange", LastChangeStr);
+			g_free(LastChangeStr);
+
+			memberships = xmlnode_get_child(service,"Memberships");
+			if (memberships == NULL) {
+				purple_debug_warning("MSNCL","Memberships = NULL, cleaning up and returning.\n");
+				g_free(typedata);
+				xmlnode_free(node);
+				return;
+			}
+			purple_debug_info("MSNCL","Memberships @ %p: Name: '%s'\n",memberships,memberships->name);
+			for (membershipnode = xmlnode_get_child(memberships, "Membership"); membershipnode;
+							membershipnode = xmlnode_get_next_twin(membershipnode)){
+				xmlnode *roleNode;
+				char *role = NULL;
+				list = 0;
+
+				if ((roleNode = xmlnode_get_child(membershipnode,"MemberRole"))) {
+					role = xmlnode_get_data(roleNode);
+					list = msn_get_memberrole(role);
+				}
+				list_op = 1 << list;
+
+				purple_debug_info("MSNCL","MemberRole role: %s, list_op: %d\n", role ? role : "(null)", list_op);
+
+				g_free(role);
+
+				members = xmlnode_get_child(membershipnode, "Members");
+				for (member = xmlnode_get_child(members, "Member"); member;
+						member = xmlnode_get_next_twin(member)){
+					MsnUser *user = NULL;
+					xmlnode *typeNode, *membershipIdNode = NULL;
+					gchar *type, *membershipId = NULL;
+					const char *member_type = xmlnode_get_attrib(member, "type");
+
+					if (!member_type) {
+						purple_debug_error("msn", "No Member Type specified for Member.\n");
+						continue;
+					}
+
+					if(!g_strcasecmp(member_type, "PassportMember") ) {
+						passport = type = NULL;
+						if ((passportNode = xmlnode_get_child(member, "PassportName")))
+							passport = xmlnode_get_data(passportNode);
+						if ((typeNode = xmlnode_get_child(member, "Type")))
+							type = xmlnode_get_data(typeNode);
+						purple_debug_info("MSNCL","Passport name: '%s', Type: %s\n", passport ? passport : "(null)", type ? type : "(null)");
+						/* Why do we even bother parsing it just to free it??? */
+						g_free(type);
+
+						user = msn_userlist_find_add_user(session->userlist,passport,NULL);
+						g_free(passport);
+
+						membershipIdNode = xmlnode_get_child(member,"MembershipId");
+						if (membershipIdNode != NULL) {
+							membershipId = xmlnode_get_data(membershipIdNode);
+							if (membershipId != NULL) {
+								user->membership_id[list] = atoi(membershipId);
+								g_free(membershipId);
+							}
+						}
+
+						msn_got_lst_user(session, user, list_op, NULL);
+					}
+					else if (!g_strcasecmp(member_type, "PhoneMember")) {
+						purple_debug_info("msn", "Recieved Phone Member; ignoring.\n");
+					}
+					else if (!g_strcasecmp(member_type, "EmailMember")) {
+						xmlnode *emailNode;
+						passport = NULL;
+
+						if ((emailNode = xmlnode_get_child(member, "Email")))
+							passport = xmlnode_get_data(emailNode);
+						purple_debug_info("MSNCL","Email Member: Name: '%s', list_op: %d\n", passport ? passport : "(null)", list_op);
+
+						user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+						g_free(passport);
+
+						membershipIdNode = xmlnode_get_child(member,"MembershipId");
+						if (membershipIdNode != NULL) {
+							membershipId = xmlnode_get_data(membershipIdNode);
+							if (membershipId != NULL) {
+								user->membership_id[list] = atoi(membershipId);
+								g_free(membershipId);
+							}
+						}
+
+						msn_got_lst_user(session, user, list_op, NULL);
+					} else {
+						purple_debug_info("msn", "Unknown Member type: %s\n", member_type);
+					}
+				}
+			}
+			g_free(typedata);	/* Free 'Type' node data after processing 'Messenger' Service */
+		}
+	}
+
+	xmlnode_free(node);	/* Free the whole XML tree */
+}
+
+static gboolean
+msn_get_contact_list_cb(MsnSoapConn *soapconn)
+{
+	MsnContact *contact;
+	MsnSession *session;
+	const char *abLastChange;
+	const char *dynamicItemLastChange;
+	gchar *partner_scenario;
+
+	if (soapconn->body == NULL)
+		return TRUE;
+
+	purple_debug_misc("MSNCL","Got the contact list!\n");
+
+	contact = soapconn->parent;
+	g_return_val_if_fail(contact != NULL, TRUE);
+	session = soapconn->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+	g_return_val_if_fail(soapconn->data_cb != NULL, TRUE);
+
+	partner_scenario = soapconn->data_cb;
+
+	msn_parse_contact_list(contact);
+	/*free the read buffer*/
+	msn_soap_free_read_buf(soapconn);
+
+	abLastChange = purple_account_get_string(session->account, "ablastChange", NULL);
+	dynamicItemLastChange = purple_account_get_string(session->account, "dynamicItemLastChange", NULL);
+
+	if (!strcmp(partner_scenario, MsnSoapPartnerScenarioText[MSN_PS_INITIAL])) {
+
+#ifdef MSN_PARTIAL_LISTS
+		/* XXX: this should be enabled when we can correctly do partial
+	 	  syncs with the server. Currently we need to retrieve the whole
+	 	  list to detect sync issues */
+		msn_get_address_book(contact, MSN_PS_INITIAL, abLastChange, dynamicItemLastChange);
+#else
+		msn_get_address_book(contact, MSN_PS_INITIAL, NULL, NULL);
+#endif
+	} else {
+		msn_soap_free_read_buf(soapconn);
+	}
+
+	return TRUE;
+}
+
+static void
+msn_get_contact_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_misc("MSNCL","Sent SOAP request for the contact list.\n");
+	soapconn->read_cb = msn_get_contact_list_cb;
+}
+
+/* SOAP  get contact list*/
+void
+msn_get_contact_list(MsnContact * contact, const MsnSoapPartnerScenario partner_scenario, const char *update_time)
+{
+	MsnSoapReq *soap_request;
+	gchar *body;
+	gchar *update_str = NULL;
+	const gchar *partner_scenario_str = MsnSoapPartnerScenarioText[partner_scenario];
+
+	purple_debug_misc("MSNCL","Getting Contact List.\n");
+
+	if ( update_time != NULL ) {
+		purple_debug_info("MSNCL","Last update time: %s\n",update_time);
+		update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML,update_time);
+	}
+
+	body = g_strdup_printf(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str, update_str ? update_str : "");
+	g_free(update_str);
+
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_GET_CONTACT_POST_URL,
+					MSN_GET_CONTACT_SOAP_ACTION,
+					body,
+					(gpointer) partner_scenario_str,
+					msn_get_contact_list_cb,
+					msn_get_contact_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+	g_free(body);
+}
+
+static void
+msn_parse_addressbook_groups(MsnContact *contact, xmlnode *node)
+{
+	MsnSession *session = contact->session;
+	xmlnode *group;
+
+	purple_debug_info("MsnAb","msn_parse_addressbook_groups()\n");
+
+	for(group = xmlnode_get_child(node, "Group"); group;
+					group = xmlnode_get_next_twin(group)){
+		xmlnode *groupId, *groupInfo, *groupname;
+		char *group_id = NULL, *group_name = NULL;
+
+		if ((groupId = xmlnode_get_child(group, "groupId")))
+			group_id = xmlnode_get_data(groupId);
+		if ((groupInfo = xmlnode_get_child(group, "groupInfo")) && (groupname = xmlnode_get_child(groupInfo, "name")))
+			group_name = xmlnode_get_data(groupname);
+
+		msn_group_new(session->userlist, group_id, group_name);
+
+		if (group_id == NULL){
+			/* Group of ungroupped buddies */
+			g_free(group_name);
+			continue;
+		}
+
+		purple_debug_info("MsnAB","group_id: %s, name: %s\n", group_id, group_name ? group_name : "(null)");
+		if ((purple_find_group(group_name)) == NULL){
+			PurpleGroup *g = purple_group_new(group_name);
+			purple_blist_add_group(g, NULL);
+		}
+		g_free(group_id);
+		g_free(group_name);
+	}
+}
+
+static void
+msn_parse_addressbook_contacts(MsnContact *contact, xmlnode *node)
+{
+	MsnSession *session = contact->session;
+	xmlnode *contactNode;
+	char *passport = NULL, *Name = NULL, *uid = NULL, *type = NULL;
+
+	for(contactNode = xmlnode_get_child(node, "Contact"); contactNode;
+				contactNode = xmlnode_get_next_twin(contactNode)) {
+		xmlnode *contactId, *contactInfo, *contactType, *passportName, *displayName, *guid, *groupIds;
+		MsnUser *user;
+		MsnUserType usertype;
+
+		if (!(contactId = xmlnode_get_child(contactNode,"contactId"))
+				|| !(contactInfo = xmlnode_get_child(contactNode, "contactInfo"))
+				|| !(contactType = xmlnode_get_child(contactInfo, "contactType")))
+			continue;
+
+		g_free(passport);
+		g_free(Name);
+		g_free(uid);
+		g_free(type);
+		passport = Name = uid = type = NULL;
+
+		uid = xmlnode_get_data(contactId);
+		type = xmlnode_get_data(contactType);
+
+		/*setup the Display Name*/
+		if (type && !strcmp(type, "Me")){
+			char *friendly = NULL;
+			if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
+				friendly = xmlnode_get_data(displayName);
+			purple_connection_set_display_name(session->account->gc, friendly ? purple_url_decode(friendly) : NULL);
+			g_free(friendly);
+			continue; /* Not adding own account as buddy to buddylist */
+		}
+
+		usertype = msn_get_user_type(type);
+		passportName = xmlnode_get_child(contactInfo, "passportName");
+		if (passportName == NULL) {
+			xmlnode *emailsNode, *contactEmailNode, *emailNode;
+			xmlnode *messengerEnabledNode;
+			char *msnEnabled;
+
+			/*TODO: add it to the none-instant Messenger group and recognize as email Membership*/
+			/*Yahoo User?*/
+			emailsNode = xmlnode_get_child(contactInfo, "emails");
+			if (emailsNode == NULL) {
+				/*TODO:  need to support the Mobile type*/
+				continue;
+			}
+			for(contactEmailNode = xmlnode_get_child(emailsNode, "ContactEmail"); contactEmailNode;
+					contactEmailNode = xmlnode_get_next_twin(contactEmailNode) ){
+				if (!(messengerEnabledNode = xmlnode_get_child(contactEmailNode, "isMessengerEnabled"))) {
+					/* XXX: Should this be a continue instead of a break? It seems like it'd cause unpredictable results otherwise. */
+					break;
+				}
+
+				msnEnabled = xmlnode_get_data(messengerEnabledNode);
+
+				if ((emailNode = xmlnode_get_child(contactEmailNode, "email"))) {
+					g_free(passport);
+					passport = xmlnode_get_data(emailNode);
+				}
+
+				if(msnEnabled && !strcmp(msnEnabled, "true")) {
+					/*Messenger enabled, Get the Passport*/
+					purple_debug_info("MsnAB", "Yahoo User %s\n", passport ? passport : "(null)");
+					usertype = MSN_USER_TYPE_YAHOO;
+					g_free(msnEnabled);
+					break;
+				} else {
+					/*TODO maybe we can just ignore it in Purple?*/
+					purple_debug_info("MSNAB", "Other type user\n");
+				}
+
+				g_free(msnEnabled);
+			}
+		} else {
+			passport = xmlnode_get_data(passportName);
+		}
+
+		if (passport == NULL)
+			continue;
+
+		if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
+			Name = xmlnode_get_data(displayName);
+		else
+			Name = g_strdup(passport);
+
+		purple_debug_misc("MsnAB","passport:{%s} uid:{%s} display:{%s}\n",
+						passport, uid ? uid : "(null)", Name ? Name : "(null)");
+
+		user = msn_userlist_find_add_user(session->userlist, passport, Name);
+		msn_user_set_uid(user, uid);
+		msn_user_set_type(user, usertype);
+
+		groupIds = xmlnode_get_child(contactInfo, "groupIds");
+		if (groupIds) {
+			for (guid = xmlnode_get_child(groupIds, "guid"); guid;
+							guid = xmlnode_get_next_twin(guid)){
+				char *group_id = xmlnode_get_data(guid);
+				msn_user_add_group_id(user, group_id);
+				purple_debug_misc("MsnAB", "guid:%s\n", group_id ? group_id : "(null)");
+				g_free(group_id);
+			}
+		} else {
+			purple_debug_info("msn", "User not in any groups, adding to default group.\n");
+			/*not in any group,Then set default group*/
+			msn_user_add_group_id(user, MSN_INDIVIDUALS_GROUP_ID);
+		}
+
+		msn_got_lst_user(session, user, MSN_LIST_FL_OP, NULL);
+	}
+
+	g_free(passport);
+	g_free(Name);
+	g_free(uid);
+	g_free(type);
+}
+
+static gboolean
+msn_parse_addressbook(MsnContact * contact)
+{
+	MsnSession *session;
+	xmlnode * node,*body,*response,*result;
+	xmlnode *groups;
+	xmlnode *contacts;
+	xmlnode *abNode;
+	xmlnode *fault, *faultstringnode, *faultdetail, *errorcode;
+
+	session = contact->session;
+
+	node = xmlnode_from_str(contact->soapconn->body, contact->soapconn->body_len);
+	if ( node == NULL ) {
+		purple_debug_error("MSN AddressBook","Error parsing Address Book with size %d\n", contact->soapconn->body_len);
+		return FALSE;
+	}
+
+	purple_debug_misc("MSN AddressBook", "Parsing Address Book with size %d\n", contact->soapconn->body_len);
+
+	purple_debug_misc("MSN AddressBook","node{%p},name:%s,child:%s,last:%s\n", node,
+		node->name ? node->name : "(null)",
+		(node->child && node->child->name) ? node->child->name : "(null)",
+		(node->lastchild && node->lastchild->name) ? node->lastchild->name : "(null)");
+
+	body = xmlnode_get_child(node,"Body");
+	purple_debug_misc("MSN AddressBook","body{%p},name:%s\n",body,body->name);
+
+	/* TODO: This appears to be used in a number of places and should be de-duplicated */
+	if ( (fault = xmlnode_get_child(body, "Fault")) != NULL) {
+		purple_debug_info("MSN AddressBook","Fault received from SOAP server!\n");
+		
+		if ( (faultstringnode = xmlnode_get_child(fault, "faultstring")) != NULL ) {
+			gchar *faultstring = xmlnode_get_data(faultstringnode);
+			purple_debug_info("MSN AddressBook","Faultstring: %s\n", faultstring ? faultstring : "(null)");
+			g_free(faultstring);
+		}
+		if ( (faultdetail = xmlnode_get_child(fault, "detail")) != NULL ) {
+			purple_debug_info("MSN AddressBook","detail @ %p, name: %s\n",faultdetail, faultdetail->name);
+
+			if ( (errorcode = xmlnode_get_child(faultdetail, "errorcode")) != NULL ) {
+				gchar *errorcodestring;
+				purple_debug_info("MSN AddressBook","errorcode @ %p, name: %s\n",errorcode, errorcode->name);
+
+				errorcodestring = xmlnode_get_data(errorcode);
+				purple_debug_info("MSN AddressBook", "Error Code: %s\n", errorcodestring ? errorcodestring : "(null)");
+						
+				if (errorcodestring && !strncmp(errorcodestring, "ABDoesNotExist", 14) ) {
+					g_free(errorcodestring);
+					xmlnode_free(node);
+					return TRUE;
+				}
+				g_free(errorcodestring);
+			}
+		}
+		xmlnode_free(node);
+		return FALSE;
+	}
+
+
+	response = xmlnode_get_child(body,"ABFindAllResponse");
+
+	if (response == NULL) {
+		xmlnode_free(node);
+		return FALSE;
+	}
+
+	purple_debug_misc("MSN SOAP","response{%p},name:%s\n",response,response->name);
+	result = xmlnode_get_child(response,"ABFindAllResult");
+	if(result == NULL){
+		purple_debug_misc("MSNAB","receive no address book update\n");
+		xmlnode_free(node);
+		return TRUE;
+	}
+	purple_debug_info("MSN SOAP","result{%p},name:%s\n",result,result->name);
+
+	/*Process Group List*/
+	groups = xmlnode_get_child(result,"groups");
+	if (groups != NULL) {
+		msn_parse_addressbook_groups(contact, groups);
+	}
+
+	/*add a default No group to set up the no group Membership*/
+	msn_group_new(session->userlist, MSN_INDIVIDUALS_GROUP_ID,
+				  MSN_INDIVIDUALS_GROUP_NAME);
+	purple_debug_misc("MsnAB","group_id:%s name:%s\n",
+					  MSN_INDIVIDUALS_GROUP_ID, MSN_INDIVIDUALS_GROUP_NAME);
+	if ((purple_find_group(MSN_INDIVIDUALS_GROUP_NAME)) == NULL){
+		PurpleGroup *g = purple_group_new(MSN_INDIVIDUALS_GROUP_NAME);
+		purple_blist_add_group(g, NULL);
+	}
+
+	/*add a default No group to set up the no group Membership*/
+	msn_group_new(session->userlist, MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME);
+	purple_debug_misc("MsnAB","group_id:%s name:%s\n", MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME);
+	if ((purple_find_group(MSN_NON_IM_GROUP_NAME)) == NULL){
+		PurpleGroup *g = purple_group_new(MSN_NON_IM_GROUP_NAME);
+		purple_blist_add_group(g, NULL);
+	}
+
+	/*Process contact List*/
+	purple_debug_info("MSNAB","process contact list...\n");
+	contacts =xmlnode_get_child(result,"contacts");
+	if (contacts != NULL) {
+		msn_parse_addressbook_contacts(contact, contacts);
+	}
+
+	abNode =xmlnode_get_child(result,"ab");
+	if(abNode != NULL){
+		xmlnode *node2;
+		char *tmp = NULL;
+
+		if ((node2 = xmlnode_get_child(abNode, "lastChange")))
+			tmp = xmlnode_get_data(node2);
+		purple_debug_info("MsnAB"," lastchanged Time:{%s}\n", tmp ? tmp : "(null)");
+		purple_account_set_string(session->account, "ablastChange", tmp);
+
+		g_free(tmp); tmp = NULL;
+		if ((node2 = xmlnode_get_child(abNode, "DynamicItemLastChanged")))
+			tmp = xmlnode_get_data(node2);
+		purple_debug_info("MsnAB"," DynamicItemLastChanged :{%s}\n", tmp ? tmp : "(null)");
+		purple_account_set_string(session->account, "DynamicItemLastChanged", tmp);
+		g_free(tmp);
+	}
+
+	xmlnode_free(node);
+	msn_soap_free_read_buf(contact->soapconn);
+	return TRUE;
+}
+
+static gboolean
+msn_get_address_cb(MsnSoapConn *soapconn)
+{
+	MsnContact *contact;
+	MsnSession *session;
+
+	if (soapconn->body == NULL)
+		return TRUE;
+
+	contact = soapconn->parent;
+	g_return_val_if_fail(contact != NULL, TRUE);
+	session = soapconn->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+
+	purple_debug_misc("MSN AddressBook", "Got the Address Book!\n");
+
+	if ( msn_parse_addressbook(contact) ) {
+		//msn_soap_free_read_buf(soapconn);
+
+		if (!session->logged_in) {
+			msn_send_privacy(session->account->gc);
+			msn_notification_dump_contact(session);
+		}
+
+		/*free the read buffer*/
+		msn_soap_free_read_buf(soapconn);
+		return TRUE;
+	} else {
+		/* This is making us loop infinitely when we fail to parse the address book,
+		  disable for now (we should re-enable when we send timestamps)
+		*/
+		/*
+		msn_get_address_book(contact, NULL, NULL);
+		*/
+		msn_session_disconnect(session);
+		purple_connection_error(session->account->gc, _("Unable to retrieve MSN Address Book"));
+		return FALSE;
+	}
+}
+
+/**/
+static void
+msn_address_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_misc("MSN AddressBook","Sent SOAP request for the Address Book.\n");
+	soapconn->read_cb = msn_get_address_cb;
+}
+
+/*get the address book*/
+void
+msn_get_address_book(MsnContact *contact, const MsnSoapPartnerScenario partner_scenario, const char *LastChanged, const char *dynamicItemLastChange)
+{
+	MsnSoapReq *soap_request;
+	char *body;
+	char *update_str = NULL;
+
+	purple_debug_misc("MSN AddressBook","Getting Address Book\n");
+
+	/*build SOAP and POST it*/
+	if (dynamicItemLastChange != NULL)
+		update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, dynamicItemLastChange);
+	else if (LastChanged != NULL)
+		update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, LastChanged);
+
+
+	body = g_strdup_printf(MSN_GET_ADDRESS_TEMPLATE, MsnSoapPartnerScenarioText[partner_scenario], update_str ? update_str : "");
+	g_free(update_str);
+
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,MSN_GET_ADDRESS_SOAP_ACTION,
+					body,
+					NULL,
+					msn_get_address_cb,
+					msn_address_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+	g_free(body);
+}
+
+static gboolean
+msn_add_contact_read_cb(MsnSoapConn *soapconn)
+{
+	MsnCallbackState *state = NULL;
+	MsnUserList *userlist;
+	MsnUser *user;
+	
+	g_return_val_if_fail(soapconn->data_cb != NULL, TRUE);
+	g_return_val_if_fail(soapconn->session != NULL, FALSE);
+	g_return_val_if_fail(soapconn->session->userlist != NULL, TRUE);
+
+	state = (MsnCallbackState *) soapconn->data_cb;
+
+	if (soapconn->body == NULL) {
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+	
+	userlist = soapconn->session->userlist;
+	
+	purple_debug_info("MSNCL","Contact added successfully\n");
+
+	// the code this block is replacing didn't send ADL for yahoo contacts,
+	// but i haven't confirmed this is WLM's behaviour wrt yahoo contacts
+
+	if ( !msn_user_is_yahoo(soapconn->session->account, state->who) ) {
+		
+		msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL);
+		msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL);
+	}
+	msn_notification_send_fqy(soapconn->session, state->who);
+
+	user = msn_userlist_find_add_user(userlist, state->who, state->who);
+	msn_user_add_group_id(user, state->guid);
+
+	if (msn_userlist_user_is_in_list(user, MSN_LIST_PL)) {
+		msn_del_contact_from_list(soapconn->session->contact, NULL, state->who, MSN_LIST_PL);
+	} else {
+		msn_soap_free_read_buf(soapconn);
+	}
+	
+	msn_callback_state_free(state);
+
+	return TRUE;
+}
+
+static void
+msn_add_contact_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSNCL","Add contact request written\n");
+	soapconn->read_cb = msn_add_contact_read_cb;
+}
+
+/* add a Contact in MSN_INDIVIDUALS_GROUP */
+void
+msn_add_contact(MsnContact *contact, MsnCallbackState *state, const char *passport)
+{
+	MsnSoapReq *soap_request;
+	gchar *body = NULL;
+	gchar *contact_xml = NULL;
+
+	g_return_if_fail(passport != NULL);
+/*	gchar *escaped_displayname;
+
+
+	 if (displayname != NULL) {
+		escaped_displayname = g_markup_decode_text(displayname, -1);
+	 } else {
+		escaped_displayname = passport;
+	 }
+	contact_xml = g_strdup_printf(MSN_XML_ADD_CONTACT, escaped_displayname, passport);
+*/
+	purple_debug_info("MSNCL","Adding contact %s to contact list\n", passport);
+
+//	if ( !strcmp(state->guid, MSN_INDIVIDUALS_GROUP_ID) ) {
+		contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport);
+//	}
+	body = g_strdup_printf(MSN_ADD_CONTACT_TEMPLATE, contact_xml);
+
+	g_free(contact_xml);
+
+	/*build SOAP and POST it*/
+
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,
+					MSN_CONTACT_ADD_SOAP_ACTION,
+					body,
+					state,
+					msn_add_contact_read_cb,
+					msn_add_contact_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+
+	g_free(body);
+}
+
+static gboolean
+msn_add_contact_to_group_read_cb(MsnSoapConn *soapconn)
+{
+	MsnCallbackState *state; 
+	MsnUserList *userlist;
+
+	g_return_val_if_fail(soapconn->data_cb != NULL, TRUE);
+	g_return_val_if_fail(soapconn->session != NULL, FALSE);
+	g_return_val_if_fail(soapconn->session->userlist != NULL, TRUE);
+
+	userlist = soapconn->session->userlist;
+
+	state = (MsnCallbackState *) soapconn->data_cb;
+
+	if (soapconn->body == NULL) {
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+	
+	if (msn_userlist_add_buddy_to_group(userlist, state->who, state->new_group_name) == TRUE) {
+		purple_debug_info("MSNCL", "Contact %s added to group %s successfully!\n", state->who, state->new_group_name);
+	} else {
+		purple_debug_info("MSNCL","Contact %s added to group %s successfully on server, but failed in the local list\n", state->who, state->new_group_name);
+	}
+
+	if (state->action & MSN_ADD_BUDDY) {
+		MsnUser *user = msn_userlist_find_user(userlist, state->who);
+
+        	if ( !msn_user_is_yahoo(soapconn->session->account, state->who) ) {
+
+		                msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL);
+		                msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL);
+	        }
+	        msn_notification_send_fqy(soapconn->session, state->who);
+
+		if (msn_userlist_user_is_in_list(user, MSN_LIST_PL)) {
+			msn_del_contact_from_list(soapconn->session->contact, NULL, state->who, MSN_LIST_PL);
+			msn_callback_state_free(state);
+			return TRUE;
+		}
+	}
+
+	if (state->action & MSN_MOVE_BUDDY) {
+		msn_del_contact_from_group(soapconn->session->contact, state->who, state->old_group_name);
+	} else {
+		msn_callback_state_free(state);
+		msn_soap_free_read_buf(soapconn);
+	}
+	return TRUE;
+}
+
+static void
+msn_add_contact_to_group_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSNCL","Add contact to group request sent!\n");
+	soapconn->read_cb = msn_add_contact_to_group_read_cb;
+}
+
+void
+msn_add_contact_to_group(MsnContact *contact, MsnCallbackState *state, 
+			 const char *passport, const char *groupId)
+{
+	MsnSoapReq *soap_request;
+	MsnUserList *userlist;
+	MsnUser *user;
+	gchar *body = NULL, *contact_xml;
+
+	g_return_if_fail(passport != NULL);
+	g_return_if_fail(groupId != NULL);
+
+	g_return_if_fail(contact != NULL);
+	g_return_if_fail(contact->session != NULL);
+	g_return_if_fail(contact->session->userlist != NULL);
+	
+	userlist = contact->session->userlist;
+
+	if (!strcmp(groupId, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(groupId, MSN_NON_IM_GROUP_ID)) {
+		
+		user = msn_userlist_find_add_user(userlist, passport, passport);
+
+		if (state->action & MSN_ADD_BUDDY) {
+			msn_add_contact(contact, state, passport);
+			return;
+		}
+
+		if (state->action & MSN_MOVE_BUDDY) {
+			msn_user_add_group_id(user, groupId);
+			msn_del_contact_from_group(contact, passport, state->old_group_name);
+		} else {
+			msn_callback_state_free(state);
+		}
+
+		return;
+	}
+
+
+	purple_debug_info("MSNCL", "Adding user %s to group %s\n", passport, 
+			  msn_userlist_find_group_name(userlist, groupId));
+
+	user = msn_userlist_find_user(userlist, passport);
+	if (user == NULL) {
+		purple_debug_warning("MSN CL", "Unable to retrieve user %s from the userlist!\n", passport);
+	}
+
+	if (user->uid != NULL) {
+		contact_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid);
+	} else {
+		contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport);
+	}
+
+	body = g_strdup_printf(MSN_ADD_CONTACT_GROUP_TEMPLATE, groupId, contact_xml);
+	g_free(contact_xml);
+
+	/*build SOAP and POST it*/
+
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,
+					MSN_ADD_CONTACT_GROUP_SOAP_ACTION,
+					body,
+					state,
+					msn_add_contact_to_group_read_cb,
+					msn_add_contact_to_group_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+
+	g_free(body);
+}
+
+
+
+static gboolean
+msn_delete_contact_read_cb(MsnSoapConn *soapconn)
+{
+	MsnUser *user;
+	MsnCallbackState *state = (MsnCallbackState *) soapconn->data_cb;
+	MsnUserList *userlist; 
+
+	g_return_val_if_fail(soapconn->session != NULL, FALSE);
+	g_return_val_if_fail(soapconn->session->userlist != NULL, TRUE);
+
+	userlist = soapconn->session->userlist;
+
+        if (soapconn->body == NULL) {
+                msn_callback_state_free(state);
+                return TRUE;
+        }
+
+	purple_debug_info("MSNCL","Delete contact successful\n");
+
+	user = msn_userlist_find_user_with_id(userlist, state->uid);
+	if (user != NULL) {
+		msn_userlist_remove_user(userlist, user);
+	}
+
+	msn_callback_state_free(state);
+	msn_soap_free_read_buf(soapconn);
+
+	return TRUE;
+}
+
+static void
+msn_delete_contact_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSNCL","Delete contact request written\n");
+	soapconn->read_cb = msn_delete_contact_read_cb;
+}
+
+/*delete a Contact*/
+void
+msn_delete_contact(MsnContact *contact, const char *contactId)
+{	
+	gchar *body = NULL;
+	gchar *contact_id_xml = NULL ;
+	MsnSoapReq *soap_request;
+	MsnCallbackState *state;
+
+	g_return_if_fail(contactId != NULL);
+	contact_id_xml = g_strdup_printf(MSN_CONTACT_ID_XML, contactId);
+
+	state = msn_callback_state_new();
+	msn_callback_state_set_uid(state, contactId);
+
+	/* build SOAP request */
+	purple_debug_info("MSNCL","Deleting contact with contactId: %s\n", contactId);
+	body = g_strdup_printf(MSN_DEL_CONTACT_TEMPLATE, contact_id_xml);
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,
+					MSN_CONTACT_DEL_SOAP_ACTION,
+					body,
+					state,
+					msn_delete_contact_read_cb,
+					msn_delete_contact_written_cb,
+					msn_contact_connect_init);
+
+	g_free(contact_id_xml);
+
+	/* POST the SOAP request */
+	msn_soap_post(contact->soapconn, soap_request);
+
+	g_free(body);
+}
+
+static gboolean
+msn_del_contact_from_group_read_cb(MsnSoapConn *soapconn)
+{
+	MsnCallbackState *state = (MsnCallbackState *) soapconn->data_cb;
+
+	if (soapconn->body == NULL) {
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+	
+	if (msn_userlist_rem_buddy_from_group(soapconn->session->userlist, state->who, state->old_group_name)) {
+		purple_debug_info("MSN CL", "Contact %s deleted successfully from group %s\n", state->who, state->old_group_name);
+	} else {
+		purple_debug_info("MSN CL", "Contact %s deleted successfully from group %s in the server, but failed in the local list\n", state->who, state->old_group_name);
+	}
+	
+	msn_callback_state_free(state);
+	msn_soap_free_read_buf(soapconn);
+
+	return TRUE;
+}
+
+static void
+msn_del_contact_from_group_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN CL","Del contact from group request sent!\n");
+	soapconn->read_cb = msn_del_contact_from_group_read_cb;
+}
+
+void
+msn_del_contact_from_group(MsnContact *contact, const char *passport, const char *group_name)
+{
+	MsnSoapReq *soap_request;
+	MsnUserList * userlist;
+	MsnUser *user;
+	MsnCallbackState *state;
+	gchar *body = NULL, *contact_id_xml;
+	const gchar *groupId;
+	
+	g_return_if_fail(passport != NULL);
+	g_return_if_fail(group_name != NULL);
+	g_return_if_fail(contact != NULL);
+	g_return_if_fail(contact->session != NULL);
+	g_return_if_fail(contact->session->userlist != NULL);
+	
+	userlist = contact->session->userlist;
+	
+	groupId = msn_userlist_find_group_id(userlist, group_name);
+	if (groupId != NULL) {
+		purple_debug_info("MSN CL", "Deleting user %s from group %s\n", passport, group_name);
+	} else {
+		purple_debug_warning("MSN CL", "Unable to retrieve group id from group %s !\n", group_name);
+		return;
+	}
+	
+	user = msn_userlist_find_user(userlist, passport);
+	
+	if (user == NULL) {
+		purple_debug_warning("MSN CL", "Unable to retrieve user from passport %s!\n", passport);
+		return;
+	}
+
+	if ( !strcmp(groupId, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(groupId, MSN_NON_IM_GROUP_ID)) {
+		msn_user_remove_group_id(user, groupId);
+		return;
+	}
+
+	state = msn_callback_state_new();
+	msn_callback_state_set_who(state, passport);
+	msn_callback_state_set_guid(state, groupId);
+	msn_callback_state_set_old_group_name(state, group_name);
+
+	contact_id_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid);
+	body = g_strdup_printf(MSN_CONTACT_DEL_GROUP_TEMPLATE, contact_id_xml, groupId);
+	g_free(contact_id_xml);
+
+	/*build SOAP and POST it*/
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					    MSN_ADDRESS_BOOK_POST_URL,
+					    MSN_CONTACT_DEL_GROUP_SOAP_ACTION,
+					    body,
+					    state,
+					    msn_del_contact_from_group_read_cb,
+					    msn_del_contact_from_group_written_cb,
+					    msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+
+	g_free(body);
+}
+
+
+static gboolean
+msn_update_contact_read_cb(MsnSoapConn *soapconn)
+{
+	if (soapconn->body == NULL)
+		return TRUE;
+
+	purple_debug_info("MSN CL","Contact updated successfully\n");
+
+	return TRUE;
+}
+
+static void
+msn_update_contact_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN CL","Update contact information request sent\n");
+	soapconn->read_cb = msn_update_contact_read_cb;
+}
+
+/* Update a contact's nickname */
+
+void
+msn_update_contact(MsnContact *contact, const char* nickname)
+{
+	MsnSoapReq *soap_request;
+	gchar *body, *escaped_nickname;
+
+	/* I'm not sure this is right, but if it isn't, the rest of this function will need to be fixed */
+	g_return_if_fail(nickname != NULL);
+
+	purple_debug_info("MSN CL","Update contact information with new friendly name: %s\n", nickname);
+
+	escaped_nickname = g_markup_escape_text(nickname, -1);
+
+	body = g_strdup_printf(MSN_CONTACT_UPDATE_TEMPLATE, escaped_nickname);
+
+	g_free(escaped_nickname);
+	/*build SOAP and POST it*/
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,
+					MSN_CONTACT_UPDATE_SOAP_ACTION,
+					body,
+					NULL,
+					msn_update_contact_read_cb,
+					msn_update_contact_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn, soap_request);
+
+	g_free(body);
+}
+
+
+static gboolean
+msn_del_contact_from_list_read_cb(MsnSoapConn *soapconn)
+{
+	MsnCallbackState *state = NULL;
+
+	g_return_val_if_fail(soapconn->data_cb != NULL, TRUE);
+	g_return_val_if_fail(soapconn->session != NULL, FALSE);
+	g_return_val_if_fail(soapconn->session->contact != NULL, FALSE);
+
+	state = (MsnCallbackState *) soapconn->data_cb;
+
+	if (soapconn->body == NULL) {
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+	
+	purple_debug_info("MSN CL", "Contact %s deleted successfully from %s list on server!\n", state->who, MsnMemberRole[state->list_id]);
+
+	if (state->list_id == MSN_LIST_PL) {
+		msn_add_contact_to_list(soapconn->session->contact, state, state->who, MSN_LIST_RL);
+		return TRUE;
+	}
+
+	if (state->list_id == MSN_LIST_AL) {
+		purple_privacy_permit_remove(soapconn->session->account, state->who, TRUE);
+		msn_add_contact_to_list(soapconn->session->contact, NULL, state->who, MSN_LIST_BL);
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+
+	if (state->list_id == MSN_LIST_BL) {
+		purple_privacy_deny_remove(soapconn->session->account, state->who, TRUE);
+		msn_add_contact_to_list(soapconn->session->contact, NULL, state->who, MSN_LIST_AL);
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+
+	msn_callback_state_free(state);
+	msn_soap_free_read_buf(soapconn);
+
+	return TRUE;
+}
+
+static void
+msn_del_contact_from_list_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN CL","Delete contact from list SOAP request sent!\n");
+	soapconn->read_cb = msn_del_contact_from_list_read_cb;
+}
+
+void
+msn_del_contact_from_list(MsnContact *contact, MsnCallbackState *state,
+			  const gchar *passport, const MsnListId list)
+{
+	MsnSoapReq *soap_request;
+	gchar *body = NULL, *member = NULL;
+	MsnSoapPartnerScenario partner_scenario;
+	MsnUser *user;
+
+	g_return_if_fail(contact != NULL);
+	g_return_if_fail(passport != NULL);
+	g_return_if_fail(list < 5);
+
+	purple_debug_info("MSN CL", "Deleting contact %s from %s list\n", passport, MsnMemberRole[list]);
+
+	if (state == NULL) {
+		state = msn_callback_state_new();
+	}
+	msn_callback_state_set_list_id(state, list);
+	msn_callback_state_set_who(state, passport);
+
+	if (list == MSN_LIST_PL) {
+		g_return_if_fail(contact->session != NULL);
+		g_return_if_fail(contact->session->userlist != NULL);
+
+		user = msn_userlist_find_user(contact->session->userlist, passport);
+
+		partner_scenario = MSN_PS_CONTACT_API;
+		member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML, user->membership_id[MSN_LIST_PL]);
+	} else {
+		/* list == MSN_LIST_AL || list == MSN_LIST_BL */
+		partner_scenario = MSN_PS_BLOCK_UNBLOCK;
+		
+		member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, passport);
+	}
+
+	body = g_strdup_printf( MSN_CONTACT_DELECT_FROM_LIST_TEMPLATE,
+			        MsnSoapPartnerScenarioText[partner_scenario],
+			        MsnMemberRole[list],
+			        member);
+	g_free(member);
+
+	soap_request = msn_soap_request_new( MSN_CONTACT_SERVER,
+					     MSN_SHARE_POST_URL,
+					     MSN_DELETE_MEMBER_FROM_LIST_SOAP_ACTION,
+					     body,
+					     state,
+					     msn_del_contact_from_list_read_cb,
+					     msn_del_contact_from_list_written_cb,
+					     msn_contact_connect_init);
+
+	msn_soap_post(contact->soapconn,soap_request);
+	
+	g_free(body);
+}
+
+static gboolean
+msn_add_contact_to_list_read_cb(MsnSoapConn *soapconn)
+{
+	MsnCallbackState *state = NULL;
+
+	g_return_val_if_fail(soapconn->data_cb != NULL, TRUE);
+
+	state = (MsnCallbackState *) soapconn->data_cb;
+	
+	if (soapconn->body == NULL) {
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+	
+	purple_debug_info("MSN CL", "Contact %s added successfully to %s list on server!\n", state->who, MsnMemberRole[state->list_id]);
+
+	if (state->list_id == MSN_LIST_RL && (state->action & MSN_DENIED_BUDDY) ) {
+		g_return_val_if_fail(soapconn->session != NULL, FALSE);
+		g_return_val_if_fail(soapconn->session->contact != NULL, FALSE);
+
+		msn_add_contact_to_list(soapconn->session->contact, NULL, state->who, MSN_LIST_BL);
+		return TRUE;
+	}
+
+	if (state->list_id == MSN_LIST_AL) {
+		purple_privacy_permit_add(soapconn->session->account, state->who, TRUE);
+	} else if (state->list_id == MSN_LIST_BL) {
+		purple_privacy_deny_add(soapconn->session->account, state->who, TRUE);
+	}
+
+	msn_callback_state_free(state);
+	msn_soap_free_read_buf(soapconn);
+	return TRUE;
+}
+
+
+static void
+msn_add_contact_to_list_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN CL","Add contact to list SOAP request sent!\n");
+	soapconn->read_cb = msn_add_contact_to_list_read_cb;
+}
+
+void
+msn_add_contact_to_list(MsnContact *contact, MsnCallbackState *state,
+			const gchar *passport, const MsnListId list)
+{
+	MsnSoapReq *soap_request;
+	gchar *body = NULL, *member = NULL;
+	MsnSoapPartnerScenario partner_scenario;
+
+	g_return_if_fail(contact != NULL);
+	g_return_if_fail(passport != NULL);
+	g_return_if_fail(list < 5);
+
+	purple_debug_info("MSN CL", "Adding contact %s to %s list\n", passport, MsnMemberRole[list]);
+
+	if (state == NULL) {
+		state = msn_callback_state_new();
+	}
+	msn_callback_state_set_list_id(state, list);
+	msn_callback_state_set_who(state, passport);
+
+	partner_scenario = (list == MSN_LIST_RL) ? MSN_PS_CONTACT_API : MSN_PS_BLOCK_UNBLOCK;
+
+	member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, passport);
+
+	body = g_strdup_printf(MSN_CONTACT_ADD_TO_LIST_TEMPLATE, 
+			       MsnSoapPartnerScenarioText[partner_scenario],
+			       MsnMemberRole[list], 
+			       member);
+
+	g_free(member);
+
+	soap_request = msn_soap_request_new( MSN_CONTACT_SERVER,
+					     MSN_SHARE_POST_URL,
+					     MSN_ADD_MEMBER_TO_LIST_SOAP_ACTION,
+					     body,
+					     state,
+					     msn_add_contact_to_list_read_cb,
+					     msn_add_contact_to_list_written_cb,
+					     msn_contact_connect_init);
+
+	msn_soap_post(contact->soapconn, soap_request);
+
+	g_free(body);
+}
+
+
+#if 0
+static gboolean
+msn_gleams_read_cb(MsnSoapConn * soapconn)
+{
+	purple_debug_info("MSN CL","Gleams read done\n");
+	return TRUE;
+}
+
+static void
+msn_gleams_written_cb(MsnSoapConn * soapconn)
+{
+	purple_debug_info("MSNP14","finish Group written\n");
+	soapconn->read_cb = msn_gleams_read_cb;
+//	msn_soap_read_cb(data,source,cond);
+}
+
+/*get the gleams info*/
+void
+msn_get_gleams(MsnContact *contact)
+{
+	MsnSoapReq *soap_request;
+
+	purple_debug_info("MSNP14","msn get gleams info...\n");
+	/*build SOAP and POST it*/
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,
+					MSN_GET_GLEAMS_SOAP_ACTION,
+					MSN_GLEAMS_TEMPLATE,
+					NULL,
+					msn_gleams_read_cb,
+					msn_gleams_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+}
+#endif
+
+
+/***************************************************************
+ * Group Operations
+ ***************************************************************/
+
+static gboolean
+msn_group_read_cb(MsnSoapConn *soapconn)
+{
+	MsnUserList *userlist;
+	MsnCallbackState *state = NULL;
+	
+	purple_debug_info("MSN CL", "Group request successful.\n");
+	
+	g_return_val_if_fail(soapconn->session != NULL, FALSE);
+	g_return_val_if_fail(soapconn->session->userlist != NULL, TRUE);
+	g_return_val_if_fail(soapconn->session->contact != NULL, FALSE);
+
+	state = (MsnCallbackState *) soapconn->data_cb;
+	
+	if (soapconn->body == NULL) {
+		msn_callback_state_free(state);
+		return TRUE;
+	}
+	
+	if (state) {
+		userlist = soapconn->session->userlist;
+		
+		if (state->action & MSN_RENAME_GROUP) {
+			msn_userlist_rename_group_id(soapconn->session->userlist,
+						     state->guid,
+						     state->new_group_name);
+		}
+		
+		if (state->action & MSN_ADD_GROUP) {
+			gchar *guid, *endguid;
+			
+			guid = g_strstr_len(soapconn->read_buf, soapconn->read_len, "<guid>");
+			guid += 6;
+			endguid = g_strstr_len(soapconn->read_buf, soapconn->read_len, "</guid>");
+			*endguid = '\0';
+			/* create and add the new group to the userlist */
+			purple_debug_info("MSN CL", "Adding group %s with guid = %s to the userlist\n", state->new_group_name, guid);
+			msn_group_new(soapconn->session->userlist, guid, state->new_group_name);
+
+			if (state->action & MSN_ADD_BUDDY) {
+				msn_userlist_add_buddy(soapconn->session->userlist,
+						       state->who,
+						       state->new_group_name);
+				msn_callback_state_free(state);
+				return TRUE;
+			}
+			
+			if (state->action & MSN_MOVE_BUDDY) {
+				msn_add_contact_to_group(soapconn->session->contact, state, state->who, guid); 
+				return TRUE;
+			}
+		}
+		
+		if (state->action & MSN_DEL_GROUP) {
+			GList *l;
+			
+			msn_userlist_remove_group_id(soapconn->session->userlist, state->guid);
+			for (l = userlist->users; l != NULL; l = l->next) {
+				msn_user_remove_group_id( (MsnUser *)l->data, state->guid);
+			}
+			
+		}
+			
+		msn_callback_state_free(state);
+	}
+	
+	msn_soap_free_read_buf(soapconn);
+	return TRUE;
+}
+
+static void
+msn_group_written_cb(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN CL","Sent group request.\n");
+	soapconn->read_cb = msn_group_read_cb;
+}
+
+/* add group */
+void
+msn_add_group(MsnSession *session, MsnCallbackState *state, const char* group_name)
+{
+	MsnSoapReq *soap_request;
+	MsnContact *contact;
+	char *body = NULL;
+	gchar *escaped_group_name;
+
+	g_return_if_fail(session != NULL);
+	g_return_if_fail(group_name != NULL);
+	
+	contact = session->contact;
+	purple_debug_info("MSN CL","Adding group %s to contact list.\n", group_name);
+
+	if (state == NULL) {
+		state = msn_callback_state_new();
+	}
+
+	msn_callback_state_set_action(state, MSN_ADD_GROUP);
+	msn_callback_state_set_new_group_name(state, group_name);
+
+	/* escape group name's html special chars so it can safely be sent
+	* in a XML SOAP request
+	*/
+	escaped_group_name = g_markup_escape_text(group_name, -1);
+	body = g_strdup_printf(MSN_GROUP_ADD_TEMPLATE, escaped_group_name);
+	g_free(escaped_group_name);
+
+	/*build SOAP and POST it*/
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					MSN_ADDRESS_BOOK_POST_URL,
+					MSN_GROUP_ADD_SOAP_ACTION,
+					body,
+					state,
+					msn_group_read_cb,
+					msn_group_written_cb,
+					msn_contact_connect_init);
+	msn_soap_post(contact->soapconn,soap_request);
+	
+	g_free(body);
+}
+
+/* delete group */
+void
+msn_del_group(MsnSession *session, const gchar *group_name)
+{
+	MsnSoapReq *soap_request;
+	MsnContact *contact;
+	MsnCallbackState *state;
+	char *body = NULL;
+	const gchar *guid;
+
+	g_return_if_fail(session != NULL);
+	
+	g_return_if_fail(group_name != NULL);
+	contact = session->contact;
+	purple_debug_info("MSN CL","Deleting group %s from contact list\n", group_name);
+	
+	guid = msn_userlist_find_group_id(session->userlist, group_name);
+	
+	/* if group uid we need to del is NULL, 
+	*  we need to delete nothing
+	*/
+	if (guid == NULL) {
+		purple_debug_info("MSN CL", "Group %s guid not found, returning.\n", group_name);
+		return;
+	}
+
+	if ( !strcmp(guid, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(guid, MSN_NON_IM_GROUP_ID) ) {
+		// XXX add back PurpleGroup since it isn't really removed in the server?
+		return;
+	}
+
+	state = msn_callback_state_new();
+	msn_callback_state_set_action(state, MSN_DEL_GROUP);
+	msn_callback_state_set_guid(state, guid);
+	
+	body = g_strdup_printf(MSN_GROUP_DEL_TEMPLATE, guid);
+	/*build SOAP and POST it*/
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					    MSN_ADDRESS_BOOK_POST_URL,
+					    MSN_GROUP_DEL_SOAP_ACTION,
+					    body,
+					    state,
+					    msn_group_read_cb,
+					    msn_group_written_cb,
+					    msn_contact_connect_init);
+	msn_soap_post(contact->soapconn, soap_request);
+
+	g_free(body);
+}
+
+/* rename group */
+void
+msn_contact_rename_group(MsnSession *session, const char *old_group_name, const char *new_group_name)
+{
+	MsnSoapReq *soap_request;
+	MsnContact *contact;
+	gchar * escaped_group_name, *body = NULL;
+	const gchar * guid;
+	MsnCallbackState *state = msn_callback_state_new();
+	
+	g_return_if_fail(session != NULL);
+	g_return_if_fail(session->userlist != NULL);
+	g_return_if_fail(old_group_name != NULL);
+	g_return_if_fail(new_group_name != NULL);
+	
+	contact = session->contact;
+	purple_debug_info("MSN CL", "Renaming group %s to %s.\n", old_group_name, new_group_name);
+	
+	guid = msn_userlist_find_group_id(session->userlist, old_group_name);
+	if (guid == NULL)
+		return;
+
+	msn_callback_state_set_guid(state, guid);
+	msn_callback_state_set_new_group_name(state, new_group_name);
+
+	if ( !strcmp(guid, MSN_INDIVIDUALS_GROUP_ID) || !strcmp(guid, MSN_NON_IM_GROUP_ID) ) {
+		msn_add_group(session, state, new_group_name);
+		// XXX move every buddy there (we probably need to fix concurrent SOAP reqs first)
+	}
+
+	msn_callback_state_set_action(state, MSN_RENAME_GROUP);
+	
+	/* escape group name's html special chars so it can safely be sent
+	 * in a XML SOAP request
+	*/
+	escaped_group_name = g_markup_escape_text(new_group_name, -1);
+	
+	body = g_strdup_printf(MSN_GROUP_RENAME_TEMPLATE, guid, escaped_group_name);
+	
+	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+					    MSN_ADDRESS_BOOK_POST_URL,
+					    MSN_GROUP_RENAME_SOAP_ACTION,
+					    body,
+					    state,
+					    msn_group_read_cb,
+					    msn_group_written_cb,
+					    msn_contact_connect_init);
+	msn_soap_post(contact->soapconn, soap_request);
+	
+	g_free(escaped_group_name);
+	g_free(body);
+}
+
+void
+msn_contact_connect_init(MsnSoapConn *soapconn)
+{
+	msn_soap_init(soapconn, MSN_CONTACT_SERVER, 1,
+		      msn_contact_login_connect_cb,
+		      msn_contact_login_error_cb);
+}
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/contact.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/contact.h	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,448 @@
+/**
+ * @file contact.h			Header file for contact.c
+ *	Author
+ * 		MaYuan<mayuan2006@gmail.com>
+ * 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 _MSN_CONTACT_H_
+#define _MSN_CONTACT_H_
+
+#define MSN_CONTACT_SERVER	"contacts.msn.com"
+
+/* Get Contact List */
+
+#define MSN_GET_CONTACT_POST_URL	"/abservice/SharingService.asmx"
+#define MSN_GET_CONTACT_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership"
+#define MSN_GET_CONTACT_UPDATE_XML "<View>Full</View>"\
+	"<deltasOnly>true</deltasOnly>"\
+	"<lastChange>%s</lastChange>"
+#define MSN_GET_CONTACT_TEMPLATE	"<?xml version='1.0' encoding='utf-8'?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
+	"<soap:Header xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId xmlns=\"http://www.msn.com/webservices/AddressBook\">09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration xmlns=\"http://www.msn.com/webservices/AddressBook\">false</IsMigration>"\
+			"<PartnerScenario xmlns=\"http://www.msn.com/webservices/AddressBook\">%s</PartnerScenario>"\
+		 "</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest xmlns=\"http://www.msn.com/webservices/AddressBook\">false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
+		"<FindMembership xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<serviceFilter xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+				"<Types xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+					"<ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Messenger</ServiceType>"\
+					"<ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Invitation</ServiceType>"\
+					"<ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">SocialNetwork</ServiceType>"\
+					"<ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Space</ServiceType>"\
+					"<ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Profile</ServiceType>"\
+				"</Types>"\
+			"</serviceFilter>"\
+			"%s"\
+		"</FindMembership>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+/************************************************
+ * Address Book SOAP
+ * *********************************************/
+
+#define MSN_ADDRESS_BOOK_POST_URL	"/abservice/abservice.asmx"
+
+/* Create AddressBook template */
+#define MSN_ADD_ADDRESSBOOK_SOAP_ACTION     "http://www.msn.com/webservices/AddressBook/ABAdd"
+
+#define MSN_ADD_ADDRESSBOOK_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>Initial</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<ABAdd xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<abInfo>"\
+				"<name/>"\
+				"<ownerPuid>0</ownerPuid>"\
+				"<ownerEmail>%s</ownerEmail>"\
+				"<fDefault>true</fDefault>"\
+			"</abInfo>"\
+		"</ABAdd>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+/* Get AddressBook */
+#define MSN_GET_ADDRESS_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABFindAll"
+#define MSN_GET_ADDRESS_FULL_TIME	"0001-01-01T00:00:00.0000000-08:00"
+#define MSN_GET_ADDRESS_UPDATE_XML "<deltasOnly>true</deltasOnly>"\
+	"<lastChange>%s</lastChange>"
+
+#define MSN_GET_GLEAM_UPDATE_XML \
+	"%s"\
+	"<dynamicItemView>Gleam</dynamicItemView>"\
+	"<dynamicItemLastChange>%s</dynamicItemLastChange>"
+
+#define MSN_GET_ADDRESS_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>%s</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<ABFindAll xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<abId>00000000-0000-0000-0000-000000000000</abId>"\
+			"<abView>Full</abView>"\
+			"%s"\
+		"</ABFindAll>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+
+/*Gleams SOAP request template*/
+#define MSN_GET_GLEAMS_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll"
+#define MSN_GLEAMS_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>Initial</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<ABFindAll xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<abId>00000000-0000-0000-0000-000000000000</abId>"\
+			"<abView>Full</abView>"\
+			"<dynamicItemView>Gleam</dynamicItemView>"\
+			"<dynamicItemLastChange>0001-01-01T00:00:00.0000000-08:00</dynamicItemLastChange>"\
+		"</ABFindAll>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+
+/*******************************************************
+ * Contact Management SOAP actions
+ *******************************************************/
+
+/* Add a new contact t*/
+#define MSN_CONTACT_ADD_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABContactAdd"
+#define MSN_CONTACT_LIVE_PENDING_XML	"<Contact xmlns=\"http://www.msn.com/webservices/AddressBook\"><contactInfo><contactType>LivePending</contactType><passportName>%s</passportName><isMessengerUser>true</isMessengerUser></contactInfo></Contact>"
+
+#define MSN_CONTACT_XML	"<Contact xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+				"<contactInfo>"\
+					"<passportName>%s</passportName>"\
+					"<isSmtp>false</isSmtp>"\
+					"<isMessengerUser>true</isMessengerUser>"\
+				"</contactInfo>"\
+			"</Contact>"
+
+#define MSN_CONTACT_DISPLAYNAME_XML	"<Contact xmlns=\"http://www.msn.com/webservices/AddressBook\"><contactInfo><displayName>%s</displayName><passportName>%s</passportName><isMessengerUser>true</isMessengerUser></contactInfo></Contact>"
+
+#define MSN_ADD_CONTACT_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>ContactSave</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABContactAdd xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><contacts>%s</contacts><options><EnableAllowListManagement>true</EnableAllowListManagement></options></ABContactAdd></soap:Body></soap:Envelope>"
+
+/* Add a contact to a group */
+#define MSN_ADD_CONTACT_GROUP_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABGroupContactAdd"
+#define MSN_ADD_CONTACT_GROUP_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>ContactSave</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<ABGroupContactAdd xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<abId>00000000-0000-0000-0000-000000000000</abId>"\
+			"<groupFilter>"\
+				"<groupIds>"\
+					"<guid>%s</guid>"\
+				"</groupIds>"\
+			"</groupFilter>"\
+			"<contacts>%s</contacts>"\
+			"<groupContactAddOptions>"\
+				"<fGenerateMissingQuickName>true</fGenerateMissingQuickName>"\
+				"<EnableAllowListManagement>true</EnableAllowListManagement>"\
+			"</groupContactAddOptions>"\
+		"</ABGroupContactAdd>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+/* Delete a contact from the Contact List */
+#define MSN_CONTACT_DEL_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABContactDelete"
+#define MSN_CONTACT_ID_XML		"<Contact><contactId>%s</contactId></Contact>"
+#define MSN_DEL_CONTACT_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABContactDelete xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><contacts>%s</contacts></ABContactDelete></soap:Body></soap:Envelope>"
+
+/* Remove a contact from a group */
+#define MSN_CONTACT_DEL_GROUP_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABGroupContactDelete"
+#define MSN_CONTACT_DEL_GROUP_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupContactDelete xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><contacts>%s</contacts><groupFilter><groupIds><guid>%s</guid></groupIds></groupFilter></ABGroupContactDelete></soap:Body></soap:Envelope>"
+
+
+/* Update Contact Nickname */
+#define MSN_CONTACT_UPDATE_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABContactUpdate"
+#define MSN_CONTACT_UPDATE_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>Timer</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<ABContactUpdate xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<abId>00000000-0000-0000-0000-000000000000</abId>"\
+			"<contacts>"\
+				"<Contact xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+					"<contactInfo>"\
+						"<contactType>Me</contactType>"\
+						"<displayName>%s</displayName>"\
+					"</contactInfo>"\
+					"<propertiesChanged>DisplayName</propertiesChanged>"\
+				"</Contact>"\
+			"</contacts>"\
+		"</ABContactUpdate>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+
+/*******************************************************
+ * Add/Delete contact from lists SOAP actions
+ *******************************************************/
+
+/* block means delete from allow list and add contact to block list */
+#define MSN_SHARE_POST_URL		"/abservice/SharingService.asmx"
+
+#define MSN_ADD_MEMBER_TO_LIST_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/AddMember"
+#define MSN_DELETE_MEMBER_FROM_LIST_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/DeleteMember"
+
+#define MSN_MEMBER_PASSPORT_XML	"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"PassportMember\">"\
+					"<Type>Passport</Type>"\
+					"<State>Accepted</State>"\
+					"<PassportName>%s</PassportName>"\
+				"</Member>"
+
+#define MSN_MEMBER_MEMBERSHIPID_XML	"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"PassportMember\">"\
+						"<Type>Passport</Type>"\
+						"<MembershipId>%u</MembershipId>"\
+						"<State>Accepted</State>"\
+					"</Member>"
+
+/* first delete contact from allow list */
+
+#define MSN_CONTACT_DELECT_FROM_LIST_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>%s</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<DeleteMember xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<serviceHandle>"\
+				"<Id>0</Id>"\
+				"<Type>Messenger</Type>"\
+				"<ForeignId></ForeignId>"\
+			"</serviceHandle>"\
+			"<memberships>"\
+				"<Membership>"\
+					"<MemberRole>%s</MemberRole>"\
+					"<Members>"\
+						"%s"\
+					"</Members>"\
+				"</Membership>"\
+			"</memberships>"\
+		"</DeleteMember>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+#define MSN_CONTACT_ADD_TO_LIST_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+	"<soap:Header>"\
+		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+			"<IsMigration>false</IsMigration>"\
+			"<PartnerScenario>%s</PartnerScenario>"\
+		"</ABApplicationHeader>"\
+		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<ManagedGroupRequest>false</ManagedGroupRequest>"\
+		"</ABAuthHeader>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<AddMember xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+			"<serviceHandle>"\
+				"<Id>0</Id>"\
+				"<Type>Messenger</Type>"\
+				"<ForeignId></ForeignId>"\
+			"</serviceHandle>"\
+			"<memberships>"\
+				"<Membership>"\
+					"<MemberRole>%s</MemberRole>"\
+					"<Members>"\
+						"%s"\
+					"</Members>"\
+				"</Membership>"\
+			"</memberships>"\
+		"</AddMember>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+
+
+/*******************************************************
+ * Group management SOAP actions
+ *******************************************************/
+
+/* add a group */
+#define MSN_GROUP_ADD_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABGroupAdd"
+#define MSN_GROUP_ADD_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>GroupSave</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupAdd xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groupAddOptions><fRenameOnMsgrConflict>false</fRenameOnMsgrConflict></groupAddOptions><groupInfo><GroupInfo><name>%s</name><groupType>C8529CE2-6EAD-434d-881F-341E17DB3FF8</groupType><fMessenger>false</fMessenger><annotations><Annotation><Name>MSN.IM.Display</Name><Value>1</Value></Annotation></annotations></GroupInfo></groupInfo></ABGroupAdd></soap:Body></soap:Envelope>"
+
+/* delete a group */
+#define MSN_GROUP_DEL_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABGroupDelete"
+#define MSN_GROUP_DEL_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupDelete xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groupFilter><groupIds><guid>%s</guid></groupIds></groupFilter></ABGroupDelete></soap:Body></soap:Envelope>"
+
+/* change a group's name */
+#define MSN_GROUP_RENAME_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABGroupUpdate"
+#define MSN_GROUP_RENAME_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupUpdate xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groups><Group><groupId>%s</groupId><groupInfo><name>%s</name></groupInfo><propertiesChanged>GroupName </propertiesChanged></Group></groups></ABGroupUpdate></soap:Body></soap:Envelope>"
+
+typedef enum 
+{
+	MSN_ADD_BUDDY			= 0x01,
+	MSN_MOVE_BUDDY			= 0x02,
+	MSN_ACCEPTED_BUDDY		= 0x04,
+	MSN_DENIED_BUDDY		= 0x08,
+	MSN_ADD_GROUP			= 0x10,
+	MSN_DEL_GROUP			= 0x20,
+	MSN_RENAME_GROUP		= 0x40,
+} MsnCallbackAction;
+
+typedef struct _MsnContact MsnContact;
+
+struct _MsnContact
+{
+	MsnSession *session;
+
+	MsnSoapConn *soapconn;
+};
+
+typedef struct _MsnCallbackState MsnCallbackState;
+
+struct _MsnCallbackState
+{
+	gchar * who;
+	gchar * uid;
+	gchar * old_group_name;
+	gchar * new_group_name;
+	gchar * guid;
+	MsnListId list_id;
+	MsnCallbackAction action;
+};
+
+typedef enum 
+{
+	MSN_PS_INITIAL,
+	MSN_PS_SAVE_CONTACT,
+	MSN_PS_PENDING_LIST,
+	MSN_PS_CONTACT_API,
+	MSN_PS_BLOCK_UNBLOCK
+} MsnSoapPartnerScenario;
+
+/************************************************
+ * function prototype
+ ************************************************/
+MsnContact * msn_contact_new(MsnSession *session);
+void msn_contact_destroy(MsnContact *contact);
+
+MsnCallbackState * msn_callback_state_new(void);
+void msn_callback_state_free(MsnCallbackState *state);
+void msn_callback_state_set_who(MsnCallbackState *state, const gchar *who);
+void msn_callback_state_set_uid(MsnCallbackState *state, const gchar *uid);
+void msn_callback_state_set_old_group_name(MsnCallbackState *state,
+					   const gchar *old_group_name);
+void msn_callback_state_set_new_group_name(MsnCallbackState *state, 
+					   const gchar *new_group_name);
+void msn_callback_state_set_guid(MsnCallbackState *state, const gchar *guid);
+void msn_callback_state_set_list_id(MsnCallbackState *state, MsnListId list_id);
+void msn_callback_state_set_action(MsnCallbackState *state, 
+				   MsnCallbackAction action);
+
+void msn_contact_connect(MsnContact *contact);
+void msn_get_contact_list(MsnContact * contact, 
+			  const MsnSoapPartnerScenario partner_scenario,
+			  const char *update);
+void msn_get_address_book(MsnContact *contact, 
+			  const MsnSoapPartnerScenario partner_scenario,
+			  const char * update, const char * gupdate);
+
+/* contact SOAP operations */
+void msn_update_contact(MsnContact *contact, const char* nickname);
+
+void msn_add_contact(MsnContact *contact, MsnCallbackState *state, 
+		     const char *passport);
+void msn_delete_contact(MsnContact *contact, const char *contactId);
+
+void msn_add_contact_to_group(MsnContact *contact, MsnCallbackState *state, 
+			      const char *passport, const char *groupId);
+void msn_del_contact_from_group(MsnContact *contact, const char *passport, 
+				const char *group_name);
+/* group operations */
+void msn_add_group(MsnSession *session, MsnCallbackState *state, 
+					const char* group_name);
+void msn_del_group(MsnSession *session, const gchar *group_name);
+void msn_contact_rename_group(MsnSession *session, const char *old_group_name,
+						   const char *new_group_name);
+
+/* lists operations */
+void msn_add_contact_to_list(MsnContact *contact, MsnCallbackState *state,
+			     const gchar *passport, const MsnListId list);
+void msn_del_contact_from_list(MsnContact *contact, MsnCallbackState *state,
+			       const gchar *passport, const MsnListId list);
+
+void msn_contact_connect_init(MsnSoapConn *soapconn);
+
+#endif /* _MSN_CONTACT_H_ */
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/dialog.c
--- a/libpurple/protocols/msn/dialog.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/dialog.c	Fri Sep 28 20:30:26 2007 +0000
@@ -36,6 +36,7 @@
 
 /* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed.
  * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */
+/* Actually with our MSNP14 code that isn't true yet, he won't be added back :( */
 static void
 msn_complete_sync_issue(MsnAddRemData *data)
 {
@@ -44,28 +45,32 @@
 
 	if (data->group != NULL)
 		group = purple_find_group(data->group);
-	
+
 	if (group != NULL)
 		buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
 	else
 		buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
-	
+
 	if (buddy != NULL)
 		purple_blist_remove_buddy(buddy);
 }
 
+
 static void
 msn_add_cb(MsnAddRemData *data)
 {
-	MsnSession *session;
-	MsnUserList *userlist;
-
+#if 0
+	/* this *should* be necessary !! */
 	msn_complete_sync_issue(data);
+#endif
 
-	session = data->gc->proto_data;
-	userlist = session->userlist;
+	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+	{
+		MsnSession *session = data->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
 
-	msn_userlist_add_buddy(userlist, data->who, MSN_LIST_FL, data->group);
+		msn_userlist_add_buddy(userlist, data->who, data->group);
+	}
 
 	g_free(data->group);
 	g_free(data->who);
@@ -75,17 +80,20 @@
 static void
 msn_rem_cb(MsnAddRemData *data)
 {
-	MsnSession *session;
-	MsnUserList *userlist;
-
 	msn_complete_sync_issue(data);
 
-	session = data->gc->proto_data;
-	userlist = session->userlist;
+	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+	{
+		MsnSession *session = data->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
 
-	msn_userlist_rem_buddy(userlist, data->who, MSN_LIST_FL, data->group);
+		if (data->group == NULL) {
+			msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL);
+		} else {
+			g_free(data->group);
+		}
+	}
 
-	g_free(data->group);
 	g_free(data->who);
 	g_free(data);
 }
@@ -104,7 +112,7 @@
 
 	data        = g_new0(MsnAddRemData, 1);
 	data->who   = g_strdup(passport);
-	data->group = g_strdup(group_name);
+	data->group = group_name != NULL ? g_strdup(group_name) : NULL;
 	data->gc    = gc;
 
 	msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/directconn.c
--- a/libpurple/protocols/msn/directconn.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/directconn.c	Fri Sep 28 20:30:26 2007 +0000
@@ -76,7 +76,6 @@
  * Connection Functions
  **************************************************************************/
 
-#if 0
 static int
 create_listener(int port)
 {
@@ -160,7 +159,6 @@
 
 	return fd;
 }
-#endif
 
 static size_t
 msn_directconn_write(MsnDirectConn *directconn,
@@ -288,6 +286,11 @@
 		/* ERROR */
 		purple_debug_error("msn", "error reading\n");
 
+		if (directconn->inpa)
+			purple_input_remove(directconn->inpa);
+
+		close(directconn->fd);
+
 		msn_directconn_destroy(directconn);
 
 		return;
@@ -302,6 +305,11 @@
 		/* ERROR */
 		purple_debug_error("msn", "error reading\n");
 
+		if (directconn->inpa)
+			purple_input_remove(directconn->inpa);
+
+		close(directconn->fd);
+
 		msn_directconn_destroy(directconn);
 
 		return;
@@ -348,17 +356,22 @@
 		/* ERROR */
 		purple_debug_error("msn", "error reading\n");
 
+		if (directconn->inpa)
+			purple_input_remove(directconn->inpa);
+
+		close(directconn->fd);
+
 		msn_directconn_destroy(directconn);
 	}
 }
 
 static void
-connect_cb(gpointer data, gint source, const gchar *error_message)
+connect_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnDirectConn* directconn;
 	int fd;
 
-	purple_debug_misc("msn", "directconn: connect_cb: %d\n", source);
+	purple_debug_misc("msn", "directconn: connect_cb: %d, %d.\n", source, cond);
 
 	directconn = data;
 	directconn->connect_data = NULL;
@@ -438,7 +451,6 @@
 	return (directconn->connect_data != NULL);
 }
 
-#if 0
 void
 msn_directconn_listen(MsnDirectConn *directconn)
 {
@@ -458,7 +470,6 @@
 	directconn->port = port;
 	directconn->c = 0;
 }
-#endif
 
 MsnDirectConn*
 msn_directconn_new(MsnSlpLink *slplink)
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/directconn.h
--- a/libpurple/protocols/msn/directconn.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/directconn.h	Fri Sep 28 20:30:26 2007 +0000
@@ -52,9 +52,7 @@
 MsnDirectConn *msn_directconn_new(MsnSlpLink *slplink);
 gboolean msn_directconn_connect(MsnDirectConn *directconn,
 								const char *host, int port);
-#if 0
 void msn_directconn_listen(MsnDirectConn *directconn);
-#endif
 void msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg);
 void msn_directconn_parse_nonce(MsnDirectConn *directconn, const char *nonce);
 void msn_directconn_destroy(MsnDirectConn *directconn);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/group.c
--- a/libpurple/protocols/msn/group.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/group.c	Fri Sep 28 20:30:26 2007 +0000
@@ -25,18 +25,18 @@
 #include "group.h"
 
 MsnGroup *
-msn_group_new(MsnUserList *userlist, int id, const char *name)
+msn_group_new(MsnUserList *userlist, const char *id, const char *name)
 {
 	MsnGroup *group;
 
-	g_return_val_if_fail(id >= 0,      NULL);
+	g_return_val_if_fail(id != NULL,      NULL);
 	g_return_val_if_fail(name != NULL, NULL);
 
 	group = g_new0(MsnGroup, 1);
 
 	msn_userlist_add_group(userlist, group);
 
-	group->id      = id;
+	group->id      = g_strdup(id);
 	group->name    = g_strdup(name);
 
 	return group;
@@ -47,17 +47,18 @@
 {
 	g_return_if_fail(group != NULL);
 
+	g_free(group->id);
 	g_free(group->name);
 	g_free(group);
 }
 
 void
-msn_group_set_id(MsnGroup *group, int id)
+msn_group_set_id(MsnGroup *group, const char *id)
 {
 	g_return_if_fail(group != NULL);
-	g_return_if_fail(id >= 0);
+	g_return_if_fail(id != NULL);
 
-	group->id = id;
+	group->id = g_strdup(id);
 }
 
 void
@@ -72,10 +73,10 @@
 	group->name = g_strdup(name);
 }
 
-int
+char*
 msn_group_get_id(const MsnGroup *group)
 {
-	g_return_val_if_fail(group != NULL, -1);
+	g_return_val_if_fail(group != NULL, NULL);
 
 	return group->id;
 }
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/group.h
--- a/libpurple/protocols/msn/group.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/group.h	Fri Sep 28 20:30:26 2007 +0000
@@ -30,8 +30,21 @@
 
 #include "session.h"
 #include "user.h"
+#include "soap.h"
+#include "userlist.h"
 
-#include "userlist.h"
+#define MSN_ADD_GROUPS	"<GroupInfo><name>test111</name><groupType>C8529CE2-6EAD-434d-881F-341E17DB3FF8</groupType><fMessenger>false</fMessenger><annotations><Annotation><Name>MSN.IM.Display</Name><Value>1</Value></Annotation></annotations></GroupInfo>"
+
+#define MSN_ADD_GROUP_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>GroupSave</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupAdd xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groupAddOptions><fRenameOnMsgrConflict>false</fRenameOnMsgrConflict></groupAddOptions><groupInfo>%s</groupInfo></ABGroupAdd></soap:Body></soap:Envelope>"
+
+#define MSN_GROUP_IDS	"<guid>9e57e654-59f0-44d1-aedc-0a7500b7e51f</guid>"
+#define MSN_DELETE_GROUP_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupDelete xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groupFilter><groupIds>%s</groupIds></groupFilter></ABGroupDelete></soap:Body></soap:Envelope>"
+
+#define MSN_INDIVIDUALS_GROUP_ID	"1983"
+#define MSN_INDIVIDUALS_GROUP_NAME	"Other Contacts"
+
+#define MSN_NON_IM_GROUP_ID		"email"
+#define MSN_NON_IM_GROUP_NAME	"Non-IM Contacts"
 
 /**
  * A group.
@@ -39,8 +52,9 @@
 struct _MsnGroup
 {
 	MsnSession *session;    /**< The MSN session.           */
+	MsnSoapConn *soapconn;
 
-	int id;                 /**< The group ID.              */
+	char *id;                 /**< The group ID.              */
 	char *name;             /**< The name of the group.     */
 };
 
@@ -58,7 +72,7 @@
  *
  * @return A new group structure.
  */
-MsnGroup *msn_group_new(MsnUserList *userlist, int id, const char *name);
+MsnGroup *msn_group_new(MsnUserList *userlist, const char *id, const char *name);
 
 /**
  * Destroys a group structure.
@@ -73,7 +87,7 @@
  * @param group The group.
  * @param id    The ID.
  */
-void msn_group_set_id(MsnGroup *group, int id);
+void msn_group_set_id(MsnGroup *group, const char *id);
 
 /**
  * Sets the name for a group.
@@ -90,7 +104,7 @@
  *
  * @return The ID.
  */
-int msn_group_get_id(const MsnGroup *group);
+char* msn_group_get_id(const MsnGroup *group);
 
 /**
  * Returns the name for a group.
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/history.c
--- a/libpurple/protocols/msn/history.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/history.c	Fri Sep 28 20:30:26 2007 +0000
@@ -84,3 +84,4 @@
 		msn_transaction_destroy(trans);
 	}
 }
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/msg.c	Fri Sep 28 20:30:26 2007 +0000
@@ -126,7 +126,7 @@
 	msn_message_set_charset(msg, "UTF-8");
 	msn_message_set_flag(msg, 'A');
 	msn_message_set_attr(msg, "X-MMS-IM-Format",
-						 "FN=MS%20Sans%20Serif; EF=; CO=0; PF=0");
+						 "FN=MS%20Sans%20Serif; EF=; CO=0; CS=86;PF=0");
 
 	message_cr = purple_str_add_cr(message);
 	msn_message_set_bin_data(msg, message_cr, strlen(message_cr));
@@ -206,7 +206,8 @@
 
 void
 msn_message_parse_payload(MsnMessage *msg,
-						  const char *payload, size_t payload_len)
+						  const char *payload, size_t payload_len,
+						  const char *line_dem,const char *body_dem)
 {
 	char *tmp_base, *tmp;
 	const char *content_type;
@@ -214,12 +215,11 @@
 	char **elems, **cur, **tokens;
 
 	g_return_if_fail(payload != NULL);
-
 	tmp_base = tmp = g_malloc0(payload_len + 1);
 	memcpy(tmp_base, payload, payload_len);
 
 	/* Parse the attributes. */
-	end = strstr(tmp, "\r\n\r\n");
+	end = strstr(tmp, body_dem);
 	/* TODO? some clients use \r delimiters instead of \r\n, the official client
 	 * doesn't send such messages, but does handle receiving them. We'll just
 	 * avoid crashing for now */
@@ -229,7 +229,7 @@
 	}
 	*end = '\0';
 
-	elems = g_strsplit(tmp, "\r\n", 0);
+	elems = g_strsplit(tmp, line_dem, 0);
 
 	for (cur = elems; *cur != NULL; cur++)
 	{
@@ -240,6 +240,7 @@
 		key = tokens[0];
 		value = tokens[1];
 
+		/*if not MIME content ,then return*/
 		if (!strcmp(key, "MIME-Version"))
 		{
 			g_strfreev(tokens);
@@ -274,7 +275,7 @@
 	g_strfreev(elems);
 
 	/* Proceed to the end of the "\r\n\r\n" */
-	tmp = end + 4;
+	tmp = end + strlen(body_dem);
 
 	/* Now we *should* be at the body. */
 	content_type = msn_message_get_content_type(msg);
@@ -480,6 +481,7 @@
 		{
 			memcpy(n, body, body_len);
 			n += body_len;
+			*n = '\0';
 		}
 	}
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msg.h
--- a/libpurple/protocols/msn/msg.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/msg.h	Fri Sep 28 20:30:26 2007 +0000
@@ -34,6 +34,12 @@
 
 typedef void (*MsnMsgCb)(MsnMessage *, void *data);
 
+#define MSG_BODY_DEM	"\r\n\r\n"
+#define MSG_LINE_DEM	"\r\n"
+
+#define MSG_OIM_BODY_DEM	"\n\n"
+#define MSG_OIM_LINE_DEM	"\n"
+
 /*
 typedef enum
 {
@@ -180,7 +186,8 @@
  * @param payload_len The length of the payload.
  */
 void msn_message_parse_payload(MsnMessage *msg, const char *payload,
-							   size_t payload_len);
+							   size_t payload_len,
+						  const char *line_dem,const char *body_dem);
 
 /**
  * Destroys a message.
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msn-utils.c
--- a/libpurple/protocols/msn/msn-utils.c	Fri Sep 28 20:30:07 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,440 +0,0 @@
-/**
- * @file msn-utils.c Utility functions
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#include "msn.h"
-#include "msn-utils.h"
-
-void
-msn_parse_format(const char *mime, char **pre_ret, char **post_ret)
-{
-	char *cur;
-	GString *pre  = g_string_new(NULL);
-	GString *post = g_string_new(NULL);
-	unsigned int colors[3];
-
-	if (pre_ret  != NULL) *pre_ret  = NULL;
-	if (post_ret != NULL) *post_ret = NULL;
-
-	cur = strstr(mime, "FN=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		pre = g_string_append(pre, "<FONT FACE=\"");
-
-		while (*cur && *cur != ';')
-		{
-			pre = g_string_append_c(pre, *cur);
-			cur++;
-		}
-
-		pre = g_string_append(pre, "\">");
-		post = g_string_prepend(post, "</FONT>");
-	}
-
-	cur = strstr(mime, "EF=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		while (*cur && *cur != ';')
-		{
-			pre = g_string_append_c(pre, '<');
-			pre = g_string_append_c(pre, *cur);
-			pre = g_string_append_c(pre, '>');
-			post = g_string_prepend_c(post, '>');
-			post = g_string_prepend_c(post, *cur);
-			post = g_string_prepend_c(post, '/');
-			post = g_string_prepend_c(post, '<');
-			cur++;
-		}
-	}
-
-	cur = strstr(mime, "CO=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		int i;
-
-		i = sscanf(cur, "%02x%02x%02x;", &colors[0], &colors[1], &colors[2]);
-
-		if (i > 0)
-		{
-			char tag[64];
-
-			if (i == 1)
-			{
-				colors[1] = 0;
-				colors[2] = 0;
-			}
-			else if (i == 2)
-			{
-				unsigned int temp = colors[0];
-
-				colors[0] = colors[1];
-				colors[1] = temp;
-				colors[2] = 0;
-			}
-			else if (i == 3)
-			{
-				unsigned int temp = colors[2];
-
-				colors[2] = colors[0];
-				colors[0] = temp;
-			}
-
-			g_snprintf(tag, sizeof(tag),
-					   "<FONT COLOR=\"#%02hhx%02hhx%02hhx\">",
-					   colors[0], colors[1], colors[2]);
-
-			pre = g_string_append(pre, tag);
-			post = g_string_prepend(post, "</FONT>");
-		}
-	}
-
-	cur = strstr(mime, "RL=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		if (*cur == '1')
-		{
-			/* RTL text was received */
-			pre = g_string_append(pre, "<SPAN style=\"direction:rtl;text-align:right;\">");
-			post = g_string_prepend(post, "</SPAN>");
-		}
-	}
-
-	cur = g_strdup(purple_url_decode(pre->str));
-	g_string_free(pre, TRUE);
-
-	if (pre_ret != NULL)
-		*pre_ret = cur;
-	else
-		g_free(cur);
-
-	cur = g_strdup(purple_url_decode(post->str));
-	g_string_free(post, TRUE);
-
-	if (post_ret != NULL)
-		*post_ret = cur;
-	else
-		g_free(cur);
-}
-
-/*
- * We need this because we're only supposed to encode spaces in the font
- * names. purple_url_encode() isn't acceptable.
- */
-static const char *
-encode_spaces(const char *str)
-{
-	static char buf[BUF_LEN];
-	const char *c;
-	char *d;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	for (c = str, d = buf; *c != '\0'; c++)
-	{
-		if (*c == ' ')
-		{
-			*d++ = '%';
-			*d++ = '2';
-			*d++ = '0';
-		}
-		else
-			*d++ = *c;
-	}
-
-	return buf;
-}
-
-/*
- * Taken from the zephyr plugin.
- * This parses HTML formatting (put out by one of the gtkimhtml widgets
- * and converts it to msn formatting. It doesn't deal with the tag closing,
- * but gtkimhtml widgets give valid html.
- * It currently deals properly with <b>, <u>, <i>, <font face=...>,
- * <font color=...>, <span dir=...>, <span style="direction: ...">.
- * It ignores <font back=...> and <font size=...>
- */
-void
-msn_import_html(const char *html, char **attributes, char **message)
-{
-	int len, retcount = 0;
-	const char *c;
-	char *msg;
-	char *fontface = NULL;
-	char fonteffect[4];
-	char fontcolor[7];
-	char direction = '0';
-
-	gboolean has_bold = FALSE;
-	gboolean has_italic = FALSE;
-	gboolean has_underline = FALSE;
-	gboolean has_strikethrough = FALSE;
-
-	g_return_if_fail(html       != NULL);
-	g_return_if_fail(attributes != NULL);
-	g_return_if_fail(message    != NULL);
-
-	len = strlen(html);
-	msg = g_malloc0(len + 1);
-
-	memset(fontcolor, 0, sizeof(fontcolor));
-	strcat(fontcolor, "0");
-	memset(fonteffect, 0, sizeof(fonteffect));
-
-	for (c = html; *c != '\0';)
-	{
-		if (*c == '<')
-		{
-			if (!g_ascii_strncasecmp(c + 1, "br>", 3))
-			{
-				msg[retcount++] = '\r';
-				msg[retcount++] = '\n';
-				c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "i>", 2))
-			{
-				if (!has_italic)
-				{
-					strcat(fonteffect, "I");
-					has_italic = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "b>", 2))
-			{
-				if (!has_bold)
-				{
-					strcat(fonteffect, "B");
-					has_bold = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "u>", 2))
-			{
-				if (!has_underline)
-				{
-					strcat(fonteffect, "U");
-					has_underline = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "s>", 2))
-			{
-				if (!has_strikethrough)
-				{
-					strcat(fonteffect, "S");
-					has_strikethrough = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "a href=\"", 8))
-			{
-				c += 9;
-
-				if (!g_ascii_strncasecmp(c, "mailto:", 7))
-					c += 7;
-
-				while ((*c != '\0') && g_ascii_strncasecmp(c, "\">", 2))
-					msg[retcount++] = *c++;
-
-				if (*c != '\0')
-					c += 2;
-
-				/* ignore descriptive string */
-				while ((*c != '\0') && g_ascii_strncasecmp(c, "</a>", 4))
-					c++;
-
-				if (*c != '\0')
-					c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "span", 4))
-			{
-				/* Bi-directional text support using CSS properties in span tags */
-				c += 5;
-
-				while (*c != '\0' && *c != '>')
-				{
-					while (*c == ' ')
-						c++;
-					if (!g_ascii_strncasecmp(c, "dir=\"rtl\"", 9))
-					{
-						c += 9;
-						direction = '1';
-					}
-					else if (!g_ascii_strncasecmp(c, "style=\"", 7))
-					{
-						/* Parse inline CSS attributes */
-						char *attributes;
-						int attr_len = 0;
-						c += 7;
-						while (*(c + attr_len) != '\0' && *(c + attr_len) != '"')
-							attr_len++;
-						if (*(c + attr_len) == '"')
-						{
-							char *attr_dir;
-							attributes = g_strndup(c, attr_len);
-							attr_dir = purple_markup_get_css_property(attributes, "direction");
-							if (attr_dir && (!g_ascii_strncasecmp(attr_dir, "RTL", 3)))
-								direction = '1';
-							g_free(attr_dir);
-							g_free(attributes);
-						}
-
-					}
-					else
-					{
-						c++;
-					}
-				}
-				if (*c == '>')
-					c++;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "font", 4))
-			{
-				c += 5;
-
-				while ((*c != '\0') && !g_ascii_strncasecmp(c, " ", 1))
-					c++;
-
-				if (!g_ascii_strncasecmp(c, "color=\"#", 7))
-				{
-					c += 8;
-
-					fontcolor[0] = *(c + 4);
-					fontcolor[1] = *(c + 5);
-					fontcolor[2] = *(c + 2);
-					fontcolor[3] = *(c + 3);
-					fontcolor[4] = *c;
-					fontcolor[5] = *(c + 1);
-
-					c += 8;
-				}
-				else if (!g_ascii_strncasecmp(c, "face=\"", 6))
-				{
-					const char *end = NULL;
-					const char *comma = NULL;
-					unsigned int namelen = 0;
-
-					c += 6;
-					end = strchr(c, '\"');
-					comma = strchr(c, ',');
-
-					if (comma == NULL || comma > end)
-						namelen = (unsigned int)(end - c);
-					else
-						namelen = (unsigned int)(comma - c);
-
-					fontface = g_strndup(c, namelen);
-					c = end + 2;
-				}
-				else
-				{
-					/* Drop all unrecognized/misparsed font tags */
-					while ((*c != '\0') && g_ascii_strncasecmp(c, "\">", 2))
-						c++;
-
-					if (*c != '\0')
-						c += 2;
-				}
-			}
-			else
-			{
-				while ((*c != '\0') && (*c != '>'))
-					c++;
-				if (*c != '\0')
-					c++;
-			}
-		}
-		else if (*c == '&')
-		{
-			if (!g_ascii_strncasecmp(c, "&lt;", 4))
-			{
-				msg[retcount++] = '<';
-				c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c, "&gt;", 4))
-			{
-				msg[retcount++] = '>';
-				c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c, "&nbsp;", 6))
-			{
-				msg[retcount++] = ' ';
-				c += 6;
-			}
-			else if (!g_ascii_strncasecmp(c, "&quot;", 6))
-			{
-				msg[retcount++] = '"';
-				c += 6;
-			}
-			else if (!g_ascii_strncasecmp(c, "&amp;", 5))
-			{
-				msg[retcount++] = '&';
-				c += 5;
-			}
-			else if (!g_ascii_strncasecmp(c, "&apos;", 6))
-			{
-				msg[retcount++] = '\'';
-				c += 6;
-			}
-			else
-				msg[retcount++] = *c++;
-		}
-		else
-			msg[retcount++] = *c++;
-	}
-
-	if (fontface == NULL)
-		fontface = g_strdup("MS Sans Serif");
-
-	*attributes = g_strdup_printf("FN=%s; EF=%s; CO=%s; PF=0; RL=%c",
-								  encode_spaces(fontface),
-								  fonteffect, fontcolor, direction);
-	*message = g_strdup(msg);
-
-	g_free(fontface);
-	g_free(msg);
-}
-
-void
-msn_parse_socket(const char *str, char **ret_host, int *ret_port)
-{
-	char *host;
-	char *c;
-	int port;
-
-	host = g_strdup(str);
-
-	if ((c = strchr(host, ':')) != NULL)
-	{
-		*c = '\0';
-		port = atoi(c + 1);
-	}
-	else
-		port = 1863;
-
-	*ret_host = host;
-	*ret_port = port;
-}
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msn-utils.h
--- a/libpurple/protocols/msn/msn-utils.h	Fri Sep 28 20:30:07 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/**
- * @file msn-utils.h Utility functions
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#ifndef _MSN_UTILS_H_
-#define _MSN_UTILS_H_
-
-/**
- * Parses the MSN message formatting into a format compatible with Purple.
- *
- * @param mime     The mime header with the formatting.
- * @param pre_ret  The returned prefix string.
- * @param post_ret The returned postfix string.
- *
- * @return The new message.
- */
-void msn_parse_format(const char *mime, char **pre_ret, char **post_ret);
-
-/**
- * Parses the Purple message formatting (html) into the MSN format.
- *
- * @param html			The html message to format.
- * @param attributes	The returned attributes string.
- * @param message		The returned message string.
- *
- * @return The new message.
- */
-void msn_import_html(const char *html, char **attributes, char **message);
-
-void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
-
-#endif /* _MSN_UTILS_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Fri Sep 28 20:30:26 2007 +0000
@@ -37,7 +37,7 @@
 #include "cmds.h"
 #include "core.h"
 #include "prpl.h"
-#include "msn-utils.h"
+#include "msnutils.h"
 #include "version.h"
 
 #include "switchboard.h"
@@ -151,7 +151,7 @@
 	return PURPLE_CMD_RET_OK;
 }
 
-static void
+void
 msn_act_id(PurpleConnection *gc, const char *entry)
 {
 	MsnCmdProc *cmdproc;
@@ -175,9 +175,12 @@
 		return;
 	}
 
-	msn_cmdproc_send(cmdproc, "REA", "%s %s",
-					 purple_account_get_username(account),
-					 alias);
+	if (*alias == '\0') {
+		alias = purple_url_encode(purple_account_get_username(account));
+	}
+
+	msn_cmdproc_send(cmdproc, "PRP", "MFN %s", alias);
+
 }
 
 static void
@@ -414,6 +417,28 @@
 	return user && user->mobile;
 }
 
+void
+msn_send_privacy(PurpleConnection *gc)
+{
+       PurpleAccount *account;
+        MsnSession *session;
+        MsnCmdProc *cmdproc;
+
+        account = purple_connection_get_account(gc);
+        session = gc->proto_data;
+        cmdproc = session->notification->cmdproc;
+
+        if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
+                account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
+        {
+                msn_cmdproc_send(cmdproc, "BLP", "%s", "AL");
+        }
+        else
+        {
+                msn_cmdproc_send(cmdproc, "BLP", "%s", "BL");
+        }
+}
+
 static void
 initiate_chat_cb(PurpleBlistNode *node, gpointer data)
 {
@@ -460,6 +485,7 @@
 	session = gc->proto_data;
 
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who);
+
 	if (xfer)
 	{
 		slplink = msn_session_get_slplink(session, who);
@@ -511,20 +537,27 @@
 	return "msn";
 }
 
+/*
+ * Set the User status text
+ * Add the PSM String Using "Name - PSM String" format
+ */
 static char *
 msn_status_text(PurpleBuddy *buddy)
 {
 	PurplePresence *presence;
 	PurpleStatus *status;
+	const char *msg, *cmedia;
 
 	presence = purple_buddy_get_presence(buddy);
 	status = purple_presence_get_active_status(presence);
 
-	if (!purple_presence_is_available(presence) && !purple_presence_is_idle(presence))
-	{
-		return g_strdup(purple_status_get_name(status));
-	}
+	msg = purple_status_get_attr_string(status, "message");
+	cmedia = purple_status_get_attr_string(status, "currentmedia");
 
+	if (cmedia)
+		return g_markup_escape_text(cmedia, -1);
+	else if (msg)
+		return g_markup_escape_text(msg, -1);
 	return NULL;
 }
 
@@ -540,14 +573,43 @@
 
 	if (purple_presence_is_online(presence))
 	{
-		purple_notify_user_info_add_pair(user_info, _("Status"),
-									   (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status)));
-	}
+		const char *psm, *currentmedia, *name;
+		char *tmp;
+
+		psm = purple_status_get_attr_string(status, "message");
+		currentmedia = purple_status_get_attr_string(status, "currentmedia");
+
+		if (!purple_presence_is_available(presence)) {
+			name = purple_status_get_name(status);
+		} else {
+			name = NULL;
+		}
+
+		if (name != NULL && *name) {
+			char *tmp2 = g_markup_escape_text(name, -1);
 
-	if (full && user)
-	{
-		purple_notify_user_info_add_pair(user_info, _("Has you"),
-									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
+			if (psm != NULL && *psm) {
+				tmp = g_markup_escape_text(psm, -1);
+				purple_notify_user_info_add_pair(user_info, tmp2, tmp);
+				g_free(tmp);
+			} else {
+				purple_notify_user_info_add_pair(user_info, _("Status"), tmp2);
+			}
+
+			g_free(tmp2);
+		} else {
+			if (psm != NULL && *psm) {
+				tmp = g_markup_escape_text(psm, -1);
+				purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
+				g_free(tmp);
+			}
+		}
+
+		if (currentmedia) {
+			tmp = g_markup_escape_text(currentmedia, -1);
+			purple_notify_user_info_add_pair(user_info, _("Current media"), tmp);
+			g_free(tmp);
+		}
 	}
 
 	/* XXX: This is being shown in non-full tooltips because the
@@ -567,28 +629,44 @@
 	PurpleStatusType *status;
 	GList *types = NULL;
 
-	status = purple_status_type_new_full(PURPLE_STATUS_AVAILABLE,
-			NULL, NULL, FALSE, TRUE, FALSE);
+	status = purple_status_type_new_with_attrs(
+				PURPLE_STATUS_AVAILABLE, NULL, NULL, TRUE, TRUE, FALSE,
+				"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+				"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+				NULL);
 	types = g_list_append(types, status);
 
-	status = purple_status_type_new_full(PURPLE_STATUS_AWAY,
-			NULL, NULL, FALSE, TRUE, FALSE);
+	status = purple_status_type_new_with_attrs(
+			PURPLE_STATUS_AWAY, NULL, NULL, TRUE, TRUE, FALSE,
+			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
 	types = g_list_append(types, status);
 
-	status = purple_status_type_new_full(PURPLE_STATUS_AWAY,
-			"brb", _("Be Right Back"), FALSE, TRUE, FALSE);
+	status = purple_status_type_new_with_attrs(
+			PURPLE_STATUS_AWAY, "brb", _("Be Right Back"), TRUE, TRUE, FALSE,
+			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
 	types = g_list_append(types, status);
 
-	status = purple_status_type_new_full(PURPLE_STATUS_UNAVAILABLE,
-			"busy", _("Busy"), FALSE, TRUE, FALSE);
+	status = purple_status_type_new_with_attrs(
+			PURPLE_STATUS_UNAVAILABLE, "busy", _("Busy"), TRUE, TRUE, FALSE,
+			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
 	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_UNAVAILABLE,
-			"phone", _("On the Phone"), FALSE, TRUE, FALSE);
+	status = purple_status_type_new_with_attrs(
+			PURPLE_STATUS_UNAVAILABLE, "phone", _("On the Phone"), TRUE, TRUE, FALSE,
+			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
 	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_AWAY,
-			"lunch", _("Out to Lunch"), FALSE, TRUE, FALSE);
+	status = purple_status_type_new_with_attrs(
+			PURPLE_STATUS_AWAY, "lunch", _("Out to Lunch"), TRUE, TRUE, FALSE,
+			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
 	types = g_list_append(types, status);
 
 	status = purple_status_type_new_full(PURPLE_STATUS_INVISIBLE,
@@ -731,7 +809,7 @@
 	http_method = purple_account_get_bool(account, "http_method", FALSE);
 
 	if (http_method)
-		host = purple_account_get_string(account, "http_method_server", MSN_SERVER);
+		host = purple_account_get_string(account, "http_method_server", MSN_HTTPCONN_SERVER);
 	else
 		host = purple_account_get_string(account, "server", MSN_SERVER);
 	port = purple_account_get_int(account, "port", MSN_PORT);
@@ -788,6 +866,7 @@
 	char *msgformat;
 	char *msgtext;
 
+	purple_debug_info("MSNP14","send IM {%s} to %s\n",message,who);
 	account = purple_connection_get_account(gc);
 
 	if (buddy) {
@@ -801,62 +880,91 @@
 	}
 
 	msn_import_html(message, &msgformat, &msgtext);
+	if(msn_user_is_online(account, who)||
+		msn_user_is_yahoo(account, who)){
+		/*User online,then send Online Instant Message*/
 
-	if (strlen(msgtext) + strlen(msgformat) + strlen(VERSION) > 1564)
-	{
+		if (strlen(msgtext) + strlen(msgformat) + strlen(VERSION) > 1564)
+		{
+			g_free(msgformat);
+			g_free(msgtext);
+
+			return -E2BIG;
+		}
+
+		msg = msn_message_new_plain(msgtext);
+		msg->remote_user = g_strdup(who);
+		msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
+
 		g_free(msgformat);
 		g_free(msgtext);
 
-		return -E2BIG;
-	}
+		purple_debug_info("MSNP14","prepare to send online Message\n");
+		if (g_ascii_strcasecmp(who, purple_account_get_username(account)))
+		{
+			MsnSession *session;
+			MsnSwitchBoard *swboard;
 
-	msg = msn_message_new_plain(msgtext);
-	msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
-
-	g_free(msgformat);
-	g_free(msgtext);
+			session = gc->proto_data;
+			if(msn_user_is_yahoo(account,who)){
+				/*we send the online and offline Message to Yahoo User via UBM*/
+				purple_debug_info("MSNP14","send to Yahoo User\n");
+				uum_send_msg(session,msg);
+			}else{
+				purple_debug_info("MSNP14","send via switchboard\n");
+				swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM);
+				msn_switchboard_send_msg(swboard, msg, TRUE);
+			}
+		}
+		else
+		{
+			char *body_str, *body_enc, *pre, *post;
+			const char *format;
+			MsnIMData *imdata = g_new0(MsnIMData, 1);
+			/*
+			 * In MSN, you can't send messages to yourself, so
+			 * we'll fake like we received it ;)
+			 */
+			body_str = msn_message_to_string(msg);
+			body_enc = g_markup_escape_text(body_str, -1);
+			g_free(body_str);
 
-	if (g_ascii_strcasecmp(who, purple_account_get_username(account)))
-	{
-		MsnSession *session;
-		MsnSwitchBoard *swboard;
+			format = msn_message_get_attr(msg, "X-MMS-IM-Format");
+			msn_parse_format(format, &pre, &post);
+			body_str = g_strdup_printf("%s%s%s", pre ? pre :  "",
+									   body_enc ? body_enc : "", post ? post : "");
+			g_free(body_enc);
+			g_free(pre);
+			g_free(post);
+
+			serv_got_typing_stopped(gc, who);
+			imdata->gc = gc;
+			imdata->who = who;
+			imdata->msg = body_str;
+			imdata->flags = flags;
+			imdata->when = time(NULL);
+			g_idle_add(msn_send_me_im, imdata);
+		}
 
+		msn_message_destroy(msg);
+	}else	{
+		/*send Offline Instant Message,only to MSN Passport User*/
+		MsnSession *session;
+		MsnOim *oim;
+		char *friendname;
+
+		purple_debug_info("MSNP14","prepare to send offline Message\n");
 		session = gc->proto_data;
-		swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM);
+		/* XXX/khc: hack */
+		if (!session->oim)
+			session->oim = msn_oim_new(session);
 
-		msn_switchboard_send_msg(swboard, msg, TRUE);
+		oim = session->oim;
+		friendname = msn_encode_mime(account->username);
+		msn_oim_prep_send_msg_info(oim, purple_account_get_username(account),
+								   friendname, who,	message);
+		msn_oim_send_msg(oim);
 	}
-	else
-	{
-		char *body_str, *body_enc, *pre, *post;
-		const char *format;
-		MsnIMData *imdata = g_new0(MsnIMData, 1);
-		/*
-		 * In MSN, you can't send messages to yourself, so
-		 * we'll fake like we received it ;)
-		 */
-		body_str = msn_message_to_string(msg);
-		body_enc = g_markup_escape_text(body_str, -1);
-		g_free(body_str);
-
-		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
-		msn_parse_format(format, &pre, &post);
-		body_str = g_strdup_printf("%s%s%s", pre ? pre :  "",
-								   body_enc ? body_enc : "", post ? post : "");
-		g_free(body_enc);
-		g_free(pre);
-		g_free(post);
-
-		serv_got_typing_stopped(gc, who);
-		imdata->gc = gc;
-		imdata->who = who;
-		imdata->msg = body_str;
-		imdata->flags = flags;
-		imdata->when = time(NULL);
-		g_idle_add(msn_send_me_im, imdata);
-	}
-
-	msn_message_destroy(msg);
 
 	return 1;
 }
@@ -995,6 +1103,7 @@
 	userlist = session->userlist;
 	who = msn_normalize(gc->account, buddy->name);
 
+	purple_debug_info("MSN","Add user:%s to group:%s\n", who, group->name);
 	if (!session->logged_in)
 	{
 #if 0
@@ -1028,8 +1137,7 @@
 	/* XXX - Would group ever be NULL here?  I don't think so...
 	 * shx: Yes it should; MSN handles non-grouped buddies, and this is only
 	 * internal. */
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_FL,
-						   group ? group->name : NULL);
+	msn_userlist_add_buddy(userlist, who, group ? group->name : NULL);
 }
 
 static void
@@ -1045,7 +1153,7 @@
 		return;
 
 	/* XXX - Does buddy->name need to be msn_normalize'd here?  --KingAnt */
-	msn_userlist_rem_buddy(userlist, buddy->name, MSN_LIST_FL, group->name);
+	msn_userlist_rem_buddy(userlist, buddy->name);
 }
 
 static void
@@ -1062,10 +1170,18 @@
 	if (!session->logged_in)
 		return;
 
-	if (user != NULL && user->list_op & MSN_LIST_BL_OP)
-		msn_userlist_rem_buddy(userlist, who, MSN_LIST_BL, NULL);
+	if (user != NULL && user->list_op & MSN_LIST_BL_OP) {
+		msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_BL);
 
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_AL, NULL);
+		/* delete contact from Block list and add it to Allow in the callback */
+		msn_del_contact_from_list(session->contact, NULL, who, MSN_LIST_BL);
+	} else {
+		/* just add the contact to Allow list */
+		msn_add_contact_to_list(session->contact, NULL, who, MSN_LIST_AL);
+	}
+
+
+	msn_userlist_add_buddy_to_list(userlist, who, MSN_LIST_AL);
 }
 
 static void
@@ -1082,10 +1198,17 @@
 	if (!session->logged_in)
 		return;
 
-	if (user != NULL && user->list_op & MSN_LIST_AL_OP)
-		msn_userlist_rem_buddy(userlist, who, MSN_LIST_AL, NULL);
+	if (user != NULL && user->list_op & MSN_LIST_AL_OP) {
+		msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_AL);
 
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_BL, NULL);
+		/* delete contact from Allow list and add it to Block in the callback */
+		msn_del_contact_from_list(session->contact, NULL, who, MSN_LIST_AL);
+	} else {
+		/* just add the contact to Block list */
+		msn_add_contact_to_list(session->contact, NULL, who, MSN_LIST_BL);
+	}
+
+	msn_userlist_add_buddy_to_list(userlist, who, MSN_LIST_BL);
 }
 
 static void
@@ -1103,10 +1226,12 @@
 
 	user = msn_userlist_find_user(userlist, who);
 
-	msn_userlist_rem_buddy(userlist, who, MSN_LIST_AL, NULL);
+	msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_AL);
+
+	msn_del_contact_from_list(session->contact, NULL, who, MSN_LIST_AL);
 
 	if (user != NULL && user->list_op & MSN_LIST_RL_OP)
-		msn_userlist_add_buddy(userlist, who, MSN_LIST_BL, NULL);
+		msn_userlist_add_buddy_to_list(userlist, who, MSN_LIST_BL);
 }
 
 static void
@@ -1124,32 +1249,18 @@
 
 	user = msn_userlist_find_user(userlist, who);
 
-	msn_userlist_rem_buddy(userlist, who, MSN_LIST_BL, NULL);
+	msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_BL);
+
+	msn_del_contact_from_list(session->contact, NULL, who, MSN_LIST_BL);
 
 	if (user != NULL && user->list_op & MSN_LIST_RL_OP)
-		msn_userlist_add_buddy(userlist, who, MSN_LIST_AL, NULL);
+		msn_userlist_add_buddy_to_list(userlist, who, MSN_LIST_AL);
 }
 
 static void
 msn_set_permit_deny(PurpleConnection *gc)
 {
-	PurpleAccount *account;
-	MsnSession *session;
-	MsnCmdProc *cmdproc;
-
-	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-
-	if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
-		account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
-	{
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "AL");
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "BL");
-	}
+	msn_send_privacy(gc);
 }
 
 static void
@@ -1286,24 +1397,20 @@
 				 PurpleGroup *group, GList *moved_buddies)
 {
 	MsnSession *session;
-	MsnCmdProc *cmdproc;
-	int old_gid;
-	const char *enc_new_group_name;
 
 	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-	enc_new_group_name = purple_url_encode(group->name);
-
-	old_gid = msn_userlist_find_group_id(session->userlist, old_name);
-
-	if (old_gid >= 0)
+	
+	g_return_if_fail(session != NULL);
+	g_return_if_fail(session->userlist != NULL);
+	
+	if (msn_userlist_find_group_with_name(session->userlist, old_name) != NULL)
 	{
-		msn_cmdproc_send(cmdproc, "REG", "%d %s 0", old_gid,
-						 enc_new_group_name);
+		msn_contact_rename_group(session, old_name, group->name);
 	}
 	else
 	{
-		msn_cmdproc_send(cmdproc, "ADG", "%s 0", enc_new_group_name);
+		/* not found */
+		msn_add_group(session, NULL, group->name);
 	}
 }
 
@@ -1363,15 +1470,20 @@
 {
 	MsnSession *session;
 	MsnCmdProc *cmdproc;
-	int group_id;
 
 	session = gc->proto_data;
 	cmdproc = session->notification->cmdproc;
 
-	if ((group_id = msn_userlist_find_group_id(session->userlist, group->name)) >= 0)
+	purple_debug_info("MSN", "Remove group %s\n", group->name);
+	/*we can't delete the default group*/
+	if(!strcmp(group->name, MSN_INDIVIDUALS_GROUP_NAME)||
+		!strcmp(group->name, MSN_NON_IM_GROUP_NAME))
 	{
-		msn_cmdproc_send(cmdproc, "RMG", "%d", group_id);
+		purple_debug_info("MSN", "This group can't be removed, returning.\n");
+		return ;
 	}
+	
+	msn_del_group(session, group->name);
 }
 
 /**
@@ -1421,12 +1533,11 @@
 {
 	char *p, *q;
 
-	if ((p = strstr(url_text, " contactparams:photopreauthurl=\"")) != NULL)
+	if ((p = strstr(url_text, PHOTO_URL)) != NULL)
 	{
-		p += strlen(" contactparams:photopreauthurl=\"");
+		p += strlen(PHOTO_URL);
 	}
-
-	if (p && (strncmp(p, "http://", 8) == 0) && ((q = strchr(p, '"')) != NULL))
+	if (p && (strncmp(p, "http://",strlen("http://")) == 0) && ((q = strchr(p, '"')) != NULL))
 			return g_strndup(p, q - p);
 
 	return NULL;
@@ -1464,8 +1575,7 @@
 msn_info_strip_search_link(const char *field, size_t len)
 {
 	const char *c;
-	if ((c = strstr(field, " (http://spaces.live.com/default.aspx?page=searchresults")) == NULL &&
-		(c = strstr(field, " (http://spaces.msn.com/default.aspx?page=searchresults")) == NULL)
+	if ((c = strstr(field, " (http://")) == NULL)
 		return g_strndup(field, len);
 	return g_strndup(field, c - field);
 }
@@ -1491,7 +1601,7 @@
 	MsnGetInfoStepTwoData *info2_data = NULL;
 #endif
 
-	purple_debug_info("msn", "In msn_got_info\n");
+	purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text);
 
 	/* Make sure the connection is still valid */
 	if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL)
@@ -1875,6 +1985,7 @@
 #if PHOTO_SUPPORT
 	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
 	photo_url_text = msn_get_photo_url(url_text);
+	purple_debug_info("MSNP14","photo url:{%s}\n",photo_url_text);
 
 	/* Marshall the existing state */
 	info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData));
@@ -2099,7 +2210,7 @@
 	msn_add_deny,			/* add_deny */
 	msn_rem_permit,			/* rem_permit */
 	msn_rem_deny,			/* rem_deny */
-	msn_set_permit_deny,		/* set_permit_deny */
+	msn_set_permit_deny,	/* set_permit_deny */
 	NULL,					/* join_chat */
 	NULL,					/* reject chat invite */
 	NULL,					/* get_chat_name */
@@ -2155,10 +2266,11 @@
 	"MSN",                                            /**< name           */
 	VERSION,                                          /**< version        */
 	                                                  /**  summary        */
-	N_("MSN Protocol Plugin"),
+	N_("Windows Live Messenger Protocol Plugin"),
 	                                                  /**  description    */
-	N_("MSN Protocol Plugin"),
-	"Christian Hammond <chipx86@gnupdate.org>",       /**< author         */
+	N_("Windows Live Messenger Protocol Plugin"),
+	"Christian Hammond <chipx86@gnupdate.org>, "
+	"MaYuan <mayuan2006@gmail.com>",				  /**< author         */
 	PURPLE_WEBSITE,                                     /**< homepage       */
 
 	msn_load,                                         /**< load           */
@@ -2183,11 +2295,11 @@
 	PurpleAccountOption *option;
 
 	option = purple_account_option_string_new(_("Server"), "server",
-											MSN_SERVER);
+											WLM_SERVER);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
-	option = purple_account_option_int_new(_("Port"), "port", 1863);
+	option = purple_account_option_int_new(_("Port"), "port", WLM_PORT);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msn.h
--- a/libpurple/protocols/msn/msn.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/msn.h	Fri Sep 28 20:30:26 2007 +0000
@@ -63,12 +63,23 @@
 #define USEROPT_MSNPORT 4
 #define MSN_PORT 1863
 
+/* Windows Live Messenger Server*/
+#define WLM_SERVER			"muser.messenger.hotmail.com"
+#define WLM_PORT			1863
+#define WLM_PROT_VER		13
+/*This MSNP14 Support chat with Yahoo Messenger*/
+#define WLM_YAHOO_PROT_VER	14
+
+#define WLM_MAX_PROTOCOL	14
+#define WLM_MIN_PROTOCOL	13
+
 #define MSN_TYPING_RECV_TIMEOUT 6
 #define MSN_TYPING_SEND_TIMEOUT	4
 
-#define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders"
+#define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders"w3
 #define PASSPORT_URL "http://lc1.law13.hotmail.passport.com/cgi-bin/dologin?login="
 #define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
+#define PHOTO_URL	" contactparams:photopreauthurl=\""
 
 #define USEROPT_HOTMAIL 0
 
@@ -88,9 +99,11 @@
 	MSN_LIST_FL_OP = 0x01,
 	MSN_LIST_AL_OP = 0x02,
 	MSN_LIST_BL_OP = 0x04,
-	MSN_LIST_RL_OP = 0x08
+	MSN_LIST_RL_OP = 0x08,
+	MSN_LIST_PL_OP = 0x10
 
 } MsnListOp;
+#define MSN_LIST_OP_MASK	0x07
 
 typedef enum
 {
@@ -131,4 +144,7 @@
 	 (MSN_CLIENT_ID_RESERVED_2 <<  8) | \
 	 (MSN_CLIENT_ID_CAPABILITIES))
 
+void msn_act_id(PurpleConnection *gc, const char *entry);
+void msn_send_privacy(PurpleConnection *gc);
+
 #endif /* _MSN_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msnutils.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/msnutils.c	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,591 @@
+/**
+ * @file msnutils.c Utility functions
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#include "msn.h"
+#include "msnutils.h"
+#include "time.h"
+//#include <openssl/md5.h>
+
+char *rand_guid(void);
+
+/**************************************************************************
+ * Util
+ **************************************************************************/
+char *
+rand_guid()
+{
+	return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111,
+			rand() % 0xAAFF + 0x1111);
+}
+
+void
+msn_parse_format(const char *mime, char **pre_ret, char **post_ret)
+{
+	char *cur;
+	GString *pre  = g_string_new(NULL);
+	GString *post = g_string_new(NULL);
+	unsigned int colors[3];
+
+	if (pre_ret  != NULL) *pre_ret  = NULL;
+	if (post_ret != NULL) *post_ret = NULL;
+
+	cur = strstr(mime, "FN=");
+
+	if (cur && (*(cur = cur + 3) != ';'))
+	{
+		pre = g_string_append(pre, "<FONT FACE=\"");
+
+		while (*cur && *cur != ';')
+		{
+			pre = g_string_append_c(pre, *cur);
+			cur++;
+		}
+
+		pre = g_string_append(pre, "\">");
+		post = g_string_prepend(post, "</FONT>");
+	}
+
+	cur = strstr(mime, "EF=");
+
+	if (cur && (*(cur = cur + 3) != ';'))
+	{
+		while (*cur && *cur != ';')
+		{
+			pre = g_string_append_c(pre, '<');
+			pre = g_string_append_c(pre, *cur);
+			pre = g_string_append_c(pre, '>');
+			post = g_string_prepend_c(post, '>');
+			post = g_string_prepend_c(post, *cur);
+			post = g_string_prepend_c(post, '/');
+			post = g_string_prepend_c(post, '<');
+			cur++;
+		}
+	}
+
+	cur = strstr(mime, "CO=");
+
+	if (cur && (*(cur = cur + 3) != ';'))
+	{
+		int i;
+
+		i = sscanf(cur, "%02x%02x%02x;", &colors[0], &colors[1], &colors[2]);
+
+		if (i > 0)
+		{
+			char tag[64];
+
+			if (i == 1)
+			{
+				colors[1] = 0;
+				colors[2] = 0;
+			}
+			else if (i == 2)
+			{
+				unsigned int temp = colors[0];
+
+				colors[0] = colors[1];
+				colors[1] = temp;
+				colors[2] = 0;
+			}
+			else if (i == 3)
+			{
+				unsigned int temp = colors[2];
+
+				colors[2] = colors[0];
+				colors[0] = temp;
+			}
+
+			g_snprintf(tag, sizeof(tag),
+					   "<FONT COLOR=\"#%02hhx%02hhx%02hhx\">",
+					   colors[0], colors[1], colors[2]);
+
+			pre = g_string_append(pre, tag);
+			post = g_string_prepend(post, "</FONT>");
+		}
+	}
+
+	cur = strstr(mime, "RL=");
+
+	if (cur && (*(cur = cur + 3) != ';'))
+	{
+		if (*cur == '1')
+		{
+			/* RTL text was received */
+			pre = g_string_append(pre, "<SPAN style=\"direction:rtl;text-align:right;\">");
+			post = g_string_prepend(post, "</SPAN>");
+		}
+	}
+
+	cur = g_strdup(purple_url_decode(pre->str));
+	g_string_free(pre, TRUE);
+
+	if (pre_ret != NULL)
+		*pre_ret = cur;
+	else
+		g_free(cur);
+
+	cur = g_strdup(purple_url_decode(post->str));
+	g_string_free(post, TRUE);
+
+	if (post_ret != NULL)
+		*post_ret = cur;
+	else
+		g_free(cur);
+}
+
+/*encode the str to RFC2047 style
+ * Currently only support the UTF-8 and base64 encode
+ */
+char *
+msn_encode_mime(const char *str)
+{
+	char *base64;
+	
+	base64 = purple_base64_encode((guchar *)str, strlen(str));
+	return g_strdup_printf("=?utf-8?B?%s?=", base64);
+}
+
+/*
+ * We need this because we're only supposed to encode spaces in the font
+ * names. purple_url_encode() isn't acceptable.
+ */
+static const char *
+encode_spaces(const char *str)
+{
+	static char buf[BUF_LEN];
+	const char *c;
+	char *d;
+
+	g_return_val_if_fail(str != NULL, NULL);
+
+	for (c = str, d = buf; *c != '\0'; c++)
+	{
+		if (*c == ' ')
+		{
+			*d++ = '%';
+			*d++ = '2';
+			*d++ = '0';
+		}
+		else
+			*d++ = *c;
+	}
+
+	return buf;
+}
+
+/*
+ * Taken from the zephyr plugin.
+ * This parses HTML formatting (put out by one of the gtkimhtml widgets
+ * and converts it to msn formatting. It doesn't deal with the tag closing,
+ * but gtkimhtml widgets give valid html.
+ * It currently deals properly with <b>, <u>, <i>, <font face=...>,
+ * <font color=...>, <span dir=...>, <span style="direction: ...">.
+ * It ignores <font back=...> and <font size=...>
+ */
+void
+msn_import_html(const char *html, char **attributes, char **message)
+{
+	int len, retcount = 0;
+	const char *c;
+	char *msg;
+	char *fontface = NULL;
+	char fonteffect[4];
+	char fontcolor[7];
+	char direction = '0';
+
+	gboolean has_bold = FALSE;
+	gboolean has_italic = FALSE;
+	gboolean has_underline = FALSE;
+	gboolean has_strikethrough = FALSE;
+
+	g_return_if_fail(html       != NULL);
+	g_return_if_fail(attributes != NULL);
+	g_return_if_fail(message    != NULL);
+
+	len = strlen(html);
+	msg = g_malloc0(len + 1);
+
+	memset(fontcolor, 0, sizeof(fontcolor));
+	strcat(fontcolor, "0");
+	memset(fonteffect, 0, sizeof(fonteffect));
+
+	for (c = html; *c != '\0';)
+	{
+		if (*c == '<')
+		{
+			if (!g_ascii_strncasecmp(c + 1, "br>", 3))
+			{
+				msg[retcount++] = '\r';
+				msg[retcount++] = '\n';
+				c += 4;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "i>", 2))
+			{
+				if (!has_italic)
+				{
+					strcat(fonteffect, "I");
+					has_italic = TRUE;
+				}
+				c += 3;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "b>", 2))
+			{
+				if (!has_bold)
+				{
+					strcat(fonteffect, "B");
+					has_bold = TRUE;
+				}
+				c += 3;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "u>", 2))
+			{
+				if (!has_underline)
+				{
+					strcat(fonteffect, "U");
+					has_underline = TRUE;
+				}
+				c += 3;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "s>", 2))
+			{
+				if (!has_strikethrough)
+				{
+					strcat(fonteffect, "S");
+					has_strikethrough = TRUE;
+				}
+				c += 3;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "a href=\"", 8))
+			{
+				c += 9;
+
+				if (!g_ascii_strncasecmp(c, "mailto:", 7))
+					c += 7;
+
+				while ((*c != '\0') && g_ascii_strncasecmp(c, "\">", 2))
+					msg[retcount++] = *c++;
+
+				if (*c != '\0')
+					c += 2;
+
+				/* ignore descriptive string */
+				while ((*c != '\0') && g_ascii_strncasecmp(c, "</a>", 4))
+					c++;
+
+				if (*c != '\0')
+					c += 4;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "span", 4))
+			{
+				/* Bi-directional text support using CSS properties in span tags */
+				c += 5;
+
+				while (*c != '\0' && *c != '>')
+				{
+					while (*c == ' ')
+						c++;
+					if (!g_ascii_strncasecmp(c, "dir=\"rtl\"", 9))
+					{
+						c += 9;
+						direction = '1';
+					}
+					else if (!g_ascii_strncasecmp(c, "style=\"", 7))
+					{
+						/* Parse inline CSS attributes */
+						char *attributes;
+						int attr_len = 0;
+						c += 7;
+						while (*(c + attr_len) != '\0' && *(c + attr_len) != '"')
+							attr_len++;
+						if (*(c + attr_len) == '"')
+						{
+							char *attr_dir;
+							attributes = g_strndup(c, attr_len);
+							attr_dir = purple_markup_get_css_property(attributes, "direction");
+							if (attr_dir && (!g_ascii_strncasecmp(attr_dir, "RTL", 3)))
+								direction = '1';
+							g_free(attr_dir);
+							g_free(attributes);
+						}
+
+					}
+					else
+					{
+						c++;
+					}
+				}
+				if (*c == '>')
+					c++;
+			}
+			else if (!g_ascii_strncasecmp(c + 1, "font", 4))
+			{
+				c += 5;
+
+				while ((*c != '\0') && !g_ascii_strncasecmp(c, " ", 1))
+					c++;
+
+				if (!g_ascii_strncasecmp(c, "color=\"#", 7))
+				{
+					c += 8;
+
+					fontcolor[0] = *(c + 4);
+					fontcolor[1] = *(c + 5);
+					fontcolor[2] = *(c + 2);
+					fontcolor[3] = *(c + 3);
+					fontcolor[4] = *c;
+					fontcolor[5] = *(c + 1);
+
+					c += 8;
+				}
+				else if (!g_ascii_strncasecmp(c, "face=\"", 6))
+				{
+					const char *end = NULL;
+					const char *comma = NULL;
+					unsigned int namelen = 0;
+
+					c += 6;
+					end = strchr(c, '\"');
+					comma = strchr(c, ',');
+
+					if (comma == NULL || comma > end)
+						namelen = (unsigned int)(end - c);
+					else
+						namelen = (unsigned int)(comma - c);
+
+					fontface = g_strndup(c, namelen);
+					c = end + 2;
+				}
+				else
+				{
+					/* Drop all unrecognized/misparsed font tags */
+					while ((*c != '\0') && g_ascii_strncasecmp(c, "\">", 2))
+						c++;
+
+					if (*c != '\0')
+						c += 2;
+				}
+			}
+			else
+			{
+				while ((*c != '\0') && (*c != '>'))
+					c++;
+				if (*c != '\0')
+					c++;
+			}
+		}
+		else if (*c == '&')
+		{
+			if (!g_ascii_strncasecmp(c, "&lt;", 4))
+			{
+				msg[retcount++] = '<';
+				c += 4;
+			}
+			else if (!g_ascii_strncasecmp(c, "&gt;", 4))
+			{
+				msg[retcount++] = '>';
+				c += 4;
+			}
+			else if (!g_ascii_strncasecmp(c, "&nbsp;", 6))
+			{
+				msg[retcount++] = ' ';
+				c += 6;
+			}
+			else if (!g_ascii_strncasecmp(c, "&quot;", 6))
+			{
+				msg[retcount++] = '"';
+				c += 6;
+			}
+			else if (!g_ascii_strncasecmp(c, "&amp;", 5))
+			{
+				msg[retcount++] = '&';
+				c += 5;
+			}
+			else if (!g_ascii_strncasecmp(c, "&apos;", 6))
+			{
+				msg[retcount++] = '\'';
+				c += 6;
+			}
+			else
+				msg[retcount++] = *c++;
+		}
+		else
+			msg[retcount++] = *c++;
+	}
+
+	if (fontface == NULL)
+		fontface = g_strdup("MS Sans Serif");
+
+	*attributes = g_strdup_printf("FN=%s; EF=%s; CO=%s; PF=0; RL=%c",
+								  encode_spaces(fontface),
+								  fonteffect, fontcolor, direction);
+	*message = g_strdup(msg);
+
+	g_free(fontface);
+	g_free(msg);
+}
+
+void
+msn_parse_socket(const char *str, char **ret_host, int *ret_port)
+{
+	char *host;
+	char *c;
+	int port;
+
+	host = g_strdup(str);
+
+	if ((c = strchr(host, ':')) != NULL){
+		*c = '\0';
+		port = atoi(c + 1);
+	}else{
+		port = 1863;
+	}
+
+	*ret_host = host;
+	*ret_port = port;
+}
+/***************************************************************************
+ * MSN Time Related Funciton
+ ***************************************************************************/
+#if 0
+int
+msn_convert_iso8601(const char *timestr,struct tm tm_time)
+{
+	char temp[64];
+	struct tm ctime;
+	time_t ts;
+
+	purple_debug_info("MSNP14","convert string is{%s}\n",timestr);
+	tzset();
+	/*copy string first*/
+	memset(temp, 0, sizeof(temp));
+	strncpy(temp, timestr, strlen(timestr));
+
+	/*convert via strptime()*/
+	memset(&ctime, 0, sizeof(struct tm));
+	strptime(temp, "%d %b %Y %T %Z", &ctime);
+	ts = mktime(&ctime) - timezone;
+	localtime_r(&ts, tm_time);
+}
+#endif
+
+/***************************************************************************
+ * MSN Challenge Computing Function
+ ***************************************************************************/
+
+/*
+ * Handle MSN Chanllege computation
+ *This algorithm reference with http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges
+ */
+#define BUFSIZE	256
+void 
+msn_handle_chl(char *input, char *output)
+{
+		PurpleCipher *cipher;
+		PurpleCipherContext *context;
+		char *productKey = MSNP13_WLM_PRODUCT_KEY,
+			 *productID  = MSNP13_WLM_PRODUCT_ID,
+			 *hexChars   = "0123456789abcdef",
+			 buf[BUFSIZE];
+		unsigned char md5Hash[16], *newHash;
+		unsigned int *md5Parts, *chlStringParts, newHashParts[5];
+
+		long long nHigh=0, nLow=0;
+
+		int i;
+
+		/* Create the MD5 hash by using Purple MD5 algorithm*/
+		cipher = purple_ciphers_find_cipher("md5");
+		context = purple_cipher_context_new(cipher, NULL);
+
+		purple_cipher_context_append(context, (const guchar *)input,
+						strlen(input));
+		purple_cipher_context_append(context, (const guchar *)productKey,
+						strlen(productKey));
+		purple_cipher_context_digest(context, sizeof(md5Hash), md5Hash, NULL);
+		purple_cipher_context_destroy(context);
+
+		/* Split it into four integers */
+		md5Parts = (unsigned int *)md5Hash;
+		for(i=0; i<4; i++){  
+				/* adjust endianess */
+				md5Parts[i] = GUINT_TO_LE(md5Parts[i]);
+
+				/* & each integer with 0x7FFFFFFF          */
+				/* and save one unmodified array for later */
+				newHashParts[i] = md5Parts[i];
+				md5Parts[i] &= 0x7FFFFFFF;
+		}
+
+		/* make a new string and pad with '0' */
+		snprintf(buf, BUFSIZE-5, "%s%s", input, productID);
+		i = strlen(buf);
+		memset(&buf[i], '0', 8 - (i % 8));
+		buf[i + (8 - (i % 8))]='\0';
+
+		/* split into integers */
+		chlStringParts = (unsigned int *)buf;
+
+		/* this is magic */
+		for (i=0; i<(strlen(buf)/4)-1; i+=2){
+				long long temp;
+
+				chlStringParts[i]   = GUINT_TO_LE(chlStringParts[i]);
+				chlStringParts[i+1] = GUINT_TO_LE(chlStringParts[i+1]);
+
+				temp=(md5Parts[0] * (((0x0E79A9C1 * (long long)chlStringParts[i]) % 0x7FFFFFFF)+nHigh) + md5Parts[1])%0x7FFFFFFF;
+				nHigh=(md5Parts[2] * (((long long)chlStringParts[i+1]+temp) % 0x7FFFFFFF) + md5Parts[3]) % 0x7FFFFFFF;
+				nLow=nLow + nHigh + temp;
+		}
+		nHigh=(nHigh+md5Parts[1]) % 0x7FFFFFFF;
+		nLow=(nLow+md5Parts[3]) % 0x7FFFFFFF;
+
+		newHashParts[0]^=nHigh;
+		newHashParts[1]^=nLow;
+		newHashParts[2]^=nHigh;
+		newHashParts[3]^=nLow;
+
+		/* adjust endianness */
+		for(i=0; i<4; i++)
+				newHashParts[i] = GUINT_TO_LE(newHashParts[i]); 
+
+		/* make a string of the parts */
+		newHash = (unsigned char *)newHashParts;
+
+		/* convert to hexadecimal */
+		for (i=0; i<16; i++)
+		{
+				output[i*2]=hexChars[(newHash[i]>>4)&0xF];
+				output[(i*2)+1]=hexChars[newHash[i]&0xF];
+		}
+
+		output[32]='\0';
+
+//		purple_debug_info("MSNP14","chl output{%s}\n",output);
+}
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/msnutils.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/msnutils.h	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,60 @@
+/**
+ * @file msnutils.h Utility functions
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#ifndef _MSN_UTILS_H_
+#define _MSN_UTILS_H_
+
+/*encode the str to RFC2047 style*/
+char * msn_encode_mime(const char *str);
+
+/**
+ * Generate the Random GUID
+ */
+char * rand_guid(void);
+
+/**
+ * Parses the MSN message formatting into a format compatible with Purple.
+ *
+ * @param mime     The mime header with the formatting.
+ * @param pre_ret  The returned prefix string.
+ * @param post_ret The returned postfix string.
+ *
+ * @return The new message.
+ */
+void msn_parse_format(const char *mime, char **pre_ret, char **post_ret);
+
+/**
+ * Parses the Purple message formatting (html) into the MSN format.
+ *
+ * @param html			The html message to format.
+ * @param attributes	The returned attributes string.
+ * @param message		The returned message string.
+ *
+ * @return The new message.
+ */
+void msn_import_html(const char *html, char **attributes, char **message);
+
+void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
+void msn_handle_chl(char *input, char *output);
+
+#endif /* _MSN_UTILS_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/nexus.c
--- a/libpurple/protocols/msn/nexus.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/nexus.c	Fri Sep 28 20:30:26 2007 +0000
@@ -22,9 +22,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
+#include "soap.h"
 #include "nexus.h"
 #include "notification.h"
 
+#undef NEXUS_LOGIN_TWN
+
+/*Local Function Prototype*/
+static gboolean nexus_login_connect_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc);
+
 /**************************************************************************
  * Main
  **************************************************************************/
@@ -36,6 +42,9 @@
 
 	nexus = g_new0(MsnNexus, 1);
 	nexus->session = session;
+	/*we must use SSL connection to do Windows Live ID authentication*/
+	nexus->soapconn = msn_soap_new(session,nexus,1);
+
 	nexus->challenge_data = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, g_free);
 
@@ -45,24 +54,14 @@
 void
 msn_nexus_destroy(MsnNexus *nexus)
 {
-	if (nexus->gsc)
-		purple_ssl_close(nexus->gsc);
-
-	g_free(nexus->login_host);
-
-	g_free(nexus->login_path);
-
 	if (nexus->challenge_data != NULL)
 		g_hash_table_destroy(nexus->challenge_data);
 
-	if (nexus->input_handler > 0)
-		purple_input_remove(nexus->input_handler);
-	g_free(nexus->write_buf);
-	g_free(nexus->read_buf);
-
+	msn_soap_destroy(nexus->soapconn);
 	g_free(nexus);
 }
 
+#if 0 /* khc */
 /**************************************************************************
  * Util
  **************************************************************************/
@@ -121,285 +120,237 @@
 	nexus->written_cb(nexus, source, 0);
 }
 
+#endif
 /**************************************************************************
  * Login
  **************************************************************************/
-
 static void
-login_connect_cb(gpointer data, PurpleSslConnection *gsc,
-				 PurpleInputCondition cond);
-
-static void
-login_error_cb(PurpleSslConnection *gsc, PurpleSslErrorType error, void *data)
+nexus_login_error_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc, PurpleSslErrorType error)
 {
-	MsnNexus *nexus;
 	MsnSession *session;
 
-	nexus = data;
-	g_return_if_fail(nexus != NULL);
-
-	nexus->gsc = NULL;
-
-	session = nexus->session;
+	session = soapconn->session;
 	g_return_if_fail(session != NULL);
 
-	msn_session_set_error(session, MSN_ERROR_AUTH, _("Unable to connect"));
+	soapconn->gsc = NULL;
+
+	msn_session_set_error(session, MSN_ERROR_AUTH, _("Windows Live ID authentication:Unable to connect"));
 	/* the above line will result in nexus being destroyed, so we don't want
 	 * to destroy it here, or we'd crash */
 }
 
-static void
-nexus_login_written_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnNexus *nexus = data;
-	MsnSession *session;
-	int len;
-
-	session = nexus->session;
-	g_return_if_fail(session != NULL);
-
-	if (nexus->input_handler == 0)
-		/* TODO: Use purple_ssl_input_add()? */
-		nexus->input_handler = purple_input_add(nexus->gsc->fd,
-			PURPLE_INPUT_READ, nexus_login_written_cb, nexus);
-
-
-	len = msn_ssl_read(nexus);
-
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len < 0) {
-		purple_input_remove(nexus->input_handler);
-		nexus->input_handler = 0;
-		g_free(nexus->read_buf);
-		nexus->read_buf = NULL;
-		nexus->read_len = 0;
-		/* TODO: error handling */
-		return;
-	}
-
-	if (g_strstr_len(nexus->read_buf, nexus->read_len,
-			"\r\n\r\n") == NULL)
-		return;
-
-	purple_input_remove(nexus->input_handler);
-	nexus->input_handler = 0;
-
-	purple_ssl_close(nexus->gsc);
-	nexus->gsc = NULL;
-
-	purple_debug_misc("msn", "ssl buffer: {%s}\n", nexus->read_buf);
-
-	if (strstr(nexus->read_buf, "HTTP/1.1 302") != NULL)
-	{
-		/* Redirect. */
-		char *location, *c;
-
-		location = strstr(nexus->read_buf, "Location: ");
-		if (location == NULL)
-		{
-			g_free(nexus->read_buf);
-			nexus->read_buf = NULL;
-			nexus->read_len = 0;
-
-			return;
-		}
-		location = strchr(location, ' ') + 1;
-
-		if ((c = strchr(location, '\r')) != NULL)
-			*c = '\0';
-
-		/* Skip the http:// */
-		if ((c = strchr(location, '/')) != NULL)
-			location = c + 2;
-
-		if ((c = strchr(location, '/')) != NULL)
-		{
-			g_free(nexus->login_path);
-			nexus->login_path = g_strdup(c);
-
-			*c = '\0';
-		}
-
-		g_free(nexus->login_host);
-		nexus->login_host = g_strdup(location);
-
-		nexus->gsc = purple_ssl_connect(session->account,
-				nexus->login_host, PURPLE_SSL_DEFAULT_PORT,
-				login_connect_cb, login_error_cb, nexus);
-	}
-	else if (strstr(nexus->read_buf, "HTTP/1.1 401 Unauthorized") != NULL)
-	{
-		const char *error;
-
-		if ((error = strstr(nexus->read_buf, "WWW-Authenticate")) != NULL)
-		{
-			if ((error = strstr(error, "cbtxt=")) != NULL)
-			{
-				const char *c;
-				char *temp;
-
-				error += strlen("cbtxt=");
-
-				if ((c = strchr(error, '\n')) == NULL)
-					c = error + strlen(error);
-
-				temp = g_strndup(error, c - error);
-				error = purple_url_decode(temp);
-				g_free(temp);
-				if ((temp = strstr(error, " Do one of the following or try again:")) != NULL)
-					*temp = '\0';
-			}
-		}
-
-		msn_session_set_error(session, MSN_ERROR_AUTH, error);
-	}
-	else if (strstr(nexus->read_buf, "HTTP/1.1 503 Service Unavailable"))
-	{
-		msn_session_set_error(session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
-	}
-	else if (strstr(nexus->read_buf, "HTTP/1.1 200 OK"))
-	{
-		char *base, *c;
-		char *login_params;
-
-#if 0
-		/* All your base are belong to us. */
-		base = buffer;
-
-		/* For great cookie! */
-		while ((base = strstr(base, "Set-Cookie: ")) != NULL)
-		{
-			base += strlen("Set-Cookie: ");
-
-			c = strchr(base, ';');
-
-			session->login_cookies =
-				g_list_append(session->login_cookies,
-							  g_strndup(base, c - base));
-		}
-#endif
-
-		base  = strstr(nexus->read_buf, "Authentication-Info: ");
-
-		g_return_if_fail(base != NULL);
-
-		base  = strstr(base, "from-PP='");
-		base += strlen("from-PP='");
-		c     = strchr(base, '\'');
-
-		login_params = g_strndup(base, c - base);
-
-		msn_got_login_params(session, login_params);
-
-		g_free(login_params);
-
-		msn_nexus_destroy(nexus);
-		session->nexus = NULL;
-		return;
-	}
-
-	g_free(nexus->read_buf);
-	nexus->read_buf = NULL;
-	nexus->read_len = 0;
-
-}
-
-/* this guards against missing hash entries */
-static char *
-nexus_challenge_data_lookup(GHashTable *challenge_data, const char *key)
-{
-	char *entry;
-
-	return (entry = (char *)g_hash_table_lookup(challenge_data, key)) ?
-		entry : "(null)";
-}
-
-void
-login_connect_cb(gpointer data, PurpleSslConnection *gsc,
-				 PurpleInputCondition cond)
+/*process the SOAP reply, get the Authentication Info*/
+static gboolean
+nexus_login_read_cb(MsnSoapConn *soapconn)
 {
 	MsnNexus *nexus;
 	MsnSession *session;
+
+	char *base, *c;
+	char *msn_twn_t,*msn_twn_p;
+	char *login_params;
+	char **elems, **cur, **tokens;
+	char * cert_str;
+
+	nexus = soapconn->parent;
+	g_return_val_if_fail(nexus != NULL, TRUE);
+	session = nexus->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+
+	/*reply OK, we should process the SOAP body*/
+	purple_debug_info("MSN Nexus","TWN Server Windows Live ID Reply OK!\n");
+
+	//TODO: we should parse it using XML
+#ifdef NEXUS_LOGIN_TWN
+	base  = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_START_TOKEN);
+	base += strlen(TWN_START_TOKEN);
+	c     = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_END_TOKEN);
+#else
+	base  = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_LIVE_START_TOKEN);
+	base += strlen(TWN_LIVE_START_TOKEN);
+	c     = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_LIVE_END_TOKEN);
+#endif
+	login_params = g_strndup(base, c - base);
+
+	//		purple_debug_info("msn", "TWN Cert: {%s}\n", login_params);
+
+	/* Parse the challenge data. */
+	elems = g_strsplit(login_params, "&amp;", 0);
+
+	for (cur = elems; *cur != NULL; cur++){
+			tokens = g_strsplit(*cur, "=", 2);
+			g_hash_table_insert(nexus->challenge_data, tokens[0], tokens[1]);
+			/* Don't free each of the tokens, only the array. */
+			g_free(tokens);
+	}
+
+	g_strfreev(elems);
+
+	msn_twn_t = (char *)g_hash_table_lookup(nexus->challenge_data, "t");
+	msn_twn_p = (char *)g_hash_table_lookup(nexus->challenge_data, "p");
+
+	/*setup the t and p parameter for session*/
+	if (session->passport_info.t != NULL){
+			g_free(session->passport_info.t);
+	}
+	session->passport_info.t = g_strdup(msn_twn_t);
+
+	if (session->passport_info.p != NULL)
+			g_free(session->passport_info.p);
+	session->passport_info.p = g_strdup(msn_twn_p);
+
+	cert_str = g_strdup_printf("t=%s&p=%s",msn_twn_t,msn_twn_p);
+	msn_got_login_params(session, cert_str);
+
+	purple_debug_info("MSN Nexus","Close nexus connection!\n");
+	g_free(cert_str);
+	g_free(login_params);
+	msn_nexus_destroy(nexus);
+	session->nexus = NULL;
+
+	return FALSE;
+}
+
+static void
+nexus_login_written_cb(MsnSoapConn *soapconn)
+{
+	soapconn->read_cb = nexus_login_read_cb;
+//	msn_soap_read_cb(data,source,cond);
+}
+
+
+/*when connect, do the SOAP Style windows Live ID authentication */
+gboolean
+nexus_login_connect_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc)
+{
+	MsnNexus * nexus;
+	MsnSession *session;
+	char *ru,*lc,*id,*tw,*ct,*kpp,*kv,*ver,*rn,*tpf;
+	char *fs0,*fs;
 	char *username, *password;
 	char *request_str, *head, *tail;
-	char *buffer = NULL;
-	guint32 ctint;
+#ifdef NEXUS_LOGIN_TWN
+	char *challenge_str;
+#else
+	char *rst1_str,*rst2_str,*rst3_str;
+#endif
+	
+	purple_debug_info("MSN Nexus","Starting Windows Live ID authentication\n");
 
-	nexus = data;
-	g_return_if_fail(nexus != NULL);
+	g_return_val_if_fail(soapconn != NULL, FALSE);
+
+	nexus = soapconn->parent;
+	g_return_val_if_fail(nexus != NULL, TRUE);
 
-	session = nexus->session;
-	g_return_if_fail(session != NULL);
+	session = soapconn->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_PROCESSING);
 
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_GET_COOKIE);
 
-	username =
-		g_strdup(purple_url_encode(purple_account_get_username(session->account)));
+	/*prepare the Windows Live ID authentication token*/
+	username = g_strdup(purple_account_get_username(session->account));
+	password = g_strdup(purple_connection_get_password(session->account->gc));
 
-	password =
-		g_strdup(purple_url_encode(purple_connection_get_password(session->account->gc)));
+	lc =	(char *)g_hash_table_lookup(nexus->challenge_data, "lc");
+	id =	(char *)g_hash_table_lookup(nexus->challenge_data, "id");
+	tw =	(char *)g_hash_table_lookup(nexus->challenge_data, "tw");
+	fs0=	(char *)g_hash_table_lookup(nexus->challenge_data, "fs");
+	ru =	(char *)g_hash_table_lookup(nexus->challenge_data, "ru");
+	ct =	(char *)g_hash_table_lookup(nexus->challenge_data, "ct");
+	kpp=	(char *)g_hash_table_lookup(nexus->challenge_data, "kpp");
+	kv =	(char *)g_hash_table_lookup(nexus->challenge_data, "kv");
+	ver=	(char *)g_hash_table_lookup(nexus->challenge_data, "ver");
+	rn =	(char *)g_hash_table_lookup(nexus->challenge_data, "rn");
+	tpf=	(char *)g_hash_table_lookup(nexus->challenge_data, "tpf");
 
-	ctint = strtoul((char *)g_hash_table_lookup(nexus->challenge_data, "ct"), NULL, 10) + 200;
+	/*
+	 * add some fail-safe code to avoid windows Purple Crash bug #1540454
+	 * If any of these string is NULL, will return Authentication Fail!
+	 * for when windows g_strdup_printf() implementation get NULL point,It crashed!
+	 */
+	if(!(lc && id && tw && ru && ct && kpp && kv && ver && tpf)){
+		purple_debug_error("MSN Nexus","WLM Authenticate Key Error!\n");
+		msn_session_set_error(session, MSN_ERROR_AUTH, _("Windows Live ID authentication Failed"));
+		g_free(username);
+		g_free(password);
+		purple_ssl_close(gsc);
+		msn_nexus_destroy(nexus);
+		session->nexus = NULL;
+		return FALSE;
+	}
 
-	head = g_strdup_printf(
-		"GET %s HTTP/1.1\r\n"
-		"Authorization: Passport1.4 OrgVerb=GET,OrgURL=%s,sign-in=%s",
-		nexus->login_path,
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ru"),
-		username);
+	/*
+	 * in old MSN NS server's "USR TWN S" return,didn't include fs string
+	 * so we use a default "1" for fs.
+	 */
+	if(fs0){
+		fs = g_strdup(fs0);
+	}else{
+		fs = g_strdup("1");
+	}
 
-	tail = g_strdup_printf(
-		"lc=%s,id=%s,tw=%s,fs=%s,ru=%s,ct=%" G_GUINT32_FORMAT ",kpp=%s,kv=%s,ver=%s,tpf=%s\r\n"
-		"User-Agent: MSMSGS\r\n"
-		"Host: %s\r\n"
-		"Connection: Keep-Alive\r\n"
-		"Cache-Control: no-cache\r\n",
-		nexus_challenge_data_lookup(nexus->challenge_data, "lc"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "id"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "tw"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "fs"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "ru"),
-		ctint,
-		nexus_challenge_data_lookup(nexus->challenge_data, "kpp"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "kv"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "ver"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "tpf"),
-		nexus->login_host);
+#ifdef NEXUS_LOGIN_TWN
+	challenge_str = g_strdup_printf(
+		"lc=%s&amp;id=%s&amp;tw=%s&amp;fs=%s&amp;ru=%s&amp;ct=%s&amp;kpp=%s&amp;kv=%s&amp;ver=%s&amp;rn=%s&amp;tpf=%s\r\n",
+		lc,id,tw,fs,ru,ct,kpp,kv,ver,rn,tpf
+		);
 
-	buffer = g_strdup_printf("%s,pwd=XXXXXXXX,%s\r\n", head, tail);
-	request_str = g_strdup_printf("%s,pwd=%s,%s\r\n", head, password, tail);
+	/*build the SOAP windows Live ID XML body */
+	tail = g_strdup_printf(TWN_ENVELOP_TEMPLATE,username,password,challenge_str	);
+	g_free(challenge_str);
+#else
+	rst1_str = g_strdup_printf(
+		"id=%s&amp;tw=%s&amp;fs=%s&amp;kpp=%s&amp;kv=%s&amp;ver=%s&amp;rn=%s",
+		id,tw,fs,kpp,kv,ver,rn
+		);
+	rst2_str = g_strdup_printf(
+		"fs=%s&amp;id=%s&amp;kv=%s&amp;rn=%s&amp;tw=%s&amp;ver=%s",
+		fs,id,kv,rn,tw,ver
+		);
+	rst3_str = g_strdup_printf("id=%s",id);
+	tail = g_strdup_printf(TWN_LIVE_ENVELOP_TEMPLATE,username,password,rst1_str,rst2_str,rst3_str);
+	g_free(rst1_str);
+	g_free(rst2_str);
+	g_free(rst3_str);
+#endif
+	g_free(fs);
 
-	purple_debug_misc("msn", "Sending: {%s}\n", buffer);
+	soapconn->login_path = g_strdup(TWN_POST_URL);
+	head = g_strdup_printf(
+					"POST %s HTTP/1.1\r\n"
+					"Accept: text/*\r\n"
+					"User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)\r\n"
+					"Host: %s\r\n"
+					"Content-Length: %" G_GSIZE_FORMAT "\r\n"
+					"Connection: Keep-Alive\r\n"
+					"Cache-Control: no-cache\r\n\r\n",
+					soapconn->login_path, soapconn->login_host, strlen(tail));
 
-	g_free(buffer);
+	request_str = g_strdup_printf("%s%s", head,tail);
+
+#ifdef MSN_SOAP_DEBUG	
+	purple_debug_misc("MSN Nexus", "TWN Sending:\n%s\n", request_str);
+#endif
 	g_free(head);
 	g_free(tail);
 	g_free(username);
 	g_free(password);
 
-	nexus->write_buf = request_str;
-	nexus->written_len = 0;
-
-	nexus->read_len = 0;
-
-	nexus->written_cb = nexus_login_written_cb;
+	/*prepare to send the SOAP request*/
+	msn_soap_write(soapconn, request_str, nexus_login_written_cb);
 
-	nexus->input_handler = purple_input_add(gsc->fd, PURPLE_INPUT_WRITE,
-		nexus_write_cb, nexus);
-
-	nexus_write_cb(nexus, gsc->fd, PURPLE_INPUT_WRITE);
-
-	return;
-
-
+	return TRUE;
 }
 
+#if 0 /* khc */
 static void
 nexus_connect_written_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnNexus *nexus = data;
 	int len;
+
 	char *da_login;
 	char *base, *c;
 
@@ -408,6 +359,7 @@
 		nexus->input_handler = purple_input_add(nexus->gsc->fd,
 			PURPLE_INPUT_READ, nexus_connect_written_cb, nexus);
 
+
 	/* Get the PassportURLs line. */
 	len = msn_ssl_read(nexus);
 
@@ -470,10 +422,13 @@
 }
 
 
+#endif
+
 /**************************************************************************
  * Connect
  **************************************************************************/
 
+#if 0 /* khc */
 static void
 nexus_connect_cb(gpointer data, PurpleSslConnection *gsc,
 				 PurpleInputCondition cond)
@@ -502,10 +457,12 @@
 	nexus_write_cb(nexus, gsc->fd, PURPLE_INPUT_WRITE);
 }
 
+#endif
+
 void
 msn_nexus_connect(MsnNexus *nexus)
 {
-	nexus->gsc = purple_ssl_connect(nexus->session->account,
-			"nexus.passport.com", PURPLE_SSL_DEFAULT_PORT,
-			nexus_connect_cb, login_error_cb, nexus);
+	/*  Authenticate via Windows Live ID. */
+	msn_soap_init(nexus->soapconn, MSN_TWN_SERVER, 1, nexus_login_connect_cb, nexus_login_error_cb);
+	msn_soap_connect(nexus->soapconn);
 }
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/nexus.h
--- a/libpurple/protocols/msn/nexus.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/nexus.h	Fri Sep 28 20:30:26 2007 +0000
@@ -24,25 +24,124 @@
 #ifndef _MSN_NEXUS_H_
 #define _MSN_NEXUS_H_
 
+#include "soap.h"
+
+/*#define MSN_TWN_SERVER	"loginnet.passport.com"*/
+#define MSN_TWN_SERVER	"login.live.com"
+
+#define TWN_START_TOKEN		"<wsse:BinarySecurityToken Id=\"PPToken1\">"
+#define TWN_END_TOKEN		"</wsse:BinarySecurityToken>"
+
+#define TWN_POST_URL			"/RST.srf"
+#define TWN_ENVELOP_TEMPLATE 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"\
+						"<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsse=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2002/12/policy\" xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\" xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\" xmlns:wssc=\"http://schemas.xmlsoap.org/ws/2004/04/sc\" xmlns:wst=\"http://schemas.xmlsoap.org/ws/2004/04/trust\">"\
+						"<Header>"\
+						"<ps:AuthInfo xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"PPAuthInfo\">"\
+						"<ps:HostingApp>{3:B}</ps:HostingApp>"\
+						"<ps:BinaryVersion>4</ps:BinaryVersion>"\
+						"<ps:UIVersion>1</ps:UIVersion>"\
+						"<ps:Cookies></ps:Cookies>"\
+						"<ps:RequestParams>AQAAAAIAAABsYwQAAAAzMDg0</ps:RequestParams>"\
+						"</ps:AuthInfo>"\
+						"<wsse:Security>"\
+						"<wsse:UsernameToken Id=\"user\">"\
+						"<wsse:Username>%s</wsse:Username>"\
+						"<wsse:Password>%s</wsse:Password>"\
+						"</wsse:UsernameToken>"\
+						"</wsse:Security>"\
+						"</Header>"\
+						"<Body>"\
+						"<ps:RequestMultipleSecurityTokens xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"RSTS\">"\
+						"<wst:RequestSecurityToken Id=\"RST0\">"\
+						"<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+						"<wsp:AppliesTo>"\
+						"<wsa:EndpointReference>"\
+						"<wsa:Address>http://Passport.NET/tb</wsa:Address>"\
+						"</wsa:EndpointReference>"\
+						"</wsp:AppliesTo>"\
+						"</wst:RequestSecurityToken>"\
+						"<wst:RequestSecurityToken Id=\"RST1\">"\
+						"<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+						"<wsp:AppliesTo>"\
+						"<wsa:EndpointReference>"\
+						"<wsa:Address>messenger.msn.com</wsa:Address>"\
+						"</wsa:EndpointReference>"\
+						"</wsp:AppliesTo>"\
+						"<wsse:PolicyReference URI=\"?%s\">"\
+						"</wsse:PolicyReference>"\
+						"</wst:RequestSecurityToken>"\
+						"</ps:RequestMultipleSecurityTokens>"\
+						"</Body>"\
+						"</Envelope>"
+
+#define TWN_LIVE_START_TOKEN	"<wsse:BinarySecurityToken Id=\"PPToken1\">"
+#define TWN_LIVE_END_TOKEN	"</wsse:BinarySecurityToken>"
+#define TWN_LIVE_ENVELOP_TEMPLATE	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"\
+"<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsse=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2002/12/policy\" xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\" xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\" xmlns:wssc=\"http://schemas.xmlsoap.org/ws/2004/04/sc\" xmlns:wst=\"http://schemas.xmlsoap.org/ws/2004/04/trust\">"\
+  "<Header>"\
+    "<ps:AuthInfo xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"PPAuthInfo\">"\
+      "<ps:HostingApp>{7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ps:HostingApp>"\
+      "<ps:BinaryVersion>4</ps:BinaryVersion>"\
+      "<ps:UIVersion>1</ps:UIVersion>"\
+      "<ps:Cookies></ps:Cookies>"\
+      "<ps:RequestParams>AQAAAAIAAABsYwQAAAAyMDUy</ps:RequestParams>"\
+    "</ps:AuthInfo>"\
+    "<wsse:Security>"\
+      "<wsse:UsernameToken Id=\"user\">"\
+        "<wsse:Username>%s</wsse:Username>"\
+        "<wsse:Password>%s</wsse:Password>"\
+      "</wsse:UsernameToken>"\
+    "</wsse:Security>"\
+  "</Header>"\
+  "<Body>"\
+    "<ps:RequestMultipleSecurityTokens xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"RSTS\">"\
+      "<wst:RequestSecurityToken Id=\"RST0\">"\
+        "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+        "<wsp:AppliesTo>"\
+          "<wsa:EndpointReference>"\
+            "<wsa:Address>http://Passport.NET/tb</wsa:Address>"\
+          "</wsa:EndpointReference>"\
+        "</wsp:AppliesTo>"\
+      "</wst:RequestSecurityToken>"\
+      "<wst:RequestSecurityToken Id=\"RST1\">"\
+        "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+        "<wsp:AppliesTo>"\
+          "<wsa:EndpointReference>"\
+            "<wsa:Address>messenger.msn.com</wsa:Address>"\
+          "</wsa:EndpointReference>"\
+        "</wsp:AppliesTo>"\
+        "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>"\
+      "</wst:RequestSecurityToken>"\
+      "<wst:RequestSecurityToken Id=\"RST2\">"\
+        "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+        "<wsp:AppliesTo>"\
+          "<wsa:EndpointReference>"\
+            "<wsa:Address>contacts.msn.com</wsa:Address>"\
+         "</wsa:EndpointReference>"\
+        "</wsp:AppliesTo>"\
+       "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>"\
+     " </wst:RequestSecurityToken>"\
+      "<wst:RequestSecurityToken Id=\"RST3\">"\
+        "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+        "<wsp:AppliesTo>"\
+          "<wsa:EndpointReference>"\
+            "<wsa:Address>voice.messenger.msn.com</wsa:Address>"\
+          "</wsa:EndpointReference>"\
+       " </wsp:AppliesTo>"\
+        "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>"\
+      "</wst:RequestSecurityToken>"\
+    "</ps:RequestMultipleSecurityTokens>"\
+  "</Body>"\
+"</Envelope>"
+
 typedef struct _MsnNexus MsnNexus;
 
 struct _MsnNexus
 {
 	MsnSession *session;
-
-	char *login_host;
-	char *login_path;
+	MsnSoapConn *soapconn;
+	char * challenge_data_str;
 	GHashTable *challenge_data;
-	PurpleSslConnection *gsc;
-
-	guint input_handler;
-
-	char *write_buf;
-	gsize written_len;
-	PurpleInputFunction written_cb;
-
-	char *read_buf;
-	gsize read_len;
 };
 
 void msn_nexus_connect(MsnNexus *nexus);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Fri Sep 28 20:30:26 2007 +0000
@@ -25,7 +25,7 @@
 #include "notification.h"
 #include "state.h"
 #include "error.h"
-#include "msn-utils.h"
+#include "msnutils.h"
 #include "page.h"
 
 #include "userlist.h"
@@ -34,6 +34,15 @@
 
 static MsnTable *cbs_table;
 
+/****************************************************************************
+ * 	Local Function Prototype
+ ****************************************************************************/
+
+static void msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_len);
+static void
+msn_add_contact_xml(MsnSession *session, xmlnode *mlNode,const char *passport,
+					 MsnListOp list_op, MsnUserType type);
+
 /**************************************************************************
  * Main
  **************************************************************************/
@@ -92,7 +101,8 @@
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
 	PurpleAccount *account;
-	char **a, **c, *vers;
+	GString *vers;
+	const char *ver_str;
 	int i;
 
 	g_return_if_fail(servconn != NULL);
@@ -101,25 +111,24 @@
 	session = servconn->session;
 	account = session->account;
 
-	/* Allocate an array for CVR0, NULL, and all the versions */
-	a = c = g_new0(char *, session->protocol_ver - 8 + 3);
+	vers = g_string_new("");
 
-	for (i = session->protocol_ver; i >= 8; i--)
-		*c++ = g_strdup_printf("MSNP%d", i);
+/*	for (i = session->protocol_ver; i >= WLM_MIN_PROTOCOL; i--) */
+	for (i = WLM_MAX_PROTOCOL; i >= WLM_MIN_PROTOCOL; i--)
+		g_string_append_printf(vers, " MSNP%d", i);
 
-	*c++ = g_strdup("CVR0");
-
-	vers = g_strjoinv(" ", a);
+	g_string_append(vers, " CVR0");
 
 	if (session->login_step == MSN_LOGIN_STEP_START)
 		msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE);
 	else
 		msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2);
 
-	msn_cmdproc_send(cmdproc, "VER", "%s", vers);
+	/* Skip the initial space */
+	ver_str = (vers->str + 1);
+	msn_cmdproc_send(cmdproc, "VER", "%s", ver_str);
 
-	g_strfreev(a);
-	g_free(vers);
+	g_string_free(vers, TRUE);
 }
 
 gboolean
@@ -153,7 +162,7 @@
  **************************************************************************/
 
 static void
-group_error_helper(MsnSession *session, const char *msg, int group_id, int error)
+group_error_helper(MsnSession *session, const char *msg, const char *group_id, int error)
 {
 	PurpleAccount *account;
 	PurpleConnection *gc;
@@ -172,11 +181,9 @@
 		else
 		{
 			const char *group_name;
-			group_name =
-				msn_userlist_find_group_name(session->userlist,
-											 group_id);
+			group_name = msn_userlist_find_group_name(session->userlist,group_id);
 			reason = g_strdup_printf(_("%s is not a valid group."),
-									 group_name);
+									 group_name ? group_name : "");
 		}
 	}
 	else
@@ -214,7 +221,6 @@
 	PurpleAccount *account;
 
 	account = cmdproc->session->account;
-
 	msn_cmdproc_send(cmdproc, "USR", "TWN I %s",
 					 purple_account_get_username(account));
 }
@@ -232,14 +238,17 @@
 
 	if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
 	{
-		/* OK */
+		/* authenticate OK */
+		/* friendly name part no longer true in msnp11 */
+#if 0
 		const char *friendly = purple_url_decode(cmd->params[3]);
 
 		purple_connection_set_display_name(gc, friendly);
-
+#endif
 		msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN);
 
-		msn_cmdproc_send(cmdproc, "SYN", "%s", "0");
+//		msn_cmdproc_send(cmdproc, "SYN", "%s", "0");
+		//TODO we should use SOAP contact to fetch contact list
 	}
 	else if (!g_ascii_strcasecmp(cmd->params[1], "TWN"))
 	{
@@ -249,15 +258,20 @@
 		session->nexus = msn_nexus_new(session);
 
 		/* Parse the challenge data. */
-
+		session->nexus->challenge_data_str = g_strdup(cmd->params[3]);
 		elems = g_strsplit(cmd->params[3], ",", 0);
 
 		for (cur = elems; *cur != NULL; cur++)
 		{
-				tokens = g_strsplit(*cur, "=", 2);
+			tokens = g_strsplit(*cur, "=", 2);
+			if(tokens[0]&&tokens[1])
+			{
+				purple_debug_info("MSNP14","challenge %p,key:%s,value:%s\n",
+									session->nexus->challenge_data,tokens[0],tokens[1]);
 				g_hash_table_insert(session->nexus->challenge_data, tokens[0], tokens[1]);
-				/* Don't free each of the tokens, only the array. */
-				g_free(tokens);
+			}
+			/* Don't free each of the tokens, only the array. */
+			g_free(tokens);
 		}
 
 		g_strfreev(elems);
@@ -322,8 +336,15 @@
 		return;
 	}
 
+	/*
+	 * Windows Live Messenger 8.0 
+	 * Notice :CVR String discriminate!
+	 * reference of http://www.microsoft.com/globaldev/reference/oslocversion.mspx
+	 * to see the Local ID
+	 */
 	msn_cmdproc_send(cmdproc, "CVR",
-					 "0x0409 winnt 5.1 i386 MSNMSGR 6.0.0602 MSMSGS %s",
+//					 "0x0409 winnt 5.1 i386 MSG80BETA 8.0.0689 msmsgs %s",
+					"0x0804 winnt 5.1 i386 MSNMSGR 8.0.0792 msmsgs %s",
 					 purple_account_get_username(account));
 }
 
@@ -366,7 +387,7 @@
 
 	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
 
-	msn_message_parse_payload(msg, payload, len);
+	msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM);
 #ifdef MSN_DEBUG_NS
 	msn_message_show_readable(msg, "Notification", TRUE);
 #endif
@@ -379,9 +400,12 @@
 static void
 msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
+	purple_debug_info("MSNP14","Processing MSG... \n");
+	if(cmd->payload_len == 0){
+		return;
+	}
 	/* NOTE: cmd is not always cmdproc->last_cmd, sometimes cmd is a queued
 	 * command and we are processing it */
-
 	if (cmd->payload == NULL)
 	{
 		cmdproc->last_cmd->payload_cb  = msg_cmd_post;
@@ -391,32 +415,145 @@
 	{
 		g_return_if_fail(cmd->payload_cb != NULL);
 
+		purple_debug_info("MSNP14","MSG payload:{%s}\n",cmd->payload);
 		cmd->payload_cb(cmdproc, cmd, cmd->payload, cmd->payload_len);
 	}
 }
 
+/*send Message to Yahoo Messenger*/
+void
+uum_send_msg(MsnSession *session,MsnMessage *msg)
+{
+	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
+	char *payload;
+	gsize payload_len;
+	int type;
+	
+	cmdproc = session->notification->cmdproc;
+	g_return_if_fail(msg     != NULL);
+	payload = msn_message_gen_payload(msg, &payload_len);
+	purple_debug_info("MSNP14","send UUM,payload{%s},strlen:%d,len:%d\n",
+		payload,strlen(payload),payload_len);
+	type = msg->type;
+	trans = msn_transaction_new(cmdproc, "UUM","%s 32 %d %d",msg->remote_user,type,payload_len);
+	msn_transaction_set_payload(trans, payload, strlen(payload));
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+static void
+ubm_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	MsnMessage *msg;
+	PurpleConnection *gc;
+	const char *passport;
+	const char *content_type;
+
+	purple_debug_info("MSNP14","Process UBM payload:%s\n",payload);
+	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
+
+	msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM);
+#ifdef MSN_DEBUG_NS
+	msn_message_show_readable(msg, "Notification", TRUE);
+#endif
+
+	gc = cmdproc->session->account->gc;
+	passport = msg->remote_user;
+
+	content_type = msn_message_get_content_type(msg);
+	purple_debug_info("MSNP14","type:%d\n",content_type);
+	if(!strcmp(content_type,"text/plain")){
+		const char *value;
+		const char *body;
+		char *body_str;
+		char *body_enc;
+		char *body_final = NULL;
+		size_t body_len;
+
+		body = msn_message_get_bin_data(msg, &body_len);
+		body_str = g_strndup(body, body_len);
+		body_enc = g_markup_escape_text(body_str, -1);
+		g_free(body_str);
+
+		if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)	{
+			char *pre, *post;
+
+			msn_parse_format(value, &pre, &post);
+			body_final = g_strdup_printf("%s%s%s", pre ? pre : "",
+							body_enc ? body_enc : "", post ? post : "");
+			g_free(pre);
+			g_free(post);
+		}
+		g_free(body_enc);
+		serv_got_im(gc, passport, body_final, 0, time(NULL));
+	}
+	if(!strcmp(content_type,"text/x-msmsgscontrol")){
+		if(msn_message_get_attr(msg, "TypingUser") != NULL){
+			serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT,
+						PURPLE_TYPING);
+		}
+	}
+	if(!strcmp(content_type,"text/x-msnmsgr-datacast")){
+		char *username, *str;
+		PurpleAccount *account;
+		PurpleBuddy *buddy;
+		const char *user;
+
+		account = cmdproc->session->account;
+		user = msg->remote_user;
+
+		if ((buddy = purple_find_buddy(account, user)) != NULL){
+			username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
+		}else{
+			username = g_markup_escape_text(user, -1);
+		}
+
+		str = g_strdup_printf(_("%s just sent you a Nudge!"), username);
+		g_free(username);
+		msn_session_report_user(cmdproc->session,user,str,PURPLE_MESSAGE_SYSTEM);
+		g_free(str);
+	}
+	msn_message_destroy(msg);
+}
+
+/*Yahoo msg process*/
+static void
+ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_info("MSNP14","Processing UBM... \n");
+	if(cmd->payload_len == 0){
+		return;
+	}
+	/* NOTE: cmd is not always cmdproc->last_cmd, sometimes cmd is a queued
+	 * command and we are processing it */
+	if (cmd->payload == NULL){
+		cmdproc->last_cmd->payload_cb  = ubm_cmd_post;
+		cmdproc->servconn->payload_len = atoi(cmd->params[2]);
+	}else{
+		g_return_if_fail(cmd->payload_cb != NULL);
+
+		purple_debug_info("MSNP14","UBM payload:{%s}\n",cmd->payload);
+		ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len);
+	}
+}
+
 /**************************************************************************
  * Challenges
+ *  we use MD5 to caculate the Challenges
  **************************************************************************/
-
 static void
 chl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnTransaction *trans;
 	char buf[33];
-	const char *challenge_resp;
-	PurpleCipher *cipher;
-	PurpleCipherContext *context;
-	guchar digest[16];
-	int i;
 
+#if 0
 	cipher = purple_ciphers_find_cipher("md5");
 	context = purple_cipher_context_new(cipher, NULL);
-
 	purple_cipher_context_append(context, (const guchar *)cmd->params[1],
 							   strlen(cmd->params[1]));
-
-	challenge_resp = "VT6PX?UQTM4WM%YR";
+	challenge_resp = MSNP13_WLM_PRODUCT_KEY;
 
 	purple_cipher_context_append(context, (const guchar *)challenge_resp,
 							   strlen(challenge_resp));
@@ -424,9 +561,14 @@
 	purple_cipher_context_destroy(context);
 
 	for (i = 0; i < 16; i++)
+	{
 		g_snprintf(buf + (i*2), 3, "%02x", digest[i]);
-
-	trans = msn_transaction_new(cmdproc, "QRY", "%s 32", "PROD0038W!61ZTF9");
+	}
+#else
+	msn_handle_chl(cmd->params[1], buf);
+#endif
+//	purple_debug_info("MSNP14","<<challenge:{%s}:{%s}\n",cmd->params[1],buf);
+	trans = msn_transaction_new(cmdproc, "QRY", "%s 32", MSNP13_WLM_PRODUCT_ID);
 
 	msn_transaction_set_payload(trans, buf, 32);
 
@@ -436,43 +578,303 @@
 /**************************************************************************
  * Buddy Lists
  **************************************************************************/
+/* add contact to xmlnode */
+static void
+msn_add_contact_xml(MsnSession *session, xmlnode *mlNode,const char *passport, MsnListOp list_op, MsnUserType type)
+{
+	xmlnode *d_node,*c_node;
+	char **tokens;
+	const char *email,*domain;
+	char fmt_str[3];
+
+	g_return_if_fail(passport != NULL);
+
+	purple_debug_info("MSNP14","Passport: %s, type: %d\n", passport, type);
+	tokens = g_strsplit(passport, "@", 2);
+	email = tokens[0];
+	domain = tokens[1];
+
+	if (email == NULL || domain == NULL) {
+		purple_debug_error("msn", "Invalid passport (%s) specified to add to contact xml.\n", passport);
+		g_strfreev(tokens);
+		g_return_if_reached();
+	}
+
+	/*find a domain Node*/
+	for(d_node = xmlnode_get_child(mlNode,"d"); d_node; d_node = xmlnode_get_next_twin(d_node))
+	{
+		const char *attr = xmlnode_get_attrib(d_node,"n");
+		if (attr == NULL)
+			continue;
+		if (!strcmp(attr,domain))
+			break;
+	}
+
+	if(d_node == NULL)
+	{
+		/*domain not found, create a new domain Node*/
+		purple_debug_info("msn", "Didn't find existing domain node, adding one.\n");
+		d_node = xmlnode_new("d");
+		xmlnode_set_attrib(d_node, "n", domain);
+		xmlnode_insert_child(mlNode, d_node);
+	}
+
+	/*create contact node*/
+	c_node = xmlnode_new("c");
+	xmlnode_set_attrib(c_node, "n", email);
+
+	purple_debug_info("MSNP14", "list_op: %d\n", list_op);
+	g_snprintf(fmt_str, sizeof(fmt_str), "%d", list_op);
+	xmlnode_set_attrib(c_node, "l", fmt_str);
+
+	if (type != MSN_USER_TYPE_UNKNOWN)
+		g_snprintf(fmt_str, sizeof(fmt_str), "%d", type);
+	else if (msn_user_is_yahoo(session->account, passport))
+		g_snprintf(fmt_str, sizeof(fmt_str), "%d", MSN_USER_TYPE_YAHOO);
+	else
+		g_snprintf(fmt_str, sizeof(fmt_str), "%d", MSN_USER_TYPE_PASSPORT);
+
+	/*mobile*/
+	//type_str = g_strdup_printf("4");
+	xmlnode_set_attrib(c_node, "t", fmt_str);
+
+	xmlnode_insert_child(d_node, c_node);
+
+	g_strfreev(tokens);
+}
 
 static void
-add_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_len)
+{
+	MsnTransaction *trans;
+	purple_debug_info("MSN Notification","Sending ADL with payload: %s\n", payload);
+	trans = msn_transaction_new(cmdproc, "ADL","%d", strlen(payload));
+	msn_transaction_set_payload(trans, payload, strlen(payload));
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+/*dump contact info to NS*/
+void
+msn_notification_dump_contact(MsnSession *session)
+{
+	MsnUser *user;
+	GList *l;
+	xmlnode *adl_node;
+	char *payload;
+	int payload_len;
+	int adl_count = 0;
+	const char *display_name;
+
+	adl_node = xmlnode_new("ml");
+	adl_node->child = NULL;
+	xmlnode_set_attrib(adl_node, "l", "1");
+
+	/*get the userlist*/
+	for (l = session->userlist->users; l != NULL; l = l->next){
+		user = l->data;
+
+		/* skip RL & PL during initial dump */
+		if (!(user->list_op & MSN_LIST_OP_MASK))
+			continue;
+
+		msn_add_contact_xml(session, adl_node, user->passport,
+			user->list_op & MSN_LIST_OP_MASK, user->type);
+
+		/* each ADL command may contain up to 150 contacts */
+		if (++adl_count % 150 == 0 || l->next == NULL) {
+			payload = xmlnode_to_str(adl_node,&payload_len);
+
+			msn_notification_post_adl(session->notification->cmdproc,
+				payload, payload_len);
+
+			g_free(payload);
+			xmlnode_free(adl_node);
+
+			if (l->next) {
+				adl_node = xmlnode_new("ml");
+				adl_node->child = NULL;
+				xmlnode_set_attrib(adl_node, "l", "1");
+			}
+		}
+	}
+
+	if (adl_count == 0) {
+		payload = xmlnode_to_str(adl_node,&payload_len);
+
+		msn_notification_post_adl(session->notification->cmdproc, payload, payload_len);
+
+		g_free(payload);
+		xmlnode_free(adl_node);
+	}
+
+	display_name = purple_connection_get_display_name(session->account->gc);
+	if (display_name 
+	    && strcmp(display_name, 
+		      purple_account_get_username(session->account))) {
+		msn_act_id(session->account->gc, display_name);
+	}
+
+}
+
+/*Post FQY to NS,Inform add a Yahoo User*/
+void
+msn_notification_send_fqy(MsnSession *session, const char *passport)
+{
+	MsnTransaction *trans;
+	MsnCmdProc *cmdproc;
+	char* email,*domain,*payload;
+	char **tokens;
+
+	cmdproc = session->notification->cmdproc;
+
+	tokens = g_strsplit(passport, "@", 2);
+	email = tokens[0];
+	domain = tokens[1];
+
+	payload = g_strdup_printf("<ml><d n=\"%s\"><c n=\"%s\"/></d></ml>", domain, email);
+	trans = msn_transaction_new(cmdproc, "FQY","%d", strlen(payload));
+	msn_transaction_set_payload(trans, payload, strlen(payload));
+	msn_cmdproc_send_trans(cmdproc, trans);
+
+	g_free(payload);
+	g_free(tokens);
+}
+
+static void
+blp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+}
+
+static void
+adl_cmd_parse(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+		                         size_t len)
+{
+	xmlnode *root, *domain_node;
+
+	purple_debug_misc("MSN Notification", "Parsing received ADL XML data\n");
+
+	g_return_if_fail(payload != NULL);
+	
+	root = xmlnode_from_str(payload, (gssize) len);
+	
+	if (root == NULL) {
+		purple_debug_info("MSN Notification", "Invalid XML!\n");
+		return;
+	}
+	for (domain_node = xmlnode_get_child(root, "d"); domain_node; domain_node = xmlnode_get_next_twin(domain_node)) {
+		const gchar * domain = NULL; 
+		xmlnode *contact_node = NULL;
+
+		domain = xmlnode_get_attrib(domain_node, "n");
+
+		for (contact_node = xmlnode_get_child(domain_node, "c"); contact_node; contact_node = xmlnode_get_next_twin(contact_node)) {
+//			gchar *name = NULL, *friendlyname = NULL, *passport= NULL;
+			const gchar *list;
+			gint list_op = 0;
+
+//			name = xmlnode_get_attrib(contact_node, "n");
+			list = xmlnode_get_attrib(contact_node, "l");
+			if (list != NULL) {
+				list_op = atoi(list);
+			}
+//			friendlyname = xmlnode_get_attrib(contact_node, "f");
+
+//			passport = g_strdup_printf("%s@%s", name, domain);
+
+//			if (friendlyname != NULL) {
+//				decoded_friendlyname = g_strdup(purple_url_decode(friendlyname));
+//			} else {
+//				decoded_friendlyname = g_strdup(passport);
+//			}
+
+			if (list_op & MSN_LIST_RL_OP) {
+				/* someone is adding us */
+//				got_new_entry(cmdproc->session->account->gc, passport, decoded_friendly_name);
+				msn_get_contact_list(cmdproc->session->contact, MSN_PS_PENDING_LIST, NULL);
+			}
+
+//			g_free(decoded_friendly_name);
+//			g_free(passport);
+		}
+	}
+
+	xmlnode_free(root);
+}
+
+static void
+adl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	MsnUser *user;
-	const char *list;
-	const char *passport;
-	const char *friendly;
-	MsnListId list_id;
-	int group_id;
 
-	list     = cmd->params[1];
-	passport = cmd->params[3];
-	friendly = purple_url_decode(cmd->params[4]);
+	g_return_if_fail(cmdproc != NULL);
+	g_return_if_fail(cmdproc->session != NULL);
+	g_return_if_fail(cmdproc->last_cmd != NULL);
+	g_return_if_fail(cmd != NULL);
 
 	session = cmdproc->session;
 
-	user = msn_userlist_find_user(session->userlist, passport);
+	if ( !strcmp(cmd->params[1], "OK")) {
+		/* ADL ack */
+		msn_session_finish_login(session);
+	} else {
+		cmdproc->last_cmd->payload_cb = adl_cmd_parse;
+	}
+
+	return;
+}
 
-	if (user == NULL)
-	{
-		user = msn_user_new(session->userlist, passport, friendly);
-		msn_userlist_add_user(session->userlist, user);
-	}
-	else
-		msn_user_set_friendly_name(user, friendly);
+static void
+adl_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
+{
+	MsnSession *session;
+	PurpleAccount *account;
+	PurpleConnection *gc;
+	char *reason = NULL;
+
+	session = cmdproc->session;
+	account = session->account;
+	gc = purple_account_get_connection(account);
+
+	purple_debug_error("msn","ADL error\n");
+	reason = g_strdup_printf(_("Unknown error (%d)"), error);
+	purple_notify_error(gc, NULL, _("Unable to add user"), reason);
+	g_free(reason);
+}
 
-	list_id = msn_get_list_id(list);
+static void
+fqy_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	purple_debug_info("MSN Notification","FQY payload:\n%s\n", payload);
+	g_return_if_fail(cmdproc->session != NULL);
+	g_return_if_fail(cmdproc->session->contact != NULL);
+//	msn_notification_post_adl(cmdproc, payload, len);
+//	msn_get_address_book(cmdproc->session->contact, MSN_AB_SAVE_CONTACT, NULL, NULL);
+}
 
-	if (cmd->param_count >= 6)
-		group_id = atoi(cmd->params[5]);
-	else
-		group_id = -1;
+static void
+fqy_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_info("MSNP14","Process FQY\n");
+	cmdproc->last_cmd->payload_cb = fqy_cmd_post;
+}
 
-	msn_got_add_user(session, user, list_id, group_id);
-	msn_user_update(user);
+static void
+rml_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+#if 0
+	MsnTransaction *trans;
+	char * payload;
+#endif
+
+	purple_debug_info("MSNP14","Process RML\n");
+#if 0
+	trans = msn_transaction_new(cmdproc, "RML","");
+
+	msn_transaction_set_payload(trans, payload, strlen(payload));
+
+	msn_cmdproc_send_trans(cmdproc, trans);
+#endif
 }
 
 static void
@@ -567,24 +969,22 @@
 
 	group_name = purple_url_decode(cmd->params[2]);
 
-	msn_group_new(session->userlist, group_id, group_name);
+	msn_group_new(session->userlist, cmd->params[3], group_name);
 
-	/* There is a user that must me moved to this group */
+	/* There is a user that must be moved to this group */
 	if (cmd->trans->data)
 	{
 		/* msn_userlist_move_buddy(); */
 		MsnUserList *userlist = cmdproc->session->userlist;
-		MsnMoveBuddy *data = cmd->trans->data;
+		MsnCallbackState *data = cmd->trans->data;
 
 		if (data->old_group_name != NULL)
 		{
-			msn_userlist_rem_buddy(userlist, data->who, MSN_LIST_FL, data->old_group_name);
+			msn_userlist_move_buddy(userlist, data->who, data->old_group_name, group_name);
 			g_free(data->old_group_name);
+		} else {
+			// msn_add_contact_to_group(userlist, data, data->who, group_name);
 		}
-
-		msn_userlist_add_buddy(userlist, data->who, MSN_LIST_FL, group_name);
-		g_free(data->who);
-
 	}
 }
 
@@ -642,6 +1042,7 @@
 	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj;
+	int wlmclient;
 	const char *state, *passport, *friendly;
 
 	session = cmdproc->session;
@@ -650,7 +1051,9 @@
 
 	state    = cmd->params[1];
 	passport = cmd->params[2];
-	friendly = purple_url_decode(cmd->params[3]);
+	/*if a contact is actually on the WLM part or the yahoo part*/
+	wlmclient = atoi(cmd->params[3]);
+	friendly = purple_url_decode(cmd->params[4]);
 
 	user = msn_userlist_find_user(session->userlist, passport);
 
@@ -658,9 +1061,9 @@
 
 	msn_user_set_friendly_name(user, friendly);
 
-	if (session->protocol_ver >= 9 && cmd->param_count == 6)
+	if (session->protocol_ver >= 9 && cmd->param_count == 8)
 	{
-		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
+		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[6]));
 		msn_user_set_object(user, msnobj);
 	}
 
@@ -692,6 +1095,7 @@
 	MsnUser *user;
 	MsnObject *msnobj;
 	int clientid;
+	int wlmclient;
 	const char *state, *passport, *friendly, *old_friendly;
 
 	session = cmdproc->session;
@@ -700,7 +1104,8 @@
 
 	state    = cmd->params[0];
 	passport = cmd->params[1];
-	friendly = purple_url_decode(cmd->params[2]);
+	wlmclient = atoi(cmd->params[2]);
+	friendly = purple_url_decode(cmd->params[3]);
 
 	user = msn_userlist_find_user(session->userlist, passport);
 
@@ -713,10 +1118,9 @@
 
 	if (session->protocol_ver >= 9)
 	{
-		if (cmd->param_count == 5)
+		if (cmd->param_count == 7)
 		{
-			msnobj =
-				msn_object_new_from_string(purple_url_decode(cmd->params[4]));
+			msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
 			msn_user_set_object(user, msnobj);
 		}
 		else
@@ -725,7 +1129,7 @@
 		}
 	}
 
-	clientid = atoi(cmd->params[3]);
+	clientid = atoi(cmd->params[4]);
 	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE);
 
 	msn_user_set_state(user, state);
@@ -797,7 +1201,9 @@
 prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session = cmdproc->session;
-	const char *type, *value;
+	const char *type, *value, *friendlyname;
+
+	purple_debug_info("MSN Notification", "prp_cmd()\n");
 
 	g_return_if_fail(cmd->param_count >= 3);
 
@@ -821,6 +1227,18 @@
 			msn_user_set_work_phone(session->user, NULL);
 		else if (!strcmp(type, "PHM"))
 			msn_user_set_mobile_phone(session->user, NULL);
+		else {
+			type = cmd->params[1];
+			if (!strcmp(type, "MFN")) {
+				friendlyname = purple_url_decode(cmd->params[2]);
+				
+				msn_update_contact(session->contact, friendlyname);
+
+				purple_connection_set_display_name(
+					purple_account_get_connection(session->account),
+					friendlyname);
+			}
+		}
 	}
 }
 
@@ -828,11 +1246,10 @@
 reg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	int group_id;
-	const char *group_name;
+	const char *group_id, *group_name;
 
 	session = cmdproc->session;
-	group_id = atoi(cmd->params[2]);
+	group_id = cmd->params[2];
 	group_name = purple_url_decode(cmd->params[3]);
 
 	msn_userlist_rename_group_id(session->userlist, group_id, group_name);
@@ -841,27 +1258,26 @@
 static void
 reg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
 {
-	int group_id;
+	const char * group_id;
 	char **params;
 
 	params = g_strsplit(trans->params, " ", 0);
 
-	group_id = atoi(params[0]);
+	group_id = params[0];
 
 	group_error_helper(cmdproc->session, _("Unable to rename group"), group_id, error);
 
 	g_strfreev(params);
 }
 
+#if 0
 static void
 rem_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
 	MsnUser *user;
-	const char *list;
-	const char *passport;
+	const char *group_id, *list, *passport;
 	MsnListId list_id;
-	int group_id;
 
 	session = cmdproc->session;
 	list = cmd->params[1];
@@ -873,22 +1289,23 @@
 	list_id = msn_get_list_id(list);
 
 	if (cmd->param_count == 5)
-		group_id = atoi(cmd->params[4]);
+		group_id = cmd->params[4];
 	else
-		group_id = -1;
+		group_id = NULL;
 
 	msn_got_rem_user(session, user, list_id, group_id);
 	msn_user_update(user);
 }
+#endif
 
 static void
 rmg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	int group_id;
+	const char *group_id;
 
 	session = cmdproc->session;
-	group_id = atoi(cmd->params[2]);
+	group_id = cmd->params[2];
 
 	msn_userlist_remove_group_id(session->userlist, group_id);
 }
@@ -896,18 +1313,19 @@
 static void
 rmg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
 {
-	int group_id;
+	const char *group_id;
 	char **params;
 
 	params = g_strsplit(trans->params, " ", 0);
 
-	group_id = atoi(params[0]);
+	group_id = params[0];
 
 	group_error_helper(cmdproc->session, _("Unable to delete group"), group_id, error);
 
 	g_strfreev(params);
 }
 
+#if 0
 static void
 syn_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
@@ -938,6 +1356,7 @@
 	session->sync = sync;
 	cmdproc->cbs_table = sync->cbs_table;
 }
+#endif
 
 /**************************************************************************
  * Misc commands
@@ -1146,6 +1565,103 @@
 	g_free(host);
 }
 
+static void
+gcf_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	xmlnode * root;
+	gchar * buf;
+
+	g_return_if_fail(cmd->payload != NULL);
+
+	if ( (root = xmlnode_from_str(cmd->payload, cmd->payload_len)) == NULL)
+	{
+		purple_debug_error("MSN","Unable to parse GCF payload into a XML tree");
+		return;
+	}
+	
+	buf = xmlnode_to_formatted_str(root, NULL);
+
+	/* get the payload content */
+	purple_debug_info("MSNP14","GCF command payload:\n%s\n",buf);
+	
+	g_free(buf);
+	xmlnode_free(root);
+}
+
+static void
+gcf_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_info("MSNP14","Processing GCF command\n");
+	cmdproc->last_cmd->payload_cb  = gcf_cmd_post;
+	return;
+}
+
+static void
+sbs_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_info("MSNP14","Processing SBS... \n");
+	if(cmd->payload_len == 0){
+		return;
+	}
+	/*get the payload content*/
+}
+
+/*
+ * Get the UBX's PSM info
+ * Post it to the User status
+ * Thanks for Chris <ukdrizzle@yahoo.co.uk>'s code
+ */
+static void
+ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	MsnSession *session;
+	PurpleAccount *account;
+	PurpleConnection *gc;
+	MsnUser *user;
+	const char *passport;
+	char *psm_str, *currentmedia_str, *str;
+
+	/*get the payload content*/
+//	purple_debug_info("MSNP14","UBX {%s} payload{%s}\n",cmd->params[0], cmd->payload);
+
+	session = cmdproc->session;
+	account = session->account;
+	gc = purple_account_get_connection(account);
+
+	passport = cmd->params[0];
+	user = msn_userlist_find_user(session->userlist, passport);
+	
+	psm_str = msn_get_psm(cmd->payload,len);
+	currentmedia_str = msn_parse_currentmedia(
+	                                 str = msn_get_currentmedia(cmd->payload, len));
+	g_free(str);
+
+	msn_user_set_statusline(user, psm_str);
+	msn_user_set_currentmedia(user, currentmedia_str);
+	msn_user_update(user);
+
+	g_free(psm_str);
+	g_free(currentmedia_str);
+}
+
+static void
+ubx_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_misc("MSNP14","UBX received.\n");
+	if(cmd->payload_len == 0){
+		return;
+	}
+	cmdproc->last_cmd->payload_cb  = ubx_cmd_post;
+}
+
+static void
+uux_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_misc("MSNP14","UUX received.\n");
+}
+
 /**************************************************************************
  * Message Types
  **************************************************************************/
@@ -1155,6 +1671,7 @@
 {
 	MsnSession *session;
 	const char *value;
+	const char *clLastChange;
 
 	session = cmdproc->session;
 
@@ -1187,10 +1704,27 @@
 	}
 
 	if ((value = msn_message_get_attr(msg, "ClientPort")) != NULL)
+	{
 		session->passport_info.client_port = ntohs(atoi(value));
+	}
 
 	if ((value = msn_message_get_attr(msg, "LoginTime")) != NULL)
 		session->passport_info.sl = atol(value);
+
+	/*starting retrieve the contact list*/
+	clLastChange = purple_account_get_string(session->account, "CLLastChange", NULL);
+	session->contact = msn_contact_new(session);
+#ifdef MSN_PARTIAL_LISTS
+	/* msn_userlist_load defeats all attempts at trying to detect blist sync issues */
+	msn_userlist_load(session);
+	msn_get_contact_list(session->contact, MSN_PS_INITIAL, clLastChange);
+#else
+	/* always get the full list? */
+	msn_get_contact_list(session->contact, MSN_PS_INITIAL, NULL);
+#endif
+#if 0
+	msn_contact_connect(session->contact);
+#endif
 }
 
 static void
@@ -1246,6 +1780,86 @@
 	g_hash_table_destroy(table);
 }
 
+/*offline Message notification process*/
+static void
+initial_mdata_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	MsnSession *session;
+	PurpleConnection *gc;
+	GHashTable *table;
+	const char *mdata, *unread;
+
+	session = cmdproc->session;
+	gc = session->account->gc;
+
+	if (strcmp(msg->remote_user, "Hotmail"))
+		/* This isn't an official message. */
+		return;
+
+	/*new a oim session*/
+	session->oim = msn_oim_new(session);
+//	msn_oim_connect(session->oim);
+
+	table = msn_message_get_hashtable_from_body(msg);
+
+	mdata = g_hash_table_lookup(table, "Mail-Data");
+
+	if (mdata != NULL)
+		msn_parse_oim_msg(session->oim, mdata);
+
+	if (g_hash_table_lookup(table, "Inbox-URL") == NULL)
+	{
+		g_hash_table_destroy(table);
+		return;
+	}
+
+	if (session->passport_info.file == NULL)
+	{
+		MsnTransaction *trans;
+		trans = msn_transaction_new(cmdproc, "URL", "%s", "INBOX");
+		msn_transaction_queue_cmd(trans, msg->cmd);
+
+		msn_cmdproc_send_trans(cmdproc, trans);
+
+		g_hash_table_destroy(table);
+		return;
+	}
+
+	if (!purple_account_get_check_mail(session->account))
+	{
+		g_hash_table_destroy(table);
+		return;
+	}
+
+	unread = g_hash_table_lookup(table, "Inbox-Unread");
+
+	if (unread != NULL)
+	{
+		int count = atoi(unread);
+
+		if (count > 0)
+		{
+			const char *passport;
+			const char *url;
+
+			passport = msn_user_get_passport(session->user);
+			url = session->passport_info.file;
+
+			purple_notify_emails(gc, atoi(unread), FALSE, NULL, NULL,
+							   &passport, &url, NULL, NULL);
+		}
+	}
+
+	g_hash_table_destroy(table);
+}
+
+/*offline Message Notification*/
+static void
+delete_oim_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	purple_debug_misc("MSN Notification","Delete OIM message.\n");
+}
+
 static void
 email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
@@ -1347,48 +1961,62 @@
 }
 
 void
-msn_notification_add_buddy(MsnNotification *notification, const char *list,
-						   const char *who, const char *store_name,
-						   int group_id)
+msn_notification_add_buddy_to_list(MsnNotification *notification, MsnListId list_id,
+						   	  const char *who)
 {
 	MsnCmdProc *cmdproc;
+	MsnListOp list_op = 1 << list_id;
+	xmlnode *adl_node;
+	char *payload;
+	int payload_len;
+
 	cmdproc = notification->servconn->cmdproc;
 
-	if (group_id < 0 && !strcmp(list, "FL"))
-		group_id = 0;
+	adl_node = xmlnode_new("ml");
+	adl_node->child = NULL;
+
+	msn_add_contact_xml(notification->session, adl_node, who, list_op, 
+						MSN_USER_TYPE_PASSPORT);
 
-	if (group_id >= 0)
-	{
-		msn_cmdproc_send(cmdproc, "ADD", "%s %s %s %d",
-						 list, who, store_name, group_id);
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "ADD", "%s %s %s", list, who, store_name);
-	}
+	payload = xmlnode_to_str(adl_node,&payload_len);
+	xmlnode_free(adl_node);
+	
+	msn_notification_post_adl(notification->servconn->cmdproc,
+						payload,payload_len);
+	g_free(payload);
 }
 
 void
-msn_notification_rem_buddy(MsnNotification *notification, const char *list,
-						   const char *who, int group_id)
+msn_notification_rem_buddy_from_list(MsnNotification *notification, MsnListId list_id,
+						   const char *who)
 {
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
+	MsnListOp list_op = 1 << list_id;
+	xmlnode *rml_node;
+	char *payload;
+	int payload_len;
+
 	cmdproc = notification->servconn->cmdproc;
 
-	if (group_id >= 0)
-	{
-		msn_cmdproc_send(cmdproc, "REM", "%s %s %d", list, who, group_id);
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "REM", "%s %s", list, who);
-	}
+	rml_node = xmlnode_new("ml");
+	rml_node->child = NULL;
+
+	msn_add_contact_xml(notification->session, rml_node, who, list_op, MSN_USER_TYPE_PASSPORT);
+
+	payload = xmlnode_to_str(rml_node, &payload_len);
+	xmlnode_free(rml_node);
+
+	purple_debug_info("MSN Notification","Send RML with payload:\n%s\n", payload);
+	trans = msn_transaction_new(cmdproc, "RML","%d", strlen(payload));
+	msn_transaction_set_payload(trans, payload, strlen(payload));
+	msn_cmdproc_send_trans(cmdproc, trans);
+	g_free(payload);
 }
 
 /**************************************************************************
  * Init
  **************************************************************************/
-
 void
 msn_notification_init(void)
 {
@@ -1399,18 +2027,18 @@
 	/* Synchronous */
 	msn_table_add_cmd(cbs_table, "CHG", "CHG", NULL);
 	msn_table_add_cmd(cbs_table, "CHG", "ILN", iln_cmd);
-	msn_table_add_cmd(cbs_table, "ADD", "ADD", add_cmd);
-	msn_table_add_cmd(cbs_table, "ADD", "ILN", iln_cmd);
-	msn_table_add_cmd(cbs_table, "REM", "REM", rem_cmd);
+	msn_table_add_cmd(cbs_table, "ADL", "ILN", iln_cmd);
+//	msn_table_add_cmd(cbs_table, "REM", "REM", rem_cmd);	/* Removed as of MSNP13 */
 	msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd);
 	msn_table_add_cmd(cbs_table, "USR", "XFR", xfr_cmd);
-	msn_table_add_cmd(cbs_table, "SYN", "SYN", syn_cmd);
+	msn_table_add_cmd(cbs_table, "USR", "GCF", gcf_cmd);
+//	msn_table_add_cmd(cbs_table, "SYN", "SYN", syn_cmd);	/* Removed as of MSNP13 */
 	msn_table_add_cmd(cbs_table, "CVR", "CVR", cvr_cmd);
 	msn_table_add_cmd(cbs_table, "VER", "VER", ver_cmd);
 	msn_table_add_cmd(cbs_table, "REA", "REA", rea_cmd);
 	msn_table_add_cmd(cbs_table, "PRP", "PRP", prp_cmd);
-	/* msn_table_add_cmd(cbs_table, "BLP", "BLP", blp_cmd); */
-	msn_table_add_cmd(cbs_table, "BLP", "BLP", NULL);
+	msn_table_add_cmd(cbs_table, "BLP", "BLP", blp_cmd);
+//	msn_table_add_cmd(cbs_table, "BLP", "BLP", NULL);
 	msn_table_add_cmd(cbs_table, "REG", "REG", reg_cmd);
 	msn_table_add_cmd(cbs_table, "ADG", "ADG", adg_cmd);
 	msn_table_add_cmd(cbs_table, "RMG", "RMG", rmg_cmd);
@@ -1419,11 +2047,15 @@
 	/* Asynchronous */
 	msn_table_add_cmd(cbs_table, NULL, "IPG", ipg_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "UBM", ubm_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "GCF", gcf_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "SBS", sbs_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "NOT", not_cmd);
 
 	msn_table_add_cmd(cbs_table, NULL, "CHL", chl_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "REM", rem_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "ADD", add_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "RML", rml_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "ADL", adl_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "FQY", fqy_cmd);
 
 	msn_table_add_cmd(cbs_table, NULL, "QRY", NULL);
 	msn_table_add_cmd(cbs_table, NULL, "QNG", qng_cmd);
@@ -1433,11 +2065,15 @@
 	msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "RNG", rng_cmd);
 
+	msn_table_add_cmd(cbs_table, NULL, "UBX", ubx_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "UUX", uux_cmd);
+
 	msn_table_add_cmd(cbs_table, NULL, "URL", url_cmd);
 
 	msn_table_add_cmd(cbs_table, "fallback", "XFR", xfr_cmd);
 
 	msn_table_add_error(cbs_table, "ADD", add_error);
+	msn_table_add_error(cbs_table, "ADL", adl_error);
 	msn_table_add_error(cbs_table, "REG", reg_error);
 	msn_table_add_error(cbs_table, "RMG", rmg_error);
 	/* msn_table_add_error(cbs_table, "REA", rea_error); */
@@ -1446,12 +2082,24 @@
 	msn_table_add_msg_type(cbs_table,
 						   "text/x-msmsgsprofile",
 						   profile_msg);
+	/*initial OIM notification*/
+	msn_table_add_msg_type(cbs_table,
+							"text/x-msmsgsinitialmdatanotification",
+							initial_mdata_msg);	
+	/*OIM notification when user online*/
+	msn_table_add_msg_type(cbs_table,
+							"text/x-msmsgsoimnotification",
+							initial_mdata_msg);	
 	msn_table_add_msg_type(cbs_table,
 						   "text/x-msmsgsinitialemailnotification",
 						   initial_email_msg);
 	msn_table_add_msg_type(cbs_table,
 						   "text/x-msmsgsemailnotification",
 						   email_msg);
+	/*delete an offline Message notification*/
+	msn_table_add_msg_type(cbs_table,
+							"text/x-msmsgsactivemailnotification",
+						   delete_oim_msg);
 	msn_table_add_msg_type(cbs_table,
 						   "application/x-msmsgssystemmessage",
 						   system_msg);
@@ -1462,3 +2110,4 @@
 {
 	msn_table_destroy(cbs_table);
 }
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/notification.h
--- a/libpurple/protocols/msn/notification.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/notification.h	Fri Sep 28 20:30:26 2007 +0000
@@ -24,6 +24,14 @@
 #ifndef _MSN_NOTIFICATION_H_
 #define _MSN_NOTIFICATION_H_
 
+/*MSN protocol challenge info*/
+/*MSNP13 challenge*/
+#define MSNP13_WLM_PRODUCT_KEY	"O4BG@C7BWLYQX?5G"
+#define MSNP13_WLM_PRODUCT_ID	"PROD01065C%ZFN6F"
+
+#define MSNP10_PRODUCT_KEY		"VT6PX?UQTM4WM%YR"
+#define MSNP10_PRODUCT_ID		"PROD0038W!61ZTF9" 
+
 typedef struct _MsnNotification MsnNotification;
 
 #include "session.h"
@@ -40,21 +48,24 @@
 };
 
 #include "state.h"
+void uum_send_msg(MsnSession *session,MsnMessage *msg);
 
 void msn_notification_end(void);
 void msn_notification_init(void);
 
-void msn_notification_add_buddy(MsnNotification *notification,
-								const char *list, const char *who,
-								const char *store_name, int group_id);
-void msn_notification_rem_buddy(MsnNotification *notification,
-								const char *list, const char *who,
-								int group_id);
+void msn_notification_add_buddy_to_list(MsnNotification *notification,
+					MsnListId list_id, const char *who);
+void msn_notification_rem_buddy_from_list(MsnNotification *notification,
+					  MsnListId list_id, const char *who);
+
+void msn_notification_send_fqy(MsnSession *session, const char *passport);
+
 MsnNotification *msn_notification_new(MsnSession *session);
 void msn_notification_destroy(MsnNotification *notification);
 gboolean msn_notification_connect(MsnNotification *notification,
-							  const char *host, int port);
+				  const char *host, int port);
 void msn_notification_disconnect(MsnNotification *notification);
+void msn_notification_dump_contact(MsnSession *session);
 
 /**
  * Closes a notification.
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/oim.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/oim.c	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,712 @@
+/**
+ * @file oim.c 
+ * 	get and send MSN offline Instant Message via SOAP request
+ *	Author
+ * 		MaYuan<mayuan2006@gmail.com>
+ * 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 "msn.h"
+#include "soap.h"
+#include "oim.h"
+#include "msnutils.h"
+
+/*Local Function Prototype*/
+static void msn_oim_post_single_get_msg(MsnOim *oim,const char *msgid);
+static MsnOimSendReq *msn_oim_new_send_req(const char *from_member,
+					   const char *friendname,
+					   const char* to_member,
+					   gint send_seq,
+					   const char *msg);
+static void msn_oim_retrieve_connect_init(MsnSoapConn *soapconn);
+static void msn_oim_send_connect_init(MsnSoapConn *soapconn);
+static void msn_oim_free_send_req(MsnOimSendReq *req);
+static void msn_oim_report_to_user(MsnOim *oim, const char *msg_str);
+static void msn_oim_get_process(MsnOim *oim, const char *oim_msg);
+static char *msn_oim_msg_to_str(MsnOim *oim, const char *body);
+static void msn_oim_send_process(MsnOim *oim, const char *body, int len);
+
+/*new a OIM object*/
+MsnOim *
+msn_oim_new(MsnSession *session)
+{
+	MsnOim *oim;
+
+	oim = g_new0(MsnOim, 1);
+	oim->session = session;
+	oim->retrieveconn = msn_soap_new(session,oim,1);
+	
+	oim->oim_list	= NULL;
+	oim->sendconn = msn_soap_new(session,oim,1);
+	oim->run_id = rand_guid();
+	oim->challenge = NULL;
+	oim->send_queue = g_queue_new();
+	oim->send_seq = 1;
+	return oim;
+}
+
+/*destroy the oim object*/
+void
+msn_oim_destroy(MsnOim *oim)
+{
+	MsnOimSendReq *request;
+	
+	purple_debug_info("OIM","destroy the OIM \n");
+	msn_soap_destroy(oim->retrieveconn);
+	msn_soap_destroy(oim->sendconn);
+	g_free(oim->run_id);
+	g_free(oim->challenge);
+	
+	while((request = g_queue_pop_head(oim->send_queue)) != NULL){
+		msn_oim_free_send_req(request);
+	}
+	g_queue_free(oim->send_queue);
+	
+	g_free(oim);
+}
+
+static MsnOimSendReq *
+msn_oim_new_send_req(const char *from_member, const char*friendname,
+					 const char* to_member, gint send_seq,
+					 const char *msg)
+{
+	MsnOimSendReq *request;
+	
+	request = g_new0(MsnOimSendReq, 1);
+	request->from_member	=g_strdup(from_member);
+	request->friendname		= g_strdup(friendname);
+	request->to_member		= g_strdup(to_member);
+	request->send_seq		= send_seq;
+	request->oim_msg		= g_strdup(msg);
+	return request;
+}
+
+static void
+msn_oim_free_send_req(MsnOimSendReq *req)
+{
+	g_return_if_fail(req != NULL);
+
+	g_free(req->from_member);
+	g_free(req->friendname);
+	g_free(req->to_member);
+	g_free(req->oim_msg);
+	
+	g_free(req);
+}
+
+/****************************************
+ * OIM send SOAP request
+ * **************************************/
+/*encode the message to OIM Message Format*/
+static char *
+msn_oim_msg_to_str(MsnOim *oim, const char *body)
+{
+	char *oim_body,*oim_base64;
+	
+	purple_debug_info("MSN OIM","encode OIM Message...\n");	
+	oim_base64 = purple_base64_encode((const guchar *)body, strlen(body));
+	purple_debug_info("MSN OIM","encoded base64 body:{%s}\n",oim_base64);	
+	oim_body = g_strdup_printf(MSN_OIM_MSG_TEMPLATE,
+				oim->run_id,oim->send_seq,oim_base64);
+
+	return oim_body;
+}
+
+/*oim SOAP server login error*/
+static void
+msn_oim_send_error_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc, PurpleSslErrorType error)
+{
+	MsnSession *session;
+
+	session = soapconn->session;
+	g_return_if_fail(session != NULL);
+
+	msn_session_set_error(session, MSN_ERROR_SERV_DOWN, _("Unable to connect to OIM server"));
+}
+
+/*msn oim SOAP server connect process*/
+static gboolean
+msn_oim_send_connect_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc)
+{
+	MsnSession * session;
+	MsnOim *oim;
+
+	oim = soapconn->parent;
+	g_return_val_if_fail(oim != NULL, TRUE);
+
+	session = oim->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+
+	return TRUE;
+}
+
+/*
+ * Process the send return SOAP string
+ * If got SOAP Fault,get the lock key,and resend it.
+ */
+static void
+msn_oim_send_process(MsnOim *oim, const char *body, int len)
+{
+	xmlnode *responseNode, *bodyNode;
+	xmlnode	*faultNode, *faultCodeNode, *faultstringNode;
+	xmlnode *detailNode, *challengeNode;
+	char *faultCodeStr = NULL, *faultstring = NULL;
+
+	responseNode = xmlnode_from_str(body,len);
+	g_return_if_fail(responseNode != NULL);
+	bodyNode = xmlnode_get_child(responseNode,"Body");
+	faultNode = xmlnode_get_child(bodyNode,"Fault");
+	if(faultNode == NULL){
+		/*Send OK! return*/
+		MsnOimSendReq *request;
+		
+		purple_debug_info("MSN OIM","send OIM OK!");
+		xmlnode_free(responseNode);
+		request = g_queue_pop_head(oim->send_queue);
+		msn_oim_free_send_req(request);
+		/*send next buffered Offline Message*/
+		msn_soap_post(oim->sendconn, NULL);
+		return;
+	}
+	/*get the challenge,and repost it*/
+	faultCodeNode = xmlnode_get_child(faultNode,"faultcode");
+	if(faultCodeNode == NULL){
+		purple_debug_info("MSN OIM","faultcode Node is NULL\n");
+		goto oim_send_process_fail;
+	}
+	faultCodeStr = xmlnode_get_data(faultCodeNode);
+	purple_debug_info("MSN OIM","fault code:{%s}\n",faultCodeStr);
+#if 0
+	if(!strcmp(faultCodeStr,"q0:AuthenticationFailed")){
+		/*other Fault Reason?*/
+		goto oim_send_process_fail;
+	}
+#endif
+
+	faultstringNode = xmlnode_get_child(faultNode,"faultstring");
+	faultstring = xmlnode_get_data(faultstringNode);
+	purple_debug_info("MSN OIM","fault string :{%s}\n",faultstring);
+
+	/* lock key fault reason,
+	 * compute the challenge and resend it
+	 */
+	detailNode = xmlnode_get_child(faultNode, "detail");
+	if(detailNode == NULL){
+		goto oim_send_process_fail;
+	}
+	challengeNode = xmlnode_get_child(detailNode,"LockKeyChallenge");
+	if (challengeNode == NULL) {
+		goto oim_send_process_fail;
+	}
+
+	g_free(oim->challenge);
+	oim->challenge = xmlnode_get_data(challengeNode);
+	purple_debug_info("MSN OIM","lockkey:{%s}\n",oim->challenge);
+
+	/*repost the send*/
+	purple_debug_info("MSN OIM","prepare to repost the send...\n");
+	msn_oim_send_msg(oim);
+
+oim_send_process_fail:
+	g_free(faultstring);
+	g_free(faultCodeStr);
+	xmlnode_free(responseNode);
+	return ;
+}
+
+static gboolean
+msn_oim_send_read_cb(MsnSoapConn *soapconn)
+{
+	MsnSession *session = soapconn->session;
+	MsnOim * oim;
+
+	if (soapconn->body == NULL)
+		return TRUE;
+
+	g_return_val_if_fail(session != NULL, FALSE);
+	oim = soapconn->session->oim;
+	g_return_val_if_fail(oim != NULL, TRUE);
+
+	purple_debug_info("MSN OIM","read buffer:{%s}\n", soapconn->body);
+	msn_oim_send_process(oim,soapconn->body,soapconn->body_len);
+
+	return TRUE;
+}
+
+static void
+msn_oim_send_written_cb(MsnSoapConn *soapconn)
+{
+	soapconn->read_cb = msn_oim_send_read_cb;
+//	msn_soap_read_cb(data,source,cond);
+}
+
+void
+msn_oim_prep_send_msg_info(MsnOim *oim, const char *membername,
+						   const char* friendname, const char *tomember,
+						   const char * msg)
+{
+	MsnOimSendReq *request;
+
+	g_return_if_fail(oim != NULL);
+
+	request = msn_oim_new_send_req(membername,friendname,tomember,oim->send_seq,msg);
+	g_queue_push_tail(oim->send_queue,request);
+}
+
+/*post send single message request to oim server*/
+void 
+msn_oim_send_msg(MsnOim *oim)
+{
+	MsnSoapReq *soap_request;
+	MsnOimSendReq *oim_request;
+	char *soap_body,*mspauth;
+	char *msg_body;
+	char buf[33];
+
+	g_return_if_fail(oim != NULL);
+	oim_request = g_queue_pop_head(oim->send_queue);
+	g_return_if_fail(oim_request != NULL);
+
+	purple_debug_info("MSN OIM","send single OIM Message\n");
+	mspauth = g_strdup_printf("t=%s&amp;p=%s",
+		oim->session->passport_info.t,
+		oim->session->passport_info.p
+		);
+	g_queue_push_head(oim->send_queue,oim_request);
+
+	/* if we got the challenge lock key, we compute it
+	 * else we go for the SOAP fault and resend it.
+	 */
+	if(oim->challenge != NULL){
+		msn_handle_chl(oim->challenge, buf);
+	}else{
+		purple_debug_info("MSN OIM","no lock key challenge,wait for SOAP Fault and Resend\n");
+		buf[0]='\0';
+	}
+	purple_debug_info("MSN OIM","get the lock key challenge {%s}\n",buf);	
+
+	msg_body = msn_oim_msg_to_str(oim, oim_request->oim_msg);
+	soap_body = g_strdup_printf(MSN_OIM_SEND_TEMPLATE,
+					oim_request->from_member,
+					oim_request->friendname,
+					oim_request->to_member,
+					mspauth,
+					MSNP13_WLM_PRODUCT_ID,
+					buf,
+					oim_request->send_seq,
+					msg_body
+					);
+	soap_request = msn_soap_request_new(MSN_OIM_SEND_HOST,
+					MSN_OIM_SEND_URL,
+					MSN_OIM_SEND_SOAP_ACTION,
+					soap_body,
+					NULL,
+					msn_oim_send_read_cb,
+					msn_oim_send_written_cb,
+					msn_oim_send_connect_init);
+	g_free(mspauth);
+	g_free(msg_body);
+	g_free(soap_body);
+
+	/*increase the offline Sequence control*/
+	if(oim->challenge != NULL){
+		oim->send_seq++;
+	}
+	msn_soap_post(oim->sendconn,soap_request);
+}
+
+/****************************************
+ * OIM delete SOAP request
+ * **************************************/
+static gboolean
+msn_oim_delete_read_cb(MsnSoapConn *soapconn)
+{
+	if (soapconn->body == NULL)
+		return TRUE;
+	purple_debug_info("MSN OIM","OIM delete read buffer:{%s}\n",soapconn->body);
+
+	msn_soap_free_read_buf(soapconn);
+	/*get next single Offline Message*/
+//	msn_soap_post(soapconn,NULL);	/* we already do this in soap.c */
+	return TRUE;
+}
+
+static void
+msn_oim_delete_written_cb(MsnSoapConn *soapconn)
+{
+	soapconn->read_cb = msn_oim_delete_read_cb;
+}
+
+/*Post to get the Offline Instant Message*/
+static void
+msn_oim_post_delete_msg(MsnOim *oim,const char *msgid)
+{
+	MsnSoapReq *soap_request;
+	const char *soap_body,*t,*p;
+
+	g_return_if_fail(oim != NULL);
+	g_return_if_fail(msgid != NULL);
+
+	purple_debug_info("MSN OIM","Delete single OIM Message {%s}\n",msgid);
+	t = oim->session->passport_info.t;
+	p = oim->session->passport_info.p;
+
+	soap_body = g_strdup_printf(MSN_OIM_DEL_TEMPLATE,
+					t,
+					p,
+					msgid
+					);
+	soap_request = msn_soap_request_new(MSN_OIM_RETRIEVE_HOST,
+					MSN_OIM_RETRIEVE_URL,
+					MSN_OIM_DEL_SOAP_ACTION,
+					soap_body,
+					NULL,
+					msn_oim_delete_read_cb,
+					msn_oim_delete_written_cb,
+					msn_oim_retrieve_connect_init);
+	msn_soap_post(oim->retrieveconn,soap_request);
+}
+
+/****************************************
+ * OIM get SOAP request
+ * **************************************/
+/*oim SOAP server login error*/
+static void
+msn_oim_get_error_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc, PurpleSslErrorType error)
+{
+	MsnSession *session;
+
+	session = soapconn->session;
+	g_return_if_fail(session != NULL);
+	msn_soap_clean_unhandled_requests(soapconn);
+
+//	msn_session_set_error(session, MSN_ERROR_SERV_DOWN, _("Unable to connect to OIM server"));
+}
+
+/*msn oim SOAP server connect process*/
+static gboolean
+msn_oim_get_connect_cb(MsnSoapConn *soapconn, PurpleSslConnection *gsc)
+{
+	MsnSession * session;
+	MsnOim *oim;
+
+	oim = soapconn->parent;
+	g_return_val_if_fail(oim != NULL, TRUE);
+
+	session = oim->session;
+	g_return_val_if_fail(session != NULL, FALSE);
+
+	purple_debug_info("MSN OIM","Connected and ready to get OIM!\n");
+
+	return TRUE;
+}
+
+/* like purple_str_to_time, but different. The format of the timestamp
+ * is like this: 5 Sep 2007 21:42:12 -0700 */
+static time_t
+msn_oim_parse_timestamp(const char *timestamp)
+{
+	char month_str[4], tz_str[6];
+	char *tz_ptr = tz_str;
+	static const char *months[] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL
+	};
+	struct tm t;
+	memset(&t, 0, sizeof(t));
+
+	if (sscanf(timestamp, "%02d %03s %04d %02d:%02d:%02d %05s",
+					&t.tm_mday, month_str, &t.tm_year,
+					&t.tm_hour, &t.tm_min, &t.tm_sec, tz_str) == 7) {
+		gboolean offset_positive = TRUE;
+		int tzhrs;
+		int tzmins;
+		
+		for (t.tm_mon = 0;
+			 months[t.tm_mon] != NULL &&
+				 strcmp(months[t.tm_mon], month_str) != 0; t.tm_mon++);
+		if (months[t.tm_mon] != NULL) {
+			if (*tz_str == '-') {
+				offset_positive = FALSE;
+				tz_ptr++;
+			} else if (*tz_str == '+') {
+				tz_ptr++;
+			}
+
+			if (sscanf(tz_ptr, "%02d%02d", &tzhrs, &tzmins) == 2) {
+				time_t tzoff = tzhrs * 60 * 60 + tzmins * 60;
+#ifdef _WIN32
+				long sys_tzoff;
+#endif
+
+				if (!offset_positive)
+					tzoff *= -1;
+
+				t.tm_year -= 1900;
+				t.tm_isdst = 0;
+
+#ifdef _WIN32
+				if ((sys_tzoff = wpurple_get_tz_offset()) != -1)
+					tzoff += sys_tzoff;
+#else
+#ifdef HAVE_TM_GMTOFF
+				tzoff += t.tm_gmtoff;
+#else
+#	ifdef HAVE_TIMEZONE
+				tzset();    /* making sure */
+				tzoff -= timezone;
+#	endif
+#endif
+#endif /* _WIN32 */
+
+				return mktime(&t) + tzoff;
+			}
+		}
+	}
+
+	purple_debug_info("MSN OIM:OIM", "Can't parse timestamp %s\n", timestamp);
+	return time(NULL);
+}
+
+/*Post the Offline Instant Message to User Conversation*/
+static void
+msn_oim_report_to_user(MsnOim *oim, const char *msg_str)
+{
+	MsnMessage *message;
+	char *date,*from,*decode_msg;
+	gsize body_len;
+	char **tokens;
+	char *start,*end;
+	int has_nick = 0;
+	char *passport_str, *passport;
+	char *msg_id;
+	time_t stamp;
+
+	message = msn_message_new(MSN_MSG_UNKNOWN);
+
+	msn_message_parse_payload(message, msg_str, strlen(msg_str),
+							  MSG_OIM_LINE_DEM, MSG_OIM_BODY_DEM);
+	purple_debug_info("MSN OIM","oim body:{%s}\n",message->body);
+	decode_msg = (char *)purple_base64_decode(message->body,&body_len);
+	date =	(char *)g_hash_table_lookup(message->attr_table, "Date");
+	from =	(char *)g_hash_table_lookup(message->attr_table, "From");
+	if(strstr(from," ")){
+		has_nick = 1;
+	}
+	if(has_nick){
+		tokens = g_strsplit(from , " " , 2);
+		passport_str = g_strdup(tokens[1]);
+		purple_debug_info("MSN OIM","oim Date:{%s},nickname:{%s},tokens[1]:{%s} passport{%s}\n",
+							date,tokens[0],tokens[1],passport_str);
+		g_strfreev(tokens);
+	}else{
+		passport_str = g_strdup(from);
+		purple_debug_info("MSN OIM","oim Date:{%s},passport{%s}\n",
+					date,passport_str);
+	}
+	start = strstr(passport_str,"<");
+	start += 1;
+	end = strstr(passport_str,">");
+	passport = g_strndup(start,end - start);
+	g_free(passport_str);
+	purple_debug_info("MSN OIM","oim Date:{%s},passport{%s}\n",date,passport);
+
+	stamp = msn_oim_parse_timestamp(date);
+
+	serv_got_im(oim->session->account->gc, passport, decode_msg, 0, stamp);
+
+	/*Now get the oim message ID from the oim_list.
+	 * and append to read list to prepare for deleting the Offline Message when sign out
+	 */
+	if(oim->oim_list != NULL){
+		msg_id = oim->oim_list->data;
+		msn_oim_post_delete_msg(oim,msg_id);
+		oim->oim_list = g_list_remove(oim->oim_list, oim->oim_list->data);
+		g_free(msg_id);
+	}
+
+	g_free(passport);
+}
+
+/* Parse the XML data,
+ * prepare to report the OIM to user
+ */
+static void
+msn_oim_get_process(MsnOim *oim, const char *oim_msg)
+{
+	xmlnode *oim_node,*bodyNode,*responseNode,*msgNode;
+	char *msg_str;
+
+	oim_node = xmlnode_from_str(oim_msg, strlen(oim_msg));
+	bodyNode = xmlnode_get_child(oim_node,"Body");
+	responseNode = xmlnode_get_child(bodyNode,"GetMessageResponse");
+	msgNode = xmlnode_get_child(responseNode,"GetMessageResult");
+	msg_str = xmlnode_get_data(msgNode);
+	purple_debug_info("OIM","msg:{%s}\n",msg_str);
+	msn_oim_report_to_user(oim,msg_str);
+
+	g_free(msg_str);
+	xmlnode_free(oim_node);
+}
+
+static gboolean
+msn_oim_get_read_cb(MsnSoapConn *soapconn)
+{
+	MsnOim * oim = soapconn->session->oim;
+
+	if (soapconn->body == NULL)
+		return TRUE;
+
+	purple_debug_info("MSN OIM","OIM get read buffer:{%s}\n",soapconn->body);
+
+	/*we need to process the read message!*/
+	msn_oim_get_process(oim,soapconn->body);
+	msn_soap_free_read_buf(soapconn);
+
+	/*get next single Offline Message*/
+//	msn_soap_post(soapconn,NULL); /* we already do this in soap.c */
+	return TRUE;
+}
+
+static void
+msn_oim_get_written_cb(MsnSoapConn *soapconn)
+{
+	soapconn->read_cb = msn_oim_get_read_cb;
+//	msn_soap_read_cb(data,source,cond);
+}
+
+/* parse the oim XML data 
+ * and post it to the soap server to get the Offline Message
+ * */
+void
+msn_parse_oim_msg(MsnOim *oim,const char *xmlmsg)
+{
+	xmlnode *node, *mNode,*ENode,*INode,*rtNode,*nNode;
+	char *passport,*msgid,*nickname, *unread, *rTime = NULL;
+	MsnSession *session = oim->session;
+
+	purple_debug_info("MSN OIM:OIM", "%s", xmlmsg);
+
+	node = xmlnode_from_str(xmlmsg, strlen(xmlmsg));
+	if (strcmp(node->name, "MD") != 0) {
+		xmlnode_free(node);
+		return;
+	}
+
+	ENode = xmlnode_get_child(node, "E");
+	INode = xmlnode_get_child(ENode, "IU");
+	unread = xmlnode_get_data(INode);
+
+	if (unread != NULL && purple_account_get_check_mail(session->account))
+	{
+		int count = atoi(unread);
+
+		if (count > 0)
+		{
+			const char *passport;
+			const char *url;
+
+			passport = msn_user_get_passport(session->user);
+			url = session->passport_info.file;
+
+			purple_notify_emails(session->account->gc, atoi(unread), FALSE, NULL, NULL,
+					&passport, &url, NULL, NULL);
+		}
+	}
+
+	for(mNode = xmlnode_get_child(node, "M"); mNode;
+					mNode = xmlnode_get_next_twin(mNode)){
+		/*email Node*/
+		ENode = xmlnode_get_child(mNode,"E");
+		passport = xmlnode_get_data(ENode);
+		/*Index */
+		INode = xmlnode_get_child(mNode,"I");
+		msgid = xmlnode_get_data(INode);
+		/*Nickname*/
+		nNode = xmlnode_get_child(mNode,"N");
+		nickname = xmlnode_get_data(nNode);
+		/*receive time*/
+		rtNode = xmlnode_get_child(mNode,"RT");
+		if(rtNode != NULL) {
+			rTime = xmlnode_get_data(rtNode);
+			rtNode = NULL;
+		}
+/*		purple_debug_info("MSN OIM","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime); */
+
+		oim->oim_list = g_list_append(oim->oim_list,strdup(msgid));
+		msn_oim_post_single_get_msg(oim,msgid);
+		g_free(passport);
+		g_free(msgid);
+		g_free(rTime);
+		rTime = NULL;
+		g_free(nickname);
+	}
+	g_free(unread);
+	xmlnode_free(node);
+}
+
+/*Post to get the Offline Instant Message*/
+static void
+msn_oim_post_single_get_msg(MsnOim *oim,const char *msgid)
+{
+	MsnSoapReq *soap_request;
+	const char *soap_body,*t,*p;
+
+	purple_debug_info("MSN OIM","Get single OIM Message\n");
+	t = oim->session->passport_info.t;
+	p = oim->session->passport_info.p;
+
+	soap_body = g_strdup_printf(MSN_OIM_GET_TEMPLATE,
+					t,
+					p,
+					msgid
+					);
+	soap_request = msn_soap_request_new(MSN_OIM_RETRIEVE_HOST,
+					MSN_OIM_RETRIEVE_URL,
+					MSN_OIM_GET_SOAP_ACTION,
+					soap_body,
+					NULL,
+					msn_oim_get_read_cb,
+					msn_oim_get_written_cb,
+					msn_oim_retrieve_connect_init);
+	msn_soap_post(oim->retrieveconn,soap_request);
+}
+
+/*msn oim retrieve server connect init */
+static void
+msn_oim_retrieve_connect_init(MsnSoapConn *soapconn)
+{
+	purple_debug_info("MSN OIM","Initializing OIM retrieve connection\n");
+	msn_soap_init(soapconn, MSN_OIM_RETRIEVE_HOST, 1,
+		      msn_oim_get_connect_cb,
+		      msn_oim_get_error_cb);
+}
+
+/*Msn OIM Send Server Connect Init Function*/
+static void
+msn_oim_send_connect_init(MsnSoapConn *sendconn)
+{
+	purple_debug_info("MSN OIM","Initializing OIM send connection\n");
+	msn_soap_init(sendconn, MSN_OIM_SEND_HOST, 1,
+		      msn_oim_send_connect_cb,
+		      msn_oim_send_error_cb);
+}
+
+/* EOF oim.c*/
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/oim.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/oim.h	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,148 @@
+/**
+ * @file oim.h			Header file for oim.c
+ *	Author
+ * 		MaYuan<mayuan2006@gmail.com>
+ * 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 _MSN_OIM_H_
+#define _MSN_OIM_H_
+
+/*OIM Retrieve SOAP Template*/
+#define MSN_OIM_RETRIEVE_HOST	"rsi.hotmail.com"
+#define MSN_OIM_RETRIEVE_URL	"/rsi/rsi.asmx"
+#define MSN_OIM_GET_SOAP_ACTION	"http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMessage"
+
+#define MSN_OIM_GET_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
+	"<soap:Header>"\
+		"<PassportCookie xmlns=\"http://www.hotmail.msn.com/ws/2004/09/oim/rsi\">"\
+			"<t>%s</t>"\
+			"<p>%s</p>"\
+		"</PassportCookie>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<GetMessage xmlns=\"http://www.hotmail.msn.com/ws/2004/09/oim/rsi\">"\
+			"<messageId>%s</messageId>"\
+			"<alsoMarkAsRead>false</alsoMarkAsRead>"\
+		"</GetMessage>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+/*OIM Delete SOAP Template*/
+#define MSN_OIM_DEL_SOAP_ACTION	"http://www.hotmail.msn.com/ws/2004/09/oim/rsi/DeleteMessages"
+
+#define MSN_OIM_DEL_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
+	"<soap:Header>"\
+		"<PassportCookie xmlns=\"http://www.hotmail.msn.com/ws/2004/09/oim/rsi\">"\
+			"<t>%s</t>"\
+			" <p>%s</p>"\
+		"</PassportCookie>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<DeleteMessages xmlns=\"http://www.hotmail.msn.com/ws/2004/09/oim/rsi\">"\
+			"<messageIds>"\
+				"<messageId>%s</messageId>"\
+			"</messageIds>"\
+		"</DeleteMessages>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+/*OIM Send SOAP Template*/
+#define MSN_OIM_MSG_TEMPLATE "MIME-Version: 1.0\n"\
+	"Content-Type: text/plain; charset=UTF-8\n"\
+	"Content-Transfer-Encoding: base64\n"\
+	"X-OIM-Message-Type: OfflineMessage\n"\
+	"X-OIM-Run-Id: {%s}\n"\
+	"X-OIM-Sequence-Num: %d\n\n"\
+	"%s"
+
+#define MSN_OIM_SEND_HOST	"ows.messenger.msn.com"
+#define MSN_OIM_SEND_URL	"/OimWS/oim.asmx"
+#define MSN_OIM_SEND_SOAP_ACTION	"http://messenger.msn.com/ws/2004/09/oim/Store"
+#define MSN_OIM_SEND_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
+	"<soap:Header>"\
+		"<From memberName=\"%s\" friendlyName=\"%s\" xml:lang=\"en-US\" proxy=\"MSNMSGR\" xmlns=\"http://messenger.msn.com/ws/2004/09/oim/\" msnpVer=\"MSNP14\" buildVer=\"8.0.0792\"/>"\
+		"<To memberName=\"%s\" xmlns=\"http://messenger.msn.com/ws/2004/09/oim/\"/>"\
+		"<Ticket passport=\"%s\" appid=\"%s\" lockkey=\"%s\" xmlns=\"http://messenger.msn.com/ws/2004/09/oim/\"/>"\
+		"<Sequence xmlns=\"http://schemas.xmlsoap.org/ws/2003/03/rm\">"\
+			"<Identifier xmlns=\"http://schemas.xmlsoap.org/ws/2002/07/utility\">http://messenger.msn.com</Identifier>"\
+			"<MessageNumber>%d</MessageNumber>"\
+		"</Sequence>"\
+	"</soap:Header>"\
+	"<soap:Body>"\
+		"<MessageType xmlns=\"http://messenger.msn.com/ws/2004/09/oim/\">text</MessageType>"\
+		"<Content xmlns=\"http://messenger.msn.com/ws/2004/09/oim/\">%s</Content>"\
+	"</soap:Body>"\
+"</soap:Envelope>"
+
+typedef struct _MsnOimSendReq MsnOimSendReq;
+
+struct _MsnOimSendReq
+{
+	char *from_member;
+	char *friendname;
+	char *to_member;
+	char *oim_msg;
+	gint send_seq;
+};
+
+typedef struct _MsnOim MsnOim;
+
+struct _MsnOim
+{
+	MsnSession *session;
+
+	MsnSoapConn *retrieveconn;
+	GList * oim_list;
+
+	MsnSoapConn *sendconn;
+	char *challenge;
+	char *run_id;
+	gint send_seq;
+	GQueue *send_queue;
+};
+
+/****************************************************
+ * function prototype
+ * **************************************************/
+MsnOim * msn_oim_new(MsnSession *session);
+void msn_oim_destroy(MsnOim *oim);
+void msn_oim_connect(MsnOim *oim);
+
+void msn_parse_oim_msg(MsnOim *oim,const char *xmlmsg);
+
+/*Send OIM Message*/
+void msn_oim_prep_send_msg_info(MsnOim *oim, const char *membername,
+								const char *friendname, const char *tomember,
+								const char * msg);
+
+void msn_oim_send_msg(MsnOim *oim);
+
+/*get the OIM message*/
+void msn_oim_get_msg(MsnOim *oim);
+
+/*report the oim message to the conversation*/
+void msn_oim_report_user(MsnOim *oim,const char *passport,char *msg);
+
+#endif/* _MSN_OIM_H_*/
+/*endof oim.h*/
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/servconn.c
--- a/libpurple/protocols/msn/servconn.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/servconn.c	Fri Sep 28 20:30:26 2007 +0000
@@ -168,7 +168,7 @@
  **************************************************************************/
 
 static void
-connect_cb(gpointer data, gint source, const gchar *error_message)
+connect_cb(gpointer data, gint source, const char *error_message)
 {
 	MsnServConn *servconn;
 
@@ -245,7 +245,9 @@
 		return TRUE;
 	}
 	else
+	{
 		return FALSE;
+	}
 }
 
 void
@@ -390,14 +392,21 @@
 
 	len = read(servconn->fd, buf, sizeof(buf) - 1);
 
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len <= 0)
-	{
-		purple_debug_error("msn", "servconn read error, len: %d error: %s\n", len, strerror(errno));
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
+	if (len <= 0) {
+		switch (errno) {
+
+			case 0:	
 
-		return;
+			case EBADF:
+			case EAGAIN: return;
+	
+			default: purple_debug_error("msn", "servconn read error,"
+						"len: %d, errno: %d, error: %s\n",
+						len, errno, strerror(errno));
+				 msn_servconn_got_error(servconn, 
+						 MSN_SERVCONN_ERROR_READ);
+				 return;
+		}
 	}
 
 	buf[len] = '\0';
@@ -446,6 +455,7 @@
 		else
 		{
 			msn_cmdproc_process_cmd_text(servconn->cmdproc, cur);
+			servconn->payload_len = servconn->cmdproc->last_cmd->payload_len;
 		}
 	} while (servconn->connected && !servconn->wasted && servconn->rx_len > 0);
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Fri Sep 28 20:30:26 2007 +0000
@@ -43,7 +43,9 @@
 	session->user = msn_user_new(session->userlist,
 								 purple_account_get_username(account), NULL);
 
-	session->protocol_ver = 9;
+	/*if you want to chat with Yahoo Messenger*/
+	//session->protocol_ver = WLM_YAHOO_PROT_VER;
+	session->protocol_ver = WLM_PROT_VER;
 	session->conv_seq = 1;
 
 	return session;
@@ -70,6 +72,8 @@
 
 	msn_userlist_destroy(session->userlist);
 
+	g_free(session->passport_info.t);
+	g_free(session->passport_info.p);
 	g_free(session->passport_info.kv);
 	g_free(session->passport_info.sid);
 	g_free(session->passport_info.mspauth);
@@ -87,6 +91,11 @@
 	if (session->nexus != NULL)
 		msn_nexus_destroy(session->nexus);
 
+	if (session->contact != NULL)
+		msn_contact_destroy(session->contact);
+	if (session->oim != NULL)
+		msn_oim_destroy(session->oim);
+
 	if (session->user != NULL)
 		msn_user_destroy(session->user);
 
@@ -154,6 +163,37 @@
 	return NULL;
 }
 
+static PurpleConversation *
+msn_session_get_conv(MsnSession *session,const char *passport)
+{
+	PurpleAccount *account;
+	PurpleConversation * conv;
+
+	g_return_val_if_fail(session != NULL, NULL);
+	account = session->account;
+
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
+									passport, account);
+	if(conv == NULL){
+		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, passport);
+	}
+	return conv;
+}
+
+/* put Message to User Conversation
+ *
+ * 	passport - the one want to talk to you
+ */
+void
+msn_session_report_user(MsnSession *session,const char *passport,char *msg,PurpleMessageFlags flags)
+{
+	PurpleConversation * conv;
+
+	if ((conv = msn_session_get_conv(session,passport)) != NULL){
+		purple_conversation_write(conv, NULL, msg, flags, time(NULL));
+	}
+}
+
 MsnSwitchBoard *
 msn_session_find_swboard_with_conv(MsnSession *session, PurpleConversation *conv)
 {
@@ -229,13 +269,14 @@
 
 	/* The core used to use msn_add_buddy to add all buddies before
 	 * being logged in. This no longer happens, so we manually iterate
-	 * over the whole buddy list to identify sync issues. */
-
-	for (gnode = purple_blist_get_root(); gnode; gnode = gnode->next) {
+	 * over the whole buddy list to identify sync issues.
+	 */
+	for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next) {
 		PurpleGroup *group = (PurpleGroup *)gnode;
-		const char *group_name = group->name;
+		const char *group_name;
 		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
 			continue;
+		group_name = group->name;
 		for(cnode = gnode->child; cnode; cnode = cnode->next) {
 			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
 				continue;
@@ -252,21 +293,17 @@
 
 					if ((remote_user != NULL) && (remote_user->list_op & MSN_LIST_FL_OP))
 					{
-						int group_id;
 						GList *l;
 
-						group_id = msn_userlist_find_group_id(remote_user->userlist,
-								group_name);
-
 						for (l = remote_user->group_ids; l != NULL; l = l->next)
 						{
-							if (group_id == GPOINTER_TO_INT(l->data))
+							const char *name = msn_userlist_find_group_name(remote_user->userlist, l->data);
+							if (name && !g_strcasecmp(group_name, name))
 							{
 								found = TRUE;
 								break;
 							}
 						}
-
 					}
 
 					if (!found)
@@ -305,6 +342,8 @@
 		case MSN_ERROR_SIGN_OTHER:
 			gc->wants_to_die = TRUE;
 			msg = g_strdup(_("You have signed on from another location."));
+			if (!purple_account_get_remember_password(session->account))
+				purple_account_set_password(session->account, NULL);
 			break;
 		case MSN_ERROR_SERV_UNAVAILABLE:
 			msg = g_strdup(_("The MSN servers are temporarily "
@@ -419,3 +458,4 @@
 		msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
 	}
 }
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/session.h
--- a/libpurple/protocols/msn/session.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/session.h	Fri Sep 28 20:30:26 2007 +0000
@@ -38,6 +38,8 @@
 #include "cmdproc.h"
 #include "nexus.h"
 #include "httpconn.h"
+#include "contact.h"
+#include "oim.h"
 
 #include "userlist.h"
 #include "sync.h"
@@ -94,6 +96,8 @@
 
 	MsnNotification *notification;
 	MsnNexus *nexus;
+	MsnContact *contact;
+	MsnOim		*oim;
 	MsnSync *sync;
 
 	MsnUserList *userlist;
@@ -105,8 +109,15 @@
 
 	int conv_seq; /**< The current conversation sequence number. */
 
+	/*psm info*/
+	char *psm;
+
 	struct
 	{
+		/*t and p, get via USR TWN*/
+		char *t;
+		char *p;
+
 		char *kv;
 		char *sid;
 		char *mspauth;
@@ -114,7 +125,6 @@
 		char *file;
 		char *client_ip;
 		int client_port;
-
 	} passport_info;
 };
 
@@ -224,4 +234,8 @@
  */
 void msn_session_finish_login(MsnSession *session);
 
+/*post message to User*/
+void msn_session_report_user(MsnSession *session,const char *passport,
+							char *msg,PurpleMessageFlags flags);
+
 #endif /* _MSN_SESSION_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Fri Sep 28 20:30:26 2007 +0000
@@ -33,6 +33,8 @@
 
 /* ms to delay between sending buddy icon requests to the server. */
 #define BUDDY_ICON_DELAY 20000
+/*debug SLP*/
+#define MSN_DEBUG_UD
 
 static void send_ok(MsnSlpCall *slpcall, const char *branch,
 					const char *type, const char *content);
@@ -777,11 +779,11 @@
 	if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account))) {
 
 		/* FIXME: it would be better if we wrote the data as we received it
-		          instead of all at once, calling write multiple times and
-		          close once at the very end
-		*/
+		   instead of all at once, calling write multiple times and
+		   close once at the very end
+		 */
 		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
-		purple_conv_custom_smiley_close(conv, slpcall->data_info);
+		purple_conv_custom_smiley_close(conv, slpcall->data_info );
 	}
 #ifdef MSN_DEBUG_UD
 	purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Fri Sep 28 20:30:26 2007 +0000
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
+#include "msnutils.h"
 #include "slpcall.h"
 #include "slpsession.h"
 
@@ -30,24 +31,6 @@
 /* #define MSN_DEBUG_SLPCALL */
 
 /**************************************************************************
- * Util
- **************************************************************************/
-
-static char *
-rand_guid()
-{
-	return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111);
-}
-
-/**************************************************************************
  * Main
  **************************************************************************/
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/slplink.c	Fri Sep 28 20:30:26 2007 +0000
@@ -112,8 +112,10 @@
 	if (slplink->remote_user != NULL)
 		g_free(slplink->remote_user);
 
+#if 0
 	if (slplink->directconn != NULL)
 		msn_directconn_destroy(slplink->directconn);
+#endif
 
 	while (slplink->slp_calls != NULL)
 		msn_slp_call_destroy(slplink->slp_calls->data);
@@ -244,11 +246,13 @@
 void
 msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
 {
+#if 0
 	if (slplink->directconn != NULL)
 	{
 		msn_directconn_send_msg(slplink->directconn, msg);
 	}
 	else
+#endif
 	{
 		if (slplink->swboard == NULL)
 		{
@@ -634,9 +638,10 @@
 			MsnDirectConn *directconn;
 
 			directconn = slplink->directconn;
-
+#if 0
 			if (!directconn->acked)
 				msn_directconn_send_handshake(directconn);
+#endif
 		}
 		else if (slpmsg->flags == 0x0 || slpmsg->flags == 0x20 ||
 				 slpmsg->flags == 0x1000030)
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/soap.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/soap.c	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,870 @@
+/**
+ * @file soap.c 
+ * 	SOAP connection related process
+ *	Author
+ * 		MaYuan<mayuan2006@gmail.com>
+ * 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 "msn.h"
+#include "soap.h"
+
+
+/*local function prototype*/
+void msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step);
+
+/*setup the soap process step*/
+void
+msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step)
+{
+#ifdef MSN_SOAP_DEBUG
+	const char *MsnSoapStepText[] =
+	{
+		"Unconnected",
+		"Connecting",
+		"Connected",
+		"Processing",
+		"Connected Idle"
+	};
+
+	purple_debug_info("MSN SOAP", "Setting SOAP process step to %s\n", MsnSoapStepText[step]);
+#endif
+	soapconn->step = step;
+}
+
+//msn_soap_new(MsnSession *session,gpointer data,int sslconn)
+/*new a soap connection*/
+MsnSoapConn *
+msn_soap_new(MsnSession *session,gpointer data,int sslconn)
+{
+	MsnSoapConn *soapconn;
+
+	soapconn = g_new0(MsnSoapConn, 1);
+	soapconn->session = session;
+	soapconn->parent = data;
+	soapconn->ssl_conn = sslconn;
+
+	soapconn->gsc = NULL;
+	soapconn->input_handler = 0;
+	soapconn->output_handler = 0;
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_UNCONNECTED);
+	soapconn->soap_queue = g_queue_new();
+
+	return soapconn;
+}
+
+/*ssl soap connect callback*/
+void
+msn_soap_connect_cb(gpointer data, PurpleSslConnection *gsc,
+				 PurpleInputCondition cond)
+{
+	MsnSoapConn * soapconn;
+	MsnSession *session;
+	gboolean soapconn_is_valid = FALSE;
+
+	purple_debug_misc("MSN SOAP","SOAP server connection established!\n");
+
+	soapconn = data;
+	g_return_if_fail(soapconn != NULL);
+
+	session = soapconn->session;
+	g_return_if_fail(session != NULL);
+
+	soapconn->gsc = gsc;
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_CONNECTED);
+
+	/*connection callback*/
+	if (soapconn->connect_cb != NULL) {
+		soapconn_is_valid = soapconn->connect_cb(soapconn, gsc);
+	}
+
+	if (!soapconn_is_valid) {
+		return;
+	}
+
+	/*we do the SOAP request here*/
+	msn_soap_post_head_request(soapconn);
+}
+
+/*ssl soap error callback*/
+static void
+msn_soap_error_cb(PurpleSslConnection *gsc, PurpleSslErrorType error, void *data)
+{	
+	MsnSoapConn * soapconn = data;
+
+	g_return_if_fail(data != NULL);
+
+	purple_debug_warning("MSN SOAP","Soap connection error!\n");
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_UNCONNECTED);
+
+	/*error callback*/
+	if (soapconn->error_cb != NULL) {
+		soapconn->error_cb(soapconn, gsc, error);
+	} else {
+		msn_soap_post(soapconn, NULL);
+	}
+}
+
+/*init the soap connection*/
+void
+msn_soap_init(MsnSoapConn *soapconn,char * host,int ssl,
+				MsnSoapSslConnectCbFunction connect_cb,
+				MsnSoapSslErrorCbFunction error_cb)
+{
+	purple_debug_misc("MSN SOAP","Initializing SOAP connection\n");
+	soapconn->login_host = g_strdup(host);
+	soapconn->ssl_conn = ssl;
+	soapconn->connect_cb = connect_cb;
+	soapconn->error_cb = error_cb;
+}
+
+/*connect the soap connection*/
+void
+msn_soap_connect(MsnSoapConn *soapconn)
+{
+	if (soapconn->ssl_conn) {
+		purple_ssl_connect(soapconn->session->account, soapconn->login_host,
+				PURPLE_SSL_DEFAULT_PORT, msn_soap_connect_cb, msn_soap_error_cb,
+				soapconn);
+	} else {
+	}
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_CONNECTING);
+}
+
+
+static void
+msn_soap_close_handler(guint *handler)
+{
+	if (*handler > 0) {
+		purple_input_remove(*handler);
+		*handler = 0;
+	} 
+#ifdef MSN_SOAP_DEBUG
+	else {
+		purple_debug_misc("MSN SOAP", "Handler inactive, not removing\n");
+	}
+#endif
+
+}
+
+
+/*close the soap connection*/
+void
+msn_soap_close(MsnSoapConn *soapconn)
+{
+	if (soapconn->ssl_conn) {
+		if (soapconn->gsc != NULL) {
+			purple_ssl_close(soapconn->gsc);
+			soapconn->gsc = NULL;
+		}
+	} else {
+	}
+	msn_soap_set_process_step(soapconn, MSN_SOAP_UNCONNECTED);
+}
+
+/*clean the unhandled SOAP request*/
+void
+msn_soap_clean_unhandled_requests(MsnSoapConn *soapconn)
+{
+	MsnSoapReq *request;
+
+	g_return_if_fail(soapconn != NULL);
+
+	soapconn->body = NULL;
+
+	while ((request = g_queue_pop_head(soapconn->soap_queue)) != NULL){
+		if (soapconn->read_cb) {
+			soapconn->read_cb(soapconn);
+		}
+		msn_soap_request_free(request);
+	}
+}
+
+/*destroy the soap connection*/
+void
+msn_soap_destroy(MsnSoapConn *soapconn)
+{
+	if(soapconn->login_host)
+		g_free(soapconn->login_host);
+
+	if(soapconn->login_path)
+		g_free(soapconn->login_path);
+
+	/*remove the write handler*/
+	if (soapconn->output_handler > 0){
+		purple_input_remove(soapconn->output_handler);
+		soapconn->output_handler = 0;
+	}
+	/*remove the read handler*/
+	if (soapconn->input_handler > 0){
+		purple_input_remove(soapconn->input_handler);
+		soapconn->input_handler = 0;
+	}
+	msn_soap_free_read_buf(soapconn);
+	msn_soap_free_write_buf(soapconn);
+
+	/*close ssl connection*/
+	msn_soap_close(soapconn);
+
+	/*process the unhandled soap request*/
+	msn_soap_clean_unhandled_requests(soapconn);
+
+	g_queue_free(soapconn->soap_queue);
+	g_free(soapconn);
+}
+
+/*check the soap is connected?
+ * if connected return 1
+ */
+int
+msn_soap_connected(MsnSoapConn *soapconn)
+{
+	if (soapconn->ssl_conn) {
+		return (soapconn->gsc == NULL ? 0 : 1);
+	}
+	return (soapconn->fd > 0 ? 1 : 0);
+}
+
+/*read and append the content to the buffer*/
+static gssize
+msn_soap_read(MsnSoapConn *soapconn)
+{
+	gssize len, requested_len;
+	char temp_buf[MSN_SOAP_READ_BUFF_SIZE];
+	
+	if ( soapconn->need_to_read == 0 || soapconn->need_to_read > MSN_SOAP_READ_BUFF_SIZE) {
+		requested_len = MSN_SOAP_READ_BUFF_SIZE;
+	}
+	else {
+		requested_len = soapconn->need_to_read;
+	}
+
+	if ( soapconn->ssl_conn ) {
+		len = purple_ssl_read(soapconn->gsc, temp_buf, requested_len);
+	} else {
+		len = read(soapconn->fd, temp_buf, requested_len);
+	}
+
+	
+	if ( len <= 0 ) {
+		switch (errno) {
+
+			case 0:
+			case EBADF: /* we are sometimes getting this in Windows */
+			case EAGAIN: return len;
+
+			default : purple_debug_error("MSN SOAP", "Read error!"
+						"read len: %d, error = %s\n",
+						len, strerror(errno));
+				  purple_input_remove(soapconn->input_handler);
+				  //soapconn->input_handler = 0;
+				  g_free(soapconn->read_buf);
+				  soapconn->read_buf = NULL;
+				  soapconn->read_len = 0;
+				  /* TODO: error handling */
+				  return len;
+		}
+	}
+	else {
+		soapconn->read_buf = g_realloc(soapconn->read_buf,
+						soapconn->read_len + len + 1);
+		if ( soapconn->read_buf != NULL ) {
+			memcpy(soapconn->read_buf + soapconn->read_len, temp_buf, len);
+			soapconn->read_len += len;
+			soapconn->read_buf[soapconn->read_len] = '\0';
+		}
+		else {
+			purple_debug_error("MSN SOAP", "Failure re-allocating %d bytes of memory!\n", soapconn->read_len + len + 1);
+			exit(EXIT_FAILURE);
+		}
+			
+	}
+
+#if defined(MSN_SOAP_DEBUG)
+	if (len > 0)
+		purple_debug_info("MSN SOAP","Read %d bytes from SOAP server:\n%s\n", len, soapconn->read_buf + soapconn->read_len - len);
+#endif
+
+	return len;
+}
+
+/*read the whole SOAP server response*/
+void 
+msn_soap_read_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	MsnSoapConn *soapconn = data;
+	MsnSession *session;
+	int len;
+	char * body_start,*body_len;
+	char *length_start,*length_end;
+#ifdef MSN_SOAP_DEBUG
+#if !defined(_WIN32)
+	gchar * formattedxml = NULL;
+	gchar * http_headers = NULL;
+	xmlnode * node = NULL;
+#endif
+	purple_debug_misc("MSN SOAP", "msn_soap_read_cb()\n");
+#endif
+	session = soapconn->session;
+	g_return_if_fail(session != NULL);
+
+	
+	/*read the request header*/
+	len = msn_soap_read(soapconn);
+	
+	if ( len < 0 )
+		return;
+
+	if (soapconn->read_buf == NULL) {
+		return;
+	}
+
+	if ( (strstr(soapconn->read_buf, "HTTP/1.1 302") != NULL) 
+		|| ( strstr(soapconn->read_buf, "HTTP/1.1 301") != NULL ) )
+	{
+		/* Redirect. */
+		char *location, *c;
+
+		purple_debug_info("MSN SOAP", "HTTP Redirect\n");
+		location = strstr(soapconn->read_buf, "Location: ");
+		if (location == NULL)
+		{
+			c = (char *) g_strstr_len(soapconn->read_buf, soapconn->read_len,"\r\n\r\n");
+			if (c != NULL) {
+				/* we have read the whole HTTP headers and found no Location: */
+				msn_soap_free_read_buf(soapconn);
+				msn_soap_post(soapconn, NULL);
+			}
+
+			return;
+		}
+		location = strchr(location, ' ') + 1;
+
+		if ((c = strchr(location, '\r')) != NULL)
+			*c = '\0';
+		else
+			return;
+
+		/* Skip the http:// */
+		if ((c = strchr(location, '/')) != NULL)
+			location = c + 2;
+
+		if ((c = strchr(location, '/')) != NULL)
+		{
+			g_free(soapconn->login_path);
+			soapconn->login_path = g_strdup(c);
+
+			*c = '\0';
+		}
+
+		g_free(soapconn->login_host);
+		soapconn->login_host = g_strdup(location);
+		
+		msn_soap_close_handler( &(soapconn->input_handler) );
+		msn_soap_close(soapconn);
+
+		if (purple_ssl_connect(session->account, soapconn->login_host,
+			PURPLE_SSL_DEFAULT_PORT, msn_soap_connect_cb,
+			msn_soap_error_cb, soapconn) == NULL) {
+		
+			purple_debug_error("MSN SOAP", "Unable to connect to %s !\n", soapconn->login_host);
+			// dispatch next request
+			msn_soap_post(soapconn, NULL);
+		}
+	}
+	/* Another case of redirection, active on May, 2007
+	   See http://msnpiki.msnfanatic.com/index.php/MSNP13:SOAPTweener#Redirect
+	 */
+	else if (strstr(soapconn->read_buf,
+                    "<faultcode>psf:Redirect</faultcode>") != NULL)
+	{
+		char *location, *c;
+
+		if ( (location = strstr(soapconn->read_buf, "<psf:redirectUrl>") ) == NULL)
+			return;
+
+		/* Omit the tag preceding the URL */
+		location += strlen("<psf:redirectUrl>");
+		if (location > soapconn->read_buf + soapconn->read_len)
+			return;
+		if ( (location = strstr(location, "://")) == NULL)
+			return;
+
+		location += strlen("://"); /* Skip http:// or https:// */
+
+		if ( (c = strstr(location, "</psf:redirectUrl>")) != NULL )
+			*c = '\0';
+		else
+			return;
+
+		if ( (c = strstr(location, "/")) != NULL )
+		{
+			g_free(soapconn->login_path);
+			soapconn->login_path = g_strdup(c);
+			*c = '\0';
+		}
+
+		g_free(soapconn->login_host);
+		soapconn->login_host = g_strdup(location);
+		
+		msn_soap_close_handler( &(soapconn->input_handler) );
+		msn_soap_close(soapconn);
+
+		if (purple_ssl_connect(session->account, soapconn->login_host,
+				PURPLE_SSL_DEFAULT_PORT, msn_soap_connect_cb,
+				msn_soap_error_cb, soapconn) == NULL) {
+
+			purple_debug_error("MSN SOAP", "Unable to connect to %s !\n", soapconn->login_host);
+			// dispatch next request
+			msn_soap_post(soapconn, NULL);
+		}
+	}
+	else if (strstr(soapconn->read_buf, "HTTP/1.1 401 Unauthorized") != NULL)
+	{
+		const char *error;
+
+		purple_debug_error("MSN SOAP", "Received HTTP error 401 Unauthorized\n");
+		if ((error = strstr(soapconn->read_buf, "WWW-Authenticate")) != NULL)
+		{
+			if ((error = strstr(error, "cbtxt=")) != NULL)
+			{
+				const char *c;
+				char *temp;
+
+				error += strlen("cbtxt=");
+
+				if ((c = strchr(error, '\n')) == NULL)
+					c = error + strlen(error);
+
+				temp = g_strndup(error, c - error);
+				error = purple_url_decode(temp);
+				g_free(temp);
+			}
+		}
+
+		msn_session_set_error(session, MSN_ERROR_AUTH, error);
+	}
+	/* Handle Passport 3.0 authentication failures.
+	 * Further info: http://msnpiki.msnfanatic.com/index.php/MSNP13:SOAPTweener
+	 */
+	else if (strstr(soapconn->read_buf,
+				"<faultcode>wsse:FailedAuthentication</faultcode>") != NULL)
+	{
+		gchar *faultstring;
+
+		faultstring = strstr(soapconn->read_buf, "<faultstring>");
+
+		if (faultstring != NULL)
+		{
+			gchar *c;
+			faultstring += strlen("<faultstring>");
+			if (faultstring < soapconn->read_buf + soapconn->read_len) {
+				c = strstr(soapconn->read_buf, "</faultstring>");
+				if (c != NULL) {
+					*c = '\0';
+					msn_session_set_error(session, MSN_ERROR_AUTH, faultstring);
+				}
+			}
+		}
+		
+	}
+	else if (strstr(soapconn->read_buf, "HTTP/1.1 503 Service Unavailable"))
+	{
+		msn_session_set_error(session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
+	}
+	else if ((strstr(soapconn->read_buf, "HTTP/1.1 200 OK"))
+		||(strstr(soapconn->read_buf, "HTTP/1.1 500")))
+	{
+		gboolean soapconn_is_valid = FALSE;
+
+		/*OK! process the SOAP body*/
+		body_start = (char *)g_strstr_len(soapconn->read_buf, soapconn->read_len,"\r\n\r\n");
+		if (!body_start) {
+			return;
+		}
+		body_start += 4;
+
+		if (body_start > soapconn->read_buf + soapconn->read_len)
+			return;
+
+		/* we read the content-length*/
+		if ( (length_start = g_strstr_len(soapconn->read_buf, soapconn->read_len, "Content-Length: ")) != NULL)
+			length_start += strlen("Content-Length: ");
+
+		if (length_start > soapconn->read_buf + soapconn->read_len)
+			return;
+
+		if ( (length_end = strstr(length_start, "\r\n")) == NULL )
+			return;
+
+		body_len = g_strndup(length_start, length_end - length_start);
+
+		/*setup the conn body */
+		soapconn->body		= body_start;
+		soapconn->body_len	= atoi(body_len);
+		g_free(body_len);
+#ifdef MSN_SOAP_DEBUG
+		purple_debug_misc("MSN SOAP","SOAP bytes read so far: %d, Content-Length: %d\n", soapconn->read_len, soapconn->body_len);
+#endif
+		soapconn->need_to_read = (body_start - soapconn->read_buf + soapconn->body_len) - soapconn->read_len;
+		if ( soapconn->need_to_read > 0 ) {
+			return;
+		}
+
+#if defined(MSN_SOAP_DEBUG) && !defined(_WIN32)
+
+		node = xmlnode_from_str(soapconn->body, soapconn->body_len);
+	
+		if (node != NULL) {
+			formattedxml = xmlnode_to_formatted_str(node, NULL);
+			http_headers = g_strndup(soapconn->read_buf, soapconn->body - soapconn->read_buf);
+				
+			purple_debug_info("MSN SOAP","Data with XML payload received from the SOAP server:\n%s%s\n", http_headers, formattedxml);
+			g_free(http_headers);
+			g_free(formattedxml);
+			xmlnode_free(node);
+		}
+		else
+			purple_debug_info("MSN SOAP","Data received from the SOAP server:\n%s\n", soapconn->read_buf);
+#endif
+
+		/*remove the read handler*/
+		msn_soap_close_handler( &(soapconn->input_handler) );
+//		purple_input_remove(soapconn->input_handler);
+//		soapconn->input_handler = 0;
+		/*
+		 * close the soap connection,if more soap request came,
+		 * Just reconnect to do it,
+		 *
+		 * To solve the problem described below:
+		 * When I post the soap request in one socket one after the other,
+		 * The first read is ok, But the second soap read always got 0 bytes,
+		 * Weird!
+		 * */
+		msn_soap_close(soapconn);
+
+		/*call the read callback*/
+		if ( soapconn->read_cb != NULL ) {
+			soapconn_is_valid = soapconn->read_cb(soapconn);
+		}
+		
+		if (!soapconn_is_valid) {
+			return;
+		}
+
+		/* dispatch next request in queue */
+		msn_soap_post(soapconn, NULL);
+	}	
+	return;
+}
+
+void 
+msn_soap_free_read_buf(MsnSoapConn *soapconn)
+{
+	g_return_if_fail(soapconn != NULL);
+	
+	if (soapconn->read_buf) {
+		g_free(soapconn->read_buf);
+	}
+	soapconn->read_buf = NULL;
+	soapconn->read_len = 0;
+	soapconn->need_to_read = 0;
+}
+
+void
+msn_soap_free_write_buf(MsnSoapConn *soapconn)
+{
+	g_return_if_fail(soapconn != NULL);
+
+	if (soapconn->write_buf) {
+		g_free(soapconn->write_buf);
+	}
+	soapconn->write_buf = NULL;
+	soapconn->written_len = 0;
+}
+
+/*Soap write process func*/
+static void
+msn_soap_write_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	MsnSoapConn *soapconn = data;
+	int len, total_len;
+
+	g_return_if_fail(soapconn != NULL);
+	if ( soapconn->write_buf == NULL ) {
+		purple_debug_error("MSN SOAP","SOAP write buffer is NULL\n");
+	//	msn_soap_check_conn_errors(soapconn);
+	//	purple_input_remove(soapconn->output_handler);
+	//	soapconn->output_handler = 0;
+		msn_soap_close_handler( &(soapconn->output_handler) );
+		return;
+	}
+	total_len = strlen(soapconn->write_buf);
+
+	/* 
+	 * write the content to SSL server,
+	 */
+	len = purple_ssl_write(soapconn->gsc,
+		soapconn->write_buf + soapconn->written_len,
+		total_len - soapconn->written_len);
+
+	if (len < 0 && errno == EAGAIN)
+		return;
+	else if (len <= 0){
+		/*SSL write error!*/
+//		msn_soap_check_conn_errors(soapconn);
+
+		msn_soap_close_handler( &(soapconn->output_handler) );
+//		purple_input_remove(soapconn->output_handler);
+//		soapconn->output_handler = 0;
+
+		msn_soap_close(soapconn);
+
+		/* TODO: notify of the error */
+		purple_debug_error("MSN SOAP", "Error writing to SSL connection!\n");
+		msn_soap_post(soapconn, NULL);
+		return;
+	}
+	soapconn->written_len += len;
+
+	if (soapconn->written_len < total_len)
+		return;
+
+	msn_soap_close_handler( &(soapconn->output_handler) );
+//	purple_input_remove(soapconn->output_handler);
+//	soapconn->output_handler = 0;
+
+	/*clear the write buff*/
+	msn_soap_free_write_buf(soapconn);
+
+	/* Write finish!
+	 * callback for write done
+	 */
+	if(soapconn->written_cb != NULL){
+		soapconn->written_cb(soapconn);
+	}
+	/*maybe we need to read the input?*/
+	if ( soapconn->input_handler == 0 ) {
+		soapconn->input_handler = purple_input_add(soapconn->gsc->fd,
+			PURPLE_INPUT_READ, msn_soap_read_cb, soapconn);
+	}
+}
+
+/*write the buffer to SOAP connection*/
+void
+msn_soap_write(MsnSoapConn * soapconn, char *write_buf, MsnSoapWrittenCbFunction written_cb)
+{
+	if (soapconn == NULL) {
+		return;
+	}
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_PROCESSING);
+
+	soapconn->write_buf = write_buf;
+	soapconn->written_len = 0;
+	soapconn->written_cb = written_cb;
+	
+	msn_soap_free_read_buf(soapconn);
+
+	/*clear the read buffer first*/
+	/*start the write*/
+	soapconn->output_handler = purple_input_add(soapconn->gsc->fd, PURPLE_INPUT_WRITE,
+						    msn_soap_write_cb, soapconn);
+	msn_soap_write_cb(soapconn, soapconn->gsc->fd, PURPLE_INPUT_WRITE);
+}
+
+/* New a soap request*/
+MsnSoapReq *
+msn_soap_request_new(const char *host,const char *post_url,const char *soap_action,
+				const char *body, const gpointer data_cb,
+				MsnSoapReadCbFunction read_cb,
+				MsnSoapWrittenCbFunction written_cb,
+				MsnSoapConnectInitFunction connect_init)
+{
+	MsnSoapReq *request;
+
+	request = g_new0(MsnSoapReq, 1);
+	request->id = 0;
+
+	request->login_host = g_strdup(host);
+	request->login_path = g_strdup(post_url);
+	request->soap_action		= g_strdup(soap_action);
+	request->body		= g_strdup(body);
+	request->data_cb 	= data_cb;
+	request->read_cb	= read_cb;
+	request->written_cb	= written_cb;
+	request->connect_init	= connect_init;
+
+	return request;
+}
+
+/*free a soap request*/
+void
+msn_soap_request_free(MsnSoapReq *request)
+{
+	g_return_if_fail(request != NULL);
+
+	g_free(request->login_host);
+	g_free(request->login_path);
+	g_free(request->soap_action);
+	g_free(request->body);
+	request->read_cb	= NULL;
+	request->written_cb	= NULL;
+	request->connect_init	= NULL;
+
+	g_free(request);
+}
+
+/*post the soap request queue's head request*/
+void
+msn_soap_post_head_request(MsnSoapConn *soapconn)
+{
+	g_return_if_fail(soapconn != NULL);
+	g_return_if_fail(soapconn->soap_queue != NULL);
+	
+	if (soapconn->step == MSN_SOAP_CONNECTED ||
+	    soapconn->step == MSN_SOAP_CONNECTED_IDLE) {
+
+		purple_debug_info("MSN SOAP", "Posting new request from head of the queue\n");
+
+		if ( !g_queue_is_empty(soapconn->soap_queue) ) {
+			MsnSoapReq *request;
+
+			if ( (request = g_queue_pop_head(soapconn->soap_queue)) != NULL ) {
+				msn_soap_post_request(soapconn,request);
+			}
+		} else {
+			purple_debug_info("MSN SOAP", "No requests to process found.\n");
+			msn_soap_set_process_step(soapconn, MSN_SOAP_CONNECTED_IDLE);
+		}
+	}
+}
+
+/*post the soap request ,
+ * if not connected, Connected first.
+ */
+void
+msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request)
+{
+	MsnSoapReq *head_request;
+
+	if (soapconn == NULL)
+		return;
+
+	if (request != NULL) {
+#ifdef MSN_SOAP_DEBUG
+		purple_debug_misc("MSN SOAP", "Request added to the queue\n");
+#endif
+		g_queue_push_tail(soapconn->soap_queue, request);
+	}
+
+	if ( !g_queue_is_empty(soapconn->soap_queue)) {
+
+		/* we may have to reinitialize the soap connection, so avoid
+		 * reusing the connection for now */
+
+		if (soapconn->step == MSN_SOAP_CONNECTED_IDLE) {
+			purple_debug_misc("MSN SOAP","Already connected to SOAP server, re-initializing\n");
+			msn_soap_close_handler( &(soapconn->input_handler) );
+			msn_soap_close_handler( &(soapconn->output_handler) );
+			msn_soap_close(soapconn);
+		}
+
+		if (!msn_soap_connected(soapconn) && (soapconn->step == MSN_SOAP_UNCONNECTED)) {
+
+			/*not connected?and we have something to process connect it first*/
+			purple_debug_misc("MSN SOAP","No connection to SOAP server. Connecting...\n");
+			head_request = g_queue_peek_head(soapconn->soap_queue);
+
+			if (head_request == NULL) {
+				purple_debug_error("MSN SOAP", "Queue is not empty, but failed to peek the head request!\n");
+				return;
+			}
+
+			if (head_request->connect_init != NULL) {
+				head_request->connect_init(soapconn);
+			}
+			msn_soap_connect(soapconn);
+			return;
+		}
+
+		purple_debug_info("MSN SOAP", "Currently processing another SOAP request\n");
+	} else {
+		purple_debug_info("MSN SOAP", "No requests left to dispatch\n");
+	}
+}
+
+/*Post the soap request action*/
+void
+msn_soap_post_request(MsnSoapConn *soapconn, MsnSoapReq *request)
+{
+	char * soap_head = NULL;
+	char * request_str = NULL;
+#ifdef MSN_SOAP_DEBUG
+#if !defined(_WIN32)
+	xmlnode * node;
+#endif
+	purple_debug_misc("MSN SOAP","msn_soap_post_request()\n");
+#endif
+
+	msn_soap_set_process_step(soapconn, MSN_SOAP_PROCESSING);
+	soap_head = g_strdup_printf(
+					"POST %s HTTP/1.1\r\n"
+					"SOAPAction: %s\r\n"
+					"Content-Type:text/xml; charset=utf-8\r\n"
+					"Cookie: MSPAuth=%s\r\n"
+					"User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)\r\n"
+					"Accept: */*\r\n"
+					"Host: %s\r\n"
+					"Content-Length: %" G_GSIZE_FORMAT "\r\n"
+					"Connection: Keep-Alive\r\n"
+					"Cache-Control: no-cache\r\n\r\n",
+					request->login_path,
+					request->soap_action,
+					soapconn->session->passport_info.mspauth,
+					request->login_host,
+					strlen(request->body)
+					);
+	request_str = g_strdup_printf("%s%s", soap_head, request->body);
+
+#if defined(MSN_SOAP_DEBUG) && !defined(_WIN32)
+	node = xmlnode_from_str(request->body, -1);
+	if (node != NULL) {
+		char *formattedstr = xmlnode_to_formatted_str(node, NULL);
+		purple_debug_info("MSN SOAP","Posting request to SOAP server:\n%s%s\n",soap_head, formattedstr);
+		g_free(formattedstr);
+		xmlnode_free(node);
+	}
+	else
+		purple_debug_info("MSN SOAP","Failed to parse SOAP request being sent:\n%s\n", request_str);
+#endif
+	
+	g_free(soap_head);
+	/*free read buffer*/
+	// msn_soap_free_read_buf(soapconn);
+	/*post it to server*/
+	soapconn->data_cb = request->data_cb;
+	msn_soap_write(soapconn, request_str, request->written_cb);
+}
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/soap.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/msn/soap.h	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,167 @@
+/**
+ * @file soap.h
+ * 	header file for SOAP connection related process
+ *	Author
+ * 		MaYuan<mayuan2006@gmail.com>
+ * 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 _MSN_SOAP_H_
+#define _MSN_SOAP_H_
+
+#define MSN_SOAP_READ_BUFF_SIZE		8192
+
+/* define this to debug the communications with the SOAP server */
+/* #define MSN_SOAP_DEBUG */
+
+#define MSN_SOAP_READ 1
+#define MSN_SOAP_WRITE 2
+
+typedef enum
+{
+	MSN_SOAP_UNCONNECTED,
+	MSN_SOAP_CONNECTING,
+	MSN_SOAP_CONNECTED,
+	MSN_SOAP_PROCESSING,
+	MSN_SOAP_CONNECTED_IDLE
+}MsnSoapStep;
+
+/* MSN SoapRequest structure*/
+typedef struct _MsnSoapReq MsnSoapReq;
+
+/* MSN Https connection structure*/
+typedef struct _MsnSoapConn MsnSoapConn;
+
+typedef void (*MsnSoapConnectInitFunction)(MsnSoapConn *);
+typedef gboolean (*MsnSoapReadCbFunction)(MsnSoapConn *);
+typedef void (*MsnSoapWrittenCbFunction)(MsnSoapConn *);
+
+typedef gboolean (*MsnSoapSslConnectCbFunction)(MsnSoapConn *, PurpleSslConnection *);
+typedef void (*MsnSoapSslErrorCbFunction)(MsnSoapConn *, PurpleSslConnection *, PurpleSslErrorType);
+
+
+struct _MsnSoapReq{
+	/*request sequence*/
+	int	 id;
+
+	char *login_host;
+	char *login_path;
+	char *soap_action;
+
+	char *body;
+	
+	gpointer data_cb;
+	MsnSoapReadCbFunction read_cb;
+	MsnSoapWrittenCbFunction written_cb;
+	MsnSoapConnectInitFunction connect_init;
+};
+
+struct _MsnSoapConn{
+	MsnSession *session;
+	gpointer parent;
+
+	char *login_host;
+	char *login_path;
+	char *soap_action;
+
+	MsnSoapStep step;
+	/*ssl connection?*/
+	guint	ssl_conn;
+	/*normal connection*/
+	guint	fd;
+	/*SSL connection*/
+	PurpleSslConnection *gsc;
+	/*ssl connection callback*/
+	MsnSoapSslConnectCbFunction connect_cb;
+	/*ssl error callback*/
+	MsnSoapSslErrorCbFunction error_cb;
+
+	/*read handler*/
+	guint input_handler;
+	/*write handler*/
+	guint output_handler;
+
+	/*Queue of SOAP request to send*/
+	int soap_id;
+	GQueue *soap_queue;
+
+	/*write buffer*/
+	char *write_buf;
+	gsize written_len;
+	MsnSoapWrittenCbFunction written_cb;
+
+	/*read buffer*/
+	char *read_buf;
+	gsize read_len;
+	gsize need_to_read;
+	MsnSoapReadCbFunction read_cb;
+
+	gpointer data_cb;
+
+	/*HTTP reply body part*/
+	char *body;
+	int body_len;
+};
+
+
+/*Function Prototype*/
+/*Soap Request Function */
+MsnSoapReq *msn_soap_request_new(const char *host, const char *post_url,
+				 const char *soap_action, const char *body,
+				 const gpointer data_cb,
+				 MsnSoapReadCbFunction read_cb,
+				 MsnSoapWrittenCbFunction written_cb,
+				 MsnSoapConnectInitFunction connect_init);
+
+void msn_soap_request_free(MsnSoapReq *request);
+void msn_soap_post_request(MsnSoapConn *soapconn,MsnSoapReq *request);
+void msn_soap_post_head_request(MsnSoapConn *soapconn);
+
+/*new a soap conneciton */
+MsnSoapConn *msn_soap_new(MsnSession *session,gpointer data,int sslconn);
+
+/*destroy */
+void msn_soap_destroy(MsnSoapConn *soapconn);
+
+/*init a soap conneciton */
+void msn_soap_init(MsnSoapConn *soapconn, char * host, int ssl,
+		   MsnSoapSslConnectCbFunction connect_cb,
+		   MsnSoapSslErrorCbFunction error_cb);
+void msn_soap_connect(MsnSoapConn *soapconn);
+void msn_soap_close(MsnSoapConn *soapconn);
+
+/*write to soap*/
+void msn_soap_write(MsnSoapConn * soapconn, char *write_buf, MsnSoapWrittenCbFunction written_cb);
+void msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request);
+
+void msn_soap_free_read_buf(MsnSoapConn *soapconn);
+void msn_soap_free_write_buf(MsnSoapConn *soapconn);
+void msn_soap_connect_cb(gpointer data, PurpleSslConnection *gsc, PurpleInputCondition cond);
+void msn_soap_read_cb(gpointer data, gint source, PurpleInputCondition cond);
+
+/*clean the unhandled requests*/
+void msn_soap_clean_unhandled_requests(MsnSoapConn *soapconn);
+
+/*check if the soap connection is connected*/
+int msn_soap_connected(MsnSoapConn *soapconn);
+void msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step);
+
+#endif/*_MSN_SOAP_H_*/
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/state.c
--- a/libpurple/protocols/msn/state.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/state.c	Fri Sep 28 20:30:26 2007 +0000
@@ -38,6 +38,197 @@
 	N_("Available")
 };
 
+/* Local Function Prototype*/
+static char *msn_build_psm(const char *psmstr,const char *mediastr,
+						   const char *guidstr);
+
+/*
+ * WLM media PSM info build prcedure
+ *
+ * Result can like:
+ *	<CurrentMedia>\0Music\01\0{0} - {1}\0Song Title\0Song Artist\0Song Album\0\0</CurrentMedia>\
+ *	<CurrentMedia>\0Games\01\0Playing {0}\0Game Name\0</CurrentMedia>\
+ *	<CurrentMedia>\0Office\01\0Office Message\0Office App Name\0</CurrentMedia>"
+ */
+static char *
+msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr)
+{
+	xmlnode *dataNode,*psmNode,*mediaNode,*guidNode;
+	char *result;
+	int length;
+
+	dataNode = xmlnode_new("Data");
+
+	psmNode = xmlnode_new("PSM");
+	if(psmstr != NULL){
+		xmlnode_insert_data(psmNode,psmstr,strlen(psmstr));
+	}
+	xmlnode_insert_child(dataNode,psmNode);
+
+	mediaNode = xmlnode_new("CurrentMedia");
+	if(mediastr != NULL){
+		xmlnode_insert_data(mediaNode,mediastr,strlen(mediastr));
+	}
+	xmlnode_insert_child(dataNode,mediaNode);
+
+	guidNode = xmlnode_new("MachineGuid");
+	if(guidstr != NULL){
+		xmlnode_insert_data(guidNode,guidstr,strlen(guidstr));
+	}
+	xmlnode_insert_child(dataNode,guidNode);
+
+	result = xmlnode_to_str(dataNode,&length);
+	xmlnode_free(dataNode);
+	return result;
+}
+
+/* parse CurrentMedia string */
+char *
+msn_parse_currentmedia(const char *cmedia)
+{
+	char **cmedia_array;
+	GString *buffer = NULL;
+	int strings;
+
+	if ((cmedia == NULL) || (*cmedia == '\0')) {
+		purple_debug_info("msn", "No currentmedia string\n");
+		return NULL;
+	}
+
+	purple_debug_info("msn", "Parsing currentmedia string: \"%s\"\n", cmedia);
+
+	cmedia_array = g_strsplit(cmedia, "\\0", 0);
+
+	strings = 0;
+	/* Yes, we want to skip the first element here, as it is empty due to
+	 * the cmedia string starting with \0 -- see the examples below. */
+	while (cmedia_array[++strings] != NULL);
+
+	/* The cmedia_array[2] field contains a 1 if enabled. */
+	if ((strings > 3) && (!strcmp(cmedia_array[2], "1"))) {
+		char *inptr = cmedia_array[3];
+
+		buffer = g_string_new(NULL);
+
+		while (*inptr != '\0') {
+			if ((*inptr == '{') && ((*(inptr + 1) != '\0') && (*(inptr+2) == '}'))) {
+				char *tmpptr;
+				int tmp;
+
+				errno = 0;
+				tmp = strtol(inptr + 1, &tmpptr, 10);
+
+				if (errno == 0 && tmpptr != inptr + 1 &&
+				    tmp + 4 < strings) {
+					/* Replace {?} tag with appropriate text only when successful.
+					 * Skip otherwise. */
+					buffer = g_string_append(buffer, cmedia_array[tmp + 4]);
+				}
+				inptr += 3; /* Skip to the next char after '}' */
+			} else {
+				buffer = g_string_append_c(buffer, *inptr++);
+			}
+		}
+		purple_debug_info("msn", "Parsed currentmedia string, result: \"%s\"\n",
+		                  buffer->str);
+	} else {
+		purple_debug_info("msn", "Current media marked disabled, not parsing.\n");
+	}
+
+	g_strfreev(cmedia_array);
+	return buffer ? g_string_free(buffer, FALSE) : NULL;
+}
+
+/* get the CurrentMedia info from the XML string */
+char *
+msn_get_currentmedia(char *xml_str, gsize len)
+{
+	xmlnode *payloadNode, *currentmediaNode;
+	char *currentmedia;
+	
+	purple_debug_info("msn","msn get CurrentMedia\n");
+	payloadNode = xmlnode_from_str(xml_str, len);
+	if (!payloadNode){
+		purple_debug_error("msn","PSM XML parse Error!\n");
+		return NULL;
+	}
+	currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia");
+	if (currentmediaNode == NULL){
+		purple_debug_info("msn","No CurrentMedia Node");
+		xmlnode_free(payloadNode);
+		return NULL;
+	}
+	currentmedia = xmlnode_get_data(currentmediaNode);
+
+	xmlnode_free(payloadNode);
+
+	return currentmedia;
+}
+
+/*get the PSM info from the XML string*/
+char *
+msn_get_psm(char *xml_str, gsize len)
+{
+	xmlnode *payloadNode, *psmNode;
+	char *psm;
+	
+	purple_debug_info("MSNP14","msn get PSM\n");
+	payloadNode = xmlnode_from_str(xml_str, len);
+	if (!payloadNode){
+		purple_debug_error("MSNP14","PSM XML parse Error!\n");
+		return NULL;
+	}
+	psmNode = xmlnode_get_child(payloadNode, "PSM");
+	if (psmNode == NULL){
+		purple_debug_info("MSNP14","No PSM status Node");
+		xmlnode_free(payloadNode);
+		return NULL;
+	}
+	psm = xmlnode_get_data(psmNode);
+
+	xmlnode_free(payloadNode);
+
+	return psm;
+}
+
+/* set the MSN's PSM info,Currently Read from the status Line 
+ * Thanks for Cris Code
+ */
+void
+msn_set_psm(MsnSession *session)
+{
+	PurpleAccount *account = session->account;
+	PurplePresence *presence;
+	PurpleStatus *status;
+	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
+	char *payload;
+	const char *statusline;
+	gchar *unescapedstatusline;
+
+	g_return_if_fail(session != NULL);
+	g_return_if_fail(session->notification != NULL);
+
+	cmdproc = session->notification->cmdproc;
+	/*prepare PSM info*/
+	if(session->psm){
+		g_free(session->psm);
+	}
+	/*Get the PSM string from Purple's Status Line*/
+	presence = purple_account_get_presence(account);
+	status = purple_presence_get_active_status(presence);
+	statusline = purple_status_get_attr_string(status, "message");
+	unescapedstatusline = purple_unescape_html(statusline);
+	session->psm = msn_build_psm(unescapedstatusline, NULL, NULL);
+	g_free(unescapedstatusline);
+	payload = session->psm;
+
+	purple_debug_misc("MSNP14","Sending UUX command with payload: %s\n",payload);
+	trans = msn_transaction_new(cmdproc, "UUX","%d",strlen(payload));
+	msn_transaction_set_payload(trans, payload, strlen(payload));
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
 void
 msn_change_status(MsnSession *session)
 {
@@ -79,6 +270,7 @@
 
 		g_free(msnobj_str);
 	}
+	msn_set_psm(session);
 }
 
 const char *
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/state.h
--- a/libpurple/protocols/msn/state.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/state.h	Fri Sep 28 20:30:26 2007 +0000
@@ -59,6 +59,17 @@
 
 const char *msn_state_get_text(MsnAwayType state);
 
+void msn_set_psm(MsnSession *session);
+
+/* Parse CurrentMedia string */
+char * msn_parse_currentmedia(const char *cmedia);
+
+/* Get the CurrentMedia info from the XML string */
+char * msn_get_currentmedia(char *xml_str,gsize len);
+
+/*get the PSM info from the XML string*/
+char * msn_get_psm(char *xml_str,gsize len);
+
 MsnAwayType msn_state_from_account(PurpleAccount *account);
 
 #endif /* _MSN_STATE_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/switchboard.c
--- a/libpurple/protocols/msn/switchboard.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Fri Sep 28 20:30:26 2007 +0000
@@ -25,7 +25,7 @@
 #include "prefs.h"
 #include "switchboard.h"
 #include "notification.h"
-#include "msn-utils.h"
+#include "msnutils.h"
 
 #include "error.h"
 
@@ -534,6 +534,7 @@
 	payload = msn_message_gen_payload(msg, &payload_len);
 
 #ifdef MSN_DEBUG_SB
+	purple_debug_info("MSNP14","SB length:{%d}",payload_len);
 	msn_message_show_readable(msg, "SB SEND", FALSE);
 #endif
 
@@ -621,6 +622,7 @@
 	g_return_if_fail(swboard != NULL);
 	g_return_if_fail(msg     != NULL);
 
+	purple_debug_info("MSNP14","switchboard send msg..\n");
 	if (msn_switchboard_can_send(swboard))
 		release_msg(swboard, msg);
 	else if (queue)
@@ -727,7 +729,8 @@
 
 	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
 
-	msn_message_parse_payload(msg, payload, len);
+	msn_message_parse_payload(msg, payload, len,
+					MSG_LINE_DEM,MSG_BODY_DEM);
 #ifdef MSN_DEBUG_SB
 	msn_message_show_readable(msg, "SB RECV", FALSE);
 #endif
@@ -749,6 +752,14 @@
 }
 
 static void
+ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_misc("MSNP14","get UBM...\n");
+	cmdproc->servconn->payload_len = atoi(cmd->params[4]);
+	cmdproc->last_cmd->payload_cb = msg_cmd_post;
+}
+
+static void
 nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnMessage *msg;
@@ -1084,6 +1095,8 @@
 cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
 {
 	int reason = MSN_SB_ERROR_UNKNOWN;
+	MsnMessage *msg;
+	MsnSwitchBoard *swboard = trans->data;
 
 	if (error == 215)
 	{
@@ -1096,7 +1109,19 @@
 	}
 
 	purple_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error);
+	purple_debug_warning("msn", "Will Use Offline Message to sendit\n");
 
+//	cal_error_helper(trans, reason);
+	/*offline Message send Process*/
+
+	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL){
+		purple_debug_warning("MSNP14","offline msg to send:{%s}\n",msg->body);
+		/* The messages could not be sent due to a switchboard error */
+		swboard->error = MSN_SB_ERROR_USER_OFFLINE;
+		msg_error_helper(swboard->cmdproc, msg,
+							 MSN_MSG_ERROR_SB);
+		msn_message_unref(msg);
+	}
 	cal_error_helper(trans, reason);
 }
 
@@ -1140,6 +1165,7 @@
 		/* The conversation window was closed. */
 		return;
 
+	purple_debug_info("MSNP14","Switchboard:auth:{%s} socket:{%s}\n",cmd->params[4],cmd->params[2]);
 	msn_switchboard_set_auth_key(swboard, cmd->params[4]);
 
 	msn_parse_socket(cmd->params[2], &host, &port);
@@ -1252,6 +1278,7 @@
 	msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd);
 
 	msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "UBM", ubm_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "JOI", joi_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "BYE", bye_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/sync.c
--- a/libpurple/protocols/msn/sync.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/sync.c	Fri Sep 28 20:30:26 2007 +0000
@@ -90,9 +90,9 @@
 {
 	MsnSession *session = cmdproc->session;
 	const char *name;
-	int group_id;
+	const char *group_id;
 
-	group_id = atoi(cmd->params[0]);
+	group_id = cmd->params[0];
 	name = purple_url_decode(cmd->params[1]);
 
 	msn_group_new(session->userlist, group_id, name);
@@ -156,10 +156,10 @@
 
 		for (c = tokens; *c != NULL; c++)
 		{
-			int id;
+			char *id;
 
-			id = atoi(*c);
-			group_ids = g_slist_append(group_ids, GINT_TO_POINTER(id));
+			id = *c;
+			group_ids = g_slist_append(group_ids, g_strdup(id));
 		}
 
 		g_strfreev(tokens);
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/user.c
--- a/libpurple/protocols/msn/user.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/user.c	Fri Sep 28 20:30:26 2007 +0000
@@ -25,6 +25,7 @@
 #include "user.h"
 #include "slp.h"
 
+/*new a user object*/
 MsnUser *
 msn_user_new(MsnUserList *userlist, const char *passport,
 			 const char *store_name)
@@ -50,6 +51,7 @@
 	return user;
 }
 
+/*destroy a user object*/
 void
 msn_user_destroy(MsnUser *user)
 {
@@ -59,7 +61,14 @@
 		g_hash_table_destroy(user->clientcaps);
 
 	if (user->group_ids != NULL)
+	{
+		GList *l;
+		for (l = user->group_ids; l != NULL; l = l->next)
+		{
+			g_free(l->data);
+		}
 		g_list_free(user->group_ids);
+	}
 
 	if (user->msnobj != NULL)
 		msn_object_destroy(user->msnobj);
@@ -67,6 +76,7 @@
 	g_free(user->passport);
 	g_free(user->friendly_name);
 	g_free(user->store_name);
+	g_free(user->uid);
 	g_free(user->phone.home);
 	g_free(user->phone.work);
 	g_free(user->phone.mobile);
@@ -81,7 +91,18 @@
 
 	account = user->userlist->session->account;
 
-	if (user->status != NULL) {
+	if (user->statusline != NULL && user->currentmedia != NULL) {
+		purple_prpl_got_user_status(account, user->passport, user->status,
+		                          "message", user->statusline,
+		                          "currentmedia", user->currentmedia, NULL);
+	} else if (user->currentmedia != NULL) {
+		purple_prpl_got_user_status(account, user->passport, user->status, "currentmedia",
+		                          user->currentmedia, NULL);
+	} else if (user->statusline != NULL) {
+		//char *status = g_strdup_printf("%s - %s", user->status, user->statusline);
+		purple_prpl_got_user_status(account, user->passport, user->status,
+		                          "message", user->statusline, NULL);
+	} else if (user->status != NULL) {
 		if (!strcmp(user->status, "offline") && user->mobile) {
 			purple_prpl_got_user_status(account, user->passport, "offline", NULL);
 			purple_prpl_got_user_status(account, user->passport, "mobile", NULL);
@@ -142,12 +163,66 @@
 }
 
 void
+msn_user_set_statusline(MsnUser *user, const char *statusline)
+{
+	g_return_if_fail(user != NULL);
+
+	g_free(user->statusline);
+	user->statusline = g_strdup(statusline);
+}
+
+void
+msn_user_set_currentmedia(MsnUser *user, const char *currentmedia)
+{
+	g_return_if_fail(user != NULL);
+
+	g_free(user->currentmedia);
+	user->currentmedia = g_strdup(currentmedia);
+}
+
+void
 msn_user_set_store_name(MsnUser *user, const char *name)
 {
 	g_return_if_fail(user != NULL);
 
-	g_free(user->store_name);
-	user->store_name = g_strdup(name);
+	if (name != NULL)
+	{
+		g_free(user->store_name);
+		user->store_name = g_strdup(name);
+	}
+}
+
+void
+msn_user_set_uid(MsnUser *user, const char *uid)
+{
+	g_return_if_fail(user != NULL);
+
+	g_free(user->uid);
+	user->uid = g_strdup(uid);
+}
+
+void
+msn_user_set_type(MsnUser *user, MsnUserType type)
+{
+	g_return_if_fail(user != NULL);
+
+	user->type = type;
+}
+
+void
+msn_user_set_op(MsnUser *user, int list_op)
+{
+	g_return_if_fail(user != NULL);
+
+	user->list_op |= list_op;
+}
+
+void
+msn_user_unset_op(MsnUser *user, int list_op)
+{
+	g_return_if_fail(user != NULL);
+	
+	user->list_op &= ~list_op;
 }
 
 void
@@ -218,54 +293,97 @@
 	}
 }
 
+/*add group id to User object*/
 void
-msn_user_add_group_id(MsnUser *user, int id)
+msn_user_add_group_id(MsnUser *user, const char* id)
 {
 	MsnUserList *userlist;
 	PurpleAccount *account;
 	PurpleBuddy *b;
 	PurpleGroup *g;
 	const char *passport;
+	char *group_id;
 	const char *group_name;
 
 	g_return_if_fail(user != NULL);
-	g_return_if_fail(id >= 0);
+	g_return_if_fail(id != NULL);
 
-	user->group_ids = g_list_append(user->group_ids, GINT_TO_POINTER(id));
+	group_id = g_strdup(id);
+	user->group_ids = g_list_append(user->group_ids, group_id);
 
 	userlist = user->userlist;
 	account = userlist->session->account;
 	passport = msn_user_get_passport(user);
 
-	group_name = msn_userlist_find_group_name(userlist, id);
+	group_name = msn_userlist_find_group_name(userlist, group_id);
+
+	purple_debug_info("User","group id:%s,name:%s,user:%s\n", group_id, group_name, passport);
 
 	g = purple_find_group(group_name);
 
-	if ((id == 0) && (g == NULL))
+	if ((id == NULL) && (g == NULL))
 	{
 		g = purple_group_new(group_name);
 		purple_blist_add_group(g, NULL);
 	}
 
 	b = purple_find_buddy_in_group(account, passport, g);
-
 	if (b == NULL)
 	{
 		b = purple_buddy_new(account, passport, NULL);
-
 		purple_blist_add_buddy(b, NULL, g, NULL);
 	}
+	b->proto_data = user;
+	/*Update the blist Node info*/
+//	purple_blist_node_set_string(&(b->node), "", "");
+}
 
-	b->proto_data = user;
+/*check if the msn user is online*/
+gboolean
+msn_user_is_online(PurpleAccount *account, const char *name)
+{
+	PurpleBuddy *buddy;
+
+	buddy =purple_find_buddy(account,name);
+	return PURPLE_BUDDY_IS_ONLINE(buddy);
+}
+
+gboolean
+msn_user_is_yahoo(PurpleAccount *account, const char *name)
+{
+	MsnSession *session = NULL;
+	MsnUser *user;
+	PurpleConnection *gc;
+
+	gc = purple_account_get_connection(account);
+	if (gc != NULL)
+		session = gc->proto_data;
+
+	if ((session != NULL) && (session->protocol_ver == WLM_PROT_VER))
+		return FALSE;
+
+	if ((session != NULL) && (user = msn_userlist_find_user(session->userlist, name)) != NULL)
+	{
+		return (user->type == MSN_USER_TYPE_YAHOO);
+	}
+	return (strstr(name,"@yahoo.") != NULL);
 }
 
 void
-msn_user_remove_group_id(MsnUser *user, int id)
+msn_user_remove_group_id(MsnUser *user, const char *id)
 {
+	GList *l;
+
 	g_return_if_fail(user != NULL);
-	g_return_if_fail(id >= 0);
+	g_return_if_fail(id != NULL);
+
+	l = g_list_find_custom(user->group_ids, id, (GCompareFunc)strcmp);
 
-	user->group_ids = g_list_remove(user->group_ids, GINT_TO_POINTER(id));
+	if (l == NULL)
+		return;
+
+	g_free(l->data);
+	user->group_ids = g_list_remove_link(user->group_ids, l);
 }
 
 void
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/user.h
--- a/libpurple/protocols/msn/user.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/user.h	Fri Sep 28 20:30:26 2007 +0000
@@ -31,6 +31,17 @@
 
 #include "userlist.h"
 
+typedef enum
+{
+	MSN_USER_TYPE_UNKNOWN  = 0x00,
+	MSN_USER_TYPE_PASSPORT = 0x01,
+	MSN_USER_TYPE_UNKNOWN1 = 0x02,
+	MSN_USER_TYPE_MOBILE   = 0x04,
+	MSN_USER_TYPE_UNKNOWN2 = 0x08,
+	MSN_USER_TYPE_UNKNOWN3 = 0x10,
+	MSN_USER_TYPE_YAHOO    = 0x20
+} MsnUserType;
+
 /**
  * A user.
  */
@@ -45,7 +56,12 @@
 	char *store_name;       /**< The name stored in the server. */
 	char *friendly_name;    /**< The friendly name.             */
 
+	char * uid;				/*< User Id							*/
+
 	const char *status;     /**< The state of the user.         */
+	char *statusline;       /**< The state of the user.         */	
+	char *currentmedia;     /**< The current media of the user. */
+
 	gboolean idle;          /**< The idle state of the user.    */
 
 	struct
@@ -65,7 +81,12 @@
 
 	GHashTable *clientcaps; /**< The client's capabilities.     */
 
-	int list_op;
+	MsnUserType type;       /**< The user type                  */
+
+	int list_op;            /**< Which lists the user is in     */
+
+	guint membership_id[5];	/**< The membershipId sent by the contacts server,
+				     indexed by the list it belongs to		*/
 };
 
 /**************************************************************************/
@@ -102,6 +123,22 @@
  */
 void msn_user_update(MsnUser *user);
 
+ /**
+  *  Sets the new statusline of user.
+  * 
+  *  @param user The user.
+  *  @param state The statusline string.
+  */
+void msn_user_set_statusline(MsnUser *user, const char *statusline);
+
+ /**
+  *  Sets the current media of user.
+  * 
+  *  @param user The user.
+  *  @param state The statusline string.
+  */
+void msn_user_set_currentmedia(MsnUser *user, const char *currentmedia);
+
 /**
  * Sets the new state of user.
  *
@@ -156,7 +193,7 @@
  * @param user The user.
  * @param id   The group ID.
  */
-void msn_user_add_group_id(MsnUser *user, int id);
+void msn_user_add_group_id(MsnUser *user, const char * id);
 
 /**
  * Removes the group ID from a user.
@@ -164,7 +201,7 @@
  * @param user The user.
  * @param id   The group ID.
  */
-void msn_user_remove_group_id(MsnUser *user, int id);
+void msn_user_remove_group_id(MsnUser *user, const char * id);
 
 /**
  * Sets the home phone number for a user.
@@ -182,6 +219,9 @@
  */
 void msn_user_set_work_phone(MsnUser *user, const char *number);
 
+void msn_user_set_uid(MsnUser *user, const char *uid);
+void msn_user_set_type(MsnUser *user, MsnUserType type);
+
 /**
  * Sets the mobile phone number for a user.
  *
@@ -279,6 +319,22 @@
  */
 GHashTable *msn_user_get_client_caps(const MsnUser *user);
 
+/**
+ * check to see if user is online
+ */
+gboolean
+msn_user_is_online(PurpleAccount *account, const char *name);
+
+/**
+ * check to see if user is Yahoo User
+ */
+gboolean
+msn_user_is_yahoo(PurpleAccount *account ,const char *name);
+
+void msn_user_set_op(MsnUser *user, int list_op);
+void msn_user_unset_op(MsnUser *user, int list_op);
+
 /*@}*/
 
+
 #endif /* _MSN_USER_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/userlist.c
--- a/libpurple/protocols/msn/userlist.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/userlist.c	Fri Sep 28 20:30:26 2007 +0000
@@ -41,10 +41,21 @@
 msn_accept_add_cb(gpointer data)
 {
 	MsnPermitAdd *pa = data;
-	MsnSession *session = pa->gc->proto_data;
-	MsnUserList *userlist = session->userlist;
+
+	purple_debug_misc("MSN Userlist", "Accepted the new buddy: %s\n", pa->who);
 
-	msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_AL, NULL);
+	if (PURPLE_CONNECTION_IS_VALID(pa->gc))
+	{
+		MsnSession *session = pa->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
+		MsnUser *user = msn_userlist_find_add_user(userlist, pa->who, pa->who);
+
+
+		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
+
+		if (msn_userlist_user_is_in_list(user, MSN_LIST_FL))
+			msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL);
+	}
 
 	g_free(pa->who);
 	g_free(pa->friendly);
@@ -55,10 +66,20 @@
 msn_cancel_add_cb(gpointer data)
 {
 	MsnPermitAdd *pa = data;
-	MsnSession *session = pa->gc->proto_data;
-	MsnUserList *userlist = session->userlist;
+
+	purple_debug_misc("MSN Userlist", "Denied the new buddy: %s\n", pa->who);
 
-	msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_BL, NULL);
+	if (PURPLE_CONNECTION_IS_VALID(pa->gc))
+	{
+		MsnSession *session = pa->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
+		MsnCallbackState *state = msn_callback_state_new();
+
+		msn_callback_state_set_action(state, MSN_DENIED_BUDDY);
+
+		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL);
+		msn_del_contact_from_list(session->contact, state, pa->who, MSN_LIST_PL);
+	}
 
 	g_free(pa->who);
 	g_free(pa->friendly);
@@ -68,59 +89,57 @@
 static void
 got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly)
 {
+	PurpleAccount *acct;
 	MsnPermitAdd *pa;
 
 	pa = g_new0(MsnPermitAdd, 1);
 	pa->who = g_strdup(passport);
 	pa->friendly = g_strdup(friendly);
 	pa->gc = gc;
-	
-	purple_account_request_authorization(purple_connection_get_account(gc), passport, NULL, friendly, NULL,
-					   purple_find_buddy(purple_connection_get_account(gc), passport) != NULL,
-					   msn_accept_add_cb, msn_cancel_add_cb, pa);
+
+	acct = purple_connection_get_account(gc);
+	purple_account_request_authorization(acct, passport, NULL, friendly, NULL,
+										 purple_find_buddy(acct, passport) != NULL,
+										 msn_accept_add_cb, msn_cancel_add_cb, pa);
+
 }
 
 /**************************************************************************
  * Utility functions
  **************************************************************************/
 
-static gboolean
-user_is_in_group(MsnUser *user, int group_id)
+gboolean
+msn_userlist_user_is_in_group(MsnUser *user, const char * group_id)
 {
 	if (user == NULL)
 		return FALSE;
 
-	if (group_id < 0)
+	if (group_id == NULL)
 		return FALSE;
 
-	if (g_list_find(user->group_ids, GINT_TO_POINTER(group_id)))
+	if (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp))
 		return TRUE;
 
 	return FALSE;
 }
 
-static gboolean
-user_is_there(MsnUser *user, int list_id, int group_id)
+gboolean
+msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
 {
 	int list_op;
 
 	if (user == NULL)
 		return FALSE;
-
+	
 	list_op = 1 << list_id;
 
-	if (!(user->list_op & list_op))
+	if (user->list_op & list_op)
+		return TRUE;
+	else
 		return FALSE;
-
-	if (list_id == MSN_LIST_FL)
-	{
-		if (group_id >= 0)
-			return user_is_in_group(user, group_id);
-	}
-
-	return TRUE;
 }
 
+#if 0
 static const char*
 get_store_name(MsnUser *user)
 {
@@ -148,31 +167,7 @@
 
 	return store_name;
 }
-
-static void
-msn_request_add_group(MsnUserList *userlist, const char *who,
-					  const char *old_group_name, const char *new_group_name)
-{
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
-	MsnMoveBuddy *data;
-
-	cmdproc = userlist->session->notification->cmdproc;
-	data = g_new0(MsnMoveBuddy, 1);
-
-	data->who = g_strdup(who);
-
-	if (old_group_name)
-		data->old_group_name = g_strdup(old_group_name);
-
-	trans = msn_transaction_new(cmdproc, "ADG", "%s %d",
-								purple_url_encode(new_group_name),
-								0);
-
-	msn_transaction_set_data(trans, data);
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
+#endif
 
 /**************************************************************************
  * Server functions
@@ -193,14 +188,16 @@
 	return -1;
 }
 
+/* this function msn_got_add_user isn't called anywhere */
 void
 msn_got_add_user(MsnSession *session, MsnUser *user,
-				 MsnListId list_id, int group_id)
+				 MsnListId list_id, const char * group_id)
 {
 	PurpleAccount *account;
 	const char *passport;
 	const char *friendly;
 
+	purple_debug_info("MSNP14","got add user...\n");
 	account = session->account;
 
 	passport = msn_user_get_passport(user);
@@ -214,7 +211,7 @@
 
 		serv_got_alias(gc, passport, friendly);
 
-		if (group_id >= 0)
+		if (group_id != NULL)
 		{
 			msn_user_add_group_id(user, group_id);
 		}
@@ -263,7 +260,7 @@
 			 *       looked at this.  Maybe we should use the store
 			 *       name instead? --KingAnt
 			 */
-			got_new_entry(gc, passport, friendly);
+//			got_new_entry(gc, passport, friendly);
 		}
 	}
 
@@ -273,7 +270,7 @@
 
 void
 msn_got_rem_user(MsnSession *session, MsnUser *user,
-				 MsnListId list_id, int group_id)
+				 MsnListId list_id, const char * group_id)
 {
 	PurpleAccount *account;
 	const char *passport;
@@ -285,7 +282,7 @@
 	if (list_id == MSN_LIST_FL)
 	{
 		/* TODO: When is the user totally removed? */
-		if (group_id >= 0)
+		if (group_id != NULL)
 		{
 			msn_user_remove_group_id(user, group_id);
 			return;
@@ -333,7 +330,6 @@
 	{
 		purple_debug_info("msn", "Buddy '%s' shall be deleted?.\n",
 						passport);
-
 	}
 }
 
@@ -351,14 +347,16 @@
 
 	passport = msn_user_get_passport(user);
 	store = msn_user_get_store_name(user);
+	
+	msn_user_set_op(user, list_op);
 
 	if (list_op & MSN_LIST_FL_OP)
 	{
 		GSList *c;
 		for (c = group_ids; c != NULL; c = g_slist_next(c))
 		{
-			int group_id;
-			group_id = GPOINTER_TO_INT(c->data);
+			char *group_id;
+			group_id = c->data;
 			msn_user_add_group_id(user, group_id);
 		}
 
@@ -393,11 +391,14 @@
 
 		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
 		{
-			got_new_entry(gc, passport, store);
+//			got_new_entry(gc, passport, store);
 		}
 	}
 
-	user->list_op = list_op;
+	if (list_op & MSN_LIST_PL_OP)
+	{
+		got_new_entry(gc, passport, store);
+	}
 }
 
 /**************************************************************************
@@ -427,18 +428,18 @@
 {
 	GList *l;
 
+	/*destroy userlist*/
 	for (l = userlist->users; l != NULL; l = l->next)
 	{
 		msn_user_destroy(l->data);
 	}
-
 	g_list_free(userlist->users);
 
+	/*destroy group list*/
 	for (l = userlist->groups; l != NULL; l = l->next)
 	{
 		msn_group_destroy(l->data);
 	}
-
 	g_list_free(userlist->groups);
 
 	g_queue_free(userlist->buddy_icon_requests);
@@ -449,6 +450,22 @@
 	g_free(userlist);
 }
 
+MsnUser *
+msn_userlist_find_add_user(MsnUserList *userlist,const char *passport,const char *userName)
+{
+	MsnUser *user;
+
+	user = msn_userlist_find_user(userlist, passport);
+	if (user == NULL)
+	{
+		user = msn_user_new(userlist, passport, userName);
+		msn_userlist_add_user(userlist, user);
+	} else {
+		msn_user_set_store_name(user, userName);
+	}
+	return user;
+}
+
 void
 msn_userlist_add_user(MsnUserList *userlist, MsnUser *user)
 {
@@ -472,10 +489,36 @@
 	{
 		MsnUser *user = (MsnUser *)l->data;
 
+//		purple_debug_info("MsnUserList","user passport:%s,passport:%s\n",user->passport,passport);
 		g_return_val_if_fail(user->passport != NULL, NULL);
 
-		if (!strcmp(passport, user->passport))
+		if (!g_strcasecmp(passport, user->passport)){
+//			purple_debug_info("MsnUserList","return:%p\n",user);
 			return user;
+		}
+	}
+
+	return NULL;
+}
+
+MsnUser *
+msn_userlist_find_user_with_id(MsnUserList *userlist, const char *uid)
+{
+ 	GList *l;
+
+        g_return_val_if_fail(uid != NULL, NULL);
+
+        for (l = userlist->users; l != NULL; l = l->next)
+        {
+                MsnUser *user = (MsnUser *)l->data;
+
+		if (user->uid == NULL) {
+			continue;
+		}
+
+		if ( !g_strcasecmp(uid, user->uid) ) {
+			return user;
+		}
 	}
 
 	return NULL;
@@ -494,18 +537,18 @@
 }
 
 MsnGroup *
-msn_userlist_find_group_with_id(MsnUserList *userlist, int id)
+msn_userlist_find_group_with_id(MsnUserList *userlist, const char * id)
 {
 	GList *l;
 
 	g_return_val_if_fail(userlist != NULL, NULL);
-	g_return_val_if_fail(id       >= 0,    NULL);
+	g_return_val_if_fail(id       != NULL, NULL);
 
 	for (l = userlist->groups; l != NULL; l = l->next)
 	{
 		MsnGroup *group = l->data;
 
-		if (group->id == id)
+		if (!g_strcasecmp(group->id,id))
 			return group;
 	}
 
@@ -524,14 +567,14 @@
 	{
 		MsnGroup *group = l->data;
 
-		if ((group->name != NULL) && !g_ascii_strcasecmp(name, group->name))
+		if ((group->name != NULL) && !g_strcasecmp(name, group->name))
 			return group;
 	}
 
 	return NULL;
 }
 
-int
+const char *
 msn_userlist_find_group_id(MsnUserList *userlist, const char *group_name)
 {
 	MsnGroup *group;
@@ -541,11 +584,11 @@
 	if (group != NULL)
 		return msn_group_get_id(group);
 	else
-		return -1;
+		return NULL;
 }
 
 const char *
-msn_userlist_find_group_name(MsnUserList *userlist, int group_id)
+msn_userlist_find_group_name(MsnUserList *userlist, const char * group_id)
 {
 	MsnGroup *group;
 
@@ -558,7 +601,7 @@
 }
 
 void
-msn_userlist_rename_group_id(MsnUserList *userlist, int group_id,
+msn_userlist_rename_group_id(MsnUserList *userlist, const char * group_id,
 							 const char *new_name)
 {
 	MsnGroup *group;
@@ -570,7 +613,7 @@
 }
 
 void
-msn_userlist_remove_group_id(MsnUserList *userlist, int group_id)
+msn_userlist_remove_group_id(MsnUserList *userlist, const char * group_id)
 {
 	MsnGroup *group;
 
@@ -584,116 +627,293 @@
 }
 
 void
-msn_userlist_rem_buddy(MsnUserList *userlist,
-					   const char *who, int list_id, const char *group_name)
+msn_userlist_rem_buddy(MsnUserList *userlist, const char *who)
+{
+	MsnUser *user = NULL;
+	
+	g_return_if_fail(userlist != NULL);
+	g_return_if_fail(userlist->session != NULL);
+	g_return_if_fail(userlist->session->contact != NULL);
+	g_return_if_fail(who != NULL);
+	
+	user = msn_userlist_find_user(userlist, who);
+
+	msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_FL);
+
+	/* delete the contact from address book via soap action */
+	if (user != NULL) {
+		msn_delete_contact(userlist->session->contact, user->uid);
+	}
+}
+
+void
+msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
+				 MsnListId list_id)
 {
 	MsnUser *user;
-	int group_id;
-	const char *list;
+	const gchar *list;
+	MsnListOp list_op = 1 << list_id;
 
 	user = msn_userlist_find_user(userlist, who);
-	group_id = -1;
-
-	if (group_name != NULL)
-	{
-		group_id = msn_userlist_find_group_id(userlist, group_name);
-
-		if (group_id < 0)
-		{
-			/* Whoa, there is no such group. */
-			purple_debug_error("msn", "Group doesn't exist: %s\n", group_name);
-			return;
-		}
-	}
-
-	/* First we're going to check if not there. */
-	if (!(user_is_there(user, list_id, group_id)))
-	{
+	
+	g_return_if_fail(user != NULL);
+	
+	if ( !msn_userlist_user_is_in_list(user, list_id)) {
 		list = lists[list_id];
-		purple_debug_error("msn", "User '%s' is not there: %s\n",
-						 who, list);
+		purple_debug_info("MSN Userlist", "User %s is not in list %s, not removing.\n", who, list);
 		return;
 	}
 
-	/* Then request the rem to the server. */
-	list = lists[list_id];
+	msn_user_unset_op(user, list_op);
 
-	msn_notification_rem_buddy(userlist->session->notification, list, who, group_id);
+	msn_notification_rem_buddy_from_list(userlist->session->notification, list_id, who);
 }
 
+/*add buddy*/
 void
-msn_userlist_add_buddy(MsnUserList *userlist,
-					   const char *who, int list_id,
-					   const char *group_name)
+msn_userlist_add_buddy(MsnUserList *userlist, const char *who, const char *group_name)
 {
 	MsnUser *user;
-	int group_id;
-	const char *list;
-	const char *store_name;
+	MsnCallbackState *state = NULL;
+	const char *group_id = NULL, *new_group_name;
+	
+	new_group_name = group_name == NULL ? MSN_INDIVIDUALS_GROUP_NAME : group_name;
 
-	group_id = -1;
+	
+	g_return_if_fail(userlist != NULL);
+	g_return_if_fail(userlist->session != NULL);
+
+	
+	purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name);
+
+	state = msn_callback_state_new();
+	msn_callback_state_set_who(state, who);
+	msn_callback_state_set_new_group_name(state, new_group_name);
 
 	if (!purple_email_is_valid(who))
 	{
 		/* only notify the user about problems adding to the friends list
 		 * maybe we should do something else for other lists, but it probably
 		 * won't cause too many problems if we just ignore it */
-		if (list_id == MSN_LIST_FL)
-		{
-			char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
-			purple_notify_error(NULL, NULL, str,
-							  _("The screen name specified is invalid."));
-			g_free(str);
-		}
+		
+		char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
+		
+		purple_notify_error(NULL, NULL, str,
+				  _("The screen name specified is invalid."));
+		g_free(str);
 
 		return;
 	}
 
-	if (group_name != NULL)
+	group_id = msn_userlist_find_group_id(userlist, new_group_name);
+
+	if (group_id == NULL)
 	{
-		group_id = msn_userlist_find_group_id(userlist, group_name);
+		/* Whoa, we must add that group first. */
+		purple_debug_info("MSN Userlist", "Adding user %s to a new group, creating group %s first\n", who, new_group_name);
+		
+		msn_callback_state_set_action(state, MSN_ADD_BUDDY);
 
-		if (group_id < 0)
-		{
-			/* Whoa, we must add that group first. */
-			msn_request_add_group(userlist, who, NULL, group_name);
+		msn_add_group(userlist->session, state, new_group_name);
+		return;
+	} else {
+		msn_callback_state_set_guid(state, group_id);
+	}
+	
+	/* XXX: adding user here may not be correct (should add them in the
+ 	 * ACK to the ADL command), but for now we need to make sure they exist  
+	 * early enough that the ILN command doesn't screw us up */
+
+	user = msn_userlist_find_add_user(userlist, who, who);
+
+	if ( msn_userlist_user_is_in_list(user, MSN_LIST_FL) ) {
+
+		purple_debug_info("MSN Userlist", "User %s already exists\n", who);
+
+		msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_BL);
+
+		if (msn_userlist_user_is_in_group(user, group_id)) {
+			purple_debug_info("MSN Userlist", "User %s is already in group %s, returning\n", who, new_group_name);
 			return;
 		}
 	}
+			
+	purple_debug_info("MSN Userlist", "Adding user: %s to group id: %s\n", who, group_id);
 
-	user = msn_userlist_find_user(userlist, who);
+	msn_callback_state_set_action(state, MSN_ADD_BUDDY);
+
+	/* Add contact in the Contact server with a SOAP request and if
+	   successful, send ADL with MSN_LIST_AL and MSN_LIST_FL and a FQY */
+	msn_add_contact_to_group(userlist->session->contact, state, who, group_id);
+}
 
+void
+msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who, 
+							MsnListId list_id)
+{
+	MsnUser *user = NULL;
+	const gchar *list;
+	MsnListOp list_op = 1 << list_id;
+
+	g_return_if_fail(userlist != NULL);
+	
+	user = msn_userlist_find_add_user(userlist, who, who);
+	
 	/* First we're going to check if it's already there. */
-	if (user_is_there(user, list_id, group_id))
+	if (msn_userlist_user_is_in_list(user, list_id))
 	{
 		list = lists[list_id];
-		purple_debug_error("msn", "User '%s' is already there: %s\n", who, list);
+		purple_debug_info("MSN Userlist", "User '%s' is already in list: %s\n", who, list);
 		return;
 	}
+	
+	//store_name = (user != NULL) ? get_store_name(user) : who;
+	
+	//purple_debug_info("MSN Userlist", "store_name = %s\n", store_name);
+	
+	/* XXX: see XXX above, this should really be done when we get the response from
+		the server */
+	
+	msn_user_set_op(user, list_op);
+	
+	msn_notification_add_buddy_to_list(userlist->session->notification, list_id, who);
+}
+
+gboolean
+msn_userlist_add_buddy_to_group(MsnUserList *userlist, const char *who,
+				const char *group_name)
+{
+	MsnUser *user;
+	gchar * group_id;
+	
+	g_return_val_if_fail(userlist != NULL, FALSE);
+	g_return_val_if_fail(group_name != NULL, FALSE);
+	g_return_val_if_fail(who != NULL, FALSE);
+
+	purple_debug_info("MSN Userlist","Adding buddy with passport %s to group %s\n", who, group_name);
+
+	if ( (group_id = (gchar *)msn_userlist_find_group_id(userlist, group_name)) == NULL) {
+		purple_debug_error("MSN Userlist", "Group %s has no guid!\n", group_name);
+		return FALSE;
+	}
 
-	store_name = (user != NULL) ? get_store_name(user) : who;
+	if ( (user = msn_userlist_find_user(userlist, who)) == NULL) {
+		purple_debug_error("MSN Userlist", "User %s not found!", who);
+		return FALSE;
+	}
+	
+	msn_user_add_group_id(user, group_id);
+
+	return TRUE;
+}
+
+
+gboolean
+msn_userlist_rem_buddy_from_group(MsnUserList *userlist, const char *who,
+				const char *group_name)
+{
+	const gchar * group_id;
+	MsnUser *user;
 
-	/* Then request the add to the server. */
-	list = lists[list_id];
+	g_return_val_if_fail(userlist != NULL, FALSE);
+	g_return_val_if_fail(group_name != NULL, FALSE);
+	g_return_val_if_fail(who != NULL, FALSE);
+	
+	purple_debug_info("MSN Userlist","Removing buddy with passport %s from group %s\n", who, group_name);
 
-	msn_notification_add_buddy(userlist->session->notification, list, who,
-							   store_name, group_id);
+	if ( (group_id = msn_userlist_find_group_id(userlist, group_name)) == NULL) {
+		purple_debug_error("MSN Userlist", "Group %s has no guid!\n", group_name);
+		return FALSE;
+	}
+
+	if ( (user = msn_userlist_find_user(userlist, who)) == NULL) {
+		purple_debug_error("MSN Userlist", "User %s not found!", who);
+		return FALSE;
+	}
+
+	msn_user_remove_group_id(user, group_id);
+
+	return TRUE;
 }
 
 void
 msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
-						const char *old_group_name, const char *new_group_name)
+			const char *old_group_name, const char *new_group_name)
 {
-	int new_group_id;
+	const char *new_group_id;
+	MsnCallbackState *state;
+	
+	g_return_if_fail(userlist != NULL);
+	g_return_if_fail(userlist->session != NULL);
+	g_return_if_fail(userlist->session->contact != NULL);
+
+	state = msn_callback_state_new();
+	msn_callback_state_set_who(state, who);
+	msn_callback_state_set_action(state, MSN_MOVE_BUDDY);
+	msn_callback_state_set_old_group_name(state, old_group_name);
+	msn_callback_state_set_new_group_name(state, new_group_name);
 
 	new_group_id = msn_userlist_find_group_id(userlist, new_group_name);
 
-	if (new_group_id < 0)
-	{
-		msn_request_add_group(userlist, who, old_group_name, new_group_name);
+	if (new_group_id == NULL)
+	{		
+		msn_add_group(userlist->session, state, new_group_name);
 		return;
 	}
+	
+	/* add the contact to the new group, and remove it from the old one in
+	 * the callback
+	*/
+	msn_add_contact_to_group(userlist->session->contact, state, who, new_group_id);
+}
 
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_FL, new_group_name);
-	msn_userlist_rem_buddy(userlist, who, MSN_LIST_FL, old_group_name);
+/*load userlist from the Blist file cache*/
+void
+msn_userlist_load(MsnSession *session)
+{
+	PurpleBlistNode *gnode, *cnode, *bnode;
+	PurpleConnection *gc = purple_account_get_connection(session->account);
+	GSList *l;
+	MsnUser * user;
+
+	g_return_if_fail(gc != NULL);
+
+	for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next)
+	{
+		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
+			continue;
+		for (cnode = gnode->child; cnode; cnode = cnode->next)
+		{
+			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
+				continue;
+			for (bnode = cnode->child; bnode; bnode = bnode->next)
+			{
+				PurpleBuddy *b;
+				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
+					continue;
+				b = (PurpleBuddy *)bnode;
+				if (b->account == gc->account)
+				{
+					user = msn_userlist_find_add_user(session->userlist,
+						b->name,NULL);
+					b->proto_data = user;
+					msn_user_set_op(user, MSN_LIST_FL_OP);
+				}
+			}
+		}
+	}
+	for (l = session->account->permit; l != NULL; l = l->next)
+	{
+		user = msn_userlist_find_add_user(session->userlist,
+						(char *)l->data,NULL);
+		msn_user_set_op(user, MSN_LIST_AL_OP);
+	}
+	for (l = session->account->deny; l != NULL; l = l->next)
+	{
+		user = msn_userlist_find_add_user(session->userlist,
+						(char *)l->data,NULL);
+		msn_user_set_op(user, MSN_LIST_BL_OP);
+	}
+	
 }
+
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/msn/userlist.h
--- a/libpurple/protocols/msn/userlist.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/msn/userlist.h	Fri Sep 28 20:30:26 2007 +0000
@@ -35,16 +35,11 @@
 	MSN_LIST_FL,
 	MSN_LIST_AL,
 	MSN_LIST_BL,
-	MSN_LIST_RL
+	MSN_LIST_RL,
+	MSN_LIST_PL
 
 } MsnListId;
 
-typedef struct
-{
-	char *who;
-	char *old_group_name;
-
-} MsnMoveBuddy;
 
 struct _MsnUserList
 {
@@ -64,40 +59,57 @@
 
 };
 
+gboolean msn_userlist_user_is_in_group(MsnUser *user, const char * group_id);
+gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id);
 MsnListId msn_get_list_id(const char *list);
 
 void msn_got_add_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, int group_id);
+					  MsnListId list_id, const char *group_id);
 void msn_got_rem_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, int group_id);
+					  MsnListId list_id, const char *group_id);
 void msn_got_lst_user(MsnSession *session, MsnUser *user,
 					  int list_op, GSList *group_ids);
 
 MsnUserList *msn_userlist_new(MsnSession *session);
 void msn_userlist_destroy(MsnUserList *userlist);
+
 void msn_userlist_add_user(MsnUserList *userlist, MsnUser *user);
 void msn_userlist_remove_user(MsnUserList *userlist, MsnUser *user);
-MsnUser *msn_userlist_find_user(MsnUserList *userlist,
-								const char *passport);
+
+MsnUser * msn_userlist_find_user(MsnUserList *userlist, const char *passport);
+MsnUser * msn_userlist_find_add_user(MsnUserList *userlist,
+				const char *passport, const char *userName);
+MsnUser * msn_userlist_find_user_with_id(MsnUserList *userlist, const char *uid);
+
 void msn_userlist_add_group(MsnUserList *userlist, MsnGroup *group);
 void msn_userlist_remove_group(MsnUserList *userlist, MsnGroup *group);
-MsnGroup *msn_userlist_find_group_with_id(MsnUserList *userlist, int id);
-MsnGroup *msn_userlist_find_group_with_name(MsnUserList *userlist,
-											const char *name);
-int msn_userlist_find_group_id(MsnUserList *userlist,
-							   const char *group_name);
-const char *msn_userlist_find_group_name(MsnUserList *userlist,
-										 int group_id);
-void msn_userlist_rename_group_id(MsnUserList *userlist, int group_id,
-								  const char *new_name);
-void msn_userlist_remove_group_id(MsnUserList *userlist, int group_id);
+MsnGroup *msn_userlist_find_group_with_id(MsnUserList *userlist, const char *id);
+MsnGroup *msn_userlist_find_group_with_name(MsnUserList *userlist, const char *name);
+const char * msn_userlist_find_group_id(MsnUserList *userlist,
+					const char *group_name);
+const char *msn_userlist_find_group_name(MsnUserList *userlist, const char *group_id);
+void msn_userlist_rename_group_id(MsnUserList *userlist, const char *group_id,
+				  const char *new_name);
+void msn_userlist_remove_group_id(MsnUserList *userlist, const char *group_id);
 
-void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who,
-							int list_id, const char *group_name);
-void msn_userlist_add_buddy(MsnUserList *userlist, const char *who,
-							int list_id, const char *group_name);
+void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who);
+void msn_userlist_add_buddy(MsnUserList *userlist, 
+			    const char *who, const char *group_name);
 void msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
-							 const char *old_group_name,
-							 const char *new_group_name);
+						    const char *old_group_name,
+						    const char *new_group_name);
+
+gboolean msn_userlist_add_buddy_to_group(MsnUserList *userlist, const char *who,
+					 const char *group_name);
+gboolean msn_userlist_rem_buddy_from_group(MsnUserList *userlist,
+					   const char *who,
+					   const char *group_name);
+
+void msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who, 
+				    MsnListId list_id);
+void msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
+				      MsnListId list_id);
+
+void msn_userlist_load(MsnSession *session);
 
 #endif /* _MSN_USERLIST_H_ */
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/myspace/markup.c
--- a/libpurple/protocols/myspace/markup.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/myspace/markup.c	Fri Sep 28 20:30:26 2007 +0000
@@ -426,13 +426,14 @@
 html_tag_to_msim_markup(MsimSession *session, xmlnode *root, gchar **begin, 
 		gchar **end)
 {
+	if (!purple_utf8_strcasecmp(root->name, "root") ||
+	    !purple_utf8_strcasecmp(root->name, "html")) {
+		*begin = g_strdup("");
+		*end = g_strdup("");
 	/* TODO: Coalesce nested tags into one <f> tag!
 	 * Currently, the 's' value will be overwritten when b/i/u is nested
 	 * within another one, and only the inner-most formatting will be 
 	 * applied to the text. */
-	if (!purple_utf8_strcasecmp(root->name, "root")) {
-		*begin = g_strdup("");
-		*end = g_strdup("");
 	} else if (!purple_utf8_strcasecmp(root->name, "b")) {
 		*begin = g_strdup_printf("<f s='%d'>", MSIM_TEXT_BOLD);
 		*end = g_strdup("</f>");
@@ -503,8 +504,21 @@
 
 		/* TODO: color (bg uses <body>), emoticons */
 	} else {
+		gchar *err;
+
+#ifdef MSIM_MARKUP_SHOW_UNKNOWN_TAGS
 		*begin = g_strdup_printf("[%s]", root->name);
 		*end = g_strdup_printf("[/%s]", root->name);
+#else
+		*begin = g_strdup("");
+		*end = g_strdup("");
+#endif
+
+		err = g_strdup_printf("html_tag_to_msim_markup: unrecognized "
+			"HTML tag %s was sent by the IM client; ignoring", 
+			root->name ? root->name : "(NULL)");
+		msim_unrecognized(NULL, NULL, err);
+		g_free(err);
 	}
 }
 
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Fri Sep 28 20:30:26 2007 +0000
@@ -291,9 +291,10 @@
 		/* Notify an error message also, because this is important! */
 		purple_notify_error(acct, g_strdup(_("MySpaceIM Error")), str, NULL);
 
+		gc->wants_to_die = TRUE;
 		purple_connection_error(gc, str);
-		
 		g_free(str);
+		return;
 	}
 #endif
 
@@ -458,6 +459,7 @@
 	purple_cipher_context_append(key_context, hash_pw, HASH_SIZE);
 	purple_cipher_context_append(key_context, (guchar *)(nonce + NONCE_SIZE), NONCE_SIZE);
 	purple_cipher_context_digest(key_context, sizeof(key), key, NULL);
+	purple_cipher_context_destroy(key_context);
 
 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE
 	purple_debug_info("msim", "key = ");
@@ -1039,7 +1041,7 @@
 	PurpleStatusType *type;
 	MsimSession *session;
 	guint status_code;
-	const gchar *statstring;
+	gchar *statstring;
 
 	session = (MsimSession *)account->gc->proto_data;
 
@@ -1073,7 +1075,7 @@
 			break;
 	}
 
-	statstring = purple_status_get_attr_string(status, "message");
+	statstring = (gchar *)purple_status_get_attr_string(status, "message");
 
 	if (!statstring) {
 		statstring = "";
@@ -1082,7 +1084,7 @@
 	/* Status strings are plain text. */
 	statstring = purple_markup_strip_html(statstring);
 
-	msim_set_status_code(session, status_code, g_strdup(statstring));
+	msim_set_status_code(session, status_code, statstring);
 }
 
 /** Go idle. */
@@ -1213,7 +1215,7 @@
 		if (uid == wanted_uid)
 		{
 			ret = g_strdup(name);
-            break;
+			break;
 		}
 	}
 
@@ -1790,11 +1792,13 @@
 	/* Destroy session if fatal. */
 	if (msim_msg_get(msg, "fatal")) {
 		purple_debug_info("msim", "fatal error, closing\n");
-		if (err == 260) {
-			/* Incorrect password */
-			session->gc->wants_to_die = TRUE;
-			if (!purple_account_get_remember_password(session->account))
-				purple_account_set_password(session->account, NULL);
+		switch (err) {
+			case 260: /* Incorrect password */
+			case 6: /* Logged in elsewhere */
+				session->gc->wants_to_die = TRUE;
+				if (!purple_account_get_remember_password(session->account))
+					purple_account_set_password(session->account, NULL);
+				break;
 		}
 		purple_connection_error(session->gc, full_errmsg);
 	} else {
@@ -1867,6 +1871,7 @@
 		purple_blist_add_buddy(buddy, NULL, NULL, NULL);
 
 		user = msim_get_user_from_buddy(buddy);
+		/* TODO: free user. memory leak? */
 
 		/* All buddies on list should have 'uid' integer associated with them. */
 		purple_blist_node_set_int(&buddy->node, "UserID", msim_msg_get_integer(msg, "f"));
@@ -2863,7 +2868,7 @@
 }
 
 /** Callbacks called by Purple, to access this plugin. */
-PurplePluginProtocolInfo prpl_info = {
+static PurplePluginProtocolInfo prpl_info = {
 	/* options */
 	  OPT_PROTO_USE_POINTSIZE        /* specify font size in sane point size */
 	| OPT_PROTO_MAIL_CHECK,
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/myspace/myspace.h
--- a/libpurple/protocols/myspace/myspace.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Fri Sep 28 20:30:26 2007 +0000
@@ -67,6 +67,10 @@
 /*#define MSIM_DEBUG_LOGIN_CHALLENGE*/
 /*#define MSIM_DEBUG_RXBUF            */
 
+/* Encode unknown HTML tags from IM clients in messages as [tag], instead of 
+ * ignoring. Useful for debugging */
+/*#define MSIM_MARKUP_SHOW_UNKNOWN_TAGS  */
+
 /* Define to cause init_plugin() to run some tests and print
  * the results to the Purple debug log, then exit. Useful to 
  * run with 'pidgin -d' to see the output. Don't define if
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/myspace/user.c
--- a/libpurple/protocols/myspace/user.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/myspace/user.c	Fri Sep 28 20:30:26 2007 +0000
@@ -154,7 +154,13 @@
 	}
 }
 
-/** Store a field of information about a buddy. */
+/** Store a field of information about a buddy. 
+ *
+ * @param key_str Key to store.
+ * @param value_str Value string, either user takes ownership of this string
+ *                  or it is freed if MsimUser doesn't store the string.
+ * @param user User to store data in. Existing data will be replaced.
+ * */
 void 
 msim_store_user_info_each(const gchar *key_str, gchar *value_str, MsimUser *user)
 {
@@ -168,25 +174,33 @@
 		/* Need to store in MsimUser, too? What if not on blist? */
 	} else if (g_str_equal(key_str, "Age")) {
 		user->age = atol(value_str);
+		g_free(value_str);
 	} else if (g_str_equal(key_str, "Gender")) {
-		user->gender = g_strdup(value_str);
+		g_free(user->gender);
+		user->gender = value_str;
 	} else if (g_str_equal(key_str, "Location")) {
-		user->location = g_strdup(value_str);
+		g_free(user->location);
+		user->location = value_str;
 	} else if (g_str_equal(key_str, "TotalFriends")) {
 		user->total_friends = atol(value_str);
 	} else if (g_str_equal(key_str, "DisplayName")) {
-		user->display_name = g_strdup(value_str);
+		g_free(user->display_name);
+		user->display_name = value_str;
 	} else if (g_str_equal(key_str, "BandName")) {
-		user->band_name = g_strdup(value_str);
+		g_free(user->band_name);
+		user->band_name = value_str;
 	} else if (g_str_equal(key_str, "SongName")) {
-		user->song_name = g_strdup(value_str);
+		g_free(user->song_name);
+		user->song_name = value_str;
 	} else if (g_str_equal(key_str, "UserName") || g_str_equal(key_str, "IMName") || g_str_equal(key_str, "NickName")) {
 		/* Ignore because PurpleBuddy knows this already */
-		;
+		g_free(value_str);
 	} else if (g_str_equal(key_str, "ImageURL") || g_str_equal(key_str, "AvatarURL")) {
 		const gchar *previous_url;
 
-		user->image_url = g_strdup(value_str);
+		g_free(user->image_url);
+
+		user->image_url = value_str;
 
 		/* Instead of showing 'no photo' picture, show nothing. */
 		if (g_str_equal(user->image_url, "http://x.myspace.com/images/no_pic.gif"))
@@ -207,14 +221,17 @@
 	} else if (g_str_equal(key_str, "LastImageUpdated")) {
 		/* TODO: use somewhere */
 		user->last_image_updated = atol(value_str);
+		g_free(value_str);
 	} else if (g_str_equal(key_str, "Headline")) {
-		user->headline = g_strdup(value_str);
+		g_free(user->headline);
+		user->headline = value_str;
 	} else {
 		/* TODO: other fields in MsimUser */
 		gchar *msg;
 
 		msg = g_strdup_printf("msim_store_user_info_each: unknown field %s=%s",
 				key_str, value_str);
+		g_free(value_str);
 
 		msim_unrecognized(NULL, NULL, msg);
 
@@ -284,7 +301,6 @@
 
 		value_str = msim_msg_get_string_from_element(elem);
 		msim_store_user_info_each(key_str, value_str, user);
-		g_free(value_str);
 	}
 
 	if (msim_msg_get_integer(msg, "dsn") == MG_OWN_IM_INFO_DSN &&
@@ -301,6 +317,7 @@
 	}
 
 	msim_msg_free(body);
+	g_free(username);
 
 	return TRUE;
 }
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Fri Sep 28 20:30:26 2007 +0000
@@ -130,6 +130,8 @@
 		if (ret_code == NMERR_AUTHENTICATION_FAILED ||
 			ret_code == NMERR_CREDENTIALS_MISSING ||
 			ret_code == NMERR_PASSWORD_INVALID) {
+			if (!purple_account_get_remember_password(gc->account))
+				purple_account_set_password(gc->account, NULL);
 			gc->wants_to_die = TRUE;
 		}
 		purple_connection_error(gc, err);
@@ -2004,11 +2006,14 @@
 _evt_user_disconnect(NMUser * user, NMEvent * event)
 {
 	PurpleConnection *gc;
-
-	gc = purple_account_get_connection((PurpleAccount *) user->client_data);
+	PurpleAccount *account = user->client_data;
+
+	gc = purple_account_get_connection(account);
 	if (gc)
 	{
 		gc->wants_to_die = TRUE; /* we don't want to reconnect in this case */
+		if (!purple_account_get_remember_password(account))
+			purple_account_set_password(account, NULL);
 		purple_connection_error(gc, _("You have been logged out because you"
 									" logged in at another workstation."));
 	}
@@ -2799,7 +2804,7 @@
 	const char *text = NULL;
 
 	if (buddy == NULL)
-		return; 
+		return;
 
 	gc = purple_account_get_connection(buddy->account);
 	if (gc == NULL || (user = gc->proto_data) == NULL)
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/oscar/flap_connection.c
--- a/libpurple/protocols/oscar/flap_connection.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Fri Sep 28 20:30:26 2007 +0000
@@ -382,6 +382,8 @@
 		gchar *tmp;
 		if (conn->disconnect_code == 0x0001) {
 			tmp = g_strdup(_("You have signed on from another location."));
+			if (!purple_account_get_remember_password(account))
+				purple_account_set_password(account, NULL);
 			od->gc->wants_to_die = TRUE;
 		} else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
 			tmp = g_strdup(_("Server closed the connection."));
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Fri Sep 28 20:30:26 2007 +0000
@@ -5523,6 +5523,8 @@
 			return "hiptop";
 		if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM)
 			return "secure";
+		if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY)
+			return "birthday";
 	}
 	return NULL;
 }
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/qq/login_logout.c
--- a/libpurple/protocols/qq/login_logout.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/qq/login_logout.c	Fri Sep 28 20:30:26 2007 +0000
@@ -480,6 +480,8 @@
 	switch (ret) {
 	case QQ_LOGIN_REPLY_PWD_ERROR:
 		gc->wants_to_die = TRUE;
+		if (!purple_account_get_remember_password(gc->account))
+			purple_account_set_password(gc->account, NULL);
 		purple_connection_error(gc, _("Incorrect password."));
 		break;
 	case QQ_LOGIN_REPLY_MISC_ERROR:
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Fri Sep 28 20:30:26 2007 +0000
@@ -695,7 +695,7 @@
 static void do_register_exp(struct simple_account_data *sip, int expire) {
 	char *uri, *to, *contact, *hdr;
 
-	/* Set our default expiration to 900, 
+	/* Set our default expiration to 900,
 	 * as done in the initialization of the simple_account_data
 	 * structure.
 	 */
@@ -1042,6 +1042,8 @@
 				if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
 					purple_debug_info("simple", "Setting wants_to_die to true.\n");
 					sip->gc->wants_to_die = TRUE;
+					if (!purple_account_get_remember_password(sip->gc->account))
+						purple_account_set_password(sip->gc->account, NULL);
 					purple_connection_error(sip->gc, _("Incorrect password."));
 					return TRUE;
 				}
diff -r d94432a338ab -r bedd56240914 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Fri Sep 28 20:30:26 2007 +0000
@@ -202,6 +202,8 @@
 
 	if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
 		gc->wants_to_die = TRUE;
+		if (!purple_account_get_remember_password(account))
+			purple_account_set_password(account, NULL);
 		purple_connection_error(gc, _("You have signed on from another location."));
 		return;
 	}
@@ -4090,12 +4092,12 @@
 {
 	return TRUE;
 }
-	
+
 gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint type)
 {
 	PurpleConversation *c;
 
-	c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, 
+	c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
 			username, gc->account);
 
 	g_return_val_if_fail(c != NULL, FALSE);
@@ -4120,7 +4122,7 @@
 		attn->incoming_description = _("%s has buzzed you!");
 		attn->outgoing_description = _("Buzzing %s...");
 		list = g_list_append(list, attn);
-	} 
+	}
 
 	return list;
 }
diff -r d94432a338ab -r bedd56240914 libpurple/server.c
--- a/libpurple/server.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/server.c	Fri Sep 28 20:30:26 2007 +0000
@@ -543,7 +543,7 @@
 				 PurpleMessageFlags flags, time_t mtime)
 {
 	PurpleAccount *account;
-	PurpleConversation *cnv;
+	PurpleConversation *conv;
 	char *message, *name;
 	char *angel, *buffy;
 	int plugin_return;
@@ -562,22 +562,19 @@
 	 * We should update the conversation window buttons and menu,
 	 * if it exists.
 	 */
-	cnv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, gc->account);
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, gc->account);
 
 	/*
-	 * Plugin stuff. we pass a char ** but we don't want to pass what's
-	 * been given us by the prpls. So we create temp holders and pass
-	 * those instead. It's basically just to avoid segfaults.
+	 * Make copies of the message and the sender in case plugins want
+	 * to free these strings and replace them with a modifed version.
 	 */
-	/* TODO: MAX(message, BUF_LONG) is pretty ugly. */
-	buffy = g_malloc(MAX(strlen(msg) + 1, BUF_LONG));
-	strcpy(buffy, msg);
+	buffy = g_strdup(msg);
 	angel = g_strdup(who);
 
 	plugin_return = GPOINTER_TO_INT(
 		purple_signal_emit_return_1(purple_conversations_get_handle(),
 								  "receiving-im-msg", gc->account,
-								  &angel, &buffy, cnv, &flags));
+								  &angel, &buffy, conv, &flags));
 
 	if (!buffy || !angel || plugin_return) {
 		g_free(buffy);
@@ -589,21 +586,21 @@
 	message = buffy;
 
 	purple_signal_emit(purple_conversations_get_handle(), "received-im-msg", gc->account,
-					 name, message, cnv, flags);
+					 name, message, conv, flags);
 
 	/* search for conversation again in case it was created by received-im-msg handler */
-	if (cnv == NULL)
-		cnv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, name, gc->account);
+	if (conv == NULL)
+		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, name, gc->account);
 
 	/*
 	 * XXX: Should we be setting this here, or relying on prpls to set it?
 	 */
 	flags |= PURPLE_MESSAGE_RECV;
 
-	if (cnv == NULL)
-		cnv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+	if (conv == NULL)
+		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
 
-	purple_conv_im_write(PURPLE_CONV_IM(cnv), NULL, message, flags, mtime);
+	purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, message, flags, mtime);
 	g_free(message);
 
 	/*
@@ -670,7 +667,7 @@
 				{
 					serv_send_im(gc, name, away_msg, PURPLE_MESSAGE_AUTO_RESP);
 
-					purple_conv_im_write(PURPLE_CONV_IM(cnv), NULL, away_msg,
+					purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, away_msg,
 									   PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_AUTO_RESP,
 									   mtime);
 				}
@@ -892,15 +889,10 @@
 		return;
 
 	/*
-	 * Plugin stuff. We pass a char ** but we don't want to pass what's
-	 * been given us by the prpls. so we create temp holders and pass those
-	 * instead. It's basically just to avoid segfaults. Of course, if the
-	 * data is binary, plugins don't see it. Bitch all you want; i really
-	 * don't want you to be dealing with it.
+	 * Make copies of the message and the sender in case plugins want
+	 * to free these strings and replace them with a modifed version.
 	 */
-	/* TODO: MAX(message, BUF_LONG) is pretty ugly. */
-	buffy = g_malloc(MAX(strlen(message) + 1, BUF_LONG));
-	strcpy(buffy, message);
+	buffy = g_strdup(message);
 	angel = g_strdup(who);
 
 	plugin_return = GPOINTER_TO_INT(
@@ -913,6 +905,7 @@
 		g_free(angel);
 		return;
 	}
+
 	who = angel;
 	message = buffy;
 
diff -r d94432a338ab -r bedd56240914 libpurple/sslconn.h
--- a/libpurple/sslconn.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/sslconn.h	Fri Sep 28 20:30:26 2007 +0000
@@ -31,6 +31,7 @@
 
 #define PURPLE_SSL_DEFAULT_PORT 443
 
+/** Possible SSL errors. */
 typedef enum
 {
 	PURPLE_SSL_HANDSHAKE_FAILED = 1,
@@ -86,39 +87,48 @@
 typedef struct
 {
 	/** Initializes the SSL system provided.
-     *  @return TRUE if initialization succeeded
-     */
+	 *  @return @a TRUE if initialization succeeded
+	 *  @see purple_ssl_init
+	 */
 	gboolean (*init)(void);
-	/** Unloads the SSL system. Inverse of init. */
+	/** Unloads the SSL system. Inverse of PurpleSslOps::init.
+	 *  @see purple_ssl_uninit
+	 */
 	void (*uninit)(void);
-	/** Sets up the SSL connection for a PurpleSslConnection once
-     *  the TCP connection has been established */
+	/** Sets up the SSL connection for a #PurpleSslConnection once
+	 *  the TCP connection has been established
+	 *  @see purple_ssl_connect
+	 */
 	void (*connectfunc)(PurpleSslConnection *gsc);
 	/** Destroys the internal data of the SSL connection provided.
 	 *  Freeing gsc itself is left to purple_ssl_close()
-	 *
+	 *  @see purple_ssl_close
 	 */
 	void (*close)(PurpleSslConnection *gsc);
 	/** Reads data from a connection (like POSIX read())
-	 * @param gsc	Connection context
-	 * @param data	Pointer to buffer to drop data into
-	 * @param len	Maximum number of bytes to read
-	 * @return	Number of bytes actually written into the buffer, or <0 on error
+	 * @param gsc   Connection context
+	 * @param data  Pointer to buffer to drop data into
+	 * @param len   Maximum number of bytes to read
+	 * @return      Number of bytes actually written into @a data (which may be
+	 *              less than @a len), or <0 on error
+	 * @see purple_ssl_read
 	*/
 	size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len);
 	/** Writes data to a connection (like POSIX send())
-	* @param gsc	Connection context
-	* @param data	Data buffer to send data from
-	* @param len	Number of bytes to send from buffer
-	* @return	The number of bytes written (may be less than len) or <0 on error
+	* @param gsc    Connection context
+	* @param data   Data buffer to send data from
+	* @param len    Number of bytes to send from buffer
+	* @return       The number of bytes written to @a data (may be less than
+	*               @a len) or <0 on error
+	* @see purple_ssl_write
 	*/
 	size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
 	/** Obtains the certificate chain provided by the peer
 	 *
 	 * @param gsc   Connection context
-	 * @return      A newly allocated list containing the certificates
-	 *              the peer provided.
-	 * @see PurpleCertificate
+	 * @return      A newly allocated list of #PurpleCertificate containing the
+	 *              certificates the peer provided.
+	 * @see purple_ssl_get_peer_certificates
 	 * @todo        Decide whether the ordering of certificates in this
 	 *              list can be guaranteed.
 	 */
@@ -141,12 +151,12 @@
 /**
  * Returns whether or not SSL is currently supported.
  *
- * @return TRUE if SSL is supported, or FALSE otherwise.
+ * @return @a TRUE if SSL is supported, or @a FALSE otherwise.
  */
 gboolean purple_ssl_is_supported(void);
 
 /**
- * Returns a human-readable string for an SSL error
+ * Returns a human-readable string for an SSL error.
  *
  * @param error      Error code
  * @return Human-readable error explanation
@@ -163,8 +173,8 @@
  * @param port       The destination port.
  * @param func       The SSL input handler function.
  * @param error_func The SSL error handler function.  This function
- *                   should NOT call purple_ssl_close().  In the event
- *                   of an error the PurpleSslConnection will be
+ *                   should <strong>NOT</strong> call purple_ssl_close().  In
+ *                   the event of an error the #PurpleSslConnection will be
  *                   destroyed for you.
  * @param data       User-defined data.
  *
@@ -177,7 +187,8 @@
 
 /**
  * Makes a SSL connection using an already open file descriptor.
- * DEPRECATED. Use purple_ssl_connect_with_host_fd instead.
+ *
+ * @deprecated Use purple_ssl_connect_with_host_fd() instead.
  *
  * @param account    The account making the connection.
  * @param fd         The file descriptor.
@@ -256,7 +267,7 @@
  * @param gsc    The SSL connection handle
  *
  * @return The peer certificate chain, in the order of certificate, issuer,
- *         issuer's issuer, etc. NULL if no certificates have been provided,
+ *         issuer's issuer, etc. @a NULL if no certificates have been provided,
  */
 GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc);
 
diff -r d94432a338ab -r bedd56240914 libpurple/status.c
--- a/libpurple/status.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/status.c	Fri Sep 28 20:30:26 2007 +0000
@@ -601,7 +601,7 @@
 	{
 		time_t current_time = time(NULL);
 		const char *buddy_alias = purple_buddy_get_alias(buddy);
-		char *tmp;
+		char *tmp, *logtmp;
 		PurpleLog *log;
 
 		if (old_status != NULL)
@@ -609,6 +609,10 @@
 			tmp = g_strdup_printf(_("%s changed status from %s to %s"), buddy_alias,
 			                      purple_status_get_name(old_status),
 			                      purple_status_get_name(new_status));
+			logtmp = g_strdup_printf(_("%s (%s) changed status from %s to %s"), buddy_alias, buddy->name,
+			                      purple_status_get_name(old_status),
+			                      purple_status_get_name(new_status));
+
 		}
 		else
 		{
@@ -618,11 +622,16 @@
 			{
 				tmp = g_strdup_printf(_("%s is now %s"), buddy_alias,
 				                      purple_status_get_name(new_status));
+				logtmp = g_strdup_printf(_("%s (%s) is now %s"), buddy_alias, buddy->name,
+				                      purple_status_get_name(new_status));
+
 			}
 			else
 			{
 				tmp = g_strdup_printf(_("%s is no longer %s"), buddy_alias,
 				                      purple_status_get_name(new_status));
+				logtmp = g_strdup_printf(_("%s (%s) is no longer %s"), buddy_alias, buddy->name,
+				                      purple_status_get_name(new_status));
 			}
 		}
 
@@ -630,10 +639,11 @@
 		if (log != NULL)
 		{
 			purple_log_write(log, PURPLE_MESSAGE_SYSTEM, buddy_alias,
-			               current_time, tmp);
+			               current_time, logtmp);
 		}
 
 		g_free(tmp);
+		g_free(logtmp);
 	}
 }
 
diff -r d94432a338ab -r bedd56240914 libpurple/util.c
--- a/libpurple/util.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/util.c	Fri Sep 28 20:30:26 2007 +0000
@@ -68,7 +68,7 @@
 };
 
 static char *custom_user_dir = NULL;
-static char *home_dir = NULL;
+static char *user_dir = NULL;
 
 PurpleMenuAction *
 purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data,
@@ -515,23 +515,6 @@
  * Date/Time Functions
  **************************************************************************/
 
-#ifdef _WIN32
-static long win32_get_tz_offset() {
-	TIME_ZONE_INFORMATION tzi;
-	DWORD ret;
-	long off = -1;
-
-	if ((ret = GetTimeZoneInformation(&tzi)) != TIME_ZONE_ID_INVALID)
-	{
-		off = -(tzi.Bias * 60);
-		if (ret == TIME_ZONE_ID_DAYLIGHT)
-			off -= tzi.DaylightBias * 60;
-	}
-
-	return off;
-}
-#endif
-
 const char *purple_get_tzoff_str(const struct tm *tm, gboolean iso)
 {
 	static char buf[7];
@@ -546,7 +529,7 @@
 		g_return_val_if_reached("");
 
 #ifdef _WIN32
-	if ((off = win32_get_tz_offset()) == -1)
+	if ((off = wpurple_get_tz_offset()) == -1)
 		return "";
 #else
 # ifdef HAVE_TM_GMTOFF
@@ -854,7 +837,7 @@
 #endif
 
 #ifdef _WIN32
-				if ((sys_tzoff = win32_get_tz_offset()) == -1)
+				if ((sys_tzoff = wpurple_get_tz_offset()) == -1)
 					tzoff = PURPLE_NO_TZ_OFF;
 				else
 					tzoff += sys_tzoff;
@@ -2465,10 +2448,10 @@
 {
 	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;
+	else if (!user_dir)
+		user_dir = g_build_filename(purple_home_dir(), ".purple", NULL);
+
+	return user_dir;
 }
 
 void purple_util_set_user_dir(const char *dir)
diff -r d94432a338ab -r bedd56240914 libpurple/win32/win32dep.c
--- a/libpurple/win32/win32dep.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/win32/win32dep.c	Fri Sep 28 20:30:26 2007 +0000
@@ -575,6 +575,22 @@
 	libpurpledll_hInstance = NULL;
 }
 
+long
+wpurple_get_tz_offset() {
+	TIME_ZONE_INFORMATION tzi;
+	DWORD ret;
+	long off = -1;
+
+	if ((ret = GetTimeZoneInformation(&tzi)) != TIME_ZONE_ID_INVALID)
+	{
+		off = -(tzi.Bias * 60);
+		if (ret == TIME_ZONE_ID_DAYLIGHT)
+			off -= tzi.DaylightBias * 60;
+	}
+
+	return off;
+}
+
 /* DLL initializer */
 /* suppress gcc "no previous prototype" warning */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
diff -r d94432a338ab -r bedd56240914 libpurple/win32/win32dep.h
--- a/libpurple/win32/win32dep.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/win32/win32dep.h	Fri Sep 28 20:30:26 2007 +0000
@@ -60,6 +60,7 @@
 void wpurple_init(void);
 void wpurple_cleanup(void);
 
+long wpurple_get_tz_offset(void);
 
 /*
  *  MACROS
diff -r d94432a338ab -r bedd56240914 libpurple/xmlnode.h
--- a/libpurple/xmlnode.h	Fri Sep 28 20:30:07 2007 +0000
+++ b/libpurple/xmlnode.h	Fri Sep 28 20:30:26 2007 +0000
@@ -129,7 +129,7 @@
  *
  * @param node The node to get data from.
  *
- * @return The data from the node.  This data is in raw escaped format.
+ * @return The data from the node or NULL. This data is in raw escaped format.
  *         You must g_free this string when finished using it.
  */
 char *xmlnode_get_data(xmlnode *node);
diff -r d94432a338ab -r bedd56240914 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Sep 28 20:30:26 2007 +0000
@@ -88,6 +88,8 @@
 	GtkWidget *group_combo;
 	GtkWidget *entries_box;
 	GtkSizeGroup *sg;
+	GtkWidget *autojoin;
+	GtkWidget *persistent;
 
 	GList *entries;
 
@@ -138,13 +140,23 @@
 static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender);
 static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node);
 static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded);
-
-struct _pidgin_blist_node {
+static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node);
+
+typedef enum {
+	PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE    =  1 << 0,  /* Whether there's pending message in a conversation */
+} PidginBlistNodeFlags;
+
+typedef struct _pidgin_blist_node {
 	GtkTreeRowReference *row;
 	gboolean contact_expanded;
 	gboolean recent_signonoff;
 	gint recent_signonoff_timer;
-};
+	struct {
+		PurpleConversation *conv;
+		time_t last_message;          /* timestamp for last displayed message */
+		PidginBlistNodeFlags flags;
+	} conv;
+} PidginBlistNode;
 
 static char dim_grey_string[8] = "";
 static char *dim_grey()
@@ -306,12 +318,36 @@
 	serv_send_file(b->account->gc, b->name, NULL);
 }
 
+static void gtk_blist_menu_move_to_cb(GtkWidget *w, PurpleBlistNode *node)
+{
+	PurpleGroup *group = g_object_get_data(G_OBJECT(w), "groupnode");
+	purple_blist_add_contact((PurpleContact *)node, group, NULL);
+
+}
+
 static void gtk_blist_menu_autojoin_cb(GtkWidget *w, PurpleChat *chat)
 {
 	purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin",
 			gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w)));
 }
 
+static void gtk_blist_menu_persistent_cb(GtkWidget *w, PurpleChat *chat)
+{
+	purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent",
+			gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w)));
+}
+
+static PurpleConversation *
+find_conversation_with_buddy(PurpleBuddy *buddy)
+{
+	PidginBlistNode *ui = buddy->node.ui_data;
+	if (ui)
+		return ui->conv.conv;
+	return purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
+									     purple_buddy_get_name(buddy),
+									     purple_buddy_get_account(buddy));
+}
+
 static void gtk_blist_join_chat(PurpleChat *chat)
 {
 	PurpleConversation *conv;
@@ -395,6 +431,105 @@
 }
 #endif
 
+static void
+gtk_blist_do_personize(GList *merges)
+{
+	PurpleBlistNode *contact = NULL;
+	int max = 0;
+	GList *tmp;
+
+	/* First, we find the contact to merge the rest of the buddies into.
+ 	 * This will be the contact with the most buddies in it; ties are broken
+ 	 * by which contact is higher in the list
+ 	 */
+	for (tmp = merges; tmp; tmp = tmp->next) {
+		PurpleBlistNode *node = tmp->data;
+		PurpleBlistNode *b;
+		int i = 0;
+
+		if (node->type == PURPLE_BLIST_BUDDY_NODE)
+			node = node->parent;
+
+		if (node->type != PURPLE_BLIST_CONTACT_NODE)
+			continue;
+		
+
+		for (b = node->child; b; b = b->next)
+			i++;
+		if (i > max) {
+			contact = node;
+			max = i;
+		}
+	}
+
+	if (contact == NULL)
+		return;
+
+	/* Merge all those buddies into this contact */
+	for (tmp = merges; tmp; tmp = tmp->next) {
+		PurpleBlistNode *node = tmp->data;
+		if (node->type == PURPLE_BLIST_BUDDY_NODE)
+			node = node->parent;
+
+		if (node == contact)
+			continue;
+
+		purple_blist_merge_contact((PurpleContact *)node, contact);
+	}
+
+	/* And show the expanded contact, so the people know what's going on */
+	pidgin_blist_expand_contact_cb(NULL, contact);
+	g_list_free(merges);
+}
+
+static void
+gtk_blist_auto_personize(PurpleBlistNode *group, const char *alias)
+{
+	PurpleBlistNode *contact;
+	PurpleBlistNode *buddy;
+	GList *merges = NULL;
+	int i = 0;
+	char *a = g_utf8_casefold(alias, -1);
+
+	for (contact = group->child; contact; contact = contact->next) {
+		char *node_alias;
+		if (contact->type != PURPLE_BLIST_CONTACT_NODE)
+			continue;
+
+		node_alias = g_utf8_casefold(purple_contact_get_alias((PurpleContact *)contact), -1);
+		if (node_alias && !g_utf8_collate(node_alias, a)) {
+			merges = g_list_append(merges, contact);
+			i++;
+			g_free(node_alias);
+			continue;
+		}
+		g_free(node_alias);
+
+		for (buddy = contact->child; buddy; buddy = buddy->next) {
+			if (buddy->type != PURPLE_BLIST_BUDDY_NODE)
+				continue;
+
+			node_alias = g_utf8_casefold(purple_buddy_get_alias((PurpleBuddy *)buddy), -1);
+			if (node_alias && !g_utf8_collate(node_alias, a)) {
+				merges = g_list_append(merges, buddy);
+				i++;
+			}
+			g_free(node_alias);
+		}
+	}
+	g_free(a);
+	
+	if (i > 1)
+	{
+		char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias);
+		purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
+							 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL,
+				      merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
+		g_free(msg);
+	} else
+		g_list_free(merges);
+}
+
 static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1,
 					 char *arg2, PurpleBuddyList *list)
 {
@@ -421,13 +556,14 @@
 				PurpleContact *contact = (PurpleContact *)node;
 				struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 
-				if (contact->alias || gtknode->contact_expanded)
+				if (contact->alias || gtknode->contact_expanded) {
 					purple_blist_alias_contact(contact, arg2);
-				else
-				{
+					gtk_blist_auto_personize(node->parent, arg2);
+				} else {
 					PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact);
 					purple_blist_alias_buddy(buddy, arg2);
 					serv_alias_buddy(buddy);
+					gtk_blist_auto_personize(node->parent, arg2);
 				}
 			}
 			break;
@@ -435,6 +571,7 @@
 		case PURPLE_BLIST_BUDDY_NODE:
 			purple_blist_alias_buddy((PurpleBuddy*)node, arg2);
 			serv_alias_buddy((PurpleBuddy *)node);
+			gtk_blist_auto_personize(node->parent->parent, arg2);
 			break;
 		case PURPLE_BLIST_GROUP_NODE:
 			dest = purple_find_group(arg2);
@@ -525,6 +662,26 @@
 	}
 }
 
+static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBlistNode *node)
+{
+	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
+	{
+		purple_blist_node_set_bool(node, "show_offline",
+		                           !purple_blist_node_get_bool(node, "show_offline"));
+	}
+	else if (PURPLE_BLIST_NODE_IS_CONTACT(node))
+	{
+		PurpleBlistNode *bnode;
+		gboolean setting = !purple_blist_node_get_bool(node, "show_offline");
+
+		purple_blist_node_set_bool(node, "show_offline", setting);
+		for (bnode = node->child; bnode != NULL; bnode = bnode->next) {
+			purple_blist_node_set_bool(bnode, "show_offline", setting);
+		}
+	}
+	pidgin_blist_update(purple_get_blist(), node);
+}
+
 static void gtk_blist_show_systemlog_cb()
 {
 	pidgin_syslog_show();
@@ -1119,17 +1276,49 @@
 	g_list_free(ll);
 }
 
+
+
+static void
+pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBlistNode *node)
+{
+	GtkWidget *submenu;
+	GtkWidget *menuitem;
+	PurpleBlistNode *group;
+
+	menuitem = gtk_menu_item_new_with_label(_("Move to"));
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	gtk_widget_show(menuitem);
+
+	submenu = gtk_menu_new();
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
+
+	for (group = purple_blist_get_root(); group; group = group->next) {
+		if (group->type != PURPLE_BLIST_GROUP_NODE)
+			continue;
+		if (group == node->parent)
+			continue;
+		menuitem = pidgin_new_item_from_stock(submenu, purple_group_get_name((PurpleGroup *)group), NULL,
+						      G_CALLBACK(gtk_blist_menu_move_to_cb), node, 0, 0, NULL);
+		g_object_set_data(G_OBJECT(menuitem), "groupnode", group);
+	}
+	gtk_widget_show_all(submenu);
+}
+
 void
 pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub) {
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleContact *contact;
+	PurpleBlistNode *node;
 	gboolean contact_expanded = FALSE;
+	gboolean show_offline = FALSE;
 
 	g_return_if_fail(menu);
 	g_return_if_fail(buddy);
 
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(buddy->account->gc->prpl);
 
+	node = (PurpleBlistNode*)buddy;
+
 	contact = purple_buddy_get_contact(buddy);
 	if (contact) {
 		contact_expanded = ((struct _pidgin_blist_node *)(((PurpleBlistNode*)contact)->ui_data))->contact_expanded;
@@ -1145,17 +1334,17 @@
 		if (!prpl_info->can_receive_file ||
 			prpl_info->can_receive_file(buddy->account->gc, buddy->name))
 		{
-			pidgin_new_item_from_stock(menu, _("_Send File"),
+			pidgin_new_item_from_stock(menu, _("_Send File..."),
 									 PIDGIN_STOCK_TOOLBAR_SEND_FILE,
 									 G_CALLBACK(gtk_blist_menu_send_file_cb),
 									 buddy, 0, 0, NULL);
 		}
 	}
 
-	pidgin_new_item_from_stock(menu, _("Add Buddy _Pounce"), NULL,
+	pidgin_new_item_from_stock(menu, _("Add Buddy _Pounce..."), NULL,
 			G_CALLBACK(gtk_blist_menu_bp_cb), buddy, 0, 0, NULL);
 
-	if (((PurpleBlistNode*)buddy)->parent && ((PurpleBlistNode*)buddy)->parent->child->next && 
+	if (node->parent && node->parent->child->next && 
 	      !sub && !contact_expanded) {
 		pidgin_new_item_from_stock(menu, _("View _Log"), NULL,
 				G_CALLBACK(gtk_blist_menu_showlog_cb),
@@ -1165,15 +1354,22 @@
 				G_CALLBACK(gtk_blist_menu_showlog_cb), buddy, 0, 0, NULL);
 	}
 
-
-	pidgin_append_blist_node_proto_menu(menu, buddy->account->gc,
-										  (PurpleBlistNode *)buddy);
-	pidgin_append_blist_node_extended_menu(menu, (PurpleBlistNode *)buddy);
-
-	if (((PurpleBlistNode*)buddy)->parent && ((PurpleBlistNode*)buddy)->parent->child->next && 
+	if (!(purple_blist_node_get_flags(node) & PURPLE_BLIST_NODE_FLAG_NO_SAVE)) {
+		show_offline = purple_blist_node_get_bool(node, "show_offline");
+		pidgin_new_item_from_stock(menu, show_offline ? _("Hide when offline") : _("Show when offline"),
+				NULL, G_CALLBACK(gtk_blist_menu_showoffline_cb), node, 0, 0, NULL);
+	}
+
+	pidgin_append_blist_node_proto_menu(menu, buddy->account->gc, node);
+	pidgin_append_blist_node_extended_menu(menu, node);
+
+	if (!contact_expanded)
+		pidgin_append_blist_node_move_to_menu(menu, (PurpleBlistNode *)contact);
+
+	if (node->parent && node->parent->child->next && 
               !sub && !contact_expanded) {
 		pidgin_separator(menu);
-		pidgin_append_blist_node_privacy_menu(menu, (PurpleBlistNode *)buddy);
+		pidgin_append_blist_node_privacy_menu(menu, node);
 		pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS,
 				G_CALLBACK(gtk_blist_menu_alias_cb),
 				contact, 0, 0, NULL);
@@ -1182,7 +1378,7 @@
 				contact, 0, 0, NULL);
 	} else if (!sub || contact_expanded) {
 		pidgin_separator(menu);
-		pidgin_append_blist_node_privacy_menu(menu, (PurpleBlistNode *)buddy);
+		pidgin_append_blist_node_privacy_menu(menu, node);
 		pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS,
 				G_CALLBACK(gtk_blist_menu_alias_cb), buddy, 0, 0, NULL);
 		pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
@@ -1235,10 +1431,10 @@
 	GtkWidget *item;
 
 	menu = gtk_menu_new();
-	item = pidgin_new_item_from_stock(menu, _("Add a _Buddy"), GTK_STOCK_ADD,
+	item = pidgin_new_item_from_stock(menu, _("Add _Buddy..."), GTK_STOCK_ADD,
 				 G_CALLBACK(pidgin_blist_add_buddy_cb), node, 0, 0, NULL);
 	gtk_widget_set_sensitive(item, purple_connections_get_all() != NULL);
-	item = pidgin_new_item_from_stock(menu, _("Add a C_hat"), GTK_STOCK_ADD,
+	item = pidgin_new_item_from_stock(menu, _("Add C_hat..."), GTK_STOCK_ADD,
 				 G_CALLBACK(pidgin_blist_add_chat_cb), node, 0, 0, NULL);
 	gtk_widget_set_sensitive(item, pidgin_blist_joinchat_is_showable());
 	pidgin_new_item_from_stock(menu, _("_Delete Group"), GTK_STOCK_REMOVE,
@@ -1256,16 +1452,19 @@
 create_chat_menu(PurpleBlistNode *node, PurpleChat *c)
 {
 	GtkWidget *menu;
-	gboolean autojoin;
+	gboolean autojoin, persistent;
 
 	menu = gtk_menu_new();
 	autojoin = (purple_blist_node_get_bool(node, "gtk-autojoin") ||
 			(purple_blist_node_get_string(node, "gtk-autojoin") != NULL));
+	persistent = purple_blist_node_get_bool(node, "gtk-persistent");
 
 	pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT,
 			G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL);
 	pidgin_new_check_item(menu, _("Auto-Join"),
 			G_CALLBACK(gtk_blist_menu_autojoin_cb), node, autojoin);
+	pidgin_new_check_item(menu, _("Persistent"),
+			G_CALLBACK(gtk_blist_menu_persistent_cb), node, persistent);
 	pidgin_new_item_from_stock(menu, _("View _Log"), NULL,
 			G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL);
 
@@ -1307,7 +1506,6 @@
 				 node, 0, 0, NULL);
 
 	pidgin_append_blist_node_extended_menu(menu, node);
-
 	return menu;
 }
 
@@ -2888,7 +3086,7 @@
 
 	/* Accounts menu */
 	{ N_("/_Accounts"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Accounts/Add\\/Edit"), "<CTL>A", pidgin_accounts_window_show, 0, "<Item>", NULL },
+	{ N_("/Accounts/Manage"), "<CTL>A", pidgin_accounts_window_show, 0, "<Item>", NULL },
 
 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
@@ -3145,8 +3343,6 @@
 	GdkPixbuf *ret;
 	PurplePresence *p;
 
-
-
 	if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		if(!gtknode->contact_expanded) {
 			buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
@@ -3188,6 +3384,13 @@
 		return ret;
 	}
 
+	if (purple_status_get_attr_string(purple_presence_get_active_status(p), PURPLE_TUNE_TITLE)) {
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "music.png", NULL);
+		ret = gdk_pixbuf_new_from_file(path, NULL);
+		g_free(path);
+		return ret;
+	}
+
 	prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account));
 	if (!prpl)
 		return NULL;
@@ -3261,17 +3464,17 @@
 	}
 
 	if(buddy) {
-	  	PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-									     purple_buddy_get_name(buddy),
-									     purple_buddy_get_account(buddy));
+	  	PurpleConversation *conv = find_conversation_with_buddy(buddy);
 		PurplePresence *p;
 		gboolean trans;
 
 		if(conv != NULL) {
 			PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-			if((gtkconv == NULL || pidgin_conv_is_hidden(gtkconv)) && size == PIDGIN_STATUS_ICON_SMALL) {
-				return gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_MESSAGE,
-							       icon_size, "GtkTreeView");
+			if (gtkconv == NULL && size == PIDGIN_STATUS_ICON_SMALL) {
+				PidginBlistNode *ui = buddy->node.ui_data;
+				if (ui == NULL || (ui->conv.flags & PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE))
+					return gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview),
+							PIDGIN_STOCK_STATUS_MESSAGE, icon_size, "GtkTreeView");
 			}
 		}
 
@@ -3327,16 +3530,17 @@
 	struct _pidgin_blist_node *gtkcontactnode = NULL;
 	char *idletime = NULL, *statustext = NULL;
 	time_t t;
-	PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-								     purple_buddy_get_name(b),
-								     purple_buddy_get_account(b));
-	PidginConversation *gtkconv;
+	PurpleConversation *conv = find_conversation_with_buddy(b);
 	gboolean hidden_conv = FALSE;
 
-	if(conv != NULL) {
-		gtkconv = PIDGIN_CONVERSATION(conv);
-		if(gtkconv == NULL || pidgin_conv_is_hidden(gtkconv)) {
-			hidden_conv = TRUE;
+	if (conv != NULL) {
+		PidginBlistNode *ui = b->node.ui_data;
+		if (ui) {
+			if (ui->conv.flags & PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE)
+				hidden_conv = TRUE;
+		} else {
+			if (PIDGIN_CONVERSATION(conv) == NULL)
+				hidden_conv = TRUE;
 		}
 	}
 
@@ -3671,7 +3875,7 @@
 		menu = NULL;
 	}
 
-	convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 0);
+	convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_ANY, PIDGIN_UNSEEN_TEXT, TRUE, 0);
 	if (!convs)
 		/* no conversations added, don't show the menu */
 		return;
@@ -3727,7 +3931,7 @@
 		gtkblist->menutrayicon = NULL;
 	}
 
-	convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 0);
+	convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_ANY, PIDGIN_UNSEEN_TEXT, TRUE, 0);
 	if (convs) {
 		GtkWidget *img = NULL;
 		GString *tooltip_text = NULL;
@@ -3735,14 +3939,10 @@
 		tooltip_text = g_string_new("");
 		l = convs;
 		while (l != NULL) {
-			if (PIDGIN_IS_PIDGIN_CONVERSATION(l->data)) {
-				PidginConversation *gtkconv = PIDGIN_CONVERSATION((PurpleConversation *)l->data);
-
-				g_string_append_printf(tooltip_text,
-						ngettext("%d unread message from %s\n", "%d unread messages from %s\n", gtkconv->unseen_count),
-						gtkconv->unseen_count,
-						gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)));
-			}
+			int count = GPOINTER_TO_INT(purple_conversation_get_data(l->data, "unseen-count"));
+			g_string_append_printf(tooltip_text,
+					ngettext("%d unread message from %s\n", "%d unread messages from %s\n", count),
+					count, purple_conversation_get_name(l->data));
 			l = l->next;
 		}
 		if(tooltip_text->len > 0) {
@@ -3770,6 +3970,88 @@
 	conversation_updated_cb(conv, PURPLE_CONV_UPDATE_UNSEEN, gtkblist);
 }
 
+static void
+conversation_deleted_update_ui_cb(PurpleConversation *conv, struct _pidgin_blist_node *ui)
+{
+	if (ui->conv.conv != conv)
+		return;
+	ui->conv.conv = NULL;
+	ui->conv.flags = 0;
+	ui->conv.last_message = 0;
+}
+
+static void
+written_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message,
+		PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node)
+{
+	PidginBlistNode *ui = node->ui_data;
+	if (ui->conv.conv != conv || PIDGIN_CONVERSATION(conv) ||
+			!(flag & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)))
+		return;
+	ui->conv.flags |= PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE;
+	ui->conv.last_message = time(NULL);    /* XXX: for lack of better data */
+	pidgin_blist_update(purple_get_blist(), node);
+}
+
+static void
+displayed_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message,
+		PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node)
+{
+	PidginBlistNode *ui = node->ui_data;
+	if (ui->conv.conv != conv)
+		return;
+	ui->conv.flags &= ~PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE;
+	pidgin_blist_update(purple_get_blist(), node);
+}
+
+static void
+conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
+{
+	switch (conv->type) {
+		case PURPLE_CONV_TYPE_IM:
+			{
+				GSList *buddies = purple_find_buddies(conv->account, conv->name);
+				while (buddies) {
+					PurpleBlistNode *buddy = buddies->data;
+					struct _pidgin_blist_node *ui = buddy->ui_data;
+					buddies = g_slist_delete_link(buddies, buddies);
+					if (!ui)
+						continue;
+					ui->conv.conv = conv;
+					ui->conv.flags = 0;
+					ui->conv.last_message = 0;
+					purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation",
+							ui, PURPLE_CALLBACK(conversation_deleted_update_ui_cb), ui);
+					purple_signal_connect(purple_conversations_get_handle(), "wrote-im-msg",
+							ui, PURPLE_CALLBACK(written_msg_update_ui_cb), buddy);
+					purple_signal_connect(pidgin_conversations_get_handle(), "displayed-im-msg",
+							ui, PURPLE_CALLBACK(displayed_msg_update_ui_cb), buddy);
+				}
+			}
+		case PURPLE_CONV_TYPE_CHAT:
+			{
+				PurpleChat *chat = purple_blist_find_chat(conv->account, conv->name);
+				struct _pidgin_blist_node *ui;
+				if (!chat)
+					break;
+				ui = chat->node.ui_data;
+				if (!ui)
+					break;
+				ui->conv.conv = conv;
+				ui->conv.flags = 0;
+				ui->conv.last_message = 0;
+				purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation",
+						ui, PURPLE_CALLBACK(conversation_deleted_update_ui_cb), ui);
+				purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg",
+						ui, PURPLE_CALLBACK(written_msg_update_ui_cb), chat);
+				purple_signal_connect(pidgin_conversations_get_handle(), "displayed-chat-msg",
+						ui, PURPLE_CALLBACK(displayed_msg_update_ui_cb), chat);
+			}
+		default:
+			break;
+	}
+}
+
 /**********************************************************************************
  * Public API Functions                                                           *
  **********************************************************************************/
@@ -4334,7 +4616,7 @@
 	tmp = g_strdup_printf(_("<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 "
+					       "<b>Accounts</b> window at <b>Accounts->Manage</b>. Once you "
 					       "enable accounts, you'll be able to sign on, set your status, "
 					       "and talk to your friends."), PIDGIN_NAME);
 	pretty = pidgin_make_pretty_arrows(tmp);
@@ -4683,6 +4965,9 @@
 	purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation",
 						gtkblist, PURPLE_CALLBACK(conversation_deleting_cb),
 						gtkblist);
+	purple_signal_connect(purple_conversations_get_handle(), "conversation-created",
+			gtkblist, PURPLE_CALLBACK(conversation_created_cb),
+			gtkblist);
 
 	gtk_widget_hide(gtkblist->headline_hbox);
 	gtk_widget_hide(gtkblist->error_buttons);
@@ -4789,6 +5074,7 @@
 		if(gtknode->recent_signonoff_timer > 0)
 			purple_timeout_remove(gtknode->recent_signonoff_timer);
 
+		purple_signals_disconnect_by_handle(node->ui_data);
 		g_free(node->ui_data);
 		node->ui_data = NULL;
 	}
@@ -4953,7 +5239,7 @@
 				   STATUS_ICON_COLUMN, NULL,
 				   NAME_COLUMN, title,
 				   NODE_COLUMN, gnode,
-				   BGCOLOR_COLUMN, &bgcolor,
+	/* 			   BGCOLOR_COLUMN, &bgcolor,     */
 				   GROUP_EXPANDER_COLUMN, TRUE,
 				   GROUP_EXPANDER_VISIBLE_COLUMN, TRUE,
 				   CONTACT_EXPANDER_VISIBLE_COLUMN, FALSE,
@@ -5213,14 +5499,17 @@
 		GdkPixbuf *emblem;
 		char *mark;
 		gboolean showicons = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
-		const char *name = purple_chat_get_name(chat);
-		PurpleConversation *conv =
-				purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name, chat->account);
-		gboolean hidden = (conv && !PIDGIN_CONVERSATION(conv));
-
-		if(!insert_node(list, node, &iter))
+		PidginBlistNode *ui;
+		PurpleConversation *conv;
+		gboolean hidden;
+
+		if (!insert_node(list, node, &iter))
 			return;
 
+		ui = node->ui_data;
+		conv = ui->conv.conv;
+		hidden = (conv && (ui->conv.flags & PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE));
+
 		status = pidgin_blist_get_status_icon(node,
 				 PIDGIN_STATUS_ICON_SMALL);
 		emblem = pidgin_blist_get_emblem(node);
@@ -5527,7 +5816,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
 	/* Set up stuff for the account box */
-	label = gtk_label_new_with_mnemonic(_("_Account:"));
+	label = gtk_label_new_with_mnemonic(_("A_ccount:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 
@@ -5644,6 +5933,12 @@
 		purple_blist_add_chat(chat, group, NULL);
 	}
 
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin)))
+		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE);
+
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent)))
+		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE);
+
 	gtk_widget_destroy(data->window);
 	g_free(data->default_chat_name);
 	g_list_free(data->entries);
@@ -5938,6 +6233,11 @@
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_BIN(data->group_combo)->child);
 	pidgin_set_accessible_label (data->group_combo, label);
 	gtk_box_pack_end(GTK_BOX(rowbox), data->group_combo, TRUE, TRUE, 0);
+	
+	data->autojoin = gtk_check_button_new_with_mnemonic(_("Autojoin when account becomes online."));
+	data->persistent = gtk_check_button_new_with_mnemonic(_("Hide chat when the window is closed."));
+	gtk_box_pack_start(GTK_BOX(vbox), data->autojoin, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), data->persistent, FALSE, FALSE, 0);
 
 	g_signal_connect(G_OBJECT(data->window), "response",
 					 G_CALLBACK(add_chat_resp_cb), data);
@@ -6586,7 +6886,7 @@
 	for (l = gtk_container_get_children(GTK_CONTAINER(accountmenu)); l; l = g_list_delete_link(l, l)) {
 		menuitem = l->data;
 
-		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
+		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Manage")))
 			gtk_widget_destroy(menuitem);
 	}
 
diff -r d94432a338ab -r bedd56240914 pidgin/gtkcellrendererexpander.c
--- a/pidgin/gtkcellrendererexpander.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkcellrendererexpander.c	Fri Sep 28 20:30:26 2007 +0000
@@ -270,6 +270,9 @@
 			    cell_area->x + cell->xpad + (width / 2),
 			    cell_area->y + cell->ypad + (height / 2),
 			    cell->is_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED);
+	if (cell->is_expanded)
+		gtk_paint_hline (widget->style, window, state, NULL, widget, NULL, 0, 
+				 widget->allocation.width, cell_area->y + cell_area->height);
 }
 
 static gboolean pidgin_cell_renderer_expander_activate(GtkCellRenderer *r,
diff -r d94432a338ab -r bedd56240914 pidgin/gtkconn.c
--- a/pidgin/gtkconn.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkconn.c	Fri Sep 28 20:30:26 2007 +0000
@@ -53,7 +53,7 @@
  * The key is a pointer to the PurpleAccount and the
  * value is a pointer to a PidginAutoRecon.
  */
-static GHashTable *hash = NULL;
+static GHashTable *auto_reconns = NULL;
 
 static void
 pidgin_connection_connect_progress(PurpleConnection *gc,
@@ -80,7 +80,7 @@
 		pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox),
 					   (purple_connections_get_connecting() != NULL));
 
-	g_hash_table_remove(hash, account);
+	g_hash_table_remove(auto_reconns, account);
 
 	pidgin_blist_update_account_error_state(account, NULL);
 }
@@ -120,7 +120,7 @@
 
 	purple_debug_info("autorecon", "do_signon called\n");
 	g_return_val_if_fail(account != NULL, FALSE);
-	info = g_hash_table_lookup(hash, account);
+	info = g_hash_table_lookup(auto_reconns, account);
 
 	if (info)
 		info->timeout = 0;
@@ -141,15 +141,16 @@
 {
 	PurpleAccount *account = NULL;
 	PidginAutoRecon *info;
+	GList *list;
 
 	account = purple_connection_get_account(gc);
-	info = g_hash_table_lookup(hash, account);
+	info = g_hash_table_lookup(auto_reconns, account);
 
 	pidgin_blist_update_account_error_state(account, text);
 	if (!gc->wants_to_die) {
 		if (info == NULL) {
 			info = g_new0(PidginAutoRecon, 1);
-			g_hash_table_insert(hash, account, info);
+			g_hash_table_insert(auto_reconns, account, info);
 			info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX);
 		} else {
 			info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
@@ -160,7 +161,7 @@
 	} else {
 		char *p, *s, *n=NULL ;
 		if (info != NULL)
-			g_hash_table_remove(hash, account);
+			g_hash_table_remove(auto_reconns, account);
 
 		if (purple_account_get_alias(account))
 		{
@@ -192,6 +193,17 @@
 		 */
 		purple_account_set_enabled(account, PIDGIN_UI, FALSE);
 	}
+
+	/* If we have any open chats, we probably want to rejoin when we get back online. */
+	list = purple_get_chats();
+	while (list) {
+		PurpleConversation *conv = list->data;
+		list = list->next;
+		if (conv->account != account ||
+				purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv)))
+			continue;
+		purple_conversation_set_data(conv, "want-to-rejoin", GINT_TO_POINTER(TRUE));
+	}
 }
 
 static void pidgin_connection_network_connected ()
@@ -204,7 +216,7 @@
 
 	while (list) {
 		PurpleAccount *account = (PurpleAccount*)list->data;
-		g_hash_table_remove(hash, account);
+		g_hash_table_remove(auto_reconns, account);
 		if (purple_account_is_disconnected(account))
 			do_signon(account);
 		list = list->next;
@@ -265,7 +277,7 @@
 static void
 account_removed_cb(PurpleAccount *account, gpointer user_data)
 {
-	g_hash_table_remove(hash, account);
+	g_hash_table_remove(auto_reconns, account);
 
 	pidgin_blist_update_account_error_state(account, NULL);
 }
@@ -286,7 +298,7 @@
 void
 pidgin_connection_init(void)
 {
-	hash = g_hash_table_new_full(
+	auto_reconns = g_hash_table_new_full(
 							g_direct_hash, g_direct_equal,
 							NULL, free_auto_recon);
 
@@ -300,5 +312,5 @@
 {
 	purple_signals_disconnect_by_handle(pidgin_connection_get_handle());
 
-	g_hash_table_destroy(hash);
+	g_hash_table_destroy(auto_reconns);
 }
diff -r d94432a338ab -r bedd56240914 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Sep 28 20:30:26 2007 +0000
@@ -70,6 +70,8 @@
 
 #include "gtknickcolors.h"
 
+#define CLOSE_CONV_TIMEOUT_SECS  (10 * 60)
+
 #define AUTO_RESPONSE "&lt;AUTO-REPLY&gt; : "
 
 typedef  enum
@@ -123,7 +125,6 @@
 static GtkWidget *invite_dialog = NULL;
 static GtkWidget *warn_close_dialog = NULL;
 
-static PidginWindow *hidden_convwin = NULL;
 static GList *window_list = NULL;
 
 /* Lists of status icons at all available sizes for use as window icons */
@@ -161,6 +162,7 @@
 static gboolean infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv);
 static gboolean pidgin_userlist_motion_cb (GtkWidget *w, GdkEventMotion *event, PidginConversation *gtkconv);
 static void pidgin_conv_leave_cb (GtkWidget *w, GdkEventCrossing *e, PidginConversation *gtkconv);
+static void hide_conv(PidginConversation *gtkconv, gboolean closetimer);
 
 static void pidgin_conv_set_position_size(PidginWindow *win, int x, int y,
 		int width, int height);
@@ -208,12 +210,49 @@
  **************************************************************************/
 
 static gboolean
-close_conv_cb(GtkWidget *w, GdkEventButton *event, PidginConversation *gtkconv)
-{
+close_this_sucker(gpointer data)
+{
+	PidginConversation *gtkconv = data;
 	GList *list = g_list_copy(gtkconv->convs);
-
 	g_list_foreach(list, (GFunc)purple_conversation_destroy, NULL);
 	g_list_free(list);
+	return FALSE;
+}
+
+static gboolean
+close_conv_cb(GtkWidget *w, GdkEventButton *dontuse, PidginConversation *gtkconv)
+{
+	/* We are going to destroy the conversations immediately only if the 'close immediately'
+	 * preference is selected. Otherwise, close the conversation after a reasonable timeout
+	 * (I am going to consider 10 minutes as a 'reasonable timeout' here.
+	 * For chats, close immediately if the chat is not in the buddylist, or if the chat is
+	 * not marked 'Persistent' */
+	PurpleConversation *conv = gtkconv->active_conv;
+	PurpleAccount *account = purple_conversation_get_account(conv);
+	const char *name = purple_conversation_get_name(conv);
+
+	switch (purple_conversation_get_type(conv)) {
+		case PURPLE_CONV_TYPE_IM:
+		{
+			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately"))
+				close_this_sucker(gtkconv);
+			else
+				hide_conv(gtkconv, TRUE);
+			break;
+		}
+		case PURPLE_CONV_TYPE_CHAT:
+		{
+			PurpleChat *chat = purple_blist_find_chat(account, name);
+			if (!chat ||
+					!purple_blist_node_get_bool(&chat->node, "gtk-persistent"))
+				close_this_sucker(gtkconv);
+			else
+				hide_conv(gtkconv, FALSE);
+			break;
+		}
+		default:
+			;
+	}
 
 	return TRUE;
 }
@@ -337,10 +376,13 @@
 static void clear_conversation_scrollback(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = NULL;
+	GList *iter;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtk_imhtml_clear(GTK_IMHTML(gtkconv->imhtml));
+	for (iter = gtkconv->convs; iter; iter = iter->next)
+		purple_conversation_clear_message_history(iter->data);
 }
 
 static PurpleCmdRet
@@ -348,7 +390,6 @@
                  const char *cmd, char **args, char **error, void *data)
 {
 	clear_conversation_scrollback(conv);
-	purple_conversation_clear_message_history(conv);
 	return PURPLE_CMD_STATUS_OK;
 }
 
@@ -1060,12 +1101,9 @@
 {
 	PidginWindow *win = data;
 	PurpleConversation *conv;
-	PidginConversation *gtkconv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
-	gtkconv = PIDGIN_CONVERSATION(conv);
-
-	gtk_imhtml_clear(GTK_IMHTML(gtkconv->imhtml));
+	clear_conversation_scrollback(conv);
 }
 
 struct _search {
@@ -1315,18 +1353,33 @@
 	add_remove_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
-#if 0
-static void
-menu_hide_conv_cb(gpointer data, guint action, GtkWidget *widget)
-{
-	PidginWindow *win = data;
-	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+static gboolean
+close_already(gpointer data)
+{
+	purple_conversation_destroy(data);
+	return FALSE;
+}
+
+static void
+hide_conv(PidginConversation *gtkconv, gboolean closetimer)
+{
+	GList *list;
+
 	purple_signal_emit(pidgin_conversations_get_handle(),
 			"conversation-hiding", gtkconv);
-	purple_conversation_set_ui_ops(conv, NULL);
-}
-#endif
+
+	for (list = g_list_copy(gtkconv->convs); list; list = g_list_delete_link(list, list)) {
+		PurpleConversation *conv = list->data;
+		if (closetimer) {
+			guint timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
+			if (timer)
+				purple_timeout_remove(timer);
+			timer = purple_timeout_add_seconds(CLOSE_CONV_TIMEOUT_SECS, close_already, conv);
+			purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(timer));
+		}
+		purple_conversation_set_ui_ops(conv, NULL);
+	}
+}
 
 static void
 menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget)
@@ -2343,63 +2396,69 @@
 	return get_prpl_icon_list(account);
 }
 
-GdkPixbuf *
-pidgin_conv_get_tab_icon(PurpleConversation *conv, gboolean small_icon)
-{
-        PurpleAccount *account = NULL;
-        const char *name = NULL;
-        GdkPixbuf *status = NULL;
-        PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
-	const char *icon_size = small_icon ? PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC : PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL;
-        g_return_val_if_fail(conv != NULL, NULL);
-
-        account = purple_conversation_get_account(conv);
-        name = purple_conversation_get_name(conv);
-
-        g_return_val_if_fail(account != NULL, NULL);
-        g_return_val_if_fail(name != NULL, NULL);
-
-        /* Use the buddy icon, if possible */
-        if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
-                PurpleBuddy *b = purple_find_buddy(account, name);
-                if (b != NULL) {
+static GdkPixbuf *
+pidgin_conv_get_icon(PurpleConversation *conv, GtkWidget *parent, const char *icon_size)
+{
+	PurpleAccount *account = NULL;
+	const char *name = NULL;
+	GdkPixbuf *status = NULL;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	g_return_val_if_fail(conv != NULL, NULL);
+
+	account = purple_conversation_get_account(conv);
+	name = purple_conversation_get_name(conv);
+
+	g_return_val_if_fail(account != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
+
+	/* Use the buddy icon, if possible */
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		PurpleBuddy *b = purple_find_buddy(account, name);
+		if (b != NULL) {
 			PurplePresence *p = purple_buddy_get_presence(b);
-                        /* I hate this hack.  It fixes a bug where the pending message icon
-                          * displays in the conv tab even though it shouldn't.
-                          * A better solution would be great. */
-                        if (ops && ops->update)
-                                ops->update(NULL, (PurpleBlistNode*)b);
+			/* I hate this hack.  It fixes a bug where the pending message icon
+			 * displays in the conv tab even though it shouldn't.
+			 * A better solution would be great. */
+			if (ops && ops->update)
+				ops->update(NULL, (PurpleBlistNode*)b);
 
 			/* XXX Seanegan: We really need a util function to return a pixbuf for a Presence to avoid all this switching */	
 			if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY))
-	                        status = pidgin_create_status_icon(PURPLE_STATUS_AWAY, PIDGIN_CONVERSATION(conv)->icon, icon_size);
+				status = pidgin_create_status_icon(PURPLE_STATUS_AWAY, parent, icon_size);
 			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_EXTENDED_AWAY))
-	                        status = pidgin_create_status_icon(PURPLE_STATUS_EXTENDED_AWAY, PIDGIN_CONVERSATION(conv)->icon, icon_size);
- 			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE))
-	                        status = pidgin_create_status_icon(PURPLE_STATUS_OFFLINE, PIDGIN_CONVERSATION(conv)->icon, icon_size);
- 			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AVAILABLE))
-	                        status = pidgin_create_status_icon(PURPLE_STATUS_AVAILABLE, PIDGIN_CONVERSATION(conv)->icon, icon_size);
- 			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
-	                        status = pidgin_create_status_icon(PURPLE_STATUS_INVISIBLE, PIDGIN_CONVERSATION(conv)->icon, icon_size);
- 			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
-	                        status = pidgin_create_status_icon(PURPLE_STATUS_UNAVAILABLE, PIDGIN_CONVERSATION(conv)->icon, icon_size);
-                }
-        }
-
-        /* If they don't have a buddy icon, then use the PRPL icon */
-        if (status == NULL) {
+				status = pidgin_create_status_icon(PURPLE_STATUS_EXTENDED_AWAY, parent, icon_size);
+			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE))
+				status = pidgin_create_status_icon(PURPLE_STATUS_OFFLINE, parent, icon_size);
+			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AVAILABLE))
+				status = pidgin_create_status_icon(PURPLE_STATUS_AVAILABLE, parent, icon_size);
+			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
+				status = pidgin_create_status_icon(PURPLE_STATUS_INVISIBLE, parent, icon_size);
+			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
+				status = pidgin_create_status_icon(PURPLE_STATUS_UNAVAILABLE, parent, icon_size);
+		}
+	}
+
+	/* If they don't have a buddy icon, then use the PRPL icon */
+	if (status == NULL) {
 		GtkIconSize size = gtk_icon_size_from_name(icon_size);
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
-        		status = gtk_widget_render_icon (PIDGIN_CONVERSATION(conv)->icon, PIDGIN_STOCK_STATUS_PERSON,
-                                                 size, "GtkWidget");
+			status = gtk_widget_render_icon (parent, PIDGIN_STOCK_STATUS_PERSON,
+					size, "GtkWidget");
 		} else {
-	        		status = gtk_widget_render_icon (PIDGIN_CONVERSATION(conv)->icon, PIDGIN_STOCK_STATUS_CHAT,
-                                                 size, "GtkWidget");
+			status = gtk_widget_render_icon (parent, PIDGIN_STOCK_STATUS_CHAT,
+					size, "GtkWidget");
 		}
 	}	
 	return status;
 }
 
+GdkPixbuf *
+pidgin_conv_get_tab_icon(PurpleConversation *conv, gboolean small_icon)
+{
+	const char *icon_size = small_icon ? PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC : PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL;
+	return pidgin_conv_get_icon(conv, PIDGIN_CONVERSATION(conv)->icon, icon_size);
+}
+
 
 static void
 update_tab_icon(PurpleConversation *conv)
@@ -2751,9 +2810,9 @@
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 	GdkModifierType state;
 
-	if(gtkconv->win==hidden_convwin) {
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
+	if (gtkconv == NULL) {
+		pidgin_conv_attach_to_conversation(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 	}
 
 	pidgin_conv_switch_active_conversation(conv);
@@ -2786,15 +2845,19 @@
 		PurpleConversation *conv = (PurpleConversation*)l->data;
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
-		if(gtkconv == NULL || gtkconv->active_conv != conv)
+		if (gtkconv != NULL && gtkconv->active_conv != conv)
 			continue;
-
-		if (gtkconv->unseen_state >= min_state
-			&& (!hidden_only ||
-				(hidden_only && gtkconv->win == hidden_convwin))) {
-
+		if (gtkconv == NULL) {
+			if (!hidden_only ||
+					!purple_conversation_get_data(conv, "unseen-count"))
+				continue;
 			r = g_list_prepend(r, conv);
 			c++;
+		} else {
+			if (gtkconv->unseen_state >= min_state && !hidden_only) {
+				r = g_list_prepend(r, conv);
+				c++;
+			}
 		}
 	}
 
@@ -2834,11 +2897,11 @@
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 		GtkWidget *icon = gtk_image_new();
-		GdkPixbuf *pbuf = pidgin_conv_get_tab_icon(conv, TRUE);
+		GdkPixbuf *pbuf = pidgin_conv_get_icon(conv, icon, PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC);
 		GtkWidget *item;
 		gchar *text = g_strdup_printf("%s (%d)",
-				gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)),
-				gtkconv->unseen_count);
+				gtkconv ? gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)) : purple_conversation_get_name(conv),
+				gtkconv ? gtkconv->unseen_count : GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count")));
 
 		gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pbuf);
 		g_object_unref(pbuf);
@@ -3096,7 +3159,7 @@
 	PurpleConversation *conv;
 	GtkWidget *item;
 
-	if (win->window == NULL || win == hidden_convwin)
+	if (win->window == NULL)
 		return;
 
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
@@ -3571,7 +3634,7 @@
 		gtk_widget_destroy(win->menu.send_to);
 
 	/* Build the Send To menu */
-	win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("_Send To"));
+	win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("S_end To"));
 	gtk_widget_show(win->menu.send_to);
 
 	menu = gtk_menu_new();
@@ -4943,6 +5006,9 @@
 	GtkWidget *tab_cont;
 	PurpleBlistNode *convnode;
 
+	if (hidden)
+		return;
+
 	if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
 		conv->ui_data = gtkconv;
 		if (!g_list_find(gtkconv->convs, conv))
@@ -5042,10 +5108,7 @@
 	                         G_CALLBACK(gtk_widget_grab_focus),
 	                         gtkconv->entry);
 
-	if (hidden)
-		pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv);
-	else
-		pidgin_conv_placement_place(gtkconv);
+	pidgin_conv_placement_place(gtkconv);
 
 	if (nick_colors == NULL) {
 		nbr_nick_colors = NUM_NICK_COLORS;
@@ -5053,11 +5116,13 @@
 	}
 }
 
+#if 0
 static void
 pidgin_conv_new_hidden(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, TRUE);
 }
+#endif
 
 void
 pidgin_conv_new(PurpleConversation *conv)
@@ -5070,26 +5135,22 @@
 				   PurpleConversation *conv, PurpleMessageFlags flags)
 {
 	PurpleConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops();
-	if (conv != NULL)
-		return;
 
 	/* create hidden conv if hide_new pref is always */
-	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0)
-	{
-		ui_ops->create_conversation = pidgin_conv_new_hidden;
-		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
-		ui_ops->create_conversation = pidgin_conv_new;
-		return;
-	}
-
-	/* create hidden conv if hide_new pref is away and account is away */
-	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 &&
-	    !purple_status_is_available(purple_account_get_active_status(account)))
-	{
-		ui_ops->create_conversation = pidgin_conv_new_hidden;
-		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
-		ui_ops->create_conversation = pidgin_conv_new;
-		return;
+	/* or if hide_new pref is away and account is away */
+	if ((strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0) ||
+		(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 &&
+		 !purple_status_is_available(purple_account_get_active_status(account)))) {
+		if (!conv) {
+			ui_ops->create_conversation = NULL;
+			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
+			purple_conversation_set_ui_ops(conv, NULL);
+			ui_ops->create_conversation = pidgin_conv_new;
+		}
+	} else {
+		/* new message for an IM */
+		if (conv && conv->type == PURPLE_CONV_TYPE_IM)
+			pidgin_conv_attach_to_conversation(conv);
 	}
 }
 
@@ -5098,6 +5159,9 @@
 {
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
+	if (!gtkconv)
+		return;
+
 	gtkconv->convs = g_list_remove(gtkconv->convs, conv);
 	/* Don't destroy ourselves until all our convos are gone */
 	if (gtkconv->convs) {
@@ -6575,6 +6639,19 @@
 	pidgin_conv_update_fields(conv, flags);
 }
 
+static void
+wrote_msg_update_unseen_cb(PurpleAccount *account, const char *who, const char *message,
+		PurpleConversation *conv, PurpleMessageFlags flag, gpointer null)
+{
+	if (conv == NULL || PIDGIN_IS_PIDGIN_CONVERSATION(conv))
+		return;
+	if (flag & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)) {
+		purple_conversation_set_data(conv, "unseen-count",
+				GINT_TO_POINTER(GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count")) + 1));
+		purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN);
+	}
+}
+
 static PurpleConversationUiOps conversation_ui_ops =
 {
 	pidgin_conv_new,
@@ -7072,6 +7149,7 @@
 account_status_changed_cb(PurpleAccount *account, PurpleStatus *oldstatus,
                           PurpleStatus *newstatus)
 {
+#if 0
 	GList *l;
 	PurpleConversation *conv = NULL;
 	PidginConversation *gtkconv;
@@ -7081,27 +7159,7 @@
 
 	if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus))
 		return;
-
-	while ((l = hidden_convwin->gtkconvs) != NULL)
-	{
-		gtkconv = l->data;
-
-		conv = gtkconv->active_conv;
-
-		while(l && !purple_status_is_available(
-					purple_account_get_active_status(
-					purple_conversation_get_account(conv))))
-			l = l->next;
-		if (!l)
-			break;
-
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
-
-		/* TODO: do we need to do anything for any other conversations that are in the same gtkconv here?
-		 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/
-		purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN);
-	}
+#endif
 }
 
 static void
@@ -7109,32 +7167,25 @@
 				 gconstpointer value, gpointer data)
 {
 	GList *l;
-	PurpleConversation *conv = NULL;
-	PidginConversation *gtkconv;
 	gboolean when_away = FALSE;
 
-	if(!hidden_convwin)
-		return;
-
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")==0)
 		return;
 
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0)
 		when_away = TRUE;
 
-	while ((l = hidden_convwin->gtkconvs) != NULL)
+	for (l = purple_get_conversations(); l; l = l->next)
 	{
-		gtkconv = l->data;
-
-		conv = gtkconv->active_conv;
-
+		PurpleConversation *conv = l->data;
+		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+		if (gtkconv)
+			continue;
 		if(when_away && !purple_status_is_available(
 							purple_account_get_active_status(
 							purple_conversation_get_account(conv))))
 			continue;
-
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
+		pidgin_conv_attach_to_conversation(conv);
 	}
 }
 
@@ -7190,6 +7241,23 @@
 		/* if (purple_conversation_get_account(conv) == account) */
 			pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON |
 							PIDGIN_CONV_MENU | PIDGIN_CONV_COLORIZE_TITLE);
+
+		if (PURPLE_CONNECTION_IS_CONNECTED(gc) &&
+				conv->type == PURPLE_CONV_TYPE_CHAT &&
+				conv->account == gc->account &&
+				purple_conversation_get_data(conv, "want-to-rejoin")) {
+			GHashTable *comps = NULL;
+			PurpleChat *chat = purple_blist_find_chat(conv->account, conv->name);
+			if (chat == NULL) {
+				if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
+					comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, conv->name);
+			} else {
+				comps = chat->components;
+			}
+			serv_join_chat(gc, comps);
+			if (chat == NULL && comps != NULL)
+				g_hash_table_destroy(comps);
+		}
 	}
 }
 
@@ -7317,9 +7385,15 @@
 	PidginConversation *gtkconv = data;
 	int count = 0;
 	int timer = gtkconv->attach.timer;
+	time_t when = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtkconv->entry), "attach-start-time"));
+
 	gtkconv->attach.timer = 0;
 	while (gtkconv->attach.current && count < 100) {  /* XXX: 100 is a random value here */
 		PurpleConvMessage *msg = gtkconv->attach.current->data;
+		if (when && when < msg->when) {
+			gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR><HR>", 0);
+			g_object_set_data(G_OBJECT(gtkconv->entry), "attach-start-time", NULL);
+		}
 		pidgin_conv_write_conv(gtkconv->active_conv, msg->who, msg->who, msg->what, msg->flags, msg->when);
 		gtkconv->attach.current = gtkconv->attach.current->prev;
 		count++;
@@ -7328,6 +7402,7 @@
 	if (gtkconv->attach.current)
 		return TRUE;
 
+	g_object_set_data(G_OBJECT(gtkconv->entry), "attach-start-time", NULL);
 	purple_signal_emit(pidgin_conversations_get_handle(),
 			"conversation-displayed", gtkconv);
 	g_source_remove(gtkconv->attach.timer);
@@ -7339,18 +7414,21 @@
 {
 	GList *list;
 	PidginConversation *gtkconv;
+	int timer;
 
 	if (PIDGIN_IS_PIDGIN_CONVERSATION(conv))
 		return FALSE;
 
+	purple_conversation_set_data(conv, "unseen-count", NULL);
 	purple_conversation_set_ui_ops(conv, pidgin_conversations_get_conv_ui_ops());
 	private_gtkconv_new(conv, FALSE);
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	list = purple_conversation_get_message_history(conv);
 	if (list) {
-		list = g_list_last(list);
-		gtkconv->attach.current = list;
+		g_object_set_data(G_OBJECT(gtkconv->entry), "attach-start-time",
+				GINT_TO_POINTER(((PurpleConvMessage*)(list->data))->when));
+		gtkconv->attach.current = g_list_last(list);
 		gtkconv->attach.timer = g_idle_add(add_message_history_to_gtkconv, gtkconv);
 	} else {
 		purple_signal_emit(pidgin_conversations_get_handle(),
@@ -7362,6 +7440,9 @@
 		pidgin_conv_chat_add_users(conv, PURPLE_CONV_CHAT(conv)->in_room, TRUE);
 	}
 
+	timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
+	if (timer)
+		purple_timeout_remove(timer);
 	return TRUE;
 }
 
@@ -7427,6 +7508,7 @@
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", TRUE);
 
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "never");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", FALSE);
 
 #ifdef _WIN32
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", FALSE);
@@ -7590,9 +7672,6 @@
 
 	purple_conversations_set_ui_ops(&conversation_ui_ops);
 
-	hidden_convwin = pidgin_conv_window_new();
-	window_list = g_list_remove(window_list, hidden_convwin);
-
 	purple_signal_connect(purple_accounts_get_handle(), "account-status-changed",
                         handle, PURPLE_CALLBACK(account_status_changed_cb), NULL);
 
@@ -7628,6 +7707,10 @@
 	purple_signal_connect_priority(purple_conversations_get_handle(), "conversation-updated", handle,
 						PURPLE_CALLBACK(pidgin_conv_updated), NULL,
 						PURPLE_SIGNAL_PRIORITY_LOWEST);
+	purple_signal_connect(purple_conversations_get_handle(), "wrote-im-msg", handle,
+			PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL);
+	purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg", handle,
+			PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL);
 }
 
 void
@@ -7636,8 +7719,6 @@
 	purple_prefs_disconnect_by_handle(pidgin_conversations_get_handle());
 	purple_signals_disconnect_by_handle(pidgin_conversations_get_handle());
 	purple_signals_unregister_by_instance(pidgin_conversations_get_handle());
-	pidgin_conv_window_destroy(hidden_convwin);
-	hidden_convwin=NULL;
 }
 
 
@@ -8019,7 +8100,7 @@
 		sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to));
 
 		if (sub && GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) {
-			GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Send To"));
+			GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("S_end To"));
 			if (populated)
 				pidgin_separator(menu);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -8769,15 +8850,10 @@
 
 	if (win->gtkconvs) {
 		while (win->gtkconvs) {
-			GList *nextgtk = win->gtkconvs->next;
-			PidginConversation *gtkconv = win->gtkconvs->data;
-			GList *nextcore = gtkconv->convs->next;
-			PurpleConversation *conv = gtkconv->convs->data;
-			purple_conversation_destroy(conv);
-			if (!nextgtk && !nextcore)
-			/* we'll end up invoking ourselves when we destroy our last child */
-			/* so don't destroy ourselves right now */
-				return;
+			gboolean last = (win->gtkconvs->next == NULL);
+			close_conv_cb(NULL, NULL, win->gtkconvs->data);
+			if (last)
+				break;
 		}
 		return;
 	}
@@ -9054,7 +9130,7 @@
 	if (win->gtkconvs && win->gtkconvs->next == NULL)
 		pidgin_conv_tab_pack(win, win->gtkconvs->data);
 
-	if (!win->gtkconvs && win != hidden_convwin)
+	if (!win->gtkconvs)
 		pidgin_conv_window_destroy(win);
 }
 
@@ -9593,9 +9669,7 @@
 gboolean
 pidgin_conv_is_hidden(PidginConversation *gtkconv)
 {
-	g_return_val_if_fail(gtkconv != NULL, FALSE);
-
-	return (gtkconv->win == hidden_convwin);
+	return (gtkconv == NULL);
 }
 
 
@@ -9696,3 +9770,4 @@
 
 	return colors;
 }
+
diff -r d94432a338ab -r bedd56240914 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkdocklet.c	Fri Sep 28 20:30:26 2007 +0000
@@ -532,7 +532,7 @@
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_mute), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	menuitem = gtk_check_menu_item_new_with_label(_("Blink on new message"));
+	menuitem = gtk_check_menu_item_new_with_label(_("Blink on New Message"));
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink"));
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blink), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
diff -r d94432a338ab -r bedd56240914 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Fri Sep 28 20:30:26 2007 +0000
@@ -1166,6 +1166,7 @@
 	GtkWidget *label;
 	GtkWidget *insert_button;
 	GtkWidget *font_button;
+	GtkWidget *smiley_button;
 	GtkWidget *font_menu;
 	GtkWidget *insert_menu;
 	GtkWidget *menuitem;
@@ -1267,12 +1268,6 @@
 	insert_menu = gtk_menu_new();
 	g_object_set_data(G_OBJECT(toolbar), "insert_menu", insert_menu);
 
-	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);
-
 	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);
@@ -1294,6 +1289,24 @@
 	g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu);
 	g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button);
 	toolbar->sml = NULL;
+	
+	/* Sep */
+	sep = gtk_vseparator_new();
+	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
+	gtk_widget_show_all(sep);
+
+	/* Smiley */
+	smiley_button = gtk_button_new();
+	gtk_button_set_relief(GTK_BUTTON(smiley_button), GTK_RELIEF_NONE);
+	bbox = gtk_hbox_new(FALSE, 3);
+	gtk_container_add(GTK_CONTAINER(smiley_button), bbox);
+	image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
+	gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0);
+	label = gtk_label_new_with_mnemonic(_("_Smile!"));
+	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0);
+	g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
+	gtk_widget_show_all(smiley_button);
 
 	gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
 	g_object_set_data(G_OBJECT(hbox), "lean-view", box);
diff -r d94432a338ab -r bedd56240914 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkmain.c	Fri Sep 28 20:30:26 2007 +0000
@@ -394,6 +394,9 @@
 		       "  -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"
+#ifndef WIN32
+		       "  --display=DISPLAY   X display to use\n"
+#endif
 		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, VERSION, name);
 	}
 
@@ -481,6 +484,7 @@
 		{"nologin",  no_argument,       NULL, 'n'},
 		{"session",  required_argument, NULL, 's'},
 		{"version",  no_argument,       NULL, 'v'},
+		{"display",  required_argument, NULL, 'D'},
 		{0, 0, 0, 0}
 	};
 
@@ -509,7 +513,7 @@
 #ifndef DEBUG
 		/* We translate this here in case the crash breaks gettext. */
 		segfault_message_tmp = g_strdup_printf(_(
-			"%s has segfaulted and attempted to dump a core file.\n"
+			"%s %s has segfaulted and attempted to dump a core file.\n"
 			"This is a bug in the software and has happened through\n"
 			"no fault of your own.\n\n"
 			"If you can reproduce the crash, please notify the developers\n"
@@ -523,7 +527,7 @@
 			"LSchiere (via AIM).  Contact information for Sean and Luke \n"
 			"on other protocols is at\n"
 			"%swiki/DeveloperPages\n"),
-			PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE
+			PIDGIN_NAME, VERSION, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE
 		);
 
 		/* we have to convert the message (UTF-8 to console
@@ -626,6 +630,9 @@
 		case 'm':   /* do not ensure single instance. */
 			opt_si = FALSE;
 			break;
+		case 'D':   /* --display */
+			/* handled by gtk_init_check below */
+			break;
 		case '?':	/* show terse help */
 		default:
 			show_usage(argv[0], TRUE);
diff -r d94432a338ab -r bedd56240914 pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtknotify.c	Fri Sep 28 20:30:26 2007 +0000
@@ -561,8 +561,8 @@
 	if (!GTK_WIDGET_VISIBLE(dialog)) {
 		GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, PIDGIN_STOCK_DIALOG_MAIL,
 							   gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), NULL);
-		char *label_text = g_strdup_printf(ngettext("<b>You have %d new e-mail.</b>",
-							    "<b>You have %d new e-mails.</b>",
+		char *label_text = g_strdup_printf(ngettext("<b>%d new e-mail.</b>",
+							    "<b>%d new e-mails.</b>",
 							    mail_dialog->total_count), mail_dialog->total_count);
 		mail_dialog->in_use = TRUE;     /* So that _set_headline doesn't accidentally
 										   remove the notifications when replacing an
@@ -692,30 +692,30 @@
 	GtkTreeIter iter;
 	GdkPixbuf *pixbuf;
 	guint col_num;
-	guint i;
-	guint j;
+	GList *row, *column;
+	guint n;
 
 	gtk_list_store_clear(data->model);
 
 	pixbuf = pidgin_create_prpl_icon(purple_connection_get_account(gc), 0.5);
 
 	/* +1 is for the automagically created Status column. */
-	col_num = purple_notify_searchresults_get_columns_count(results) + 1;
+	col_num = g_list_length(results->columns) + 1;
 
-	for (i = 0; i < purple_notify_searchresults_get_rows_count(results); i++) {
-		GList *row = purple_notify_searchresults_row_get(results, i);
+	for (row = results->rows; row != NULL; row = row->next) {
 
 		gtk_list_store_append(model, &iter);
 		gtk_list_store_set(model, &iter, 0, pixbuf, -1);
 
-		for (j = 1; j < col_num; j++) {
+		n = 1;
+		for (column = row->data; column != NULL; column = column->next) {
 			GValue v;
-			char *data = g_list_nth_data(row, j - 1);
 
 			v.g_type = 0;
 			g_value_init(&v, G_TYPE_STRING);
-			g_value_set_string(&v, data);
-			gtk_list_store_set_value(model, &iter, j, &v);
+			g_value_set_string(&v, column->data);
+			gtk_list_store_set_value(model, &iter, n, &v);
+			n++;
 		}
 	}
 
@@ -735,6 +735,7 @@
 	GtkListStore *model;
 	GtkCellRenderer *renderer;
 	guint col_num;
+	GList *column;
 	guint i;
 
 	GtkWidget *vbox;
@@ -782,7 +783,7 @@
 	g_free(label_text);
 
 	/* +1 is for the automagically created Status column. */
-	col_num = purple_notify_searchresults_get_columns_count(results) + 1;
+	col_num = g_list_length(results->columns) + 1;
 
 	/* Setup the list model */
 	col_types = g_new0(GType, col_num);
@@ -817,12 +818,13 @@
 	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview),
 					-1, "", renderer, "pixbuf", 0, NULL);
 
-	for (i = 1; i < col_num; i++) {
+	i = 1;
+	for (column = results->columns; column != NULL; column = column->next) {
 		renderer = gtk_cell_renderer_text_new();
 
 		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), -1,
-				purple_notify_searchresults_column_get_title(results, i-1),
-				renderer, "text", i, NULL);
+				column->data, renderer, "text", i, NULL);
+		i++;
 	}
 
 	for (i = 0; i < g_list_length(results->buttons); i++) {
diff -r d94432a338ab -r bedd56240914 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtkprefs.c	Fri Sep 28 20:30:26 2007 +0000
@@ -994,6 +994,8 @@
 
 	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
 				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
+	pidgin_prefs_checkbox(_("Close IMs immediately when the tab is closed"),
+				PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", vbox);
 
 	iconpref1 = pidgin_prefs_checkbox(_("Show _detailed information"),
 			PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox);
diff -r d94432a338ab -r bedd56240914 pidgin/gtksession.c
--- a/pidgin/gtksession.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/gtksession.c	Fri Sep 28 20:30:26 2007 +0000
@@ -36,6 +36,7 @@
 #include <gdk/gdkx.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <gdk/gdk.h>
 
 #define ERROR_LENGTH 512
 
@@ -141,7 +142,7 @@
 /* my magic utility function */
 
 static gchar **session_make_command(gchar *client_id, gchar *config_dir) {
-	gint i = 2;
+	gint i = 4;
 	gint j = 0;
 	gchar **ret;
 
@@ -161,6 +162,9 @@
 		ret[j++] = g_strdup(config_dir);
 	}
 
+	ret[j++] = g_strdup("--display");
+	ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
+
 	ret[j++] = NULL;
 
 	return ret;
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/cool.png
Binary file pidgin/pixmaps/dialogs/64/cool.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/error.png
Binary file pidgin/pixmaps/dialogs/64/error.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/info.png
Binary file pidgin/pixmaps/dialogs/64/info.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/mail.png
Binary file pidgin/pixmaps/dialogs/64/mail.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/question.png
Binary file pidgin/pixmaps/dialogs/64/question.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/scalable/cool.svg
--- a/pidgin/pixmaps/dialogs/64/scalable/cool.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/scalable/cool.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -7,101 +7,25 @@
    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="64"
-   height="64"
+   width="48"
+   height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.45"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/dialogs"
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/dialogs"
    sodipodi:docname="dialog-cool.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/dialogs/dialog-cool.png"
+   inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2351">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2353" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2355" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2351"
-       id="linearGradient2357"
-       x1="12.488563"
-       y1="5.8544211"
-       x2="12.488563"
-       y2="19.066195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(60.97357,13.05831)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2343">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop2345" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:0;"
-         offset="1"
-         id="stop2347" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2343"
-       id="linearGradient2349"
-       x1="12.515625"
-       y1="8.7261219"
-       x2="12.515625"
-       y2="0.68458056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99284,0,0,1,61.04756,13.09375)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3121">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop3123" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop3125" />
-    </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="linearGradient3104">
       <stop
          style="stop-color:#eeeeec;stop-opacity:1;"
@@ -123,15 +47,380 @@
        r="9.975256"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <filter
+       inkscape:collect="always"
+       x="-0.27879593"
+       width="1.5575919"
+       y="-0.78248727"
+       height="2.5649745"
+       id="filter3405">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5438116"
+         id="feGaussianBlur3407" />
+    </filter>
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2247"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3263">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3265" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3267" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2216"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3269"
+       x1="12.845698"
+       y1="16.037401"
+       x2="10.698112"
+       y2="15.449714"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <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="#linearGradient3104"
+       id="radialGradient3175"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <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
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       id="radialGradient2214"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3313"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="2.5781252"
+       fy="11.083743"
+       fx="17.911736"
+       cy="11.083743"
+       cx="17.911736"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient2382"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2867">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2869" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2871" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2382">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2384" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2386" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2230"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient2853"
+       x1="12.5"
+       y1="18.202251"
+       x2="12.746171"
+       y2="20.761486"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867"
+       id="linearGradient2873"
+       x1="12.720216"
+       y1="20.952612"
+       x2="12.720216"
+       y2="17.682426"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2303"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2233"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient3771"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <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="linearGradient3121"
+       inkscape:collect="always">
+      <stop
+         id="stop3123"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop3125"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.99284,0,0,1,61.04756,13.09375)"
+       gradientUnits="userSpaceOnUse"
+       y2="0.68458056"
+       x2="12.515625"
+       y1="8.7261219"
+       x1="12.515625"
+       id="linearGradient2349"
+       xlink:href="#linearGradient2343"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2343"
+       inkscape:collect="always">
+      <stop
+         id="stop2345"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop2347"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(60.97357,13.05831)"
+       gradientUnits="userSpaceOnUse"
+       y2="19.066195"
+       x2="12.488563"
+       y1="5.8544211"
+       x1="12.488563"
+       id="linearGradient2357"
+       xlink:href="#linearGradient2351"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2351"
+       inkscape:collect="always">
+      <stop
+         id="stop2353"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2355"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3794"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3121"
-       id="linearGradient1551"
+       id="linearGradient3802"
        gradientUnits="userSpaceOnUse"
        x1="42.925175"
        y1="40.136646"
        x2="42.925175"
        y2="15.474488" />
+    <filter
+       inkscape:collect="always"
+       x="-0.47282609"
+       width="1.9456522"
+       y="-0.47282609"
+       height="1.9456522"
+       id="filter4019">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.552286"
+         id="feGaussianBlur4021" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -140,17 +429,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.003863"
-     inkscape:cx="43.074856"
-     inkscape:cy="35.626159"
+     inkscape:zoom="15.839192"
+     inkscape:cx="40.272536"
+     inkscape:cy="20.18158"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     fill="#555753"
-     inkscape:window-width="1267"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     fill="#fce94f"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="3"
+     inkscape:window-y="25"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -167,25 +458,25 @@
      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:0.5;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(2.383972,0,0,1.117487,-53.5217,33.04541)" />
+       style="opacity:0.64044949;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3405)"
+       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.2723916,0,0,1.6905173,-0.1758194,23.510748)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:0.53913006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#cc6400;stroke-width:0.55559433;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1307"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.854646,0,0,1.855034,-0.899768,22.62707)" />
+       transform="matrix(1.8043406,0,0,1.8043406,3.1976696,7.6828846)" />
     <path
        sodipodi:type="arc"
        style="opacity:0.79545456;fill:url(#radialGradient3114);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -195,98 +486,215 @@
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.704217,0,0,1.704217,0.879746,24.28255)" />
+       transform="matrix(1.6958412,0,0,1.6958412,4.3182736,9.0348912)" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.57006598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.58677971;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2184"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.75441,0,0,1.753957,0.28417,23.73792)" />
+       transform="matrix(1.7042169,0,0,1.7042169,4.3797455,8.7825453)" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 23.500001,23.5 C 23.500001,26.26 21.260002,28.500001 18.500001,28.500001 C 15.740001,28.500001 13.5,26.26 13.5,23.5 C 13.5,20.74 15.740001,18.5 18.500001,18.5 C 21.260002,18.5 23.500001,20.74 23.500001,23.5 z "
+       id="path3154" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2172"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494387,0,0,1.2877392,1.0769258,12.069869)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:0.282258;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3152"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(4.8735976,0,0,2.5754783,-16.807694,-1.3602618)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3148"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494393,0,0,1.2877392,10.076919,12.069869)" />
+    <path
+       style="opacity:1;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 36,31 C 35.958854,34.901861 33.103799,38.559709 28.776926,39.671439 C 24.450054,40.78317 20.070187,38.984235 18,35.624852 C 24.906148,40.499205 32.307884,37.963138 36,31 z "
+       id="path2186"
+       sodipodi:nodetypes="cscc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2259"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(3.5277688,0.705265,-0.6665314,1.855957,7.1597185,-7.1449202)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
     <path
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32,46 C 30.709742,51.13847 26.288403,55 21.000001,55 C 15.7116,55 11.290259,51.13847 10,46 C 12.318243,49.327326 16.389775,52.419284 21.000001,52.419284 C 25.610224,52.419285 29.681757,49.327326 32,46 z "
-       id="path2186"
+       sodipodi:type="arc"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2261"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(-3.5277688,0.705265,0.6665314,1.855957,41.208475,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
+    <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:0.5;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(2.383972,0,0,1.117487,-126.51617,-6.51091)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:0.53913003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3777"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(1.854646,0,0,1.855034,-73.894233,-16.92925)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.79545456;fill:url(#radialGradient3794);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3779"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(1.704217,0,0,1.704217,-72.114719,-15.27377)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.57006598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3781"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(1.75441,0,0,1.753957,-72.710295,-15.8184)" />
+    <path
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -40.994465,6.44368 C -42.284723,11.58215 -46.706062,15.44368 -51.994464,15.44368 C -57.282865,15.44368 -61.704206,11.58215 -62.994465,6.44368 C -60.676222,9.771006 -56.60469,12.862964 -51.994464,12.862964 C -47.384241,12.862965 -43.312708,9.771006 -40.994465,6.44368 z "
+       id="path3783"
        sodipodi:nodetypes="cscsc" />
     <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"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2191"
        sodipodi:cx="9.0598059"
        sodipodi:cy="8.7845774"
        sodipodi:rx="1.1679889"
        sodipodi:ry="1.4520943"
        d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,1.486487,14.80163)" />
+       transform="matrix(1.712345,0,0,2.754643,-71.507978,-24.75469)" />
     <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"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2193"
        sodipodi:cx="9.0598059"
        sodipodi:cy="8.7845774"
        sodipodi:rx="1.1679889"
        sodipodi:ry="1.4520943"
        d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,9.486483,14.80163)" />
+       transform="matrix(1.712345,0,0,2.754643,-63.507982,-24.75469)" />
     <path
-       style="opacity:0.78977272;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.66300178;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6,37 C 6,41.951923 9.359998,46 13.499999,46 C 17.413598,46 20.659892,42.352213 21,37.773438 C 21.340107,42.352213 24.586402,46 28.499999,46 C 32.640004,46 36,41.951923 36,37 L 21,37 L 6,37 z "
-       id="path2264" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;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;stroke-dasharray:none"
-       d="M 44.078659,9.5112136 C 34.84342,9.8834971 27.500059,15.977362 27.500059,23.405814 C 27.500059,27.671183 29.253586,32.180745 33.0662,34.729626 C 33.874807,38.292011 31.54507,41.058776 31.141507,41.494102 C 31.871844,41.290557 37.643487,39.670532 39.808221,37.260561 C 41.990193,37.168054 43.23089,37.300418 44.997262,37.300418 C 54.649949,37.300418 62.494467,31.073895 62.494465,23.405814 C 62.494465,15.737733 54.649949,9.5112136 44.997262,9.5112136 C 44.695616,9.5112136 44.37657,9.4992035 44.078659,9.5112136 z "
+       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;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"
+       d="M -28.915806,-30.045106 C -38.151045,-29.672823 -45.494406,-23.578958 -45.494406,-16.150506 C -45.494406,-11.885137 -43.740879,-7.375575 -39.928265,-4.826694 C -39.119658,-1.264309 -41.449395,1.502456 -41.852958,1.937782 C -41.122621,1.734237 -35.350978,0.114212 -33.186244,-2.295759 C -31.004272,-2.388266 -29.763575,-2.255902 -27.997203,-2.255902 C -18.344516,-2.255902 -10.499998,-8.482425 -10.5,-16.150506 C -10.5,-23.818587 -18.344516,-30.045106 -27.997203,-30.045106 C -28.298849,-30.045106 -28.617895,-30.057116 -28.915806,-30.045106 z "
        id="path13316"
        sodipodi:nodetypes="cscccsssc" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-1.0020103"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
+       inkscape:original="M -28.90625 -30.03125 C -38.141489 -29.658966 -45.5 -23.584702 -45.5 -16.15625 C -45.499998 -11.890882 -43.750114 -7.361381 -39.9375 -4.8125 C -39.128893 -1.250115 -41.440187 1.502174 -41.84375 1.9375 C -41.113412 1.733955 -35.352234 0.128721 -33.1875 -2.28125 C -31.005527 -2.373757 -29.766372 -2.25 -28 -2.25 C -18.347312 -2.2499999 -10.499998 -8.488169 -10.5 -16.15625 C -10.5 -23.824332 -18.347313 -30.03125 -28 -30.03125 C -28.301645 -30.031249 -28.608339 -30.04326 -28.90625 -30.03125 z "
        xlink:href="#path13316"
        style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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="path13323"
        inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.082559,10.856667 28.28125,16.643774 28.28125,23.4375 C 28.28125,27.441186 29.946384,31.636673 33.4375,33.96875 C 33.648247,34.117093 33.793739,34.340928 33.84375,34.59375 C 34.305353,36.625753 33.873291,38.418899 33.28125,39.75 C 33.741286,39.588469 33.859625,39.584381 34.375,39.375 C 36.123726,38.664548 38.008731,37.651133 38.875,36.6875 C 39.056781,36.478508 39.316956,36.354077 39.59375,36.34375 C 41.847992,36.248256 43.128683,36.40625 44.84375,36.40625 C 54.103198,36.406251 61.406252,30.447219 61.40625,23.4375 C 61.406249,16.427779 54.105354,10.5 44.84375,10.5 C 44.5143,10.499999 44.179676,10.490245 43.9375,10.5 z " />
+       d="M 44.125,10.5 C 35.308909,10.855387 28.5,16.639515 28.5,23.40625 C 28.5,27.397567 30.147439,31.550115 33.625,33.875 C 33.835747,34.023343 33.981239,34.247178 34.03125,34.5 C 34.490803,36.524599 34.051533,38.324325 33.46875,39.65625 C 33.930328,39.493414 34.045022,39.492531 34.5625,39.28125 C 36.305088,38.56977 38.200088,37.553862 39.0625,36.59375 C 39.244281,36.384758 39.504456,36.260327 39.78125,36.25 C 42.026592,36.154804 43.292249,36.3125 45,36.3125 C 54.22098,36.312499 61.500002,30.39071 61.5,23.40625 C 61.5,16.421791 54.220979,10.5 45,10.5 C 44.671757,10.5 44.368389,10.490188 44.125,10.5 z "
+       transform="translate(-72.994465,-39.55632)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-1.0109046"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
+       inkscape:original="M -28.90625 -30.03125 C -38.141489 -29.658966 -45.5 -23.584702 -45.5 -16.15625 C -45.499998 -11.890882 -43.750114 -7.361381 -39.9375 -4.8125 C -39.128893 -1.250115 -41.440187 1.502174 -41.84375 1.9375 C -41.113412 1.733955 -35.352234 0.128721 -33.1875 -2.28125 C -31.005527 -2.373757 -29.766372 -2.25 -28 -2.25 C -18.347312 -2.2499999 -10.499998 -8.488169 -10.5 -16.15625 C -10.5 -23.824332 -18.347313 -30.03125 -28 -30.03125 C -28.301645 -30.031249 -28.608339 -30.04326 -28.90625 -30.03125 z "
        xlink:href="#path13316"
-       style="opacity:1;color:#000000;fill:url(#linearGradient1551);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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;stroke-dasharray:none"
+       style="color:#000000;fill:url(#linearGradient3802);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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="path1336"
        inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.086269,10.856517 28.28125,16.649624 28.28125,23.4375 C 28.28125,27.43874 29.949375,31.638672 33.4375,33.96875 C 33.659358,34.111954 33.816384,34.336276 33.875,34.59375 C 34.337119,36.628026 33.873842,38.417659 33.28125,39.75 C 33.741161,39.588512 33.859781,39.584317 34.375,39.375 C 36.123195,38.664763 38.010688,37.617706 38.875,36.65625 C 39.06282,36.459679 39.321894,36.347038 39.59375,36.34375 C 41.848554,36.248232 43.129202,36.40625 44.84375,36.40625 C 54.099359,36.406251 61.406252,30.441153 61.40625,23.4375 C 61.406249,16.433845 54.101534,10.5 44.84375,10.5 C 44.514064,10.499999 44.17917,10.490265 43.9375,10.5 z " />
+       d="M 44.125,10.5 C 35.31263,10.855237 28.5,16.645389 28.5,23.40625 C 28.5,27.395135 30.150413,31.552103 33.625,33.875 C 33.846858,34.018204 34.003884,34.242526 34.0625,34.5 C 34.519684,36.514161 34.077673,38.294264 33.5,39.625 C 33.948389,39.466107 34.062909,39.485228 34.5625,39.28125 C 36.304559,38.569986 38.202041,37.520438 39.0625,36.5625 C 39.25032,36.365929 39.509394,36.253288 39.78125,36.25 C 42.027154,36.154781 43.29277,36.3125 45,36.3125 C 54.217148,36.312499 61.500002,30.384642 61.5,23.40625 C 61.5,16.427859 54.217147,10.5 45,10.5 C 44.671521,10.5 44.367905,10.490207 44.125,10.5 z "
+       transform="translate(-72.994465,-39.55632)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1397"
        sodipodi:cx="9.0598059"
        sodipodi:cy="8.7845774"
        sodipodi:rx="1.1679889"
        sodipodi:ry="1.4520943"
        d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(0.856174,0,0,0.688661,33.24323,22.95041)" />
+       transform="matrix(0.856174,0,0,0.688661,-39.751235,-16.60591)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1403"
        sodipodi:cx="9.0598059"
        sodipodi:cy="8.7845774"
        sodipodi:rx="1.1679889"
        sodipodi:ry="1.4520943"
        d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(0.856172,0,0,0.688662,37.24325,22.9504)" />
+       transform="matrix(0.856172,0,0,0.688662,-35.751215,-16.60592)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1405"
        sodipodi:cx="9.0598059"
        sodipodi:cy="8.7845774"
        sodipodi:rx="1.1679889"
        sodipodi:ry="1.4520943"
        d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(0.856173,0,0,0.688662,41.24324,22.95039)" />
+       transform="matrix(0.856173,0,0,0.688662,-31.751225,-16.60593)" />
+    <path
+       style="opacity:0.78977272;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.66300178;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.9375 23 C 6.6605 23 6.4375 23.223 6.4375 23.5 C 6.4375 23.777 6.6605 24 6.9375 24 L 11.0625 24 C 11.531404 27.382552 14.351819 30 17.75 30 C 21.272241 30 24.193903 27.155019 24.5 23.59375 C 24.806096 27.15502 27.727762 30 31.25 30 C 34.648185 30 37.468596 27.382552 37.9375 24 L 42.0625 24 C 42.3395 24 42.5625 23.777 42.5625 23.5 C 42.5625 23.223 42.3395 23 42.0625 23 L 38 23 L 24.5 23 L 11.5 23 L 11 23 L 6.9375 23 z "
+       id="path2264" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4019)"
+       id="path3813"
+       sodipodi:cx="13.826463"
+       sodipodi:cy="24.19828"
+       sodipodi:rx="3.2829957"
+       sodipodi:ry="3.2829957"
+       d="M 17.109458 24.19828 A 3.2829957 3.2829957 0 1 1  10.543467,24.19828 A 3.2829957 3.2829957 0 1 1  17.109458 24.19828 z"
+       transform="matrix(0.9137996,0,0,0.9137994,-1.6346163,0.8876255)" />
   </g>
 </svg>
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/scalable/error.svg
--- a/pidgin/pixmaps/dialogs/64/scalable/error.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/scalable/error.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -7,101 +7,25 @@
    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="64"
-   height="64"
+   width="48"
+   height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.45"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop"
-   sodipodi:docname="dialog-error.svg"
-   inkscape:export-filename="/home/hbons/Desktop/dialog-warning.png"
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/dialogs"
+   sodipodi:docname="dialog--error.svg"
+   inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <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>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2239"
-       id="linearGradient2245"
-       x1="15.535398"
-       y1="1.8014067"
-       x2="15.535398"
-       y2="48.674999"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.667328,0,0,0.667328,34.82201,12.82201)" />
-    <linearGradient
-       inkscape:collect="always"
-       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"
-       xlink:href="#linearGradient2186"
-       id="linearGradient2194"
-       x1="11.226587"
-       y1="-5.4832759"
-       x2="11.226587"
-       y2="17.697369"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.946132,0,0,0.946123,34.14115,12.15018)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3121">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop3123" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop3125" />
-    </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="linearGradient3104">
       <stop
          style="stop-color:#eeeeec;stop-opacity:1;"
@@ -123,15 +47,462 @@
        r="9.975256"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <filter
+       inkscape:collect="always"
+       x="-0.27879593"
+       width="1.5575919"
+       y="-0.78248727"
+       height="2.5649745"
+       id="filter3405">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5438116"
+         id="feGaussianBlur3407" />
+    </filter>
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2247"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3263">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3265" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3267" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2216"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3269"
+       x1="12.845698"
+       y1="16.037401"
+       x2="10.698112"
+       y2="15.449714"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <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="#linearGradient3104"
+       id="radialGradient3175"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <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
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       id="radialGradient2214"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3313"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="2.5781252"
+       fy="11.083743"
+       fx="17.911736"
+       cy="11.083743"
+       cx="17.911736"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient2382"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2867">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2869" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2871" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2382">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2384" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2386" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2230"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient2853"
+       x1="12.5"
+       y1="18.202251"
+       x2="12.746171"
+       y2="20.761486"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3121"
-       id="linearGradient1551"
+       xlink:href="#linearGradient2867"
+       id="linearGradient2873"
+       x1="12.720216"
+       y1="20.952612"
+       x2="12.720216"
+       y2="17.682426"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2303"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2233"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3456"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3454"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3452"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3450"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.682426"
+       x2="12.720216"
+       y1="20.952612"
+       x1="12.720216"
+       id="linearGradient3448"
+       xlink:href="#linearGradient2867"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.761486"
+       x2="12.746171"
+       y1="18.202251"
+       x1="12.5"
+       id="linearGradient3446"
+       xlink:href="#linearGradient2847"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
        gradientUnits="userSpaceOnUse"
-       x1="42.925175"
-       y1="40.136646"
-       x2="42.925175"
-       y2="15.474488" />
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient3444"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2382"
+       id="radialGradient3424"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
+       cx="17.911736"
+       cy="11.083743"
+       fx="17.911736"
+       fy="11.083743"
+       r="2.5781252" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient3422"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3420"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3418"
+       cx="8.7359829"
+       cy="18.005522"
+       fx="8.7359829"
+       fy="18.005522"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)" />
+    <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="radialGradient3416"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient3414"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3406"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       cx="8.7359829"
+       cy="18.005522"
+       fx="8.7359829"
+       fy="18.005522"
+       r="9.975256" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="15.449714"
+       x2="10.698112"
+       y1="16.037401"
+       x1="12.845698"
+       id="linearGradient3404"
+       xlink:href="#linearGradient3263"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient3402"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3394"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       cx="8.7359829"
+       cy="18.005522"
+       fx="8.7359829"
+       fy="18.005522"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient3388"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3479"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -140,17 +511,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="29.556978"
-     inkscape:cx="52.766638"
-     inkscape:cy="42.047904"
+     inkscape:zoom="11.2"
+     inkscape:cx="49.816631"
+     inkscape:cy="24.376627"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     fill="#cc0000"
-     inkscape:window-width="1267"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     fill="#fce94f"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="3"
+     inkscape:window-y="25"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -167,25 +540,25 @@
      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:0.5;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(2.383972,0,0,1.117487,-53.5217,33.04541)" />
+       style="opacity:0.64044949;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3405)"
+       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.2723916,0,0,1.6905173,-0.1758194,23.510748)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:0.53913006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#cc6400;stroke-width:0.55559433;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1307"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.854646,0,0,1.855034,-0.899768,22.62707)" />
+       transform="matrix(1.8043406,0,0,1.8043406,3.1976696,7.6828846)" />
     <path
        sodipodi:type="arc"
        style="opacity:0.79545456;fill:url(#radialGradient3114);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -195,93 +568,55 @@
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.704217,0,0,1.704217,0.879746,24.28255)" />
+       transform="matrix(1.6958412,0,0,1.6958412,4.3182736,9.0348912)" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.57006598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.58677971;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2184"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.75441,0,0,1.753957,0.28417,23.73792)" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;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;stroke-dasharray:none"
-       d="M 44.078659,9.5112136 C 34.84342,9.8834971 27.500059,15.977362 27.500059,23.405814 C 27.500059,27.671183 29.253586,32.180745 33.0662,34.729626 C 33.874807,38.292011 31.54507,41.058776 31.141507,41.494102 C 31.871844,41.290557 37.643487,39.670532 39.808221,37.260561 C 41.990193,37.168054 43.23089,37.300418 44.997262,37.300418 C 54.649949,37.300418 62.494467,31.073895 62.494465,23.405814 C 62.494465,15.737733 54.649949,9.5112136 44.997262,9.5112136 C 44.695616,9.5112136 44.37657,9.4992035 44.078659,9.5112136 z "
-       id="path13316"
-       sodipodi:nodetypes="cscccsssc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0020103"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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="path13323"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.082559,10.856667 28.28125,16.643774 28.28125,23.4375 C 28.28125,27.441186 29.946384,31.636673 33.4375,33.96875 C 33.648247,34.117093 33.793739,34.340928 33.84375,34.59375 C 34.305353,36.625753 33.873291,38.418899 33.28125,39.75 C 33.741286,39.588469 33.859625,39.584381 34.375,39.375 C 36.123726,38.664548 38.008731,37.651133 38.875,36.6875 C 39.056781,36.478508 39.316956,36.354077 39.59375,36.34375 C 41.847992,36.248256 43.128683,36.40625 44.84375,36.40625 C 54.103198,36.406251 61.406252,30.447219 61.40625,23.4375 C 61.406249,16.427779 54.105354,10.5 44.84375,10.5 C 44.5143,10.499999 44.179676,10.490245 43.9375,10.5 z " />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0109046"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="opacity:1;color:#000000;fill:url(#linearGradient1551);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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;stroke-dasharray:none"
-       id="path1336"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.086269,10.856517 28.28125,16.649624 28.28125,23.4375 C 28.28125,27.43874 29.949375,31.638672 33.4375,33.96875 C 33.659358,34.111954 33.816384,34.336276 33.875,34.59375 C 34.337119,36.628026 33.873842,38.417659 33.28125,39.75 C 33.741161,39.588512 33.859781,39.584317 34.375,39.375 C 36.123195,38.664763 38.010688,37.617706 38.875,36.65625 C 39.06282,36.459679 39.321894,36.347038 39.59375,36.34375 C 41.848554,36.248232 43.129202,36.40625 44.84375,36.40625 C 54.099359,36.406251 61.406252,30.441153 61.40625,23.4375 C 61.406249,16.433845 54.101534,10.5 44.84375,10.5 C 44.514064,10.499999 44.17917,10.490265 43.9375,10.5 z " />
+       transform="matrix(1.7042169,0,0,1.7042169,4.3797455,8.7825453)" />
     <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="path2193"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,9.486483,14.80163)" />
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2259"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(3.5277688,0.705265,-0.6665314,1.855957,7.2901885,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
     <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="path2191"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,1.486487,14.80163)" />
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2261"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(-3.5277688,0.705265,0.6665314,1.855957,41.208475,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
     <path
        style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32,55 C 30.709742,49.86153 26.288403,46 21.000001,46 C 15.7116,46 11.290259,49.86153 10,55 C 12.318243,51.672674 16.389775,48.580716 21.000001,48.580716 C 25.610224,48.580715 29.681757,51.672674 32,55 z "
-       id="path2186"
-       sodipodi:nodetypes="cscsc" />
-    <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"
-       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,34.07926,11.36022)" />
+       d="M 17,21 L 17,22 L 18,22 L 18,21 L 17,21 z M 18,22 L 18,23 L 19,23 L 19,22 L 18,22 z M 19,23 L 19,24 L 20,24 L 20,23 L 19,23 z M 20,23 L 21,23 L 21,22 L 20,22 L 20,23 z M 21,22 L 22,22 L 22,21 L 21,21 L 21,22 z M 20,24 L 20,25 L 21,25 L 21,24 L 20,24 z M 21,25 L 21,26 L 22,26 L 22,25 L 21,25 z M 19,24 L 18,24 L 18,25 L 19,25 L 19,24 z M 18,25 L 17,25 L 17,26 L 18,26 L 18,25 z "
+       id="rect3307" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1.4342562px;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.697225,0,0,0.697224,34.63061,11.94498)" />
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 27,21 L 27,22 L 28,22 L 28,21 L 27,21 z M 28,22 L 28,23 L 29,23 L 29,22 L 28,22 z M 29,23 L 29,24 L 30,24 L 30,23 L 29,23 z M 30,23 L 31,23 L 31,22 L 30,22 L 30,23 z M 31,22 L 32,22 L 32,21 L 31,21 L 31,22 z M 30,24 L 30,25 L 31,25 L 31,24 L 30,24 z M 31,25 L 31,26 L 32,26 L 32,25 L 31,25 z M 29,24 L 28,24 L 28,25 L 29,25 L 29,24 z M 28,25 L 27,25 L 27,26 L 28,26 L 28,25 z "
+       id="path3326" />
     <path
-       style="opacity:0.6;color:#000000;fill:url(#linearGradient2194);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2245);stroke-width:1.00000024px;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 54.501284,23.499216 C 54.501284,28.468337 50.46837,32.501247 45.499243,32.501247 C 40.530116,32.501247 36.497202,28.468337 36.497202,23.499216 C 36.497202,18.530098 40.530116,14.497189 45.499243,14.497189 C 50.46837,14.497189 54.501284,18.530098 54.501284,23.499216 z "
-       id="path2220" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;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 53.472399,23.373021 C 53.472399,25.828104 51.776345,25.485533 45.279112,25.485533 C 38.811218,25.485533 37.51405,25.897351 37.51405,23.485931 C 37.51405,21.235525 38.820793,21.494116 45.34652,21.494116 C 51.901652,21.494116 53.472399,20.942767 53.472399,23.373021 z "
-       id="path1341"
-       sodipodi:nodetypes="czczz" />
+       style="fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34,39 C 32.885686,35.003412 29.067255,32 24.5,32 C 19.932746,32 16.114315,35.003412 15,39 C 17.00212,36.412082 20.518441,33.850868 24.5,33.850868 C 28.481556,33.850866 31.99788,36.412082 34,39 z "
+       id="path3492"
+       sodipodi:nodetypes="cscsc" />
   </g>
 </svg>
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/scalable/info.svg
--- a/pidgin/pixmaps/dialogs/64/scalable/info.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/scalable/info.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -7,147 +7,25 @@
    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="64"
-   height="64"
+   width="48"
+   height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.45"
    version="1.0"
    sodipodi:docbase="/home/hbons/Desktop"
-   sodipodi:docname="dialog-info.svg"
-   inkscape:export-filename="/home/hbons/Desktop/dialog-info.png"
+   sodipodi:docname="dialog.svg"
+   inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2226">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2228" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0;"
-         offset="1"
-         id="stop2230" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2226"
-       id="radialGradient2232"
-       cx="6.8598728"
-       cy="12.836589"
-       fx="6.8598728"
-       fy="12.836589"
-       r="6"
-       gradientTransform="matrix(-1.535401,1.457479,-1.350253,-1.281728,72.86699,21.2066)"
-       gradientUnits="userSpaceOnUse" />
-    <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,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2351">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2353" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2355" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2351"
-       id="linearGradient2357"
-       x1="12.488563"
-       y1="5.8544211"
-       x2="12.488563"
-       y2="19.066195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.005826,31.99641,10.9359)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2343">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop2345" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:0;"
-         offset="1"
-         id="stop2347" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2343"
-       id="linearGradient2349"
-       x1="12.515625"
-       y1="8.7261219"
-       x2="12.515625"
-       y2="0.68458056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993429,0,0,1.004681,32.05868,11.024)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3121">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop3123" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop3125" />
-    </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="linearGradient3104">
       <stop
          style="stop-color:#eeeeec;stop-opacity:1;"
@@ -169,15 +47,259 @@
        r="9.975256"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <filter
+       inkscape:collect="always"
+       x="-0.27879593"
+       width="1.5575919"
+       y="-0.78248727"
+       height="2.5649745"
+       id="filter3405">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5438116"
+         id="feGaussianBlur3407" />
+    </filter>
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2247"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3263">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3265" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3267" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2216"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3269"
+       x1="12.845698"
+       y1="16.037401"
+       x2="10.698112"
+       y2="15.449714"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3121"
-       id="linearGradient1551"
+       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="#linearGradient3104"
+       id="radialGradient3175"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <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
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       id="radialGradient2214"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3313"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="2.5781252"
+       fy="11.083743"
+       fx="17.911736"
+       cy="11.083743"
+       cx="17.911736"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
        gradientUnits="userSpaceOnUse"
-       x1="42.925175"
-       y1="40.136646"
-       x2="42.925175"
-       y2="15.474488" />
+       id="radialGradient2259"
+       xlink:href="#linearGradient2382"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2867">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2869" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2871" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2382">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2384" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2386" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2230"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient2853"
+       x1="12.5"
+       y1="18.202251"
+       x2="12.746171"
+       y2="20.761486"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867"
+       id="linearGradient2873"
+       x1="12.720216"
+       y1="20.952612"
+       x2="12.720216"
+       y2="17.682426"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2303"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2233"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -186,17 +308,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.0019314"
-     inkscape:cx="46.66506"
-     inkscape:cy="27.955978"
+     inkscape:zoom="11.2"
+     inkscape:cx="49.304407"
+     inkscape:cy="24.325832"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     fill="#2e3436"
-     inkscape:window-width="1267"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     fill="#fce94f"
+     inkscape:window-width="1440"
+     inkscape:window-height="845"
+     inkscape:window-x="3"
+     inkscape:window-y="25"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -213,25 +337,25 @@
      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:0.5;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(2.383972,0,0,1.117487,-53.5217,33.04541)" />
+       style="opacity:0.64044949;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3405)"
+       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.2723916,0,0,1.6905173,-0.1758194,23.510748)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:0.53913006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#cc6400;stroke-width:0.55559433;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1307"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.854646,0,0,1.855034,-0.899768,22.62707)" />
+       transform="matrix(1.8043406,0,0,1.8043406,3.1976696,7.6828846)" />
     <path
        sodipodi:type="arc"
        style="opacity:0.79545456;fill:url(#radialGradient3114);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -241,161 +365,81 @@
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.704217,0,0,1.704217,0.879746,24.28255)" />
+       transform="matrix(1.6958412,0,0,1.6958412,4.3182736,9.0348912)" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.57006598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.58677971;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2184"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.75441,0,0,1.753957,0.28417,23.73792)" />
+       transform="matrix(1.7042169,0,0,1.7042169,4.3797455,8.7825453)" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 23.500001,23.5 C 23.500001,26.26 21.260002,28.500001 18.500001,28.500001 C 15.740001,28.500001 13.5,26.26 13.5,23.5 C 13.5,20.74 15.740001,18.5 18.500001,18.5 C 21.260002,18.5 23.500001,20.74 23.500001,23.5 z "
+       id="path3154" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2172"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494387,0,0,1.2877392,1.0769249,12.069869)" />
     <path
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32,46 C 30.709742,51.13847 26.288403,55 21.000001,55 C 15.7116,55 11.290259,51.13847 10,46 C 12.318243,49.327326 16.389775,52.419284 21.000001,52.419284 C 25.610224,52.419285 29.681757,49.327326 32,46 z "
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:0.282258;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3152"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(4.8735976,0,0,2.5754783,-16.807694,-1.3602618)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3148"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494393,0,0,1.2877392,10.07692,12.069869)" />
+    <path
+       style="opacity:1;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34,32 C 32.885686,35.996588 29.067255,39 24.5,39 C 19.932746,39 16.114315,35.996588 15,32 C 17.00212,34.587918 20.518441,37.149132 24.5,37.149132 C 28.481556,37.149134 31.99788,34.587918 34,32 z "
        id="path2186"
        sodipodi:nodetypes="cscsc" />
     <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="path2191"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,1.486487,14.80163)" />
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2259"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(3.5277688,0.705265,-0.6665314,1.855957,7.2901885,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
     <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="path2193"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,9.486483,14.80163)" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;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;stroke-dasharray:none"
-       d="M 44.078659,9.5112136 C 34.84342,9.8834971 27.500059,15.977362 27.500059,23.405814 C 27.500059,27.671183 29.253586,32.180745 33.0662,34.729626 C 33.874807,38.292011 31.54507,41.058776 31.141507,41.494102 C 31.871844,41.290557 37.643487,39.670532 39.808221,37.260561 C 41.990193,37.168054 43.23089,37.300418 44.997262,37.300418 C 54.649949,37.300418 62.494467,31.073895 62.494465,23.405814 C 62.494465,15.737733 54.649949,9.5112136 44.997262,9.5112136 C 44.695616,9.5112136 44.37657,9.4992035 44.078659,9.5112136 z "
-       id="path13316"
-       sodipodi:nodetypes="cscccsssc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0020103"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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="path13323"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.082559,10.856667 28.28125,16.643774 28.28125,23.4375 C 28.28125,27.441186 29.946384,31.636673 33.4375,33.96875 C 33.648247,34.117093 33.793739,34.340928 33.84375,34.59375 C 34.305353,36.625753 33.873291,38.418899 33.28125,39.75 C 33.741286,39.588469 33.859625,39.584381 34.375,39.375 C 36.123726,38.664548 38.008731,37.651133 38.875,36.6875 C 39.056781,36.478508 39.316956,36.354077 39.59375,36.34375 C 41.847992,36.248256 43.128683,36.40625 44.84375,36.40625 C 54.103198,36.406251 61.406252,30.447219 61.40625,23.4375 C 61.406249,16.427779 54.105354,10.5 44.84375,10.5 C 44.5143,10.499999 44.179676,10.490245 43.9375,10.5 z " />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0109046"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="opacity:1;color:#000000;fill:url(#linearGradient1551);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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;stroke-dasharray:none"
-       id="path1336"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.086269,10.856517 28.28125,16.649624 28.28125,23.4375 C 28.28125,27.43874 29.949375,31.638672 33.4375,33.96875 C 33.659358,34.111954 33.816384,34.336276 33.875,34.59375 C 34.337119,36.628026 33.873842,38.417659 33.28125,39.75 C 33.741161,39.588512 33.859781,39.584317 34.375,39.375 C 36.123195,38.664763 38.010688,37.617706 38.875,36.65625 C 39.06282,36.459679 39.321894,36.347038 39.59375,36.34375 C 41.848554,36.248232 43.129202,36.40625 44.84375,36.40625 C 54.099359,36.406251 61.406252,30.441153 61.40625,23.4375 C 61.406249,16.433845 54.101534,10.5 44.84375,10.5 C 44.514064,10.499999 44.17917,10.490265 43.9375,10.5 z " />
-    <path
-       style="opacity:1;fill:url(#radialGradient2232);fill-opacity:1;stroke:#729fcf;stroke-width:1.00000012;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 44.703431,14.533668 C 40.70252,14.678436 37.503421,17.811488 37.503421,21.651365 C 37.503421,24.907582 40.201737,27.911617 43.341119,28.760108 L 43.389173,30.850471 C 43.389173,30.872875 43.386855,30.909548 43.389173,30.931354 C 43.394328,30.963552 43.421848,31.022249 43.431776,31.052677 C 43.443213,31.082437 43.458677,31.146493 43.474381,31.174002 C 43.480062,31.182896 43.510872,31.20584 43.516985,31.214444 C 43.569231,31.280841 43.655052,31.37351 43.730003,31.41665 C 43.749323,31.426587 43.794808,31.448926 43.815208,31.457092 C 43.857011,31.471566 43.940397,31.49101 43.985625,31.497533 C 44.008596,31.499735 44.047229,31.497533 44.07083,31.497533 L 46.028589,31.404055 C 46.052192,31.404055 46.090827,31.406257 46.113796,31.404055 C 46.159024,31.397531 46.242411,31.378087 46.284211,31.363613 C 46.304612,31.355448 46.350096,31.333109 46.369418,31.323172 C 46.444367,31.280031 46.53019,31.187363 46.582436,31.120966 C 46.588549,31.112362 46.619359,31.089417 46.62504,31.080523 C 46.640742,31.053014 46.656207,30.988959 46.667645,30.959199 C 46.677573,30.928771 46.705092,30.870073 46.710248,30.837876 C 46.712565,30.816069 46.710248,30.779396 46.710248,30.756993 L 46.758302,28.760108 C 49.897683,27.911617 52.499887,24.907584 52.499889,21.651365 C 52.499889,17.719331 49.13652,14.533668 45.001656,14.533668 C 44.904746,14.533668 44.799454,14.530194 44.703431,14.533668 z "
-       id="path1311"
-       sodipodi:nodetypes="csccsssssssccsssssssccssc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-0.98906523"
-       inkscape:original="M 44.71875 14.53125 C 40.71784 14.676018 37.5 17.816373 37.5 21.65625 C 37.499999 24.912467 40.204368 27.901509 43.34375 28.75 L 43.375 30.84375 C 43.375001 30.866154 43.372682 30.915694 43.375 30.9375 C 43.380156 30.969697 43.427572 31.032072 43.4375 31.0625 C 43.448939 31.09226 43.453046 31.159991 43.46875 31.1875 C 43.474432 31.196394 43.525137 31.210146 43.53125 31.21875 C 43.583494 31.285148 43.643799 31.36311 43.71875 31.40625 C 43.73807 31.416186 43.7921 31.460584 43.8125 31.46875 C 43.854303 31.483224 43.954772 31.493477 44 31.5 C 44.02297 31.502201 44.038899 31.5 44.0625 31.5 L 46.03125 31.40625 C 46.054855 31.40625 46.102031 31.408452 46.125 31.40625 C 46.170228 31.399726 46.23945 31.389474 46.28125 31.375 C 46.301652 31.366835 46.355678 31.322437 46.375 31.3125 C 46.449948 31.269359 46.541504 31.191397 46.59375 31.125 C 46.599863 31.116396 46.619319 31.102644 46.625 31.09375 C 46.640704 31.066241 46.644812 30.99851 46.65625 30.96875 C 46.666178 30.938321 46.713594 30.875947 46.71875 30.84375 C 46.721068 30.821944 46.71875 30.772403 46.71875 30.75 L 46.75 28.75 C 49.889382 27.901508 52.499998 24.912469 52.5 21.65625 C 52.5 17.724216 49.134864 14.53125 45 14.53125 C 44.90309 14.53125 44.814773 14.527776 44.71875 14.53125 z "
-       xlink:href="#path1311"
-       style="opacity:0.7;fill:#ffffff;fill-opacity:0.41960784;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2204"
-       inkscape:href="#path1311"
-       d="M 33.46875,7.46875 C 29.99276,7.595007 27.28125,10.282227 27.28125,13.5625 C 27.281251,16.268084 29.627654,18.959072 32.3125,19.6875 C 32.745246,19.795209 33.052411,20.179165 33.0625,20.625 L 33.125,22.34375 L 34.40625,22.28125 L 34.46875,20.625 C 34.478839,20.179165 34.786004,19.795209 35.21875,19.6875 C 37.89876,18.960384 40.156248,16.287128 40.15625,13.5625 C 40.15625,10.202426 37.315969,7.4687499 33.71875,7.46875 C 33.598771,7.4687498 33.517755,7.46697 33.46875,7.46875 z "
-       transform="translate(3.330669e-15,4.169556e-4)" />
-    <rect
-       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#c4a000;stroke-width:1.00000107;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2188"
-       width="5.0002198"
-       height="3.994288"
-       x="42.497272"
-       y="29.502851"
-       rx="0.50000107"
-       ry="0.50000083" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0076578"
-       inkscape:original="M 43 29.5 C 42.722999 29.5 42.5 29.723 42.5 30 L 42.5 33 C 42.5 33.277 42.723 33.5 43 33.5 L 47 33.5 C 47.277001 33.5 47.499999 33.277 47.5 33 L 47.5 30 C 47.5 29.723 47.277002 29.5 47 29.5 L 43 29.5 z "
-       xlink:href="#rect2188"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.00000083;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path1324"
-       inkscape:href="#rect2188"
-       d="M 32.21875,22.4375 L 32.21875,24.40625 L 35.1875,24.40625 L 35.1875,22.4375 L 32.21875,22.4375 z " />
-    <rect
-       style="opacity:0.7;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2238"
-       width="1"
-       height="2"
-       x="43"
-       y="24" />
-    <rect
-       style="opacity:0.70454544;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2240"
-       width="1.0217247"
-       height="2"
-       x="45.978275"
-       y="24" />
-    <rect
-       style="opacity:0.7;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2242"
-       width="1"
-       height="2.0132751"
-       x="-25"
-       y="43.986725"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <rect
-       style="opacity:0.7;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2244"
-       width="1.0000002"
-       height="1"
-       x="-24"
-       y="43"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <rect
-       style="opacity:0.7;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2246"
-       width="1.0000002"
-       height="1"
-       x="-24"
-       y="45"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <rect
-       style="opacity:0.5;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2250"
-       width="1.0000002"
-       height="1.0066376"
-       x="-23"
-       y="45.993362"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <rect
-       style="opacity:0.5;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2252"
-       width="1.0000002"
-       height="1.0066376"
-       x="-23"
-       y="43.993362"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:0.41960784;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2254"
-       sodipodi:cx="8.9137974"
-       sodipodi:cy="6.046802"
-       sodipodi:rx="1.3745575"
-       sodipodi:ry="1.3329042"
-       d="M 10.288355 6.046802 A 1.3745575 1.3329042 0 1 1  7.5392399,6.046802 A 1.3745575 1.3329042 0 1 1  10.288355 6.046802 z"
-       transform="matrix(1.455014,0,0,1.500481,30.0303,10.92689)" />
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2261"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(-3.5277688,0.705265,0.6665314,1.855957,41.208475,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
   </g>
 </svg>
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/scalable/question.svg
--- a/pidgin/pixmaps/dialogs/64/scalable/question.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/scalable/question.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -7,57 +7,25 @@
    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="64"
-   height="64"
+   width="48"
+   height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.45"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/dialogs/scalable"
    sodipodi:docname="dialog-question.svg"
-   inkscape:export-filename="/home/hbons/Desktop/dialog-question.png"
+   inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3121">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop3123" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop3125" />
-    </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="linearGradient3104">
       <stop
          style="stop-color:#eeeeec;stop-opacity:1;"
@@ -79,15 +47,259 @@
        r="9.975256"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <filter
+       inkscape:collect="always"
+       x="-0.27879593"
+       width="1.5575919"
+       y="-0.78248727"
+       height="2.5649745"
+       id="filter3405">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5438116"
+         id="feGaussianBlur3407" />
+    </filter>
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2247"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3263">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3265" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3267" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2216"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3269"
+       x1="12.845698"
+       y1="16.037401"
+       x2="10.698112"
+       y2="15.449714"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3121"
-       id="linearGradient1551"
+       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="#linearGradient3104"
+       id="radialGradient3175"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <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
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       id="radialGradient2214"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3313"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="2.5781252"
+       fy="11.083743"
+       fx="17.911736"
+       cy="11.083743"
+       cx="17.911736"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
        gradientUnits="userSpaceOnUse"
-       x1="42.925175"
-       y1="40.136646"
-       x2="42.925175"
-       y2="15.474488" />
+       id="radialGradient2259"
+       xlink:href="#linearGradient2382"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2867">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2869" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2871" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2382">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2384" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2386" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2230"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient2853"
+       x1="12.5"
+       y1="18.202251"
+       x2="12.746171"
+       y2="20.761486"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867"
+       id="linearGradient2873"
+       x1="12.720216"
+       y1="20.952612"
+       x2="12.720216"
+       y2="17.682426"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2303"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2233"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -96,17 +308,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16.976026"
-     inkscape:cx="39.201403"
-     inkscape:cy="23.251521"
+     inkscape:zoom="22.4"
+     inkscape:cx="41.793957"
+     inkscape:cy="31.031721"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     fill="#204a87"
-     inkscape:window-width="1267"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     fill="#fce94f"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="3"
+     inkscape:window-y="25"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,25 +337,25 @@
      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:0.5;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(2.383972,0,0,1.117487,-53.5217,33.04541)" />
+       style="opacity:0.64044949;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3405)"
+       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.2723916,0,0,1.6905173,-4.1758193,23.510748)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:0.53913006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#cc6400;stroke-width:0.55559433;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1307"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.854646,0,0,1.855034,-0.899768,22.62707)" />
+       transform="matrix(1.8043406,0,0,1.8043406,-0.8023303,7.6828845)" />
     <path
        sodipodi:type="arc"
        style="opacity:0.79545456;fill:url(#radialGradient3114);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -151,81 +365,90 @@
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.704217,0,0,1.704217,0.879746,24.28255)" />
+       transform="matrix(1.6958412,0,0,1.6958412,0.3182737,9.0348911)" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.57006598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.58677971;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2184"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.75441,0,0,1.753957,0.28417,23.73792)" />
+       transform="matrix(1.7042169,0,0,1.7042169,0.3797456,8.7825452)" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 19.500001,23.5 C 19.500001,26.26 17.260002,28.500001 14.500001,28.500001 C 11.740001,28.500001 9.5000001,26.26 9.5000001,23.5 C 9.5000001,20.74 11.740001,18.5 14.500001,18.5 C 17.260002,18.5 19.500001,20.74 19.500001,23.5 z "
+       id="path3154" />
     <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="path2191"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,1.486487,11.80163)" />
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2172"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494387,0,0,1.2877392,-1.9230749,13.069869)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:0.282258;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3152"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(4.8735976,0,0,2.5754783,-20.807694,-1.3602619)" />
     <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="path2193"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,9.486483,11.80163)" />
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3148"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494393,0,0,1.2877392,9.0769201,13.069869)" />
     <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;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;stroke-dasharray:none"
-       d="M 44.078659,9.5112136 C 34.84342,9.8834971 27.500059,15.977362 27.500059,23.405814 C 27.500059,27.671183 29.253586,32.180745 33.0662,34.729626 C 33.874807,38.292011 31.54507,41.058776 31.141507,41.494102 C 31.871844,41.290557 37.643487,39.670532 39.808221,37.260561 C 41.990193,37.168054 43.23089,37.300418 44.997262,37.300418 C 54.649949,37.300418 62.494467,31.073895 62.494465,23.405814 C 62.494465,15.737733 54.649949,9.5112136 44.997262,9.5112136 C 44.695616,9.5112136 44.37657,9.4992035 44.078659,9.5112136 z "
-       id="path13316"
-       sodipodi:nodetypes="cscccsssc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0020103"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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="path13323"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.082559,10.856667 28.28125,16.643774 28.28125,23.4375 C 28.28125,27.441186 29.946384,31.636673 33.4375,33.96875 C 33.648247,34.117093 33.793739,34.340928 33.84375,34.59375 C 34.305353,36.625753 33.873291,38.418899 33.28125,39.75 C 33.741286,39.588469 33.859625,39.584381 34.375,39.375 C 36.123726,38.664548 38.008731,37.651133 38.875,36.6875 C 39.056781,36.478508 39.316956,36.354077 39.59375,36.34375 C 41.847992,36.248256 43.128683,36.40625 44.84375,36.40625 C 54.103198,36.406251 61.406252,30.447219 61.40625,23.4375 C 61.406249,16.427779 54.105354,10.5 44.84375,10.5 C 44.5143,10.499999 44.179676,10.490245 43.9375,10.5 z " />
+       style="opacity:1;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 30,32 C 28.885686,35.996588 25.067255,39 20.5,39 C 15.932746,39 12.114315,35.996588 11,32 C 16.460075,38.82871 24.447577,38.177252 30,32 z "
+       id="path2186"
+       sodipodi:nodetypes="cscc" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0109046"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="opacity:1;color:#000000;fill:url(#linearGradient1551);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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;stroke-dasharray:none"
-       id="path1336"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.086269,10.856517 28.28125,16.649624 28.28125,23.4375 C 28.28125,27.43874 29.949375,31.638672 33.4375,33.96875 C 33.659358,34.111954 33.816384,34.336276 33.875,34.59375 C 34.337119,36.628026 33.873842,38.417659 33.28125,39.75 C 33.741161,39.588512 33.859781,39.584317 34.375,39.375 C 36.123195,38.664763 38.010688,37.617706 38.875,36.65625 C 39.06282,36.459679 39.321894,36.347038 39.59375,36.34375 C 41.848554,36.248232 43.129202,36.40625 44.84375,36.40625 C 54.099359,36.406251 61.406252,30.441153 61.40625,23.4375 C 61.406249,16.433845 54.101534,10.5 44.84375,10.5 C 44.514064,10.499999 44.17917,10.490265 43.9375,10.5 z " />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2649"
-       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#204a87;font-family:Bitstream Charter"
-       transform="matrix(1.282232,0,0,1.31579,-8.49345,-11.44883)"><flowRegion
-         id="flowRegion2651"><rect
-           id="rect2653"
-           width="44.011906"
-           height="42.819229"
-           x="36.988094"
-           y="20.180773"
-           style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#204a87;font-family:Bitstream Charter" /></flowRegion><flowPara
-         id="flowPara2655">?</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2278"
-       width="16.246384"
-       height="1.4764884"
-       x="-2.760174"
-       y="54.321537"
-       ry="0.49634099"
-       rx="0.49687836"
-       transform="matrix(0.972407,-0.233292,0.286699,0.958021,0,0)" />
+       sodipodi:type="arc"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2259"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(3.5277688,0.705265,-0.6665314,1.855957,3.2901886,-4.1630499)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2261"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(-3.5277688,0.705265,0.6665314,1.855957,37.208475,-4.1630499)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
+    <path
+       transform="translate(-2.96875,2.96875)"
+       style="font-size:19.03945923px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#204a87;fill-opacity:1;stroke:none;stroke-width:1.55613649px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Century Schoolbook L"
+       d="M 41.5625,0.03125 C 39.882592,0.03125 38.340312,0.45633843 37.125,1.3125 C 35.909688,2.1686616 35.03125,3.5773827 35.03125,5.15625 C 35.031248,6.9581536 36.509895,8.65625 38.375,8.65625 C 39.965182,8.6562496 41.5,7.3378655 41.5,5.65625 C 41.5,5.3071726 41.34266,4.9823536 41.21875,4.65625 C 41.387991,4.6997757 41.631962,4.7250666 41.6875,4.78125 C 41.780384,4.8752143 41.90625,5.0515022 41.90625,5.59375 C 41.90625,6.1652988 41.718827,6.6932831 41.46875,7.03125 C 40.561362,8.1855326 40.145637,8.7242892 39.8125,9.21875 C 39.479363,9.7132108 39.280996,10.139806 39.125,10.53125 C 39.124907,10.541666 39.124907,10.552084 39.125,10.5625 C 39.043286,10.775751 38.25,11.848298 38.25,13.46875 L 38.25,14.21875 C 38.248868,14.683225 38.432878,15.129003 38.761313,15.457437 C 39.089747,15.785872 39.535525,15.969882 40,15.96875 L 40.59375,15.96875 C 39.296693,16.363109 38.1875,17.335329 38.1875,18.78125 C 38.187498,20.599164 39.742417,21.96875 41.46875,21.96875 C 43.193995,21.968752 44.75,20.563489 44.75,18.78125 C 44.749996,17.191313 43.501537,16.129612 42.0625,15.84375 C 42.760608,15.593328 43.224284,14.929144 43.21875,14.1875 C 43.207309,13.142551 43.280625,12.715648 43.375,12.5 C 43.469375,12.284352 43.666112,12.036543 44.375,11.46875 C 44.385548,11.458466 44.395966,11.448048 44.40625,11.4375 C 45.640264,10.416457 46.472134,9.663013 47.09375,8.75 C 47.715366,7.836987 47.96875,6.7448903 47.96875,5.75 C 47.968751,4.1061365 47.251058,2.5766205 46.0625,1.5625 C 44.873942,0.5483795 43.29027,0.03125 41.5625,0.03125 z "
+       id="path3346" />
+    <path
+       id="text2395"
+       d="M 38.506782,17.184869 C 38.482313,14.953817 38.751472,14.339138 40.317489,13.087017 C 42.715448,11.106389 43.253768,10.332347 43.253768,8.7387398 C 43.253768,6.3710938 41.369653,4.7774818 38.580188,4.7774818 C 35.815195,4.7774818 33.808732,6.1889664 33.808732,8.1468275 C 33.808732,9.1485242 34.493866,9.8997976 35.399218,9.8997976 C 36.182227,9.8997976 36.793951,9.3534166 36.793951,8.6476754 C 36.793951,8.1923596 36.549258,7.8053395 36.08435,7.4410862 C 35.717315,7.1678961 35.692845,7.122364 35.692845,6.9402374 C 35.692845,6.3483259 36.769483,5.8019451 37.943996,5.8019451 C 39.681291,5.8019451 40.684521,6.8491761 40.684521,8.6021443 C 40.684521,9.5355437 40.390894,10.400647 39.901517,11.060855 C 38.09081,13.360205 38.090807,13.360208 37.772712,14.157012 C 37.528022,14.794454 37.034866,15.386368 37.034866,16.456362 L 37.034866,17.184869 L 38.506782,17.184869 M 38.512445,20.345536 C 37.65603,20.345536 36.970897,20.982982 36.970897,21.75702 C 36.970897,22.553823 37.65603,23.191268 38.487976,23.191268 C 39.344388,23.191268 40.029523,22.553823 40.029523,21.75702 C 40.029523,20.982982 39.344388,20.345536 38.512445,20.345536"
+       style="font-size:19.03945923px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#eeeeec;fill-opacity:1;stroke:#ffffff;stroke-width:1.55496371px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Century Schoolbook L" />
   </g>
 </svg>
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/scalable/warning.svg
--- a/pidgin/pixmaps/dialogs/64/scalable/warning.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/scalable/warning.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -7,55 +7,35 @@
    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="64"
-   height="64"
+   width="48"
+   height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.45"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/dialogs"
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/dialogs"
    sodipodi:docname="dialog-warning.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/dialogs/dialog-warning.png"
+   inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3121">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop3123" />
+       id="linearGradient3179">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop3125" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3816">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#555753;stop-opacity:1;"
          offset="0"
-         id="stop3818" />
+         id="stop3181" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         style="stop-color:#555753;stop-opacity:0;"
          offset="1"
-         id="stop3820" />
+         id="stop3183" />
     </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="linearGradient3104">
@@ -79,15 +59,268 @@
        r="9.975256"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <filter
+       inkscape:collect="always"
+       x="-0.27879593"
+       width="1.5575919"
+       y="-0.78248727"
+       height="2.5649745"
+       id="filter3405">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5438116"
+         id="feGaussianBlur3407" />
+    </filter>
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2247"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3263">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3265" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3267" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2216"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3269"
+       x1="12.845698"
+       y1="16.037401"
+       x2="10.698112"
+       y2="15.449714"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3121"
-       id="linearGradient1551"
+       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="#linearGradient3104"
+       id="radialGradient3175"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <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
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       id="radialGradient2214"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3313"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="2.5781252"
+       fy="11.083743"
+       fx="17.911736"
+       cy="11.083743"
+       cx="17.911736"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
        gradientUnits="userSpaceOnUse"
-       x1="42.925175"
-       y1="40.136646"
-       x2="42.925175"
-       y2="15.474488" />
+       id="radialGradient2259"
+       xlink:href="#linearGradient2382"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2867">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2869" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2871" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2382">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2384" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2386" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2230"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient2853"
+       x1="12.5"
+       y1="18.202251"
+       x2="12.746171"
+       y2="20.761486"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867"
+       id="linearGradient2873"
+       x1="12.720216"
+       y1="20.952612"
+       x2="12.720216"
+       y2="17.682426"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2303"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2233"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3179"
+       id="linearGradient3185"
+       x1="19.107143"
+       y1="33.892857"
+       x2="24.017857"
+       y2="33.892857"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -96,17 +329,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.003863"
-     inkscape:cx="39.201403"
-     inkscape:cy="23.251521"
+     inkscape:zoom="11.2"
+     inkscape:cx="48.857979"
+     inkscape:cy="24.415118"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     fill="#cc0000"
-     inkscape:window-width="1267"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     fill="#fce94f"
+     inkscape:window-width="1440"
+     inkscape:window-height="845"
+     inkscape:window-x="3"
+     inkscape:window-y="25"
+     width="48px"
+     height="48px" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,25 +358,25 @@
      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:0.5;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(2.383972,0,0,1.117487,-53.5217,33.04541)" />
+       style="opacity:0.64044949;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3405)"
+       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.2723916,0,0,1.6905173,-0.1758194,23.510748)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:0.53913006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#cc6400;stroke-width:0.55559433;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1307"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.854646,0,0,1.855034,-0.899768,22.62707)" />
+       transform="matrix(1.8043406,0,0,1.8043406,3.1976696,7.6828846)" />
     <path
        sodipodi:type="arc"
        style="opacity:0.79545456;fill:url(#radialGradient3114);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -151,83 +386,96 @@
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.704217,0,0,1.704217,0.879746,24.28255)" />
+       transform="matrix(1.6958412,0,0,1.6958412,4.3182736,9.0348912)" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.57006598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.58677971;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2184"
        sodipodi:cx="11.806158"
        sodipodi:cy="10.983024"
        sodipodi:rx="9.975256"
        sodipodi:ry="9.975256"
        d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
-       transform="matrix(1.75441,0,0,1.753957,0.28417,23.73792)" />
+       transform="matrix(1.7042169,0,0,1.7042169,4.3797455,8.7825453)" />
     <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;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;stroke-dasharray:none"
-       d="M 44.078659,9.5112136 C 34.84342,9.8834971 27.500059,15.977362 27.500059,23.405814 C 27.500059,27.671183 29.253586,32.180745 33.0662,34.729626 C 33.874807,38.292011 31.54507,41.058776 31.141507,41.494102 C 31.871844,41.290557 37.643487,39.670532 39.808221,37.260561 C 41.990193,37.168054 43.23089,37.300418 44.997262,37.300418 C 54.649949,37.300418 62.494467,31.073895 62.494465,23.405814 C 62.494465,15.737733 54.649949,9.5112136 44.997262,9.5112136 C 44.695616,9.5112136 44.37657,9.4992035 44.078659,9.5112136 z "
-       id="path13316"
-       sodipodi:nodetypes="cscccsssc" />
+       style="fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 23.500001,23.5 C 23.500001,26.26 21.260002,28.500001 18.500001,28.500001 C 15.740001,28.500001 13.5,26.26 13.5,23.5 C 13.5,20.74 15.740001,18.5 18.500001,18.5 C 21.260002,18.5 23.500001,20.74 23.500001,23.5 z "
+       id="path3154" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0020103"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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="path13323"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.082559,10.856667 28.28125,16.643774 28.28125,23.4375 C 28.28125,27.441186 29.946384,31.636673 33.4375,33.96875 C 33.648247,34.117093 33.793739,34.340928 33.84375,34.59375 C 34.305353,36.625753 33.873291,38.418899 33.28125,39.75 C 33.741286,39.588469 33.859625,39.584381 34.375,39.375 C 36.123726,38.664548 38.008731,37.651133 38.875,36.6875 C 39.056781,36.478508 39.316956,36.354077 39.59375,36.34375 C 41.847992,36.248256 43.128683,36.40625 44.84375,36.40625 C 54.103198,36.406251 61.406252,30.447219 61.40625,23.4375 C 61.406249,16.427779 54.105354,10.5 44.84375,10.5 C 44.5143,10.499999 44.179676,10.490245 43.9375,10.5 z " />
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2172"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494387,0,0,1.2877392,1.0769249,12.069869)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:0.282258;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3152"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(4.8735976,0,0,2.5754783,-16.807694,-1.3602618)" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0109046"
-       inkscape:original="M 44.09375 9.5 C 34.858511 9.8722838 27.5 15.977798 27.5 23.40625 C 27.5 27.67162 29.249886 32.169869 33.0625 34.71875 C 33.871107 38.281135 31.559813 41.064674 31.15625 41.5 C 31.886588 41.296455 37.647766 39.659971 39.8125 37.25 C 41.994473 37.157491 43.233628 37.3125 45 37.3125 C 54.652688 37.312499 62.500002 31.074331 62.5 23.40625 C 62.5 15.73817 54.652687 9.5 45 9.5 C 44.698355 9.5000003 44.391661 9.4879899 44.09375 9.5 z "
-       xlink:href="#path13316"
-       style="opacity:1;color:#000000;fill:url(#linearGradient1551);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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;stroke-dasharray:none"
-       id="path1336"
-       inkscape:href="#path13316"
-       d="M 43.9375,10.5 C 35.086269,10.856517 28.28125,16.649624 28.28125,23.4375 C 28.28125,27.43874 29.949375,31.638672 33.4375,33.96875 C 33.659358,34.111954 33.816384,34.336276 33.875,34.59375 C 34.337119,36.628026 33.873842,38.417659 33.28125,39.75 C 33.741161,39.588512 33.859781,39.584317 34.375,39.375 C 36.123195,38.664763 38.010688,37.617706 38.875,36.65625 C 39.06282,36.459679 39.321894,36.347038 39.59375,36.34375 C 41.848554,36.248232 43.129202,36.40625 44.84375,36.40625 C 54.099359,36.406251 61.406252,30.441153 61.40625,23.4375 C 61.406249,16.433845 54.101534,10.5 44.84375,10.5 C 44.514064,10.499999 44.17917,10.490265 43.9375,10.5 z " />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2649"
-       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc0000;font-family:Bitstream Charter"
-       transform="matrix(1.41844,0,0,1.343101,-12.30498,-12.66081)"><flowRegion
-         id="flowRegion2651"><rect
-           id="rect2653"
-           width="44.011906"
-           height="42.819229"
-           x="36.988094"
-           y="20.180773"
-           style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc0000;font-family:Bitstream Charter" /></flowRegion><flowPara
-         id="flowPara2655">!</flowPara></flowRoot>    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3148"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
+       transform="matrix(1.9494393,0,0,1.2877392,10.07692,12.069869)" />
+    <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="path2193"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,9.486483,14.80163)" />
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2259"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(3.5277688,0.705265,-0.6665314,1.855957,7.2901885,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.3774938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2261"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(-3.5277688,0.705265,0.6665314,1.855957,41.208475,-4.1630498)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
     <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="path2191"
-       sodipodi:cx="9.0598059"
-       sodipodi:cy="8.7845774"
-       sodipodi:rx="1.1679889"
-       sodipodi:ry="1.4520943"
-       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
-       transform="matrix(1.712345,0,0,2.754643,1.486487,14.80163)" />
+       id="path3228"
+       sodipodi:cx="21.5625"
+       sodipodi:cy="33.892857"
+       sodipodi:rx="2.4553571"
+       sodipodi:ry="1.9642857"
+       d="M 24.017857 33.892857 A 2.4553571 1.9642857 0 1 1  19.107143,33.892857 A 2.4553571 1.9642857 0 1 1  24.017857 33.892857 z"
+       transform="matrix(3.0545454,0,0,2.2909093,-41.363636,-42.145461)" />
     <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="path2251"
-       sodipodi:cx="9.3754778"
-       sodipodi:cy="13.4881"
-       sodipodi:rx="6.1556172"
-       sodipodi:ry="6.1556172"
-       d="M 15.531095 13.4881 A 6.1556172 6.1556172 0 1 1  3.2198606,13.4881 A 6.1556172 6.1556172 0 1 1  15.531095 13.4881 z"
-       transform="matrix(0.97472,0,0,0.812266,11.86154,41.04407)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       style="opacity:1;fill:url(#linearGradient3185);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2206"
+       sodipodi:cx="21.5625"
+       sodipodi:cy="33.892857"
+       sodipodi:rx="2.4553571"
+       sodipodi:ry="1.9642857"
+       d="M 24.017857 33.892857 A 2.4553571 1.9642857 0 1 1  19.107143,33.892857 A 2.4553571 1.9642857 0 1 1  24.017857 33.892857 z"
+       transform="matrix(-3.0545454,0,0,2.2909093,90.363634,-42.145461)" />
   </g>
 </svg>
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/dialogs/64/warning.png
Binary file pidgin/pixmaps/dialogs/64/warning.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/emblems/16/Makefile.am
--- a/pidgin/pixmaps/emblems/16/Makefile.am	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/Makefile.am	Fri Sep 28 20:30:26 2007 +0000
@@ -1,6 +1,7 @@
 SUBDIRS = scalable
 
 EXTRA_DIST = 	aol-client.png \
+		birthday.png \
 		blocked.png \
 		bot.png \
 		external.png \
@@ -12,6 +13,7 @@
 		hiptop.png \
 		male.png \
 		mobile.png \
+		music.png \
 		not-authorized.png \
 		operator.png \
 		qq-member.png \
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/emblems/16/birthday.png
Binary file pidgin/pixmaps/emblems/16/birthday.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/emblems/16/music.png
Binary file pidgin/pixmaps/emblems/16/music.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/emblems/16/scalable/Makefile.am
--- a/pidgin/pixmaps/emblems/16/scalable/Makefile.am	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/scalable/Makefile.am	Fri Sep 28 20:30:26 2007 +0000
@@ -7,6 +7,7 @@
 		game.svg \
 		male.svg \
 		mobile.svg \
+		music.svg \
 		not-authorized.svg \
 		qq-member.svg \
 		secure.svg \
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/emblems/16/scalable/music.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/emblems/16/scalable/music.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   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://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.45"
+   sodipodi:modified="true"
+   version="1.0">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3185">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3187" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:0"
+         offset="1"
+         id="stop3189" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3177">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3179" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:0;"
+         offset="1"
+         id="stop3181" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3153">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3155" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3157" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3153"
+       id="linearGradient3159"
+       x1="2.5409546"
+       y1="10.048674"
+       x2="10.378205"
+       y2="15.928688"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3177"
+       id="radialGradient3183"
+       cx="5.2116022"
+       cy="8.4051199"
+       fx="5.2116022"
+       fy="8.4051199"
+       r="2.9404981"
+       gradientTransform="matrix(2.6050387,0,0,2.2888674,-8.415579,-10.767812)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3185"
+       id="radialGradient3191"
+       cx="5.1978397"
+       cy="8.4135866"
+       fx="5.1978397"
+       fy="8.4135866"
+       r="3.1428281"
+       gradientTransform="matrix(2.8202152,0,0,2.4999643,-9.461187,-12.455954)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="19.784002"
+     inkscape:cy="11.848"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="16px"
+     height="16px"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="0"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#555753;fill-opacity:1;stroke:#222728;stroke-width:1.14297926;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2160"
+       sodipodi:cx="6.4712896"
+       sodipodi:cy="14.484771"
+       sodipodi:rx="3.5986683"
+       sodipodi:ry="2.1781414"
+       d="M 10.069958 14.484771 A 3.5986683 2.1781414 0 1 1  2.8726213,14.484771 A 3.5986683 2.1781414 0 1 1  10.069958 14.484771 z"
+       transform="matrix(0.8336417,0,0,0.918214,4.1052631,-0.8001194)" />
+    <rect
+       style="opacity:1;fill:#222728;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3143"
+       width="1"
+       height="12"
+       x="12"
+       y="1"
+       rx="0.18940361"
+       ry="0.20662212" />
+    <path
+       style="fill:#222728;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.006464,3.0203051 L 11.981638,1 C 13.945163,1 17.837365,1.1548232 14.996311,7.9684328 C 15.596089,2.2547574 13.743811,3.0203051 12.006464,3.0203051 z "
+       id="rect3146"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#555753;fill-opacity:1;stroke:url(#linearGradient3159);stroke-width:1.97969818;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3151"
+       sodipodi:cx="6.4712896"
+       sodipodi:cy="14.484771"
+       sodipodi:rx="3.5986683"
+       sodipodi:ry="2.1781414"
+       d="M 10.069958 14.484771 A 3.5986683 2.1781414 0 1 1  2.8726213,14.484771 A 3.5986683 2.1781414 0 1 1  10.069958 14.484771 z"
+       transform="matrix(0.5557611,0,0,0.4591071,5.903509,5.8499391)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3191);stroke-width:0.98568761;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3173"
+       sodipodi:cx="8.0970039"
+       sodipodi:cy="11.122857"
+       sodipodi:rx="4.3089318"
+       sodipodi:ry="3.5513175"
+       d="M 3.9729753,12.152015 A 4.3089318,3.5513175 0 0 1 9.0871283,7.6665672"
+       transform="matrix(1.0443424,0,0,0.9855497,-0.4560443,3.7870959e-2)"
+       sodipodi:start="2.8475788"
+       sodipodi:end="4.9442449"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3183);stroke-width:0.58102763;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3175"
+       sodipodi:cx="8.0970039"
+       sodipodi:cy="11.122857"
+       sodipodi:rx="4.3089318"
+       sodipodi:ry="3.5513175"
+       d="M 3.9729753,12.152015 A 4.3089318,3.5513175 0 0 1 9.0871283,7.6665672"
+       transform="matrix(1.6981233,0,0,1.7443645,-5.9310642,-8.697544)"
+       sodipodi:start="2.8475788"
+       sodipodi:end="4.9442449"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/protocols/16/myspace.png
Binary file pidgin/pixmaps/protocols/16/myspace.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/protocols/48/myspace.png
Binary file pidgin/pixmaps/protocols/48/myspace.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/available.png
Binary file pidgin/pixmaps/status/16/available.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/away.png
Binary file pidgin/pixmaps/status/16/away.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/busy.png
Binary file pidgin/pixmaps/status/16/busy.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/extended-away.png
Binary file pidgin/pixmaps/status/16/extended-away.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/offline.png
Binary file pidgin/pixmaps/status/16/offline.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/rtl/extended-away.png
Binary file pidgin/pixmaps/status/16/rtl/extended-away.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/scalable/available.svg
--- a/pidgin/pixmaps/status/16/scalable/available.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/available.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -13,13 +13,15 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45"
    version="1.0"
    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/experiment/status/16/scalable"
-   sodipodi:docname="available.svg">
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/status/16/scalable"
+   sodipodi:docname="available.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
@@ -246,7 +248,7 @@
      inkscape:window-width="1274"
      inkscape:window-height="844"
      inkscape:window-x="3"
-     inkscape:window-y="0" />
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -263,16 +265,6 @@
      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="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.173169,-20.73469,11.2083)" />
-    <path
        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 "
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/scalable/away.svg
--- a/pidgin/pixmaps/status/16/scalable/away.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/away.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -13,13 +13,15 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45"
    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/2.0.2/pidgin/pixmaps/status/16/scalable"
-   sodipodi:docname="away.svg">
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/status/16/scalable"
+   sodipodi:docname="away.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
@@ -123,8 +125,8 @@
      fill="#eeeeec"
      inkscape:window-width="1434"
      inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-x="3"
+     inkscape:window-y="25"
      inkscape:object-paths="false"
      inkscape:grid-bbox="true"
      inkscape:guide-bbox="false"
@@ -145,16 +147,6 @@
      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(#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.173169,-20.73469,11.2083)" />
-    <path
        sodipodi:type="arc"
        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"
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/scalable/busy.svg
--- a/pidgin/pixmaps/status/16/scalable/busy.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/busy.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -13,13 +13,15 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45"
    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/experiment/status/16/scalable"
-   sodipodi:docname="busy.svg">
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/status/16/scalable"
+   sodipodi:docname="busy.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
@@ -192,8 +194,8 @@
      fill="#eeeeec"
      inkscape:window-width="1268"
      inkscape:window-height="844"
-     inkscape:window-x="6"
-     inkscape:window-y="0" />
+     inkscape:window-x="3"
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -210,16 +212,6 @@
      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="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.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"
        id="path1311"
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/scalable/extended-away.svg
--- a/pidgin/pixmaps/status/16/scalable/extended-away.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/extended-away.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -13,12 +13,14 @@
    height="16px"
    id="svg4245"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/GUI/Tango/Gaim Refresh/status/16/scalable"
+   inkscape:version="0.45"
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/status/16/scalable"
    sodipodi:docname="extended-away.svg"
    inkscape:export-filename="/home/hbons/GUI/Tango/Gaim Refresh/status/16/extended-away.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4247">
     <linearGradient
@@ -53,16 +55,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.6246122"
+     inkscape:cx="14.39703"
+     inkscape:cy="8.273127"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="872"
-     inkscape:window-height="626"
-     inkscape:window-x="129"
-     inkscape:window-y="124" />
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="0"
+     inkscape:window-y="22" />
   <metadata
      id="metadata4250">
     <rdf:RDF>
@@ -79,27 +81,17 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient5300);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81530744;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5131"
-       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,19.54667,-0.273206)" />
-    <path
-       transform="matrix(-1.708738,0,0,1.647118,-1.878642,-0.867731)"
        style="fill:#fce94f;fill-opacity:1;stroke:#ce5c00;stroke-width:0.59607363;stroke-miterlimit:4;stroke-opacity:1"
        d="M -9,3.2233667 L -7.134588,1.4374993 L -2.89508,1.4374993 C -2.3096744,1.4374993 -1.9824877,1.8329068 -1.9824877,2.3263196 L -1.9824877,9.3300741 L -9,9.3300741 L -9,3.2233667 z "
        id="rect5097"
-       sodipodi:nodetypes="ccccccc" />
+       sodipodi:nodetypes="ccccccc"
+       transform="matrix(-1.708738,0,0,1.647118,-1.878642,-0.867731)" />
     <path
-       transform="matrix(-1.398059,0,0,1.342047,-8.253506e-2,0.574281)"
        style="opacity:0.5625;fill:none;fill-opacity:1;stroke:#eeeeec;stroke-width:0.7300511;stroke-miterlimit:4;stroke-opacity:1"
        d="M -8.9656284,3.1521999 L -7.1361003,1.4267646 L -1.8535964,1.4374993 L -1.8535964,9.6313422 L -9,9.6313422 L -8.9656284,3.1521999 z "
        id="rect5099"
-       sodipodi:nodetypes="cccccc" />
+       sodipodi:nodetypes="cccccc"
+       transform="matrix(-1.398059,0,0,1.342047,-8.253506e-2,0.574281)" />
     <rect
        style="opacity:0.4;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5988"
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/status/16/scalable/offline.svg
--- a/pidgin/pixmaps/status/16/scalable/offline.svg	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/offline.svg	Fri Sep 28 20:30:26 2007 +0000
@@ -13,13 +13,15 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45"
    version="1.0"
    inkscape:export-filename="/home/hbons/Desktop/offline.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop/experiment/status/16/scalable"
-   sodipodi:docname="offline.svg">
+   sodipodi:docbase="/home/hbons/Desktop/2.1.1/status/16/scalable"
+   sodipodi:docname="offline.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
@@ -168,8 +170,8 @@
      fill="#eeeeec"
      inkscape:window-width="1434"
      inkscape:window-height="844"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-x="3"
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -186,16 +188,6 @@
      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: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
        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 "
        id="path2187" />
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/toolbar/16/emote-select.png
Binary file pidgin/pixmaps/toolbar/16/emote-select.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/toolbar/16/insert.png
Binary file pidgin/pixmaps/toolbar/16/insert.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/pixmaps/toolbar/16/send-file.png
Binary file pidgin/pixmaps/toolbar/16/send-file.png has changed
diff -r d94432a338ab -r bedd56240914 pidgin/plugins/history.c
--- a/pidgin/plugins/history.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/plugins/history.c	Fri Sep 28 20:30:26 2007 +0000
@@ -45,6 +45,9 @@
 
 	convtype = purple_conversation_get_type(c);
 	gtkconv = PIDGIN_CONVERSATION(c);
+	if (gtkconv == NULL)
+		return;
+
 	if (convtype == PURPLE_CONV_TYPE_IM && g_list_length(gtkconv->convs) < 2)
 	{
 		GSList *buddies;
@@ -163,6 +166,7 @@
 	purple_signal_connect(purple_conversations_get_handle(),
 						"conversation-created",
 						plugin, PURPLE_CALLBACK(historize), NULL);
+	/* XXX: Do we want to listen to pidgin's "conversation-displayed" signal? */
 
 	purple_prefs_connect_callback(plugin, "/purple/logging/log_ims",
 								history_prefs_cb, plugin);
diff -r d94432a338ab -r bedd56240914 pidgin/plugins/pidginrc.c
--- a/pidgin/plugins/pidginrc.c	Fri Sep 28 20:30:07 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Fri Sep 28 20:30:26 2007 +0000
@@ -57,22 +57,16 @@
 
 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 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 gchar *font_names[] = {
 	N_("Conversation Entry"),
-	N_("Conversation History"),
-	N_("Log Viewer"),
 	N_("Request Dialog"),
 	N_("Notify Dialog")
 };
diff -r d94432a338ab -r bedd56240914 po/ChangeLog
--- a/po/ChangeLog	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/ChangeLog	Fri Sep 28 20:30:26 2007 +0000
@@ -4,6 +4,7 @@
 	* Arabic translation updated (Khaled Hosny)
 	* Italian translation updated (Claudio Satriano)
 	* Lao translation added (Anousak Souphavah)
+	* Norwegian Bokmål translation updated (Espen Stefansen)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Serbian translation updated (Miloš Popović)
 
diff -r d94432a338ab -r bedd56240914 po/POTFILES.in
--- a/po/POTFILES.in	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/POTFILES.in	Fri Sep 28 20:30:26 2007 +0000
@@ -91,11 +91,13 @@
 libpurple/protocols/jabber/usermood.c
 libpurple/protocols/jabber/usernick.c
 libpurple/protocols/jabber/xdata.c
+libpurple/protocols/msn/contact.c
 libpurple/protocols/msn/dialog.c
 libpurple/protocols/msn/error.c
 libpurple/protocols/msn/msn.c
 libpurple/protocols/msn/nexus.c
 libpurple/protocols/msn/notification.c
+libpurple/protocols/msn/oim.c
 libpurple/protocols/msn/servconn.c
 libpurple/protocols/msn/session.c
 libpurple/protocols/msn/state.c
diff -r d94432a338ab -r bedd56240914 po/da.po
--- a/po/da.po	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/da.po	Fri Sep 28 20:30:26 2007 +0000
@@ -15976,2817 +15976,3 @@
 msgstr "P_ause ved tastning"
 
 #: ../pidgin/gtkpounce.c:609
-msgid "Stops t_yping"
-msgstr "Stopper med at s_krive"
-
-#: ../pidgin/gtkpounce.c:611
-msgid "Sends a _message"
-msgstr "Sender en _besked"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "Ope_n an IM window"
-msgstr "_Åbn et besked-vindue"
-
-#: ../pidgin/gtkpounce.c:656
-msgid "_Pop up a notification"
-msgstr "_Popup en påmindelse"
-
-#: ../pidgin/gtkpounce.c:658
-msgid "Send a _message"
-msgstr "Send en _besked"
-
-#: ../pidgin/gtkpounce.c:660
-msgid "E_xecute a command"
-msgstr "_Kør en kommando"
-
-#: ../pidgin/gtkpounce.c:662
-msgid "P_lay a sound"
-msgstr "_Afspil en lyd"
-
-#: ../pidgin/gtkpounce.c:668
-msgid "Brows_e..."
-msgstr "_Gennemse..."
-
-#: ../pidgin/gtkpounce.c:670
-msgid "Br_owse..."
-msgstr "G_ennemse..."
-
-#: ../pidgin/gtkpounce.c:671
-msgid "Pre_view"
-msgstr "Forhånds_visning"
-
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
-msgid "P_ounce only when my status is not Available"
-msgstr "Over_våg kun når min status er ikke tilgængelig"
-
-#: ../pidgin/gtkpounce.c:803
-msgid "_Recurring"
-msgstr "_Gentages"
-
-#: ../pidgin/gtkpounce.c:1246
-msgid "Pounce Target"
-msgstr "Overvåg mål"
-
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
-msgid "Default"
-msgstr "GNOME standard"
-
-#: ../pidgin/gtkprefs.c:517
-msgid "Smiley theme failed to unpack."
-msgstr "Smiley-tema kunne ikke udpakkes."
-
-#: ../pidgin/gtkprefs.c:644
-msgid "Install Theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Vælg et smiley-tema som du gerne vil bruge fra listen forneden. Nye temaer "
-"kan installeres ved at træk-og-slippe dem ind i tema listen."
-
-#: ../pidgin/gtkprefs.c:732
-msgid "Icon"
-msgstr "Ikon"
-
-#: ../pidgin/gtkprefs.c:894
-msgid "System Tray Icon"
-msgstr "Statusområde ikon"
-
-#: ../pidgin/gtkprefs.c:895
-msgid "_Show system tray icon:"
-msgstr "_Vis statusområde ikon:"
-
-#: ../pidgin/gtkprefs.c:899
-msgid "On unread messages"
-msgstr "Ulæste beskeder"
-
-#: ../pidgin/gtkprefs.c:904
-msgid "Conversation Window Hiding"
-msgstr "Skjul beskedsamtalevindue"
-
-#: ../pidgin/gtkprefs.c:905
-msgid "_Hide new IM conversations:"
-msgstr "_Skjul nye samtaler:"
-
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
-msgid "When away"
-msgstr "Hvis fraværende"
-
-#. All the tab options!
-#: ../pidgin/gtkprefs.c:916
-msgid "Tabs"
-msgstr "Faner"
-
-#: ../pidgin/gtkprefs.c:918
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Vis beskeder og chats i fanebladsvinduer"
-
-#: ../pidgin/gtkprefs.c:932
-msgid "Show close b_utton on tabs"
-msgstr "Vis _luk knapper på faneblade"
-
-#: ../pidgin/gtkprefs.c:935
-msgid "_Placement:"
-msgstr "_Placering:"
-
-#: ../pidgin/gtkprefs.c:937
-msgid "Top"
-msgstr "Top"
-
-#: ../pidgin/gtkprefs.c:938
-msgid "Bottom"
-msgstr "Bund"
-
-#: ../pidgin/gtkprefs.c:939
-msgid "Left"
-msgstr "Venstre"
-
-#: ../pidgin/gtkprefs.c:940
-msgid "Right"
-msgstr "Højre"
-
-#: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr "Venstre-vertikalt"
-
-#: ../pidgin/gtkprefs.c:943
-msgid "Right Vertical"
-msgstr "Højre-vertikalt"
-
-#: ../pidgin/gtkprefs.c:950
-msgid "N_ew conversations:"
-msgstr "_Nye samtaler:"
-
-#: ../pidgin/gtkprefs.c:995
-msgid "Show _formatting on incoming messages"
-msgstr "Vis _formatteringslinje på nye beskeder"
-
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
-msgid "Show _detailed information"
-msgstr "Vis logind information"
-
-#: ../pidgin/gtkprefs.c:1000
-msgid "Enable buddy ic_on animation"
-msgstr "Aktivér animation af venneikoner"
-
-#: ../pidgin/gtkprefs.c:1007
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Fortæl venner at du er ved at skrive til dem"
-
-#: ../pidgin/gtkprefs.c:1010
-msgid "Highlight _misspelled words"
-msgstr "Frem_hæv forkert stavede ord"
-
-#: ../pidgin/gtkprefs.c:1014
-msgid "Use smooth-scrolling"
-msgstr "Brug blød rullebjælke"
-
-#: ../pidgin/gtkprefs.c:1017
-msgid "F_lash window when IMs are received"
-msgstr "_Blink vindue når beskeder modtages"
-
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "H_æv samtalevindue"
-
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
-msgid "Font"
-msgstr "Skrifttyper"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1027
-msgid "Use font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
-msgid "Conversation _font:"
-msgstr "Samtaler"
-
-#: ../pidgin/gtkprefs.c:1043
-msgid "Default Formatting"
-msgstr "Standard formattering"
-
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"Dette er hvordan dine udgående beskeder vil se ud når du bruger protokoller "
-"der understøtter formattering. :)"
-
-#: ../pidgin/gtkprefs.c:1128
-msgid "ST_UN server:"
-msgstr "ST_UN server:"
-
-#: ../pidgin/gtkprefs.c:1140
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Eksempel: stunserver.org</span>"
-
-#: ../pidgin/gtkprefs.c:1144
-msgid "_Autodetect IP address"
-msgstr "Find IP-adresse _automatisk"
-
-#: ../pidgin/gtkprefs.c:1153
-msgid "Public _IP:"
-msgstr "Offentlig _IP-adresse:"
-
-#: ../pidgin/gtkprefs.c:1182
-msgid "Ports"
-msgstr "Porte"
-
-#: ../pidgin/gtkprefs.c:1185
-msgid "_Manually specify range of ports to listen on"
-msgstr "Angiv _manuelt område af porte der skal lyttes på"
-
-#: ../pidgin/gtkprefs.c:1188
-msgid "_Start port:"
-msgstr "_Start port:"
-
-#: ../pidgin/gtkprefs.c:1195
-msgid "_End port:"
-msgstr "Slut _port:"
-
-#: ../pidgin/gtkprefs.c:1203
-msgid "Proxy Server"
-msgstr "Server"
-
-#: ../pidgin/gtkprefs.c:1207
-msgid "No proxy"
-msgstr "Ingen mellemvært"
-
-#: ../pidgin/gtkprefs.c:1263
-msgid "_User:"
-msgstr "_Bruger:"
-
-#: ../pidgin/gtkprefs.c:1328
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../pidgin/gtkprefs.c:1329
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1330
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../pidgin/gtkprefs.c:1331
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../pidgin/gtkprefs.c:1332
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../pidgin/gtkprefs.c:1333
-msgid "GNOME Default"
-msgstr "GNOME standard"
-
-#: ../pidgin/gtkprefs.c:1334
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../pidgin/gtkprefs.c:1335
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../pidgin/gtkprefs.c:1336
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../pidgin/gtkprefs.c:1337
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../pidgin/gtkprefs.c:1346
-msgid "Manual"
-msgstr "Andet program"
-
-#: ../pidgin/gtkprefs.c:1399
-msgid "Browser Selection"
-msgstr "Browservalg"
-
-#: ../pidgin/gtkprefs.c:1403
-msgid "_Browser:"
-msgstr "_Browser:"
-
-#: ../pidgin/gtkprefs.c:1411
-msgid "_Open link in:"
-msgstr "_Åbn link i:"
-
-#: ../pidgin/gtkprefs.c:1413
-msgid "Browser default"
-msgstr "Browser standard"
-
-#: ../pidgin/gtkprefs.c:1414
-msgid "Existing window"
-msgstr "Eksisterende vindue"
-
-#: ../pidgin/gtkprefs.c:1416
-msgid "New tab"
-msgstr "Nyt faneblad"
-
-#: ../pidgin/gtkprefs.c:1430
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Manuelt:\n"
-"(%s for URL)"
-
-#: ../pidgin/gtkprefs.c:1470
-msgid "Log _format:"
-msgstr "Log_format:"
-
-#: ../pidgin/gtkprefs.c:1475
-msgid "Log all _instant messages"
-msgstr "_Log alle samtaler"
-
-#: ../pidgin/gtkprefs.c:1477
-msgid "Log all c_hats"
-msgstr "Log alle c_hats"
-
-#: ../pidgin/gtkprefs.c:1479
-msgid "Log all _status changes to system log"
-msgstr "Log alle _status ændringer til systemlog"
-
-#: ../pidgin/gtkprefs.c:1625
-msgid "Sound Selection"
-msgstr "Lydvalg"
-
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
-msgid "Quietest"
-msgstr "Mest stille"
-
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
-msgid "Quieter"
-msgstr "Mere stille"
-
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
-msgid "Quiet"
-msgstr "Stille"
-
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
-msgid "Loud"
-msgstr "Høj"
-
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
-msgid "Louder"
-msgstr "Højere"
-
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
-msgid "Loudest"
-msgstr "Højest"
-
-#: ../pidgin/gtkprefs.c:1713
-msgid "_Method:"
-msgstr "_Metode:"
-
-#: ../pidgin/gtkprefs.c:1715
-msgid "Console beep"
-msgstr "Konsol-bip"
-
-#: ../pidgin/gtkprefs.c:1722
-msgid "No sounds"
-msgstr "Ingen lyde"
-
-#: ../pidgin/gtkprefs.c:1730
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Lydk_ommando:\n"
-"(%s for filnavn)"
-
-#: ../pidgin/gtkprefs.c:1757
-msgid "Sounds when conversation has _focus"
-msgstr "Lyde når samtale har _fokus"
-
-#: ../pidgin/gtkprefs.c:1759
-msgid "Enable sounds:"
-msgstr "Aktivér lyde:"
-
-#: ../pidgin/gtkprefs.c:1770
-msgid "Volume:"
-msgstr "Lydstyrke:"
-
-#: ../pidgin/gtkprefs.c:1850
-msgid "Play"
-msgstr "Afspil"
-
-#: ../pidgin/gtkprefs.c:1927
-msgid "_Report idle time:"
-msgstr "_Rapportér inaktiv tid:"
-
-#: ../pidgin/gtkprefs.c:1932
-msgid "Based on keyboard or mouse use"
-msgstr "Baseret på keyboard- eller musebrug"
-
-#: ../pidgin/gtkprefs.c:1941
-msgid "_Auto-reply:"
-msgstr "_Automatisk svar:"
-
-#: ../pidgin/gtkprefs.c:1945
-msgid "When both away and idle"
-msgstr "Når både fraværende og inaktiv"
-
-#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
-msgid "Auto-away"
-msgstr "Automatisk fraværende"
-
-#: ../pidgin/gtkprefs.c:1953
-msgid "Change status when _idle"
-msgstr "Skift status ved inaktivitet"
-
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
-msgid "_Minutes before becoming idle:"
-msgstr "_Minutter før du ændrer status:"
-
-#: ../pidgin/gtkprefs.c:1965
-msgid "Change _status to:"
-msgstr "Skift _status til:"
-
-#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
-msgid "Status at Startup"
-msgstr "Status ved opstart"
-
-#: ../pidgin/gtkprefs.c:1988
-msgid "Use status from last _exit at startup"
-msgstr "Brug status fra sidste _afslutning ved opstart"
-
-#: ../pidgin/gtkprefs.c:1994
-msgid "Status to a_pply at startup:"
-msgstr "Status som skal anvendes ved opstart:"
-
-#: ../pidgin/gtkprefs.c:2032
-msgid "Interface"
-msgstr "Grænseflade"
-
-#: ../pidgin/gtkprefs.c:2034
-msgid "Smiley Themes"
-msgstr "Smiley-temaer"
-
-#: ../pidgin/gtkprefs.c:2041
-msgid "Browser"
-msgstr "Browser"
-
-#: ../pidgin/gtkprefs.c:2045
-msgid "Status / Idle"
-msgstr "Status / inaktiv"
-
-#: ../pidgin/gtkprivacy.c:80
-msgid "Allow all users to contact me"
-msgstr "Tillad alle brugere at kontakte mig"
-
-#: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users on my buddy list"
-msgstr "Tillad kun brugere på min venneliste"
-
-#: ../pidgin/gtkprivacy.c:82
-msgid "Allow only the users below"
-msgstr "Tillad kun brugerne forneden"
-
-#: ../pidgin/gtkprivacy.c:83
-msgid "Block all users"
-msgstr "Blokér alle brugere"
-
-#: ../pidgin/gtkprivacy.c:84
-msgid "Block only the users below"
-msgstr "Blokér kun brugerne forneden"
-
-#: ../pidgin/gtkprivacy.c:370
-msgid "Privacy"
-msgstr "Privatliv"
-
-#: ../pidgin/gtkprivacy.c:382
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Ændringer til privatlivs-indstillinger virker straks."
-
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
-msgid "Set privacy for:"
-msgstr "Sæt privatlivsindstillinger for:"
-
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
-msgid "Permit User"
-msgstr "Tillad bruger"
-
-#: ../pidgin/gtkprivacy.c:558
-msgid "Type a user you permit to contact you."
-msgstr "Angiv en bruger, du vil tillade at kontakte dig."
-
-#: ../pidgin/gtkprivacy.c:559
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Indtast navnet på den bruger, som der har lov til at kontakte dig."
-
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Tillad"
-
-#: ../pidgin/gtkprivacy.c:568
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Tillad %s at kontakte dig?"
-
-#: ../pidgin/gtkprivacy.c:570
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Er du sikker på at du vil tillade %s at kontakte dig?"
-
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
-msgid "Block User"
-msgstr "Blokér bruger"
-
-#: ../pidgin/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Angiv en bruger at blokere."
-
-#: ../pidgin/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Indtast navnet på brugeren som du vil blokere."
-
-#: ../pidgin/gtkprivacy.c:609
-#, c-format
-msgid "Block %s?"
-msgstr "Blokér %s?"
-
-#: ../pidgin/gtkprivacy.c:611
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Er du sikker på at du vil blokere %s?"
-
-#: ../pidgin/gtkrequest.c:272
-msgid "Apply"
-msgstr "Anvend"
-
-#: ../pidgin/gtkrequest.c:1507
-msgid "That file already exists"
-msgstr "Den fil eksisterer allerede"
-
-#: ../pidgin/gtkrequest.c:1508
-msgid "Would you like to overwrite it?"
-msgstr "Vil du overskrive den?"
-
-#: ../pidgin/gtkrequest.c:1511
-msgid "Overwrite"
-msgstr "Overskriv"
-
-#: ../pidgin/gtkrequest.c:1512
-msgid "Choose New Name"
-msgstr "Vælg nyt navn"
-
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
-msgid "Select Folder..."
-msgstr "Vælg mappe"
-
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "Rumliste"
-
-#. list button
-#: ../pidgin/gtkroomlist.c:443
-msgid "_Get List"
-msgstr "_Hent liste"
-
-#. add button
-#: ../pidgin/gtkroomlist.c:451
-msgid "_Add Chat"
-msgstr "_Tilføj chat"
-
-#: ../pidgin/gtksavedstatuses.c:337
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Er du sikker på at du vil slette de valgte gemte statusser?"
-
-#. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
-msgid "_Use"
-msgstr "_Brug"
-
-#: ../pidgin/gtksavedstatuses.c:780
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Titel allerede i brug. Du skal vælge en unik titel."
-
-#: ../pidgin/gtksavedstatuses.c:970
-msgid "Different"
-msgstr "Forskellig"
-
-#: ../pidgin/gtksavedstatuses.c:1159
-msgid "_Title:"
-msgstr "_Titel:"
-
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
-msgid "_Status:"
-msgstr "_Status:"
-
-#. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
-msgid "Use a _different status for some accounts"
-msgstr "Brug en _anden status for nogle konti"
-
-#. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
-msgid "Sa_ve & Use"
-msgstr "G_em og brug"
-
-#: ../pidgin/gtksavedstatuses.c:1480
-#, c-format
-msgid "Status for %s"
-msgstr "Status for %s"
-
-#: ../pidgin/gtkstatusbox.c:664
-msgid "Waiting for network connection"
-msgstr "Venter på netværksforbindelse"
-
-#: ../pidgin/gtkutils.c:632
-#, fuzzy
-msgid "Google Talk"
-msgstr "Mærke til/fra"
-
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Den følgende fejl opstod ved indlæsning: %s %s"
-
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
-msgid "Failed to load image"
-msgstr "Kunne ikke indlæse billede"
-
-#: ../pidgin/gtkutils.c:1498
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Kan ikke sende mappe %s."
-
-#: ../pidgin/gtkutils.c:1499
-#, fuzzy, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr "Gaim kan ikke overføre en mappe. Du skal sende filerne individuelt"
-
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
-msgid "You have dragged an image"
-msgstr "Du har trukket et billede"
-
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Du kan sende dette billede som en filoverførsel, vedlægge det til en besked, "
-"eller bruge det som venneikonet for denne bruger."
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
-msgid "Set as buddy icon"
-msgstr "Sæt som venneikon"
-
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
-msgid "Send image file"
-msgstr "Send billedfil"
-
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
-msgid "Insert in message"
-msgstr "Indsæt i besked"
-
-#: ../pidgin/gtkutils.c:1544
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Vil du sætte det som venneikon for denne bruger?"
-
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"Du kan sende dette billede som en filoverførsel, vedlægge det til en besked, "
-"eller bruge det som venneikonet for denne bruger."
-
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Du kan indsætte dette billede i beskeden, eller bruge det som venneikon for "
-"denne bruger"
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
-msgid "Cannot send launcher"
-msgstr "Kan ikke sende starter"
-
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Du har trukket en skrivebords starter. Højst sandsynligt vil du sende hvad "
-"starteren peger på og ikke starten selv."
-
-#: ../pidgin/gtkutils.c:2345
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Fil:</b> %s\n"
-"<b>Filstørrelse:</b> %s\n"
-"<b>Billedstørrelse:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2641
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Filen \"%s\" er for stor for %s. Venligst prøv et mindre billede.\n"
-
-#: ../pidgin/gtkutils.c:2643
-msgid "Icon Error"
-msgstr "Ikon fejl"
-
-#: ../pidgin/gtkutils.c:2644
-msgid "Could not set icon"
-msgstr "Kunne ikke opsætte ikon"
-
-#: ../pidgin/gtkutils.c:2744
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Kunne ikke åbne fil \"%s\": %s"
-
-#: ../pidgin/gtkutils.c:2793
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Kunne ikke indlæse billeder \"%s\": årsag ikke kendt, måske en ødelagt "
-"billedefil"
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
-msgid "Save File"
-msgstr "Gem fil"
-
-#: ../pidgin/gtkwhiteboard.c:861
-msgid "Select color"
-msgstr "Vælg farve"
-
-#: ../pidgin/pidginstock.c:87
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../pidgin/pidginstock.c:89
-msgid "Close _tabs"
-msgstr "Luk _faneblade"
-
-#: ../pidgin/pidginstock.c:91
-msgid "_Get Info"
-msgstr "_Hent info"
-
-#: ../pidgin/pidginstock.c:92
-msgid "_Invite"
-msgstr "_Invitér"
-
-#: ../pidgin/pidginstock.c:93
-msgid "_Modify"
-msgstr "_Ret"
-
-#: ../pidgin/pidginstock.c:94
-msgid "_Open Mail"
-msgstr "_Åbn post"
-
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-msgid "Pidgin smileys"
-msgstr ""
-
-#: ../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
-#, fuzzy
-msgid "none"
-msgstr "(intet)"
-
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "Vis statistikker"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
-msgid "Response Probability:"
-msgstr "Svar sandsynlighed:"
-
-#: ../pidgin/plugins/cap/cap.c:811
-msgid "Statistics Configuration"
-msgstr "Statistik konfiguration"
-
-#. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
-msgid "Maximum response timeout:"
-msgstr "Maksimal svar-udløbstid:"
-
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
-msgid "minutes"
-msgstr "minutter"
-
-#. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
-msgid "Maximum last-seen difference:"
-msgstr "Maksimal sidst set forskel:"
-
-#. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
-msgid "Threshold:"
-msgstr "Grænseværdi:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/cap/cap.c:936
-msgid "Contact Availability Prediction"
-msgstr "Tilgængelighedsforudsigelse for kontakt"
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/cap/cap.c:938
-msgid "Contact Availability Prediction plugin."
-msgstr "Tilængelighedsforudsigelses-udvidelsesmodul."
-
-#. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"Tilgængelighedsforudsigelses-udvidelsesmodulet (cap) bruges til at vise "
-"statistik-information om venner i en brugers kontaktliste."
-
-#: ../pidgin/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Ven er inaktiv"
-
-#: ../pidgin/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Ven er fraværende"
-
-#: ../pidgin/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Ven er \"udvidet\" fraværende"
-
-#. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Ven er mobil"
-
-#: ../pidgin/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Ven er offline"
-
-#: ../pidgin/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Værdier der skal bruges når..."
-
-#: ../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 ""
-"Vennen med den <i>højeste score</i> er den ven som vil have prioritet i "
-"kontakten.\n"
-
-#: ../pidgin/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Brug den sidste ven når score er lige"
-
-#: ../pidgin/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Værdier der skal bruges til konto..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/contact_priority.c:187
-msgid "Contact Priority"
-msgstr "Kontaktsprioritet"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Giver mulighed for at kontrollere værdierne associeret med venners "
-"forskellige status."
-
-#. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Giver mulighed for at ændre værdierne af inaktiv/fraværende/offline status "
-"for venner i kontaktprioritets beregninger."
-
-#: ../pidgin/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Samtalefarver"
-
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "Tilpas farver i samtalevinduet"
-
-#: ../pidgin/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Fejlbeskeder"
-
-#: ../pidgin/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "Fremhæv beskeder"
-
-#: ../pidgin/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "Systembeskeder"
-
-#: ../pidgin/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Sendte beskeder"
-
-#: ../pidgin/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Modtaget beskeder"
-
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
-#, c-format
-msgid "Select Color for %s"
-msgstr "Vælg farve for %s"
-
-#: ../pidgin/plugins/convcolors.c:310
-msgid "Ignore incoming format"
-msgstr "Ignorér indkomne format"
-
-#: ../pidgin/plugins/convcolors.c:311
-msgid "Apply in Chats"
-msgstr "Anvend i chat"
-
-#: ../pidgin/plugins/convcolors.c:312
-msgid "Apply in IMs"
-msgstr "Tilføj i kvik-beskeder"
-
-#: ../pidgin/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Efter antallet af samtaler"
-
-#: ../pidgin/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Samtale placering"
-
-#. 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 "Antal af samtaler pr. vindue"
-
-#: ../pidgin/plugins/extplacement.c:117
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Seperate besked- og chatvinduer når der placeres med tal"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/extplacement.c:146
-msgid "ExtPlacement"
-msgstr "EkstraPlacering"
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/extplacement.c:148
-msgid "Extra conversation placement options."
-msgstr "Ekstra placeringsmuligheder for samtaler."
-
-#. *< summary
-#. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Begræns antallet af samtaler pr. vindue, med mulighed for seperate samtale- "
-"og chatvinduer."
-
-#. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Musebevægelses opsætning"
-
-#: ../pidgin/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Midterste museknap"
-
-#: ../pidgin/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Højre museknap"
-
-#. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Visuel bevægelsesvisning"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
-msgid "Mouse Gestures"
-msgstr "Musebevægelser"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
-msgid "Provides support for mouse gestures"
-msgstr "Giver understøttelse for musebevægelser"
-
-#. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
-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 ""
-"Giver understøttelse for musebevægelser i samtalevinduer.\n"
-"Træk i den midterste knap for at udføre forskellige handlinger:\n"
-"\n"
-"Træk ned og derefter til højre, for at lukke en samtale.\n"
-"Træk op og derefter til venstre, for at skifte til den forrige samtale.\n"
-"Træk op og derefter til højre, for at skifte til den næste samtale."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Øjeblikkelig besked"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Vælg en person fra adressebogen forneden, eller tilføj en ny person."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
-msgid "Group:"
-msgstr "Gruppe:"
-
-#. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
-msgid "New Person"
-msgstr "Ny person"
-
-#. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
-msgid "Select Buddy"
-msgstr "Vælg ven"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Vælg en person fra din adressebog at tilføje denne ven til, eller tilføj en "
-"ny person."
-
-#. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
-msgid "User _details"
-msgstr "Bruger_detaljer"
-
-#. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
-msgid "_Associate Buddy"
-msgstr "_Associér ven"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "Kunne ikke sende e-mail."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:241
-msgid "The evolution executable was not found in the PATH."
-msgstr "Den ekskvebar Evolution fil blev ikke fundet i PATH."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
-msgstr "En e-post-adresse blev ikke fundet for denne ven."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:273
-msgid "Add to Address Book"
-msgstr "Tilføj til adressebog"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Send e-mail"
-
-#. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
-msgid "Evolution Integration Configuration"
-msgstr "Evolution-integrering opsætning"
-
-#. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Vælg alle konti som venner automatisk skal tilføjes til."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution-integration"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Giver integration med Evolution"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
-msgid "Please enter the person's information below."
-msgstr "Indtast personens oplysninger forneden."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Indtast vennens brugernavn og konto type forneden."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
-msgid "Account type:"
-msgstr "Konto type:"
-
-#. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
-msgid "Optional information:"
-msgstr "Valgfri oplysninger:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
-msgid "First name:"
-msgstr "Fornavn:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
-msgid "Last name:"
-msgstr "Efternavn:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK signal test"
-
-#. *< 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 "Test for at se at alle grafiske handlinger virker korrekt."
-
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Vennealias:</b> %s"
-
-#: ../pidgin/plugins/history.c:188
-msgid "History"
-msgstr "Historik"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Minimer ved fravær"
-
-#. *< 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 "Minimerer vennelisten og dine samtaler når du er fraværende."
-
-#: ../pidgin/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Post-overvåger"
-
-#: ../pidgin/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Tjekker for lokal post."
-
-#: ../pidgin/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Tilføjer en lille boks til vennelisten der viser om du har ny post."
-
-#: ../pidgin/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Markeringslinje"
-
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Tegn en linje for indikering af nye beskeder i en samtale."
-
-#: ../pidgin/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "Tegn markeringslinje i "
-
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
-msgid "_IM windows"
-msgstr "Besked-v_induer"
-
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
-msgid "C_hat windows"
-msgstr "C_hat-vinduer"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"En musik-beskeds session er blevet anmodet. Klik på MM-ikonet for at "
-"acceptere."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Musik beskeds-session bekræftet."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
-msgid "Music Messaging"
-msgstr "Musik beskeder"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
-msgid "There was a conflict in running the command:"
-msgstr "Der var en konflikt ved kørsel af kommandoen:"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
-msgid "Error Running Editor"
-msgstr "Fejl ved kørsel tekstredigering"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
-msgid "The following error has occurred:"
-msgstr "Den følgende fejl er opstået:"
-
-#. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
-msgid "Music Messaging Configuration"
-msgstr "Musik beskeder opsætning"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
-msgid "Score Editor Path"
-msgstr "Sti til score editor"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
-msgid "_Apply"
-msgstr "_Anvend"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Musik besked modul for samarbejdskomposition"
-
-#. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Musik beskeds modulet tillader flere bruger af gangen, til samtidig at "
-"arbejde på et stykke musik ved at redigere en fælles score i real-time."
-
-#. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
-msgid "Notify For"
-msgstr "Påmind for"
-
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Kun når nogle siger dit brugernavn"
-
-#: ../pidgin/plugins/notify.c:707
-msgid "_Focused windows"
-msgstr "_Fokuserede vinduer"
-
-#. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
-msgid "Notification Methods"
-msgstr "Påmindelse-metoder"
-
-#: ../pidgin/plugins/notify.c:722
-msgid "Prepend _string into window title:"
-msgstr "Indsæt _streng i vinduets titel:"
-
-#. Count method button
-#: ../pidgin/plugins/notify.c:741
-msgid "Insert c_ount of new messages into window title"
-msgstr "Indsæt antal af nye beskeder ind i vinduets titel"
-
-#. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
-msgid "Insert count of new message into _X property"
-msgstr "Indsæt antal af nye beskeder ind i _X-område"
-
-#. Urgent method button
-#: ../pidgin/plugins/notify.c:758
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Sæt vindueshåndterings-vinket \"_URGENT\" (\"haster\")"
-
-#. Raise window method button
-#: ../pidgin/plugins/notify.c:767
-msgid "R_aise conversation window"
-msgstr "H_æv samtalevindue"
-
-#. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
-msgid "Notification Removal"
-msgstr "Fjernelse af påmindelse"
-
-#. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
-msgid "Remove when conversation window _gains focus"
-msgstr "Fjern når samtalevindue får _fokus"
-
-#. Remove on click button
-#: ../pidgin/plugins/notify.c:787
-msgid "Remove when conversation window _receives click"
-msgstr "Fjern når samtalevindue modtage_r klik"
-
-#. Remove on type button
-#: ../pidgin/plugins/notify.c:795
-msgid "Remove when _typing in conversation window"
-msgstr "Fjern når der bliver skreve_t i samtalevindue"
-
-#. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
-msgid "Remove when a _message gets sent"
-msgstr "Fjern når en _besked bliver sendt"
-
-#. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
-msgid "Remove on switch to conversation ta_b"
-msgstr "Fjern når der skiftes til samtale fanebla_d"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/notify.c:907
-msgid "Message Notification"
-msgstr "Påmindelse af beskeder"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-"Giver mulighed for at påminde dig om ulæste beskeder på forskellige måder."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/pidgininc.c:91
-#, fuzzy
-msgid "Pidgin Demonstration Plugin"
-msgstr "Gaim demonstrations-modul"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Et eksempels-modul der gør forskellige ting - se beskrivelsen."
-
-#. *  description
-#: ../pidgin/plugins/pidgininc.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 ""
-"Dette er et virkeligt fedt modul, der gør en masse ting:\n"
-"- Det fortæller hvem der skrev programmet når du logger ind\n"
-"- Det skriver al indkommende tekst bagvendt\n"
-"- Det sender en besked til folk på din venneliste straks når de logger på"
-
-#: ../pidgin/plugins/pidginrc.c:41
-msgid "Cursor Color"
-msgstr "Markør farve"
-
-#: ../pidgin/plugins/pidginrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Sekundær markør farve"
-
-#: ../pidgin/plugins/pidginrc.c:43
-msgid "Hyperlink Color"
-msgstr "Link farve"
-
-#: ../pidgin/plugins/pidginrc.c:54
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView horisontal separering"
-
-#: ../pidgin/plugins/pidginrc.c:73
-msgid "Conversation Entry"
-msgstr "Samtaler"
-
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Samtale historik"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Loglæser"
-
-#: ../pidgin/plugins/pidginrc.c:76
-msgid "Request Dialog"
-msgstr "Anmodnings dialog"
-
-#: ../pidgin/plugins/pidginrc.c:77
-msgid "Notify Dialog"
-msgstr "Påmindelses dialog"
-
-#: ../pidgin/plugins/pidginrc.c:253
-msgid "Select Color"
-msgstr "Vælg farve"
-
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
-msgid "Select Interface Font"
-msgstr "Vælg grænseflade skrifttype"
-
-#: ../pidgin/plugins/pidginrc.c:303
-#, c-format
-msgid "Select Font for %s"
-msgstr "Vælg skrifttype for %s"
-
-#: ../pidgin/plugins/pidginrc.c:371
-msgid "GTK+ Interface Font"
-msgstr "GTK+ grænseflade skrifttype"
-
-#: ../pidgin/plugins/pidginrc.c:391
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ tekst genvejstema"
-
-#.
-#. 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:428
-msgid "Interface colors"
-msgstr "Grænseflade farver"
-
-#: ../pidgin/plugins/pidginrc.c:452
-msgid "Widget Sizes"
-msgstr "Størrelse på kontroller"
-
-#: ../pidgin/plugins/pidginrc.c:473
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: ../pidgin/plugins/pidginrc.c:497
-#, fuzzy
-msgid "Gtkrc File Tools"
-msgstr "Gaim filkontrol"
-
-#: ../pidgin/plugins/pidginrc.c:502
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Skriv indstillinger til %s%sgtkrc-2.0"
-
-#: ../pidgin/plugins/pidginrc.c:511
-msgid "Re-read gtkrc files"
-msgstr "Genindlæs gtkrc filer"
-
-#: ../pidgin/plugins/pidginrc.c:544
-#, fuzzy
-msgid "Pidgin GTK+ Theme Control"
-msgstr "Gaim GTK+ tema kontrol"
-
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Giver adgang til fælles brugte gtkrc indstillinger."
-
-#: ../pidgin/plugins/raw.c:175
-msgid "Raw"
-msgstr "Rå"
-
-#: ../pidgin/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"Giver dig mulighed for at sende rå inddata til text-baserede protokoller."
-
-#: ../pidgin/plugins/raw.c:178
-#, fuzzy
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Giver dig mulighed for at sende rå inddata til text-baserede protokoller "
-"(Jabber, MSN, IRC, TOC. Tryk 'Enter' i tekstfeltet for at sende. Hold øje "
-"med fejlsøgningsvinduet."
-
-#: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr "Du bruger Gaim version %s. Den nyeste version er %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
-msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>Ændringer:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "Ny version tilgængelig"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Påmindelse om nye udgivelser"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Tjekker periodisk efter nye udgivelser."
-
-#. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Tjeker periodisk efter nye udgivelser og viser brugeren hvilke ændringer der "
-"er i den nye udgivelse."
-
-#: ../pidgin/plugins/spellchk.c:1962
-msgid "Duplicate Correction"
-msgstr "Dublet rettelse"
-
-#: ../pidgin/plugins/spellchk.c:1963
-msgid "The specified word already exists in the correction list."
-msgstr "Det angivne ord findes allerede i rettelseslisten."
-
-#: ../pidgin/plugins/spellchk.c:2177
-msgid "Text Replacements"
-msgstr "Tekst erstatninger"
-
-#: ../pidgin/plugins/spellchk.c:2200
-msgid "You type"
-msgstr "Du skriver"
-
-#: ../pidgin/plugins/spellchk.c:2214
-msgid "You send"
-msgstr "Du sender"
-
-#: ../pidgin/plugins/spellchk.c:2228
-msgid "Whole words only"
-msgstr "Kun hele ord"
-
-#: ../pidgin/plugins/spellchk.c:2240
-msgid "Case sensitive"
-msgstr "Forskel på store og små bogstaver"
-
-#: ../pidgin/plugins/spellchk.c:2266
-msgid "Add a new text replacement"
-msgstr "Tilføj en ny tekst erstatning"
-
-#: ../pidgin/plugins/spellchk.c:2282
-msgid "You _type:"
-msgstr "Du s_kriver:"
-
-#: ../pidgin/plugins/spellchk.c:2299
-msgid "You _send:"
-msgstr "Du _sender:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Præcist match på store og små bogstaver"
-
-#: ../pidgin/plugins/spellchk.c:2313
-msgid "Only replace _whole words"
-msgstr "Erstat kun _hele ord"
-
-#: ../pidgin/plugins/spellchk.c:2338
-msgid "General Text Replacement Options"
-msgstr "Generelle teksterstatnings indstillinger"
-
-#: ../pidgin/plugins/spellchk.c:2339
-msgid "Enable replacement of last word on send"
-msgstr "Slå erstatning af sidste ord ved send på"
-
-#: ../pidgin/plugins/spellchk.c:2370
-msgid "Text replacement"
-msgstr "Teksterstatning"
-
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Erstatter tekst i udgående beskeder udfra bruger-definerede regler."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
-msgid "Buddy Ticker"
-msgstr "Horisontal venneliste"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "En horisontal kørende version af vennelisten."
-
-#: ../pidgin/plugins/timestamp.c:137
-msgid "Display Timestamps Every"
-msgstr "Vis tidsstempler hver"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp.c:202
-msgid "Timestamp"
-msgstr "Tidsstempel"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp.c:205
-msgid "Display iChat-style timestamps"
-msgstr "Vis iChat-agtige tidsstempler"
-
-#. *  description
-#: ../pidgin/plugins/timestamp.c:207
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Vis iChat-agtige tidsstempler hvert N'te minut."
-
-#: ../pidgin/plugins/timestamp_format.c:23
-msgid "Timestamp Format Options"
-msgstr "Formatteringsindstillinger for tidsstempel"
-
-#: ../pidgin/plugins/timestamp_format.c:26
-#, fuzzy, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Tving (traditionel Gaim) 24-timers format"
-
-#: ../pidgin/plugins/timestamp_format.c:33
-msgid "Show dates in..."
-msgstr "Vis datoer i..."
-
-#: ../pidgin/plugins/timestamp_format.c:38
-msgid "Co_nversations:"
-msgstr "_Samtaler:"
-
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
-msgid "For delayed messages"
-msgstr "For forsinkede beskeder"
-
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
-msgid "For delayed messages and in chats"
-msgstr "For forsinkede beskeder og i chats"
-
-#: ../pidgin/plugins/timestamp_format.c:47
-msgid "_Message Logs:"
-msgstr "_Besked logs:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
-msgid "Message Timestamp Formats"
-msgstr "Tidsstempel format for beskeder"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
-msgid "Customizes the message timestamp formats."
-msgstr "Definerer formatet på tidsstempler i beskeder."
-
-#. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Dette modul tillader brugeren selv at definere formatet på tidsstempler i "
-"samtaler og logs."
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
-msgid "Opacity:"
-msgstr "Ugennemsigtighed:"
-
-#. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
-msgid "IM Conversation Windows"
-msgstr "Beskedsamtalevinduer"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
-msgid "_IM window transparency"
-msgstr "Beskedvinduer gennemsigtighed"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
-msgid "_Show slider bar in IM window"
-msgstr "Vis rullebjælke i besked-vindue"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
-msgid "Remove IM window transparency on focus"
-msgstr "Fjern samtalevindue gennemsigtighed ved fokus"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
-msgid "Always on top"
-msgstr "Altid øverst"
-
-#. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
-msgid "Buddy List Window"
-msgstr "Venneliste vindue"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
-msgid "_Buddy List window transparency"
-msgstr "Venneliste vindue gennemsigtighed"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Fjern venneliste vindue gennemsigtighed ved fokus"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
-msgid "Transparency"
-msgstr "Gennemsigtighed"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variabel gennemsigtighed for venneliste og samtaler."
-
-#. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Dette modul giver dig mulighed variabel alpha gennemsigtighed i samtale-"
-"vinduer og vennelisten.\n"
-"\n"
-"* Bemærk: Dette modul kræver Win2000 eller bedre."
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ kørselstidsversion"
-
-#. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
-msgid "Startup"
-msgstr "Opstart"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
-#, fuzzy, c-format
-msgid "_Start %s on Windows startup"
-msgstr "_Start Gaim ved Windows opstart"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
-msgid "_Dockable Buddy List"
-msgstr "_Dockbar venneliste"
-
-#. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
-msgid "_Keep Buddy List window on top:"
-msgstr "_Hold vennelistevinduet øverst:"
-
-#. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
-msgid "Only when docked"
-msgstr "Kun når docked"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
-msgid "_Flash window when chat messages are received"
-msgstr "_Blink vindue når chat-beskeder modtages"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-#, fuzzy
-msgid "Windows Pidgin Options"
-msgstr "Logind-indstillinger"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
-#, fuzzy
-msgid "Options specific to Pidgin for Windows."
-msgstr "Indstilinger specifikke for Windows Gaim."
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-#, fuzzy
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Giver muligheder specifikt til Windows Gaim, såsom venneliste dokning."
-
-#: ../pidgin/plugins/xmppconsole.c:667
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Loggede ud.</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "XMPP-konsol"
-
-#: ../pidgin/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "Konto: "
-
-#: ../pidgin/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Ikke forbundet til XMPP</font>"
-
-#: ../pidgin/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "Indsæt en <iq/>-stanza."
-
-#: ../pidgin/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "Indsæt en <presence/>-stanza."
-
-#: ../pidgin/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "Indsæt et <message/>-vers."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr "Send og modtag rå XMPP-stanzas."
-
-#. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller "
-"klienter."
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Vis afkoblede venner"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Logstørrelse"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Kunne ikke kontakte server."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Vælg Notes adressebog"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Nuværende symbol"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger protokolmodul"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Normal godkendelse fejlede!"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s sendte dig et vink!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Ukendt fejl"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kunne ikke kontakte server."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s ændrede status fra %s til %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s er nu %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s er ikke længere %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Besked:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Send fil"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "_Tilføj overvågning"
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Ikke tilladt når du er offline"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Ikke tilladt når du er offline"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Tilføj ven"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Tilføj chat"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persisk"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Konti"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Konto:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "_Send til"
-
-#~ msgid "Gaim Internet Messenger"
-#~ msgstr "Gaim - internet beskeder"
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "Afkoblet venner til/fra"
-
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s blev afbrudt grundet følgende fejl:\n"
-#~ "%s"
-
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "Kommandoer er ikke understøttet endnu. Besked blev IKKE sendt."
-
-#~ msgid "Timestamps"
-#~ msgstr "Tidsstempler"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Still need to do something about this."
-#~ msgstr "Mangler stadig at gøre noget ved dette."
-
-#~ msgid "Alias..."
-#~ msgstr "Alias..."
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/Værktøjer/Venneovervågning"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Valgmuligheder/Vis venne_ikoner"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Valgmuligheder/Vis venne_ikoner"
-
-#~ msgid "Jabber developer"
-#~ msgstr "Jabber udvikler"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim på irc.freenode.net<BR><BR>"
-
-#~ msgid "Smaller font size"
-#~ msgstr "Mindre skriftstørrelse"
-
-#~ msgid "Insert link"
-#~ msgstr "Indsæt link"
-
-#~ msgid "Insert image"
-#~ msgstr "Indsæt billede"
-
-#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
-#~ msgstr "Gaim %s. Prøv `%s -h' for flere oplysninger.\n"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "Vis venne_ikoner"
-
-#~ 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 ""
-#~ "Du kan sende dette billede som en filoverførsel, vedlægge det til en "
-#~ "besked, eller bruge det som venneikonet for denne bruger."
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "GtkTreeView udfoldelses-pil størrelse"
-
-#~ msgid "GtkTreeView Indent Expanders"
-#~ msgstr "GtkTreeView indryknings pile"
-
-#~ msgid "Tools"
-#~ msgstr "Værktøjer"
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-#~ msgstr ""
-#~ "Du kan få version %s fra:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-
-#~ msgid "WinGaim Options"
-#~ msgstr "WinGaim Indstillinger"
-
-#~ 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 ven fra gruppe %s blev ikke fjernet fordi den tilhører en konto som er "
-#~ "slået fra eller offline. Denne ven og gruppen blev ikke flyttet.\n"
-#~ msgstr[1] ""
-#~ "%d venner fra gruppe %s blev ikke fjernet fordi de tilhører en konto som "
-#~ "er slået fra eller offline. Disse venner og gruppen blev ikke flyttet.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "Gruppe ikke fjernet"
-
-#~ msgid "Old Gaim"
-#~ msgstr "Gammel Gaim"
-
-#~ msgid "Autoreply"
-#~ msgstr "Automatisk svar"
-
-#~ msgid "Autoreply for all the protocols"
-#~ msgstr "Automatisk svar for alle protokollerne"
-
-#~ msgid ""
-#~ "This plugin lets you set autoreply message for any protocol. You can set "
-#~ "the global autoreply message from the Plugin-options dialog. To set some "
-#~ "specific autoreply message for a particular buddy, right click on the "
-#~ "buddy in the buddy-list window. To set autoreply messages for some "
-#~ "account, go to the `Advanced' tab of the Account-edit dialog."
-#~ msgstr ""
-#~ "Dette udvidelsesmodul tillader dig at sætte automatisk svarbesked for "
-#~ "enhver protokol. Du kan sætte en global automatisk svarbesked fra "
-#~ "udvidelsesmodulets.valgmulighedsvindue. For at sætte en specifik "
-#~ "automatisk svarbesked for en bestemt ven, højreklik på vennen i "
-#~ "venneliste-vinduet. For at sætte en automatisk svarbesked for bestemte "
-#~ "konti, gå til \"Avanceret\"-fanen i Konto-redigér-vinduet."
-
-#~ msgid "Set autoreply message for %s"
-#~ msgstr "Sæt automatisk svarbesked for %s"
-
-#~ msgid "Set Autoreply Message"
-#~ msgstr "Sæt automatisk svarbesked"
-
-#~ msgid ""
-#~ "The following message will be sent to the buddy when the buddy sends you "
-#~ "a message and autoreply is enabled."
-#~ msgstr ""
-#~ "Følgende besked vil blive sendt til vennen når vennen sender dig en "
-#~ "besked og automatisk svarbesked er aktiveret."
-
-#~ msgid "Set _Autoreply Message"
-#~ msgstr "Sæt _automatisk svarbesked"
-
-#~ msgid "Autoreply message"
-#~ msgstr "Automatisk svarbesked"
-
-#~ msgid "Send autoreply messages when"
-#~ msgstr "Send automatisk svarbesked når"
-
-#~ msgid "When my account is _away"
-#~ msgstr "Når min konto er _væk"
-
-#~ msgid "When my account is _idle"
-#~ msgstr "Når min konto er _fraværende"
-
-#~ msgid "_Default reply"
-#~ msgstr "_Standard-svar"
-
-#~ msgid "Status message"
-#~ msgstr "Status-besked"
-
-#~ msgid "Autoreply with status message"
-#~ msgstr "Automatisk svar med statusbesked"
-
-#~ msgid "Always when there is a status message"
-#~ msgstr "Altid når der er en statusbesked"
-
-#~ msgid "Only when there's no autoreply message"
-#~ msgstr "Kun når der ikke er nogen automatisk svarbesked"
-
-#~ msgid "Delay between autoreplies"
-#~ msgstr "Forsinkelse mellem automatisk svar"
-
-#~ msgid "_Minimum delay (mins)"
-#~ msgstr "_Mindste forsinkelse (mins)"
-
-#~ msgid "Times to send autoreplies"
-#~ msgstr "Antal gange der sendes automatisk svar"
-
-#~ msgid "Ma_ximum count"
-#~ msgstr "Maksimum tæller"
-
-#~ msgid ""
-#~ "I am currently not available. Please leave your message, and I will get "
-#~ "back to you as soon as possible."
-#~ msgstr ""
-#~ "Jeg er ikke til stede. Vær venlig at efterlade en besked, og jeg vil "
-#~ "vende tilbage til dig hurtigst muligt."
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim bruger"
-
-#~ msgid "Jabber Account"
-#~ msgstr "Jabber-konto"
-
-#~ msgid "Cannot join %s:"
-#~ msgstr "Kan ikke deltage i %s:"
-
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "Server kunne ikke godkende dig uden en adgangskode"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "Søg efter Jabber brugere"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "Ugyldigt Jabber ID"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Skift Jabber adgangskode"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Jabber protokolmodul"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Du har sendt et vink!"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "Brug altid AIM/ICQ-mellemværtsserver til filoverførsler\n"
-#~ "(langsommere, men afslører ikke din IP-adresse)"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC gav fejlen: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "Bruger oplysninger for %s er ikke tilgængelige:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Grænsefejl."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Du er blevet logget af pga. en ukendt årsag."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Dit brugernavn er formatter således på nuværende tidspunkt:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "Kunne ikke tilføje vennen %s pga. en ukendt årsag. Den normale grund for "
-#~ "dette er at du har det maskimale antal tilladte venner i din venneliste."
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Ny brugernavn formatering:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formatér brugernavn..."
-
-#~ msgid "_Connect"
-#~ msgstr "_Tilslut"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "Er du sikker på at du vil forlade denne Qun?"
-
-#~ msgid "Go ahead"
-#~ msgstr "Fortsæt"
-
-#~ msgid "Server ACK"
-#~ msgstr "Server-ACK"
-
-#~ msgid "Send IM fail\n"
-#~ msgstr "Send kvik-besked fejlede\n"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "Hold i live fejl, lader til at forbindelsen er tabt!"
-
-#~ msgid "Request login token error!"
-#~ msgstr "Login forespørgelesmærke-fejl!"
-
-#~ msgid "%s Address"
-#~ msgstr "%s-adresse"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: Tilgængelig"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: Fraværende"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: Usynlig"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: Offline"
-
-#~ msgid "Modify My Information"
-#~ msgstr "Ændre min information"
-
-#~ msgid "Login in TCP"
-#~ msgstr "Logind i TCP"
-
-#~ msgid "Login Hidden"
-#~ msgstr "Skjult logind"
-
-#~ msgid "Socket send error"
-#~ msgstr "Sokkel sendefejl"
-
-#~ msgid "Connection refused"
-#~ msgstr "Forbindelse afslået"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "Vil du tilføje ham?"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Nægt andre brugere at kigge på"
-
-#~ msgid "Block invites"
-#~ msgstr "Blokér invitationer"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Nægt anmodning om online status-attributter"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC har sendt en PAUSE kommando."
-
-#~ 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 ""
-#~ "Dermed ignorerer TOC alle beskeder der sendes, men du kan alligevel "
-#~ "risikere at blive logget af, hvis du forsøger at sende en besked. Gaim "
-#~ "vil derfor tilbageholde alle beskeder. Dette er kun midlertidigt, så hav "
-#~ "tålmodighed."
-
-#~ msgid "Gaim - Save As..."
-#~ msgstr "Gaim - Gem som..."
-
-#~ 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 ""
-#~ "De normale godkendelsesmetoder har fejlet. Dette betyder enten at din "
-#~ "adgangskode er forkert, eller at Yahoo!'s godkendelsesmetode er blevet "
-#~ "ændret. Gaim vil nu forsøge at logge ind via Web Messenger-"
-#~ "godkendelsesmetoden, som vil resultere i begrænset funktionalitet."
-
-#~ msgid "Unavailable"
-#~ msgstr "Ikke tilgængelig"
-
-#~ msgid "Crazychat"
-#~ msgstr "Skørchat"
-
-#~ msgid "Plugin to establish a Crazychat session."
-#~ msgstr "Plugin til at etablere en skørchat session."
-
-#~ msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-#~ msgstr ""
-#~ "Bruger Gaim til at finde venners ip-adresser til at forbinde til en "
-#~ "skørchat session"
-
-#~ msgid "Network Configuration"
-#~ msgstr "Netværksopsætning"
-
-#~ msgid "TCP port"
-#~ msgstr "TCP port"
-
-#~ msgid "UDP port"
-#~ msgstr "UDP port"
-
-#~ msgid "Feature Calibration"
-#~ msgstr "Funktionalitets justering"
-
-#~ msgid "Disabled"
-#~ msgstr "Slået fra"
-
-#~ msgid "DBus"
-#~ msgstr "DBus"
-
-#~ msgid "Blink tray icon for unread..."
-#~ msgstr "Blink statusikon for ulæste..."
-
-#~ msgid "_Instant Messages:"
-#~ msgstr "_Kvikbeskeder:"
-
-#~ msgid "C_hat Messages:"
-#~ msgstr "C_hat beskeder:"
-
-#~ msgid "Displays an icon for Gaim in the system tray."
-#~ msgstr "Viser et Gaim-ikon i statusområdet."
-
-#~ msgid ""
-#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
-#~ "show the current status of Gaim, allow fast access to commonly used "
-#~ "functions, and to toggle display of the buddy list. Also provides options "
-#~ "to blink for unread messages."
-#~ msgstr ""
-#~ "Viser et ikon i statusområdet (i f.eks. GNOME, KDE eller Windows) til at "
-#~ "vise Gaims nuværende status. Det tillader hurtig adgang til ofte brugte "
-#~ "funktioner, og du kan hurtigt skjule/vise vennelisten. Det giver også "
-#~ "mulighed for at blinke når der er ulæste beskeder."
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr "Den angivne ven blev ikke fundet i Evolution kontakter"
-
-#~ msgid "Delay"
-#~ msgstr "Forsinkelse"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "Venneikon:"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Kælenavn:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Logget ind:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inaktiv:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Beskrivelse:</b> Skræmmende"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Status:</b> Enestående"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Status:</b> Fantastisk"
-
-#~ msgid "IM the user"
-#~ msgstr "Send besked til bruger"
-
-#~ msgid "Ignore the user"
-#~ msgstr "Ignorér brugeren"
-
-#~ msgid "Get the user's information"
-#~ msgstr "Hent brugerens oplysninger"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Du har fået post!</span>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "Send ukendte \"_skråstreg\" kommandoer som beskeder"
-
-#~ msgid "Tab Options"
-#~ msgstr "Faneblad indstillinger"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "Afspil _lyde under fravær"
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "Kunne ikke afspille lyd fordi 'Kommando' lydmetoden er blevet valgt, men "
-#~ "ingen kommando er blevet sat."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "Ikke i stand til at afspille lyd fordi den opsatte lydkommando ikke kunne "
-#~ "køres: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Status</b>: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Besked:</b> %s"
-
-#~ msgid "Unable to initiate a new search"
-#~ msgstr "Kunne ikke lave en ny søgning"
-
-#~ msgid "You have a pending search. Please wait for it to finish."
-#~ msgstr "Du har en søgning i gang. Vent til den afslutter."
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> %s<br>"
-#~ msgstr "<b>%s:</b> %s<br>"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "Server kræevr TLS/SSL til logind.  Vælg \"Brug TLS hvis tilgængeligt\" i "
-#~ "kontoegenskaber"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Brug TLS hvis tilgængelig"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "Brugeren %s vil tilføje %s til sin venneliste."
-
-#~ msgid "_Authorize"
-#~ msgstr "_Godkend"
-
-#~ msgid "_Deny"
-#~ msgstr "_Nægt"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
-
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "%s<b>Generelt</b><br>%s"
-
-#~ msgid "%s<b>Social</b><br>%s"
-#~ msgstr "%s<b>Social</b><br>%s"
-
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>Personlig</b><br>%s"
-
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>Erhverv</b><br>%s"
-
-#~ msgid "<hr><b>Contact Info</b>%s%s"
-#~ msgstr "<hr><b>Kontaktoplysninger</b>%s%s"
-
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<hr><b>%s:</b> "
-
-#~ msgid "Login server"
-#~ msgstr "Indlogningsserver"
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "Brugeren %s (%s) vil tilføje %s til sin venneliste."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "Kunne ikke hente hoved fra server"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr ""
-#~ "Kunne ikke læse besked fra server: %s. Kommando er %hd, længde er %hd."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "brugere: %s, filer: %s, størrelse: %sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "Kunne ikke tilføje \"%s\" til din Napster hotlist"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s anmodede om PING"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "NAPSTER protokolmodul"
-
-#~ msgid "Invalid password"
-#~ msgstr "Ugyldig adgangskode"
-
-#~ msgid "Invalid username or password"
-#~ msgstr "Ugyldigt brugernavn eller adgangskode"
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "Direkte forbindelse til %s lukket"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "Direkte forbindelse til %s fejlede"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "Kunne ikke oprette direkte forbindelse"
-
-#~ msgid "You have lost your connection to chat room %s."
-#~ msgstr "Du har tabt forbindelsen til chatrummet %s."
-
-#~ msgid "Chat is currently unavailable"
-#~ msgstr "Chat er ikke tilgængelig nu"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
-#~ "Account -> Advanced."
-#~ msgstr ""
-#~ "Overførsel af fil %s overløb tidsgrænsen.\n"
-#~ " Prøv at aktivere proxy servere for filoverførsler i Konti -> %s -> "
-#~ "Redigér konto -> Avanceret."
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "Kunne ikke logge ind til filoverførselsproxy."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr ""
-#~ "Kan ikke etablere lytte sokkel eller ingen AOL proxy forbindelse tilstede."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "Brugeren %s kræver godkendelse for at blive tilføjet til en venneliste."
-#~ "Vil du sende en anmodning om godkendelse?"
-
-#~ msgid "Request Authorization"
-#~ msgstr "Anmod om godkendelse"
-
-#~ msgid "_Request Authorization"
-#~ msgstr "_Anmod om godkendelse"
-
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Brugeren %u vil tilføje %s til sin venneliste af følgende grund:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "Godkendelse anmodning"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-
-#~ msgid "Auth host"
-#~ msgstr "Godkendelses server"
-
-#~ msgid "Auth port"
-#~ msgstr "Godkendelses port"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Understøtter:</b>: %s"
-
-#~ msgid "<b>External User</b><br>"
-#~ msgstr "<b>Ekstern bruger</b><br>"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>Fulde navn:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Understøtter:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Status:</b> %s"
-
-#~ msgid "Wrong Password"
-#~ msgstr "Forkert adgangskode"
-
-#~ msgid "TOC host"
-#~ msgstr "TOC Vært"
-
-#~ msgid "TOC port"
-#~ msgstr "TOC Port"
-
-#~ msgid "Message (optional) :"
-#~ msgstr "Besked (valgfri) :"
-
-#~ msgid "Unable to read"
-#~ msgstr "Kunne ikke læse"
-
-#~ msgid "Pager host"
-#~ msgstr "Bipper vært"
-
-#~ msgid "YCHT host"
-#~ msgstr "YCHT vært"
-
-#~ msgid "YCHT port"
-#~ msgstr "YCHT port"
-
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>IP-adresse:</b> %s<br>"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: Fejl ved oprettelse af forbindelse\n"
diff -r d94432a338ab -r bedd56240914 po/en_GB.po
--- a/po/en_GB.po	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/en_GB.po	Fri Sep 28 20:30:26 2007 +0000
@@ -10263,7544 +10263,4 @@
 msgid "Import Sametime List..."
 msgstr "Import Sametime List..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
-msgid "Export Sametime List..."
-msgstr "Export Sametime List..."
-
-#: ../libpurple/protocols/sametime/sametime.c:5630
-msgid "Add Notes Address Book Group..."
-msgstr "Add Notes Address Book Group..."
-
-#: ../libpurple/protocols/sametime/sametime.c:5634
-msgid "User Search..."
-msgstr "User Search..."
-
-#: ../libpurple/protocols/sametime/sametime.c:5740
-msgid "Force login (ignore server redirects)"
-msgstr "Force login (ignore server redirects)"
-
-#. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
-msgid "Hide client identity"
-msgstr "Hide client identity"
-
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../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 "User %s is not present in the network"
-
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../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: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 "Key Agreement"
-
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
-msgid "Cannot perform the key agreement"
-msgstr "Cannot perform the key agreement"
-
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
-msgid "Error occurred during key agreement"
-msgstr "Error occurred during key agreement"
-
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-msgid "Key Agreement failed"
-msgstr "Key Agreement failed"
-
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
-msgid "Timeout during key agreement"
-msgstr "Timeout during key agreement"
-
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Key agreement was aborted"
-
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
-msgid "Key agreement is already started"
-msgstr "Key agreement is already started"
-
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
-msgid "Key agreement cannot be started with yourself"
-msgstr "Key agreement cannot be started with yourself"
-
-#: ../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 "The remote user is not present in the network any more"
-
-#: ../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 ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
-#, c-format
-msgid ""
-"The remote user is waiting key agreement on:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"The remote user is waiting key agreement on:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
-msgid "Key Agreement Request"
-msgstr "Key Agreement Request"
-
-#: ../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 "IM With Password"
-
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
-msgid "Cannot set IM key"
-msgstr "Cannot set IM key"
-
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
-msgid "Set IM Password"
-msgstr "Set IM Password"
-
-#: ../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 "Get Public Key"
-
-#: ../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 "Cannot fetch the public key"
-
-#: ../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 "Show Public Key"
-
-#: ../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 "Could not load public key"
-
-#: ../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 "User Information"
-
-#: ../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 "Cannot get user information"
-
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
-#, c-format
-msgid "The %s buddy is not trusted"
-msgstr "The %s buddy is not trusted"
-
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"You cannot receive buddy notifications until you import their public key.  "
-"You can use the Get Public Key command to get the public key."
-
-#. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
-msgid "Open..."
-msgstr "Open..."
-
-#: ../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 "The %s buddy is not present in the network"
-
-#: ../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 ""
-"To add the buddy you must import their public key. Press Import to import a "
-"public key."
-
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
-msgid "_Import..."
-msgstr "_Import..."
-
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
-msgid "Select correct user"
-msgstr "Select correct user"
-
-#: ../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 ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
-msgid "Detached"
-msgstr "Detached"
-
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
-#: ../libpurple/protocols/silc10/silc.c:49
-msgid "Indisposed"
-msgstr "Indisposed"
-
-#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
-#: ../libpurple/protocols/silc10/silc.c:51
-msgid "Wake Me Up"
-msgstr "Wake Me Up"
-
-#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
-#: ../libpurple/protocols/silc10/silc.c:43
-msgid "Hyper Active"
-msgstr "Hyper Active"
-
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
-msgid "Robot"
-msgstr "Robot"
-
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
-msgid "Happy"
-msgstr "Happy"
-
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
-msgid "Sad"
-msgstr "Sad"
-
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
-msgid "Angry"
-msgstr "Angry"
-
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
-msgid "Jealous"
-msgstr "Jealous"
-
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
-msgid "Ashamed"
-msgstr "Ashamed"
-
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
-msgid "Invincible"
-msgstr "Invincible"
-
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
-#: ../libpurple/protocols/silc10/util.c:524
-msgid "In Love"
-msgstr "In Love"
-
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
-msgid "Sleepy"
-msgstr "Sleepy"
-
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
-msgid "Bored"
-msgstr "Bored"
-
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
-msgid "Excited"
-msgstr "Excited"
-
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
-msgid "Anxious"
-msgstr "Anxious"
-
-#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
-msgid "User Modes"
-msgstr "User Modes"
-
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1219
-msgid "Preferred Contact"
-msgstr "Preferred Contact"
-
-#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
-#: ../libpurple/protocols/silc10/ops.c:1224
-msgid "Preferred Language"
-msgstr "Preferred Language"
-
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1229
-msgid "Device"
-msgstr "Device"
-
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../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 "Timezone"
-
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
-msgid "Geolocation"
-msgstr "Geolocation"
-
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
-msgid "Reset IM Key"
-msgstr "Reset IM Key"
-
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
-msgid "IM with Key Exchange"
-msgstr "IM with Key Exchange"
-
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
-msgid "IM with Password"
-msgstr "IM with Password"
-
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
-msgid "Get Public Key..."
-msgstr "Get Public Key..."
-
-#: ../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 "Kill User"
-
-#: ../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 "Draw On Whiteboard"
-
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
-msgid "_Passphrase:"
-msgstr "_Passphrase:"
-
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
-#, c-format
-msgid "Channel %s does not exist in the network"
-msgstr "Channel %s does not exist in the network"
-
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
-msgid "Channel Information"
-msgstr "Channel Information"
-
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
-msgid "Cannot get channel information"
-msgstr "Cannot get channel information"
-
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
-#, c-format
-msgid "<b>Channel Name:</b> %s"
-msgstr "<b>Channel Name:</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>User Count:</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>Channel Founder:</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>Channel Cipher:</b> %s"
-
-#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
-#, c-format
-msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "<br><b>Channel HMAC:</b> %s"
-
-#: ../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>Channel Topic:</b><br>%s"
-
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
-msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>Channel Modes:</b> "
-
-#: ../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>Founder Key Fingerprint:</b><br>%s"
-
-#: ../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>Founder Key Babbleprint:</b><br>%s"
-
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
-msgid "Add Channel Public Key"
-msgstr "Add Channel Public Key"
-
-#. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
-msgid "Open Public Key..."
-msgstr "Open Public Key..."
-
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
-msgid "Channel Passphrase"
-msgstr "Channel Passphrase"
-
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
-msgid "Channel Public Keys List"
-msgstr "Channel Public Keys List"
-
-#: ../libpurple/protocols/silc/chat.c:435
-#: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"Channel authentication is used to secure the channel from unauthorised "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-
-#: ../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 "Channel Authentication"
-
-#: ../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 "Add / Remove"
-
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc10/chat.c:581
-msgid "Group Name"
-msgstr "Group name"
-
-#: ../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 "Passphrase"
-
-#: ../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 "Please enter the %s channel private group name and passphrase."
-
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
-msgid "Add Channel Private Group"
-msgstr "Add Channel Private Group"
-
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
-msgid "User Limit"
-msgstr "User Limit"
-
-#: ../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 "Set user limit on channel. Set to zero to reset user limit."
-
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
-msgid "Invite List"
-msgstr "Invite List"
-
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
-msgid "Ban List"
-msgstr "Ban List"
-
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
-msgid "Add Private Group"
-msgstr "Add Private Group"
-
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
-msgid "Reset Permanent"
-msgstr "Reset Permanent"
-
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
-msgid "Set Permanent"
-msgstr "Set Permanent"
-
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
-msgid "Set User Limit"
-msgstr "Set User Limit"
-
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
-msgid "Reset Topic Restriction"
-msgstr "Reset Topic Restriction"
-
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
-msgid "Set Topic Restriction"
-msgstr "Set Topic Restriction"
-
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
-msgid "Reset Private Channel"
-msgstr "Reset Private Channel"
-
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
-msgid "Set Private Channel"
-msgstr "Set Private Channel"
-
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
-msgid "Reset Secret Channel"
-msgstr "Reset Secret Channel"
-
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
-msgid "Set Secret Channel"
-msgstr "Set Secret Channel"
-
-#: ../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 ""
-"You have to join the %s channel before you are able to join the private group"
-
-#: ../libpurple/protocols/silc/chat.c:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
-msgid "Join Private Group"
-msgstr "Join Private Group"
-
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
-msgid "Cannot join private group"
-msgstr "Cannot join private group"
-
-#: ../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 "Call Command"
-
-#: ../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 "Cannot call command"
-
-#: ../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 "Unknown command"
-
-#: ../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 "Secure File Transfer"
-
-#: ../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 "Error during file transfer"
-
-#: ../libpurple/protocols/silc/ft.c:87
-msgid "Remote disconnected"
-msgstr "Remote disconnected"
-
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
-msgid "Key agreement failed"
-msgstr "Key agreement failed"
-
-#: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timed out"
-msgstr "Connection timed out"
-
-#: ../libpurple/protocols/silc/ft.c:118
-msgid "Creating connection failed"
-msgstr "Connection creation failed"
-
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
-msgid "File transfer session does not exist"
-msgstr "File transfer session does not exist"
-
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
-msgid "No file transfer session active"
-msgstr "No file transfer session active"
-
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
-msgid "File transfer already started"
-msgstr "File transfer already started"
-
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
-msgid "Could not perform key agreement for file transfer"
-msgstr "Could not perform key agreement for file transfer"
-
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
-msgid "Could not start the file transfer"
-msgstr "Could not start the file transfer"
-
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
-msgid "Cannot send file"
-msgstr "Cannot send file"
-
-#: ../libpurple/protocols/silc/ops.c:57
-msgid "Error occurred"
-msgstr "Error occurred"
-
-#: ../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 has changed the topic of <I>%s</I> to: %s"
-
-#: ../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> set channel <I>%s</I> modes to: %s"
-
-#: ../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> removed all channel <I>%s</I> modes"
-
-#: ../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> set <I>%s's</I> modes to: %s"
-
-#: ../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> removed all <I>%s's</I> modes"
-
-#: ../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 "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-
-#: ../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 "You have been killed by %s (%s)"
-
-#: ../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 "Killed by %s (%s)"
-
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
-msgid "Server signoff"
-msgstr "Server signoff"
-
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
-msgid "Personal Information"
-msgstr "Personal Information"
-
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
-msgid "Birth Day"
-msgstr "Date of Birth"
-
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
-msgid "Job Role"
-msgstr "Job Role"
-
-#: ../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 "Organisation"
-
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
-msgid "Unit"
-msgstr "Unit"
-
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
-msgid "Note"
-msgstr "Note"
-
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
-msgid "Join Chat"
-msgstr "Join Chat"
-
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "You are channel founder on <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 "Channel founder on <I>%s</I> is <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:1071
-msgid "Real Name"
-msgstr "Real Name"
-
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
-msgid "Status Text"
-msgstr "Status Text"
-
-#: ../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 "Public Key Fingerprint"
-
-#: ../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 "Public Key Babbleprint"
-
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
-msgid "_More..."
-msgstr "_More..."
-
-#: ../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 "Detach From Server"
-
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
-msgid "Cannot detach"
-msgstr "Cannot detach"
-
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
-msgid "Cannot set topic"
-msgstr "Cannot set topic"
-
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
-msgid "Failed to change nickname"
-msgstr "Failed to change nickname"
-
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
-msgid "Roomlist"
-msgstr "Room List"
-
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
-msgid "Cannot get room list"
-msgstr "Cannot get room list"
-
-#: ../libpurple/protocols/silc/ops.c:1468
-msgid "Network is empty"
-msgstr "Network is empty"
-
-#: ../libpurple/protocols/silc/ops.c:1512
-#: ../libpurple/protocols/silc10/ops.c:1507
-msgid "No public key was received"
-msgstr "No public key was received"
-
-#: ../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 "Server Information"
-
-#: ../libpurple/protocols/silc/ops.c:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
-msgid "Cannot get server information"
-msgstr "Cannot get server information"
-
-#: ../libpurple/protocols/silc/ops.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
-msgid "Server Statistics"
-msgstr "Server Statistics"
-
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
-msgid "Cannot get server statistics"
-msgstr "Cannot get server statistics"
-
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
-#, c-format
-msgid ""
-"Local server start time: %s\n"
-"Local server uptime: %s\n"
-"Local server clients: %d\n"
-"Local server channels: %d\n"
-"Local server operators: %d\n"
-"Local router operators: %d\n"
-"Local cell clients: %d\n"
-"Local cell channels: %d\n"
-"Local cell servers: %d\n"
-"Total clients: %d\n"
-"Total channels: %d\n"
-"Total servers: %d\n"
-"Total routers: %d\n"
-"Total server operators: %d\n"
-"Total router operators: %d\n"
-msgstr ""
-"Local server start time: %s\n"
-"Local server uptime: %s\n"
-"Local server clients: %d\n"
-"Local server channels: %d\n"
-"Local server operators: %d\n"
-"Local router operators: %d\n"
-"Local cell clients: %d\n"
-"Local cell channels: %d\n"
-"Local cell servers: %d\n"
-"Total clients: %d\n"
-"Total channels: %d\n"
-"Total servers: %d\n"
-"Total routers: %d\n"
-"Total server operators: %d\n"
-"Total router operators: %d\n"
-
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
-msgid "Network Statistics"
-msgstr "Network Statistics"
-
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
-msgid "Ping failed"
-msgstr "Ping failed"
-
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping reply received from server"
-msgstr "Ping reply received from server"
-
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
-msgid "Could not kill user"
-msgstr "Could not kill user"
-
-#: ../libpurple/protocols/silc/ops.c:1648
-msgid "WATCH"
-msgstr "WATCH"
-
-#: ../libpurple/protocols/silc/ops.c:1648
-msgid "Cannot watch user"
-msgstr "Cannot watch user"
-
-#: ../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 "Resuming session"
-
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
-msgid "Authenticating connection"
-msgstr "Authenticating connection"
-
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
-msgid "Verifying server public key"
-msgstr "Verifying server public key"
-
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
-msgid "Passphrase required"
-msgstr "Passphrase required"
-
-#: ../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 ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
-#, c-format
-msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "Received %s's public key. Would you like to accept this public key?"
-
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
-#, c-format
-msgid ""
-"Fingerprint and babbleprint for the %s key are:\n"
-"\n"
-"%s\n"
-"%s\n"
-msgstr ""
-"Fingerprint and babbleprint for the %s key are:\n"
-"\n"
-"%s\n"
-"%s\n"
-
-#: ../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 "Verify Public Key"
-
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
-msgid "_View..."
-msgstr "_View..."
-
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
-msgid "Unsupported public key type"
-msgstr "Unsupported public key type"
-
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
-msgid "Disconnected by server"
-msgstr "Disconnected by server"
-
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
-msgid "Error during connecting to SILC Server"
-msgstr "Error during connecting to SILC Server"
-
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
-msgid "Key Exchange failed"
-msgstr "Key Exchange failed"
-
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
-msgid "Connection failed"
-msgstr "Connection failed"
-
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
-msgid "Performing key exchange"
-msgstr "Performing key exchange"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
-msgstr "Connecting to SILC Server"
-
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
-msgid "Could not load SILC key pair"
-msgstr "Could not load SILC key pair"
-
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
-msgid "Unable to create connection"
-msgstr "Unable to create connection"
-
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
-msgid "Out of memory"
-msgstr "Out of memory"
-
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
-msgid "Cannot initialize SILC protocol"
-msgstr "Cannot initialise SILC protocol"
-
-#: ../libpurple/protocols/silc/silc.c:445
-msgid "Error loading SILC key pair"
-msgstr "Error loading SILC key pair"
-
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
-msgid "Your Current Mood"
-msgstr "Your Current Mood"
-
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
-msgid "Normal"
-msgstr "Normal"
-
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
-msgid "In love"
-msgstr "In love"
-
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
-msgid ""
-"\n"
-"Your Preferred Contact Methods"
-msgstr ""
-"\n"
-"Your Preferred Contact Methods"
-
-#: ../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: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:778
-#: ../libpurple/protocols/silc10/silc.c:689
-msgid "Video conferencing"
-msgstr "Video conferencing"
-
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
-msgid "Your Current Status"
-msgstr "Your Current Status"
-
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
-msgid "Online Services"
-msgstr "Online Services"
-
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
-msgid "Let others see what services you are using"
-msgstr "Let others see what services you are using"
-
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
-msgid "Let others see what computer you are using"
-msgstr "Let others see what computer you are using"
-
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
-msgid "Your VCard File"
-msgstr "Your vCard File"
-
-#: ../libpurple/protocols/silc/silc.c:812
-msgid "Timezone (UTC)"
-msgstr "Timezone (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 "User Online Status Attributes"
-
-#: ../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 "
-"about yourself."
-msgstr ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-
-#: ../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 "Message of the Day"
-
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
-msgid "No Message of the Day available"
-msgstr "No Message of the Day available"
-
-#: ../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 "There is no Message of the Day associated with this connection"
-
-#: ../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 "Create New SILC Key Pair"
-
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
-msgid "Passphrases do not match"
-msgstr "Passphrases do not match"
-
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
-msgid "Key Pair Generation failed"
-msgstr "Key Pair Generation failed"
-
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
-msgid "Key length"
-msgstr "Key length"
-
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
-msgid "Public key file"
-msgstr "Public key file"
-
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
-msgid "Private key file"
-msgstr "Private key file"
-
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
-msgid "Passphrase (retype)"
-msgstr "Passphrase (retype)"
-
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
-msgid "Generate Key Pair"
-msgstr "Generate Key Pair"
-
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
-msgid "Online Status"
-msgstr "Online Status"
-
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
-msgid "View Message of the Day"
-msgstr "View Message of the Day"
-
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
-msgid "Create SILC Key Pair..."
-msgstr "Create SILC key pair..."
-
-#: ../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 "User <I>%s</I> is not present in the network"
-
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
-msgid "Topic too long"
-msgstr "Topic too long."
-
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
-msgid "You must specify a nick"
-msgstr "You must specify a nick"
-
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
-#, c-format
-msgid "channel %s not found"
-msgstr "channel %s not found"
-
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
-#, c-format
-msgid "channel modes for %s: %s"
-msgstr "channel modes for %s: %s"
-
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
-#, c-format
-msgid "no channel modes are set on %s"
-msgstr "no channel modes are set on %s"
-
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
-#, c-format
-msgid "Failed to set cmodes for %s"
-msgstr "Failed to set cmodes for %s"
-
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
-#, c-format
-msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Unknown command: %s, (may be a client bug)"
-
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
-msgid "part [channel]:  Leave the chat"
-msgstr "part [channel]:  Leave the chat"
-
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
-msgid "leave [channel]:  Leave the chat"
-msgstr "leave [channel]:  Leave the chat"
-
-#: ../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;new topic&gt;]:  View or change the topic"
-
-#: ../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;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
-msgid "list:  List channels on this network"
-msgstr "list:  List channels on this network"
-
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
-msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;nick&gt;:  View nick's information"
-
-#: ../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;nick&gt; &lt;message&gt;:  Send a private message to a user"
-
-#: ../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;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
-msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  View the server's Message Of The Day"
-
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
-msgid "detach:  Detach this session"
-msgstr "detach:  Detach this session"
-
-#: ../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 [message]:  Disconnect from the server, with an optional message"
-
-#: ../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;command&gt;:  Call any silc client command"
-
-#: ../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;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;newnick&gt;:  Change your nickname"
-
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
-msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;nick&gt;:  View nick's information"
-
-#: ../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;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-
-#: ../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;usermodes&gt;:  Set your modes in the network"
-
-#: ../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;nick&gt; [-pubkey]:  Get server operator privileges"
-
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-
-#: ../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;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
-msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  View server administrative details"
-
-#: ../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;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-
-#: ../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;nick|server&gt;:  Retrieve client's or server's public key"
-
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
-msgid "stats:  View server and network statistics"
-msgstr "stats:  View server and network statistics"
-
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
-msgid "ping:  Send PING to the connected server"
-msgstr "ping:  Send PING to the connected server"
-
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
-msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;channel&gt;:  List users in channel"
-
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
-msgid "SILC Protocol Plugin"
-msgstr "SILC Protocol Plug-in"
-
-#. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
-msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Secure Internet Live Conferencing (SILC) Protocol"
-
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
-msgid "Network"
-msgstr "Network"
-
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
-msgid "Public Key file"
-msgstr "Public Key file"
-
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
-msgid "Private Key file"
-msgstr "Private Key file"
-
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
-msgid "Cipher"
-msgstr "Cipher"
-
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
-msgid "HMAC"
-msgstr "HMAC"
-
-#: ../libpurple/protocols/silc/silc.c:1948
-msgid "Use Perfect Forward Secrecy"
-msgstr "Use Perfect Forward Secrecy"
-
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
-msgid "Public key authentication"
-msgstr "Public key authentication"
-
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
-msgid "Block IMs without Key Exchange"
-msgstr "Block IMs without Key Exchange"
-
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
-msgid "Block messages to whiteboard"
-msgstr "Block messages to whiteboard"
-
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
-msgid "Automatically open whiteboard"
-msgstr "Automatically open whiteboard"
-
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
-msgid "Digitally sign and verify all messages"
-msgstr "Digitally sign and verify all messages"
-
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
-msgid "Creating SILC key pair..."
-msgstr "Creating SILC key pair..."
-
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-msgid "Cannot create SILC key pair\n"
-msgstr "Cannot create SILC key pair\n"
-
-#. Hint for translators: Please check the tabulator width here and in
-#. the next strings (short strings: 2 tabs, longer strings 1 tab,
-#. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
-#, c-format
-msgid "Real Name: \t%s\n"
-msgstr "Real Name: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
-#, c-format
-msgid "User Name: \t%s\n"
-msgstr "User Name: \t%s\n"
-
-#: ../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:364
-#: ../libpurple/protocols/silc10/util.c:361
-#, c-format
-msgid "Host Name: \t%s\n"
-msgstr "Host Name: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
-#, c-format
-msgid "Organization: \t%s\n"
-msgstr "Organisation: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
-#, c-format
-msgid "Country: \t%s\n"
-msgstr "Country: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
-#, c-format
-msgid "Algorithm: \t%s\n"
-msgstr "Algorithm: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
-#, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "Key Length: \t%d bits\n"
-
-#: ../libpurple/protocols/silc/util.c:372
-#, c-format
-msgid "Version: \t%s\n"
-msgstr "Version: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
-#, c-format
-msgid ""
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
-#, c-format
-msgid ""
-"Public Key Babbleprint:\n"
-"%s"
-msgstr ""
-"Public Key Babbleprint:\n"
-"%s"
-
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
-msgid "Public Key Information"
-msgstr "Public Key Information"
-
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
-msgid "Paging"
-msgstr "Paging"
-
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
-msgid "Computer"
-msgstr "Computer"
-
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
-msgid "PDA"
-msgstr "PDA"
-
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
-msgid "Terminal"
-msgstr "Terminal"
-
-#: ../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 sent message to whiteboard. Would you like to open the whiteboard?"
-
-#: ../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 sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
-msgid "Whiteboard"
-msgstr "Whiteboard"
-
-#: ../libpurple/protocols/silc10/ops.c:1559
-msgid "No server statistics available"
-msgstr "No server statistics available"
-
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Failure: Version mismatch, upgrade your client"
-
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Failure: Remote does not trust/support your public key"
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Failure: Remote does not support proposed KE group"
-
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Failure: Remote does not support proposed cipher"
-
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Failure: Remote does not support proposed PKCS"
-
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Failure: Remote does not support proposed hash function"
-
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Failure: Remote does not support proposed HMAC"
-
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
-msgid "Failure: Incorrect signature"
-msgstr "Failure: Incorrect signature"
-
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
-msgid "Failure: Invalid cookie"
-msgstr "Failure: Invalid cookie"
-
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
-msgid "Failure: Authentication failed"
-msgstr "Failure: Authentication failed"
-
-#: ../libpurple/protocols/silc10/silc.c:182
-msgid "Cannot initialize SILC Client connection"
-msgstr "Cannot initialise SILC Client connection"
-
-#: ../libpurple/protocols/silc10/silc.c:290
-msgid "John Noname"
-msgstr "No name"
-
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Cannot find/access ~/.silc directory"
-
-#: ../libpurple/protocols/silc10/silc.c:334
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Could not load SILC key pair: %s"
-
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
-msgid "Could not write"
-msgstr "Could not write"
-
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
-msgid "Could not connect"
-msgstr "Could not connect"
-
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
-msgid "Unknown server response."
-msgstr "Unknown reason."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
-msgid "Could not create listen socket"
-msgstr "Could not create listen socket"
-
-#: ../libpurple/protocols/simple/simple.c:1586
-msgid "Couldn't resolve host"
-msgstr "Couldn't resolve host"
-
-#: ../libpurple/protocols/simple/simple.c:1677
-msgid "Could not resolve hostname"
-msgstr "Could not resolve hostname"
-
-#: ../libpurple/protocols/simple/simple.c:1694
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "SIP screen names may not contain whitespaces or @ symbols"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE Protocol Plug-in"
-
-#. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "The SIP/SIMPLE Protocol Plug-in"
-
-#: ../libpurple/protocols/simple/simple.c:1899
-msgid "Publish status (note: everyone may watch you)"
-msgstr "Publish status (note: anyone can watch you)"
-
-#: ../libpurple/protocols/simple/simple.c:1905
-msgid "Use UDP"
-msgstr "Use UDP"
-
-#: ../libpurple/protocols/simple/simple.c:1907
-msgid "Use proxy"
-msgstr "Use proxy"
-
-#: ../libpurple/protocols/simple/simple.c:1909
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../libpurple/protocols/simple/simple.c:1911
-msgid "Auth User"
-msgstr "Auth User"
-
-#: ../libpurple/protocols/simple/simple.c:1913
-msgid "Auth Domain"
-msgstr "Auth Domain"
-
-#: ../libpurple/protocols/toc/toc.c:139
-#, c-format
-msgid "Looking up %s"
-msgstr "Looking up %s"
-
-#: ../libpurple/protocols/toc/toc.c:148
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connect to %s failed"
-
-#: ../libpurple/protocols/toc/toc.c:201
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#: ../libpurple/protocols/toc/toc.c:488
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Unable to write file %s."
-
-#: ../libpurple/protocols/toc/toc.c:491
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Unable to read file %s."
-
-#: ../libpurple/protocols/toc/toc.c:494
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message too long, last %s bytes truncated."
-
-#: ../libpurple/protocols/toc/toc.c:497
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s not currently logged in."
-
-#: ../libpurple/protocols/toc/toc.c:500
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Warning of %s not allowed."
-
-#: ../libpurple/protocols/toc/toc.c:503
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "A message has been dropped, you are exceeding the server speed limit."
-
-#: ../libpurple/protocols/toc/toc.c:506
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat in %s is not available."
-
-#: ../libpurple/protocols/toc/toc.c:509
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "You are sending messages too fast to %s."
-
-#: ../libpurple/protocols/toc/toc.c:512
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "You missed an IM from %s because it was too big."
-
-#: ../libpurple/protocols/toc/toc.c:515
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "You missed an IM from %s because it was sent too fast."
-
-#: ../libpurple/protocols/toc/toc.c:518
-#, c-format
-msgid "Failure."
-msgstr "Failure."
-
-#: ../libpurple/protocols/toc/toc.c:521
-#, c-format
-msgid "Too many matches."
-msgstr "Too many matches."
-
-#: ../libpurple/protocols/toc/toc.c:524
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Need more qualifiers."
-
-#: ../libpurple/protocols/toc/toc.c:527
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir service temporarily unavailable."
-
-#: ../libpurple/protocols/toc/toc.c:530
-#, c-format
-msgid "E-mail lookup restricted."
-msgstr "E-mail lookup restricted."
-
-#: ../libpurple/protocols/toc/toc.c:533
-#, c-format
-msgid "Keyword ignored."
-msgstr "Keyword ignored."
-
-#: ../libpurple/protocols/toc/toc.c:536
-#, c-format
-msgid "No keywords."
-msgstr "No keywords."
-
-#: ../libpurple/protocols/toc/toc.c:539
-#, c-format
-msgid "User has no directory information."
-msgstr "User has no directory information."
-
-#: ../libpurple/protocols/toc/toc.c:543
-#, c-format
-msgid "Country not supported."
-msgstr "Country not supported."
-
-#: ../libpurple/protocols/toc/toc.c:546
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Failure unknown: %s."
-
-#: ../libpurple/protocols/toc/toc.c:549
-#, c-format
-msgid "Incorrect screen name or password."
-msgstr "Incorrect screen name or password."
-
-#: ../libpurple/protocols/toc/toc.c:552
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "The service is temporarily unavailable."
-
-#: ../libpurple/protocols/toc/toc.c:555
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Your warning level is currently too high to log in."
-
-#: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"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."
-
-#: ../libpurple/protocols/toc/toc.c:560
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "An unknown signon error has occurred: %s."
-
-#: ../libpurple/protocols/toc/toc.c:563
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "An unknown error, %d, has occurred.  Info: %s"
-
-#: ../libpurple/protocols/toc/toc.c:590
-msgid "Invalid Groupname"
-msgstr "Invalid Groupname"
-
-#: ../libpurple/protocols/toc/toc.c:674
-msgid "Connection Closed"
-msgstr "Connection Closed"
-
-#: ../libpurple/protocols/toc/toc.c:714
-msgid "Waiting for reply..."
-msgstr "Waiting for reply..."
-
-#: ../libpurple/protocols/toc/toc.c:792
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC has come back from its pause. You may now send messages again."
-
-#: ../libpurple/protocols/toc/toc.c:995
-msgid "Password Change Successful"
-msgstr "Password Change Successful"
-
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
-msgid "_Group:"
-msgstr "_Group:"
-
-#: ../libpurple/protocols/toc/toc.c:1535
-msgid "Get Dir Info"
-msgstr "Get Dir Info"
-
-#: ../libpurple/protocols/toc/toc.c:1675
-msgid "Set Dir Info"
-msgstr "Set Dir Info"
-
-#: ../libpurple/protocols/toc/toc.c:1797
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Could not open %s for writing!"
-
-#: ../libpurple/protocols/toc/toc.c:1833
-msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably cancelled."
-
-#: ../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 "Could not connect for transfer."
-
-#: ../libpurple/protocols/toc/toc.c:2075
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Could not write file header.  The file will not be transferred."
-
-#: ../libpurple/protocols/toc/toc.c:2175
-msgid "Save As..."
-msgstr "Save As..."
-
-#: ../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"
-msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-
-#: ../libpurple/protocols/toc/toc.c:2216
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s requests you to send them a file"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plug-in"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:782
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s has sent you a webcam invitation, which is not yet supported."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:838
-msgid "Your Yahoo! message did not get sent."
-msgstr "Your Yahoo! message did not get sent."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:960
-#, c-format
-msgid "Yahoo! system message for %s:"
-msgstr "Yahoo! system message for %s:"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
-msgid "Authorization denied message:"
-msgstr "Authorisation denied message:"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s has (retroactively) denied your request to add them to your list."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
-msgid "Add buddy rejected"
-msgstr "Add buddy rejected"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
-msgid "Failed Yahoo! Authentication"
-msgstr "Failed Yahoo! Authentication"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
-msgid "Ignore buddy?"
-msgstr "Ignore buddy?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Your account is locked, please log in to the Yahoo! website."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
-#, c-format
-msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Could not add buddy %s to group %s to the server list on account %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
-msgid "Could not add buddy to server list"
-msgstr "Could not add buddy to server list"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
-#, c-format
-msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ Audible %s/%s/%s.swf ] %s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
-msgid "Received unexpected HTTP response from server."
-msgstr "Received unexpected HTTP response from server."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
-msgid "Connection problem"
-msgstr "Connection problem"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Lost connection with %s:\n"
-"%s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Could not establish a connection with %s:\n"
-"%s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
-msgid "Not at Home"
-msgstr "Not at Home"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
-msgid "Not at Desk"
-msgstr "Not at Desk"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
-msgid "Not in Office"
-msgstr "Not in Office"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "On Vacation"
-msgstr "On Vacation"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
-msgid "Stepped Out"
-msgstr "Stepped Out"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
-msgid "Not on server list"
-msgstr "Not on server list"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
-msgid "Appear Online"
-msgstr "Appear Online"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
-msgid "Appear Permanently Offline"
-msgstr "Appear Permanently Offline"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
-msgid "Presence"
-msgstr "Presence"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
-msgid "Don't Appear Permanently Offline"
-msgstr "Don't Appear Permanently Offline"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
-msgid "Join in Chat"
-msgstr "Join in Chat"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
-msgid "Initiate Conference"
-msgstr "Initiate Conference"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
-msgid "Presence Settings"
-msgstr "Presence Settings"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
-msgid "Start Doodling"
-msgstr "Start Doodling"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-msgid "Activate which ID?"
-msgstr "Activate which ID?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
-msgstr "Join whom in chat?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
-msgid "Activate ID..."
-msgstr "Activate ID..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
-msgid "Join User in Chat..."
-msgstr "Join User in Chat..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-msgid "Open Inbox"
-msgstr "Open Inbox"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr "Buzz"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Buzzing %s..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List rooms on the Yahoo network"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Request user to start a Doodle session"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plug-in"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
-msgid "Pager server"
-msgstr "Pager server"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
-msgid "Japan Pager server"
-msgstr "Japan Pager server"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
-msgid "Pager port"
-msgstr "Pager port"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
-msgid "File transfer server"
-msgstr "File transfer server"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
-msgid "Japan file transfer server"
-msgstr "Japan file transfer server"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-msgid "Chat room locale"
-msgstr "Chat room locale"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignore conference and chatroom invitations"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
-msgid "Chat room list URL"
-msgstr "Chat room list URL"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat server"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat port"
-
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
-msgid "Sent Doodle request."
-msgstr "Sent Doodle request."
-
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
-msgid "Unable to establish file descriptor."
-msgstr "Unable to establish file descriptor."
-
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Write Error"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
-msgid "Yahoo! Japan Profile"
-msgstr "Yahoo! Japan Profile"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
-msgid "Yahoo! Profile"
-msgstr "Yahoo! Profile"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
-msgid "Hobbies"
-msgstr "Hobbies"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
-msgid "Latest News"
-msgstr "Latest News"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
-msgid "Home Page"
-msgstr "Home Page"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
-msgid "Cool Link 1"
-msgstr "Cool Link 1"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
-msgid "Cool Link 2"
-msgstr "Cool Link 2"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
-msgid "Cool Link 3"
-msgstr "Cool Link 3"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
-msgid "Last Update"
-msgstr "Last Update"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "User information for %s unavailable"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
-msgid "The user's profile is empty."
-msgstr "The user's profile is empty."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
-msgid "Invitation Rejected"
-msgstr "Invitation Rejected"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
-msgid "Failed to join chat"
-msgstr "Failed to join chat"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
-msgid "Unknown room"
-msgstr "Unknown room"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
-msgid "Maybe the room is full"
-msgstr "Perhaps the room is full"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
-msgid "Not available"
-msgstr "Not available"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "You are now chatting in %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
-msgid "Failed to join buddy in chat"
-msgstr "Failed to join buddy in chat"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
-msgid "Maybe they're not in a chat?"
-msgstr "Perhaps they're not in a chat?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Fetching the room list failed."
-msgstr "Fetching the room list failed."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
-msgid "Voices"
-msgstr "Voices"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-msgid "Unable to fetch room list."
-msgstr "Unable to fetch room list."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
-msgid "User Rooms"
-msgstr "User Rooms"
-
-#: ../libpurple/protocols/yahoo/ycht.c:456
-msgid "Connection problem with the YCHT server."
-msgstr "Connection problem with the YCHT server."
-
-#: ../libpurple/protocols/yahoo/ycht.c:475
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Lost connection with server\n"
-"%s"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:752
-#, c-format
-msgid "Unable to send to chat %s,%s,%s"
-msgstr "Unable to send to chat %s,%s,%s"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
-msgid "Hidden or not logged-in"
-msgstr "Hidden or not logged-in"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
-#, c-format
-msgid "<br>At %s since %s"
-msgstr "<br>At %s since %s"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
-msgid "Anyone"
-msgstr "Anyone"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
-msgid "_Class:"
-msgstr "_Class:"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
-msgid "_Instance:"
-msgstr "_Instance:"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
-msgid "_Recipient:"
-msgstr "_Recipient:"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
-#, c-format
-msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Attempt to subscribe to %s,%s,%s failed"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
-msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;nick&gt;: Locate user"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
-msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;nick&gt;: Locate user"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
-msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
-msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
-msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
-msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
-msgid "Resubscribe"
-msgstr "Resubscribe"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
-msgid "Retrieve subscriptions from server"
-msgstr "Retrieve subscriptions from server"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
-msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr Protocol Plug-in"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
-msgid "Use tzc"
-msgstr "Use tzc"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
-msgid "tzc command"
-msgstr "tzc command"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
-msgid "Export to .anyone"
-msgstr "Export to .anyone"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
-msgid "Export to .zephyr.subs"
-msgstr "Export to .zephyr.subs"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
-msgid "Import from .anyone"
-msgstr "Import from .anyone"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
-msgid "Import from .zephyr.subs"
-msgstr "Import from .zephyr.subs"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
-msgid "Realm"
-msgstr "Realm"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
-msgid "Exposure"
-msgstr "Exposure"
-
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Unable to create socket:\n"
-"%s"
-
-#: ../libpurple/proxy.c:659
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Unable to parse response from HTTP proxy: %s\n"
-
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
-#, c-format
-msgid "HTTP proxy connection error %d"
-msgstr "HTTP proxy connection error %d"
-
-#: ../libpurple/proxy.c:788
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Access denied: HTTP proxy server forbids port %d tunnelling."
-
-#: ../libpurple/proxy.c:1012
-#, c-format
-msgid "Error resolving %s"
-msgstr "Error resolving %s"
-
-#: ../libpurple/proxy.c:1714
-msgid "Could not resolve host name"
-msgstr "Could not resolve host name"
-
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#.
-#: ../libpurple/request.h:1378
-msgid "_Yes"
-msgstr "_Yes"
-
-#: ../libpurple/request.h:1378
-msgid "_No"
-msgstr "_No"
-
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#.
-#: ../libpurple/request.h:1398
-msgid "_Accept"
-msgstr "_Accept"
-
-#. *
-#. * The default message to use when the user becomes auto-away.
-#.
-#: ../libpurple/savedstatuses.c:48
-msgid "I'm not here right now"
-msgstr "I'm not here right now"
-
-#: ../libpurple/savedstatuses.c:535
-msgid "saved statuses"
-msgstr "saved statuses"
-
-#: ../libpurple/server.c:234
-#, c-format
-msgid "%s is now known as %s.\n"
-msgstr "%s is now known as %s.\n"
-
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Requesting %s's attention..."
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s has requested your attention!"
-
-#: ../libpurple/server.c:796
-#, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-
-#: ../libpurple/server.c:801
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s has invited %s to the chat room %s\n"
-
-#: ../libpurple/server.c:805
-msgid "Accept chat invitation?"
-msgstr "Accept chat invitation?"
-
-#: ../libpurple/sslconn.c:164
-msgid "SSL Connection Failed"
-msgstr "SSL Connection Failed"
-
-#: ../libpurple/sslconn.c:166
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Failed"
-
-#: ../libpurple/sslconn.c:168
-msgid "SSL peer presented an invalid certificate"
-msgstr "SSL peer presented an invalid certificate"
-
-#: ../libpurple/sslconn.c:171
-msgid "Unknown SSL error"
-msgstr "Unknown SSL error"
-
-#: ../libpurple/status.c:153
-msgid "Unset"
-msgstr "Unset"
-
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-msgid "Do not disturb"
-msgstr "Do not disturb"
-
-#: ../libpurple/status.c:159
-msgid "Extended away"
-msgstr "Extended away"
-
-#: ../libpurple/status.c:160
-msgid "Mobile"
-msgstr "Mobile"
-
-#: ../libpurple/status.c:609
-#, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s changed status from %s to %s"
-
-#: ../libpurple/status.c:619
-#, c-format
-msgid "%s is now %s"
-msgstr "%s is now %s"
-
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s is no longer %s"
-
-#: ../libpurple/status.c:1234
-#, c-format
-msgid "%s became idle"
-msgstr "%s became idle"
-
-#: ../libpurple/status.c:1251
-#, c-format
-msgid "%s became unidle"
-msgstr "%s is no longer idle"
-
-#: ../libpurple/status.c:1314
-#, c-format
-msgid "+++ %s became idle"
-msgstr "+++ %s became idle"
-
-#: ../libpurple/status.c:1316
-#, c-format
-msgid "+++ %s became unidle"
-msgstr "+++ %s is no longer idle"
-
-#: ../libpurple/util.c:718
-#, c-format
-msgid "%x %X"
-msgstr "%x %X"
-
-#: ../libpurple/util.c:2722
-#, c-format
-msgid "Error Reading %s"
-msgstr "Error reading %s"
-
-#: ../libpurple/util.c:2723
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-
-#: ../libpurple/util.c:3223
-msgid "Calculating..."
-msgstr "Calculating..."
-
-#: ../libpurple/util.c:3226
-msgid "Unknown."
-msgstr "Unknown."
-
-#: ../libpurple/util.c:3252
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
-#: ../libpurple/util.c:3264
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d day"
-msgstr[1] "%d days"
-
-#: ../libpurple/util.c:3272
-#, c-format
-msgid "%s, %d hour"
-msgid_plural "%s, %d hours"
-msgstr[0] "%s, %d hour"
-msgstr[1] "%s, %d hours"
-
-#: ../libpurple/util.c:3278
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#: ../libpurple/util.c:3286
-#, c-format
-msgid "%s, %d minute"
-msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d minute"
-msgstr[1] "%s, %d minutes"
-
-#: ../libpurple/util.c:3292
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#: ../libpurple/util.c:3552
-#, c-format
-msgid "Could not open %s: Redirected too many times"
-msgstr "Could not open %s: Redirected too many times"
-
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
-#, c-format
-msgid "Unable to connect to %s"
-msgstr "Unable to connect to %s"
-
-#: ../libpurple/util.c:3712
-#, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-
-#: ../libpurple/util.c:3747
-#, c-format
-msgid "Error reading from %s: %s"
-msgstr "Error reading from %s: %s"
-
-#: ../libpurple/util.c:3778
-#, c-format
-msgid "Error writing to %s: %s"
-msgstr "Error writing to %s: %s"
-
-#: ../libpurple/util.c:3803
-#, c-format
-msgid "Unable to connect to %s: %s"
-msgstr "Unable to connect to %s: %s"
-
-#: ../pidgin.desktop.in.h:1
-msgid "Internet Messenger"
-msgstr "Internet Messenger"
-
-#: ../pidgin.desktop.in.h:2
-msgid "Pidgin Internet Messenger"
-msgstr "Pidgin Internet Messenger"
-
-#: ../pidgin.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Send instant messages over multiple protocols"
-
-#: ../pidgin/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Orientation"
-
-#: ../pidgin/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
-#. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
-msgid "Login Options"
-msgstr "Login Options"
-
-#: ../pidgin/gtkaccount.c:428
-msgid "Pro_tocol:"
-msgstr "Pro_tocol:"
-
-#: ../pidgin/gtkaccount.c:439
-msgid "Screen _name:"
-msgstr "Screen _name:"
-
-#: ../pidgin/gtkaccount.c:529
-msgid "_Local alias:"
-msgstr "_Local alias:"
-
-#: ../pidgin/gtkaccount.c:533
-msgid "Remember pass_word"
-msgstr "Remember pass_word"
-
-#. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
-msgid "User Options"
-msgstr "User Options"
-
-#: ../pidgin/gtkaccount.c:604
-msgid "New _mail notifications"
-msgstr "New _mail notifications"
-
-#. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-msgid "Use this buddy _icon for this account:"
-msgstr "Use this buddy _icon for this account:"
-
-#. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
-#, c-format
-msgid "%s Options"
-msgstr "%s Options"
-
-#: ../pidgin/gtkaccount.c:936
-msgid "Use GNOME Proxy Settings"
-msgstr "Use GNOME Proxy Settings"
-
-#: ../pidgin/gtkaccount.c:937
-msgid "Use Global Proxy Settings"
-msgstr "Use Global Proxy Settings"
-
-#: ../pidgin/gtkaccount.c:943
-msgid "No Proxy"
-msgstr "No Proxy"
-
-#: ../pidgin/gtkaccount.c:949
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../pidgin/gtkaccount.c:955
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../pidgin/gtkaccount.c:961
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
-msgid "Use Environmental Settings"
-msgstr "Use Environmental Settings"
-
-#. 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:1006
-msgid "If you look real closely"
-msgstr "If you look real closely"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
-msgid "you can see the butterflies mating"
-msgstr "you can see the butterflies mating"
-
-#: ../pidgin/gtkaccount.c:1030
-msgid "Proxy Options"
-msgstr "Proxy Options"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
-msgid "Proxy _type:"
-msgstr "Proxy _type:"
-
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
-msgid "_Host:"
-msgstr "_Host:"
-
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../pidgin/gtkaccount.c:1065
-msgid "_Username:"
-msgstr "_Username:"
-
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
-msgid "Pa_ssword:"
-msgstr "Pa_ssword:"
-
-#: ../pidgin/gtkaccount.c:1195
-msgid "Unable to save new account"
-msgstr "Unable to save new account"
-
-#: ../pidgin/gtkaccount.c:1196
-msgid "An account already exists with the specified criteria."
-msgstr "An account already exists with the specified criteria."
-
-#: ../pidgin/gtkaccount.c:1473
-msgid "Add Account"
-msgstr "Add Account"
-
-#: ../pidgin/gtkaccount.c:1492
-msgid "_Basic"
-msgstr "_Basic"
-
-#: ../pidgin/gtkaccount.c:1499
-msgid "Create this new account on the server"
-msgstr "Create this new account on the server"
-
-#: ../pidgin/gtkaccount.c:1515
-msgid "_Advanced"
-msgstr "_Advanced"
-
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../pidgin/gtkaccount.c:2001
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../pidgin/gtkaccount.c:2201
-#, 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'>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"
-
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Join a Chat"
-
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
-msgid "_Account:"
-msgstr "_Account:"
-
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
-msgid "_Block"
-msgstr "_Block"
-
-#: ../pidgin/gtkblist.c:1088
-msgid "Un_block"
-msgstr "Un_block"
-
-#: ../pidgin/gtkblist.c:1139
-msgid "Get _Info"
-msgstr "Get _Info"
-
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
-msgid "I_M"
-msgstr "I_M"
-
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Send File"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Add Buddy _Pounce"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
-msgid "View _Log"
-msgstr "View _Log"
-
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
-msgid "_Alias..."
-msgstr "_Alias..."
-
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Add a _Buddy"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Add a C_hat"
-
-#: ../pidgin/gtkblist.c:1244
-msgid "_Delete Group"
-msgstr "_Delete Group"
-
-#: ../pidgin/gtkblist.c:1246
-msgid "_Rename"
-msgstr "_Rename"
-
-#. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
-msgid "_Join"
-msgstr "_Join"
-
-#: ../pidgin/gtkblist.c:1267
-msgid "Auto-Join"
-msgstr "Auto-Join"
-
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
-msgid "_Collapse"
-msgstr "_Collapse"
-
-#: ../pidgin/gtkblist.c:1334
-msgid "_Expand"
-msgstr "_Expand"
-
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
-msgid "/Tools/Mute Sounds"
-msgstr "/Tools/Mute Sounds"
-
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"You are not currently signed on with an account that can add that buddy."
-
-#. Buddies menu
-#: ../pidgin/gtkblist.c:2869
-msgid "/_Buddies"
-msgstr "/_Buddies"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Buddies/New Instant _Message..."
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Buddies/Join a _Chat..."
-
-#: ../pidgin/gtkblist.c:2872
-msgid "/Buddies/Get User _Info..."
-msgstr "/Buddies/Get User _Info..."
-
-#: ../pidgin/gtkblist.c:2873
-msgid "/Buddies/View User _Log..."
-msgstr "/Buddies/View User _Log..."
-
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr "/Buddies/Show"
-
-#: ../pidgin/gtkblist.c:2876
-msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Buddies/Show/_Offline Buddies"
-
-#: ../pidgin/gtkblist.c:2877
-msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Buddies/Show/_Empty Groups"
-
-#: ../pidgin/gtkblist.c:2878
-msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Buddies/Show/Buddy _Details"
-
-#: ../pidgin/gtkblist.c:2879
-msgid "/Buddies/Show/Idle _Times"
-msgstr "/Buddies/Show/Idle _Times"
-
-#: ../pidgin/gtkblist.c:2880
-msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Buddies/Show/_Protocol Icons"
-
-#: ../pidgin/gtkblist.c:2881
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Buddies/_Sort Buddies"
-
-#: ../pidgin/gtkblist.c:2883
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Buddies/_Add Buddy..."
-
-#: ../pidgin/gtkblist.c:2884
-msgid "/Buddies/Add C_hat..."
-msgstr "/Buddies/Add C_hat..."
-
-#: ../pidgin/gtkblist.c:2885
-msgid "/Buddies/Add _Group..."
-msgstr "/Buddies/Add _Group..."
-
-#: ../pidgin/gtkblist.c:2887
-msgid "/Buddies/_Quit"
-msgstr "/Buddies/_Quit"
-
-#. Accounts menu
-#: ../pidgin/gtkblist.c:2890
-msgid "/_Accounts"
-msgstr "/_Accounts"
-
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Accounts/Add\\/Edit"
-
-#. Tools
-#: ../pidgin/gtkblist.c:2894
-msgid "/_Tools"
-msgstr "/_Tools"
-
-#: ../pidgin/gtkblist.c:2895
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Tools/Buddy _Pounces"
-
-#: ../pidgin/gtkblist.c:2896
-msgid "/Tools/_Certificates"
-msgstr "/Tools/_Certificates"
-
-#: ../pidgin/gtkblist.c:2897
-msgid "/Tools/Plu_gins"
-msgstr "/Tools/Plu_g-ins"
-
-#: ../pidgin/gtkblist.c:2898
-msgid "/Tools/Pr_eferences"
-msgstr "/Tools/Pr_eferences"
-
-#: ../pidgin/gtkblist.c:2899
-msgid "/Tools/Pr_ivacy"
-msgstr "/Tools/Pr_ivacy"
-
-#: ../pidgin/gtkblist.c:2901
-msgid "/Tools/_File Transfers"
-msgstr "/Tools/_File Transfers"
-
-#: ../pidgin/gtkblist.c:2902
-msgid "/Tools/R_oom List"
-msgstr "/Tools/R_oom List"
-
-#: ../pidgin/gtkblist.c:2903
-msgid "/Tools/System _Log"
-msgstr "/Tools/System _Log"
-
-#: ../pidgin/gtkblist.c:2905
-msgid "/Tools/Mute _Sounds"
-msgstr "/Tools/Mute _Sounds"
-
-#. Help
-#: ../pidgin/gtkblist.c:2907
-msgid "/_Help"
-msgstr "/_Help"
-
-#: ../pidgin/gtkblist.c:2908
-msgid "/Help/Online _Help"
-msgstr "/Help/Online _Help"
-
-#: ../pidgin/gtkblist.c:2909
-msgid "/Help/_Debug Window"
-msgstr "/Help/_Debug Window"
-
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
-msgid "/Help/_About"
-msgstr "/Help/_About"
-
-#: ../pidgin/gtkblist.c:2942
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Account:</b> %s"
-
-#: ../pidgin/gtkblist.c:3020
-msgid "Buddy Alias"
-msgstr "Buddy Alias"
-
-#: ../pidgin/gtkblist.c:3049
-msgid "Logged In"
-msgstr "Logged In"
-
-#: ../pidgin/gtkblist.c:3095
-msgid "Last Seen"
-msgstr "Last Seen"
-
-#: ../pidgin/gtkblist.c:3116
-msgid "Spooky"
-msgstr "Spooky"
-
-#: ../pidgin/gtkblist.c:3118
-msgid "Awesome"
-msgstr "Awesome"
-
-#: ../pidgin/gtkblist.c:3120
-msgid "Rockin'"
-msgstr "Rockin'"
-
-#: ../pidgin/gtkblist.c:3453
-#, c-format
-msgid "Idle %dd %dh %02dm"
-msgstr "Idle %dd %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3455
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Idle %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3457
-#, c-format
-msgid "Idle %dm"
-msgstr "Idle %dm"
-
-#: ../pidgin/gtkblist.c:3602
-msgid "/Buddies/New Instant Message..."
-msgstr "/Buddies/New Instant Message..."
-
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
-msgid "/Buddies/Join a Chat..."
-msgstr "/Buddies/Join a Chat..."
-
-#: ../pidgin/gtkblist.c:3604
-msgid "/Buddies/Get User Info..."
-msgstr "/Buddies/Get User Info..."
-
-#: ../pidgin/gtkblist.c:3605
-msgid "/Buddies/Add Buddy..."
-msgstr "/Buddies/Add Buddy..."
-
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
-msgid "/Buddies/Add Chat..."
-msgstr "/Buddies/Add Chat..."
-
-#: ../pidgin/gtkblist.c:3607
-msgid "/Buddies/Add Group..."
-msgstr "/Buddies/Add Group..."
-
-#: ../pidgin/gtkblist.c:3642
-msgid "/Tools/Privacy"
-msgstr "/Tools/Privacy"
-
-#: ../pidgin/gtkblist.c:3645
-msgid "/Tools/Room List"
-msgstr "/Tools/Room List"
-
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d unread message from %s\n"
-msgstr[1] "%d unread messages from %s\n"
-
-#: ../pidgin/gtkblist.c:3822
-msgid "Manually"
-msgstr "Manually"
-
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alphabetically"
-
-#: ../pidgin/gtkblist.c:3825
-msgid "By status"
-msgstr "By status"
-
-#: ../pidgin/gtkblist.c:3826
-msgid "By log size"
-msgstr "By log size"
-
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
-#, c-format
-msgid "%s disconnected"
-msgstr "%s disconnected"
-
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s disconnected: %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
-msgid "<b>Username:</b>"
-msgstr "<b>Username:</b>"
-
-#: ../pidgin/gtkblist.c:4226
-msgid "<b>Password:</b>"
-msgstr "<b>Password:</b>"
-
-#: ../pidgin/gtkblist.c:4237
-msgid "_Login"
-msgstr "_Login"
-
-#: ../pidgin/gtkblist.c:4320
-msgid "/Accounts"
-msgstr "/Accounts"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, 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 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."
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../pidgin/gtkblist.c:4597
-msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Buddies/Show/Offline Buddies"
-
-#: ../pidgin/gtkblist.c:4600
-msgid "/Buddies/Show/Empty Groups"
-msgstr "/Buddies/Show/ Empty Groups"
-
-#: ../pidgin/gtkblist.c:4606
-msgid "/Buddies/Show/Buddy Details"
-msgstr "/Buddies/Show/Buddy Details"
-
-#: ../pidgin/gtkblist.c:4609
-msgid "/Buddies/Show/Idle Times"
-msgstr "/Buddies/Show/Idle Times"
-
-#: ../pidgin/gtkblist.c:4612
-msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Buddies/Show/Protocol Icons"
-
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"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"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:5542
-msgid "_Screen name:"
-msgstr "_Screen name:"
-
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-msgid "A_lias:"
-msgstr "A_lias:"
-
-#: ../pidgin/gtkblist.c:5826
-msgid "This protocol does not support chat rooms."
-msgstr "This protocol does not support chat rooms."
-
-#: ../pidgin/gtkblist.c:5842
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-
-#: ../pidgin/gtkblist.c:5883
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-
-#: ../pidgin/gtkblist.c:5964
-msgid "Please enter the name of the group to be added."
-msgstr "Please enter the name of the group to be added."
-
-#: ../pidgin/gtkblist.c:6609
-msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/Accounts/"
-
-#: ../pidgin/gtkblist.c:6633
-msgid "_Edit Account"
-msgstr "_Edit Account"
-
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
-msgid "No actions available"
-msgstr "No actions available"
-
-#: ../pidgin/gtkblist.c:6654
-msgid "_Disable"
-msgstr "_Disable"
-
-#: ../pidgin/gtkblist.c:6666
-msgid "Enable Account"
-msgstr "Enable Account"
-
-#: ../pidgin/gtkblist.c:6672
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Accounts/Enable Account"
-
-#: ../pidgin/gtkblist.c:6721
-msgid "/Tools"
-msgstr "/Tools"
-
-#: ../pidgin/gtkblist.c:6791
-msgid "/Buddies/Sort Buddies"
-msgstr "/Buddies/Sort Buddies"
-
-#. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-msgid "SSL Servers"
-msgstr "SSL Servers"
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-
-#: ../pidgin/gtkconv.c:482
-msgid "Unknown command."
-msgstr "Unknown command."
-
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "That buddy is not on the same protocol as this chat."
-
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"You are not currently signed on with an account that can invite that buddy."
-
-#: ../pidgin/gtkconv.c:827
-msgid "Invite Buddy Into Chat Room"
-msgstr "Invite Buddy Into Chat Room"
-
-#. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
-#: ../pidgin/gtkconv.c:878
-msgid "_Buddy:"
-msgstr "_Buddy:"
-
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
-msgid "_Message:"
-msgstr "_Message:"
-
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Unable to open file."
-
-#: ../pidgin/gtkconv.c:953
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Conversation with %s</h1>\n"
-
-#: ../pidgin/gtkconv.c:991
-msgid "Save Conversation"
-msgstr "Save Conversation"
-
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
-msgid "Find"
-msgstr "Find"
-
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
-msgid "_Search for:"
-msgstr "_Search for:"
-
-#: ../pidgin/gtkconv.c:1622
-msgid "Un-Ignore"
-msgstr "Un-Ignore"
-
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "Ignore"
-
-#: ../pidgin/gtkconv.c:1645
-msgid "Get Away Message"
-msgstr "Get Away Message"
-
-#: ../pidgin/gtkconv.c:1668
-msgid "Last said"
-msgstr "Last said"
-
-#: ../pidgin/gtkconv.c:2606
-msgid "Unable to save icon file to disk."
-msgstr "Unable to save icon file to disk."
-
-#: ../pidgin/gtkconv.c:2657
-msgid "Save Icon"
-msgstr "Save Icon"
-
-#: ../pidgin/gtkconv.c:2709
-msgid "Animate"
-msgstr "Animate"
-
-#: ../pidgin/gtkconv.c:2714
-msgid "Hide Icon"
-msgstr "Hide Icon"
-
-#: ../pidgin/gtkconv.c:2717
-msgid "Save Icon As..."
-msgstr "Save Icon As..."
-
-#: ../pidgin/gtkconv.c:2721
-msgid "Set Custom Icon..."
-msgstr "Set Custom Icon..."
-
-#: ../pidgin/gtkconv.c:2734
-msgid "Remove Custom Icon"
-msgstr "Remove Custom Icon"
-
-#: ../pidgin/gtkconv.c:2861
-msgid "Show All"
-msgstr "Show All"
-
-#. Conversation menu
-#: ../pidgin/gtkconv.c:2880
-msgid "/_Conversation"
-msgstr "/_Conversation"
-
-#: ../pidgin/gtkconv.c:2882
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Conversation/New Instant _Message..."
-
-#: ../pidgin/gtkconv.c:2887
-msgid "/Conversation/_Find..."
-msgstr "/Conversation/_Find..."
-
-#: ../pidgin/gtkconv.c:2889
-msgid "/Conversation/View _Log"
-msgstr "/Conversation/View _Log"
-
-#: ../pidgin/gtkconv.c:2890
-msgid "/Conversation/_Save As..."
-msgstr "/Conversation/_Save As..."
-
-#: ../pidgin/gtkconv.c:2892
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Conversation/Clea_r Scrollback"
-
-#: ../pidgin/gtkconv.c:2896
-msgid "/Conversation/Se_nd File..."
-msgstr "/Conversation/Se_nd File..."
-
-#: ../pidgin/gtkconv.c:2897
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversation/Add Buddy _Pounce..."
-
-#: ../pidgin/gtkconv.c:2899
-msgid "/Conversation/_Get Info"
-msgstr "/Conversation/_Get Info"
-
-#: ../pidgin/gtkconv.c:2901
-msgid "/Conversation/In_vite..."
-msgstr "/Conversation/In_vite..."
-
-#: ../pidgin/gtkconv.c:2903
-msgid "/Conversation/M_ore"
-msgstr "/Conversation/M_ore"
-
-#: ../pidgin/gtkconv.c:2907
-msgid "/Conversation/Al_ias..."
-msgstr "/Conversation/Al_ias..."
-
-#: ../pidgin/gtkconv.c:2909
-msgid "/Conversation/_Block..."
-msgstr "/Conversation/_Block..."
-
-#: ../pidgin/gtkconv.c:2911
-msgid "/Conversation/_Unblock..."
-msgstr "/Conversation/_Unblock..."
-
-#: ../pidgin/gtkconv.c:2913
-msgid "/Conversation/_Add..."
-msgstr "/Conversation/_Add..."
-
-#: ../pidgin/gtkconv.c:2915
-msgid "/Conversation/_Remove..."
-msgstr "/Conversation/_Remove..."
-
-#: ../pidgin/gtkconv.c:2920
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversation/Insert Lin_k..."
-
-#: ../pidgin/gtkconv.c:2922
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Conversation/Insert Imag_e..."
-
-#: ../pidgin/gtkconv.c:2928
-msgid "/Conversation/_Close"
-msgstr "/Conversation/_Close"
-
-#. Options
-#: ../pidgin/gtkconv.c:2932
-msgid "/_Options"
-msgstr "/_Options"
-
-#: ../pidgin/gtkconv.c:2933
-msgid "/Options/Enable _Logging"
-msgstr "/Options/Enable _Logging"
-
-#: ../pidgin/gtkconv.c:2934
-msgid "/Options/Enable _Sounds"
-msgstr "/Options/Enable _Sounds"
-
-#: ../pidgin/gtkconv.c:2936
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Options/Show Formatting _Toolbars"
-
-#: ../pidgin/gtkconv.c:2937
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Options/Show Ti_mestamps"
-
-#: ../pidgin/gtkconv.c:3061
-msgid "/Conversation/More"
-msgstr "/Conversation/More"
-
-#: ../pidgin/gtkconv.c:3117
-msgid "/Options"
-msgstr "/Options"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
-msgid "/Conversation"
-msgstr "/Conversation"
-
-#: ../pidgin/gtkconv.c:3192
-msgid "/Conversation/View Log"
-msgstr "/Conversation/View Log"
-
-#: ../pidgin/gtkconv.c:3198
-msgid "/Conversation/Send File..."
-msgstr "/Conversation/Send File..."
-
-#: ../pidgin/gtkconv.c:3202
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Conversation/Add Buddy Pounce..."
-
-#: ../pidgin/gtkconv.c:3208
-msgid "/Conversation/Get Info"
-msgstr "/Conversation/Get Info"
-
-#: ../pidgin/gtkconv.c:3212
-msgid "/Conversation/Invite..."
-msgstr "/Conversation/Invite..."
-
-#: ../pidgin/gtkconv.c:3218
-msgid "/Conversation/Alias..."
-msgstr "/Conversation/Alias..."
-
-#: ../pidgin/gtkconv.c:3222
-msgid "/Conversation/Block..."
-msgstr "/Conversation/Block..."
-
-#: ../pidgin/gtkconv.c:3226
-msgid "/Conversation/Unblock..."
-msgstr "/Conversation/Unblock..."
-
-#: ../pidgin/gtkconv.c:3230
-msgid "/Conversation/Add..."
-msgstr "/Conversation/Add..."
-
-#: ../pidgin/gtkconv.c:3234
-msgid "/Conversation/Remove..."
-msgstr "/Conversation/Remove..."
-
-#: ../pidgin/gtkconv.c:3240
-msgid "/Conversation/Insert Link..."
-msgstr "/Conversation/Insert Link..."
-
-#: ../pidgin/gtkconv.c:3244
-msgid "/Conversation/Insert Image..."
-msgstr "/Conversation/Insert Image..."
-
-#: ../pidgin/gtkconv.c:3250
-msgid "/Options/Enable Logging"
-msgstr "/Options/Enable Logging"
-
-#: ../pidgin/gtkconv.c:3253
-msgid "/Options/Enable Sounds"
-msgstr "/Options/Enable Sounds"
-
-#: ../pidgin/gtkconv.c:3266
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Options/Show Formatting Toolbars"
-
-#: ../pidgin/gtkconv.c:3269
-msgid "/Options/Show Timestamps"
-msgstr "/Options/Show Timestamps"
-
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
-msgid "User is typing..."
-msgstr "User is typing..."
-
-#: ../pidgin/gtkconv.c:3391
-msgid "User has typed something and stopped"
-msgstr "User has typed something and stopped"
-
-#. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Send To"
-
-#: ../pidgin/gtkconv.c:4286
-msgid "_Send"
-msgstr "_Send"
-
-#. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
-msgid "0 people in room"
-msgstr "0 people in room"
-
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d person in room"
-msgstr[1] "%d people in room"
-
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
-msgid "Typing"
-msgstr "Typing"
-
-#: ../pidgin/gtkconv.c:6490
-msgid "Stopped Typing"
-msgstr "Stopped Typing"
-
-#: ../pidgin/gtkconv.c:6493
-msgid "Nick Said"
-msgstr "Nick Said"
-
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
-msgid "Unread Messages"
-msgstr "Unread Messages"
-
-#: ../pidgin/gtkconv.c:6499
-msgid "New Event"
-msgstr "New Event"
-
-#: ../pidgin/gtkconv.c:7572
-msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Clears all conversation scrollbacks."
-
-#: ../pidgin/gtkconv.c:7736
-msgid "Confirm close"
-msgstr "Confirm close"
-
-#: ../pidgin/gtkconv.c:7768
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "You have unread messages. Are you sure you want to close the window?"
-
-#: ../pidgin/gtkconv.c:8355
-msgid "Close other tabs"
-msgstr "Close other tabs"
-
-#: ../pidgin/gtkconv.c:8361
-msgid "Close all tabs"
-msgstr "Close all tabs"
-
-#: ../pidgin/gtkconv.c:8369
-msgid "Detach this tab"
-msgstr "Detach this tab"
-
-#: ../pidgin/gtkconv.c:8375
-msgid "Close this tab"
-msgstr "Close this tab"
-
-#: ../pidgin/gtkconv.c:8875
-msgid "Close conversation"
-msgstr "Close conversation"
-
-#: ../pidgin/gtkconv.c:9477
-msgid "Last created window"
-msgstr "Last created window"
-
-#: ../pidgin/gtkconv.c:9479
-msgid "Separate IM and Chat windows"
-msgstr "Separate IM and Chat windows"
-
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
-msgid "New window"
-msgstr "New window"
-
-#: ../pidgin/gtkconv.c:9483
-msgid "By group"
-msgstr "By group"
-
-#: ../pidgin/gtkconv.c:9485
-msgid "By account"
-msgstr "By account"
-
-#: ../pidgin/gtkdebug.c:234
-msgid "Save Debug Log"
-msgstr "Save Debug Log"
-
-#: ../pidgin/gtkdebug.c:582
-msgid "Invert"
-msgstr "Invert"
-
-#: ../pidgin/gtkdebug.c:585
-msgid "Highlight matches"
-msgstr "Highlight matches"
-
-#: ../pidgin/gtkdebug.c:652
-msgid "_Icon Only"
-msgstr "_Icon Only"
-
-#: ../pidgin/gtkdebug.c:653
-msgid "_Text Only"
-msgstr "_Text Only"
-
-#: ../pidgin/gtkdebug.c:654
-msgid "_Both Icon & Text"
-msgstr "_Both Icon & Text"
-
-#: ../pidgin/gtkdebug.c:775
-msgid "Filter"
-msgstr "Filter"
-
-#: ../pidgin/gtkdebug.c:794
-msgid "Right click for more options."
-msgstr "Right click for more options."
-
-#: ../pidgin/gtkdebug.c:824
-msgid "Level "
-msgstr "Level "
-
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
-msgid "Select the debug filter level."
-msgstr "Select the debug filter level."
-
-#: ../pidgin/gtkdebug.c:833
-msgid "All"
-msgstr "All"
-
-#: ../pidgin/gtkdebug.c:834
-msgid "Misc"
-msgstr "Misc"
-
-#: ../pidgin/gtkdebug.c:836
-msgid "Warning"
-msgstr "Warning"
-
-#: ../pidgin/gtkdebug.c:837
-msgid "Error "
-msgstr "Error "
-
-#: ../pidgin/gtkdebug.c:838
-msgid "Fatal Error"
-msgstr "Fatal Error"
-
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
-msgstr "lead developer"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
-msgid "developer"
-msgstr "developer"
-
-#: ../pidgin/gtkdialogs.c:87
-msgid "support"
-msgstr "support"
-
-#: ../pidgin/gtkdialogs.c:88
-msgid "support/QA"
-msgstr "support/QA"
-
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
-#: ../pidgin/gtkdialogs.c:99
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/QA"
-
-#: ../pidgin/gtkdialogs.c:108
-msgid "win32 port"
-msgstr "win32 port"
-
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
-msgid "maintainer"
-msgstr "maintainer"
-
-#: ../pidgin/gtkdialogs.c:111
-msgid "libfaim maintainer"
-msgstr "libfaim maintainer"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker and designated driver [lazy bum]"
-
-#: ../pidgin/gtkdialogs.c:115
-msgid "XMPP developer"
-msgstr "XMPP developer"
-
-#: ../pidgin/gtkdialogs.c:116
-msgid "original author"
-msgstr "original author"
-
-#: ../pidgin/gtkdialogs.c:133
-msgid "Afrikaans"
-msgstr "Afrikaans"
-
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
-msgid "Arabic"
-msgstr "Arabic"
-
-#: ../pidgin/gtkdialogs.c:135
-msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-msgid "Bengali"
-msgstr "Bengali"
-
-#: ../pidgin/gtkdialogs.c:142
-msgid "Bosnian"
-msgstr "Bosnian"
-
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
-msgid "Catalan"
-msgstr "Catalan"
-
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
-msgid "Valencian-Catalan"
-msgstr "Valencian Catalan"
-
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
-msgid "Czech"
-msgstr "Czech"
-
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
-msgid "Danish"
-msgstr "Danish"
-
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
-msgid "German"
-msgstr "German"
-
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-msgid "Dzongkha"
-msgstr "Dzongkha"
-
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
-msgid "Greek"
-msgstr "Greek"
-
-#: ../pidgin/gtkdialogs.c:156
-msgid "Australian English"
-msgstr "Australian English"
-
-#: ../pidgin/gtkdialogs.c:157
-msgid "Canadian English"
-msgstr "Canadian English"
-
-#: ../pidgin/gtkdialogs.c:158
-msgid "British English"
-msgstr "British English"
-
-#: ../pidgin/gtkdialogs.c:159
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
-msgid "Spanish"
-msgstr "Spanish"
-
-#: ../pidgin/gtkdialogs.c:161
-msgid "Estonian"
-msgstr "Estonian"
-
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
-msgid "Euskera(Basque)"
-msgstr "Euskera (Basque)"
-
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-msgid "Persian"
-msgstr "Persian"
-
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-msgid "Finnish"
-msgstr "Finnish"
-
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
-msgid "French"
-msgstr "French"
-
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
-msgid "Galician"
-msgstr "Galician"
-
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: ../pidgin/gtkdialogs.c:172
-msgid "Gujarati Language Team"
-msgstr "Gujarati Language Team"
-
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
-msgid "Hebrew"
-msgstr "Hebrew"
-
-#: ../pidgin/gtkdialogs.c:174
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
-msgid "Hungarian"
-msgstr "Hungarian"
-
-#: ../pidgin/gtkdialogs.c:176
-msgid "Indonesian"
-msgstr "Indonesian"
-
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
-msgid "Italian"
-msgstr "Italian"
-
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-msgid "Japanese"
-msgstr "Japanese"
-
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-msgid "Georgian"
-msgstr "Georgian"
-
-#: ../pidgin/gtkdialogs.c:179
-msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu Georgian Translators"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada"
-msgstr "Kannada"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada Translation team"
-msgstr "Kannada Translation team"
-
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
-msgid "Korean"
-msgstr "Korean"
-
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
-msgid "Kurdish"
-msgstr "Kurdish"
-
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
-msgid "Lao"
-msgstr "Leo"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
-msgid "Macedonian"
-msgstr "Macedonian"
-
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
-msgid "Bokmål Norwegian"
-msgstr "Bokmål Norwegian"
-
-#: ../pidgin/gtkdialogs.c:191
-msgid "Nepali"
-msgstr "Nepali"
-
-#: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr "Dutch, Flemish"
-
-#: ../pidgin/gtkdialogs.c:193
-msgid "Norwegian Nynorsk"
-msgstr "Norwegian Nynorsk"
-
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
-msgid "Polish"
-msgstr "Polish"
-
-#: ../pidgin/gtkdialogs.c:197
-msgid "Portuguese"
-msgstr "Portuguese"
-
-#: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr "Portuguese-Brazil"
-
-#: ../pidgin/gtkdialogs.c:199
-msgid "Pashto"
-msgstr "Pashto"
-
-#: ../pidgin/gtkdialogs.c:200
-msgid "Romanian"
-msgstr "Romanian"
-
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
-msgid "Russian"
-msgstr "Russian"
-
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
-msgid "Slovak"
-msgstr "Slovak"
-
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
-msgid "Slovenian"
-msgstr "Slovenian"
-
-#: ../pidgin/gtkdialogs.c:205
-msgid "Albanian"
-msgstr "Albanian"
-
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
-msgid "Serbian"
-msgstr "Serbian"
-
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
-msgid "Swedish"
-msgstr "Swedish"
-
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "Tamil"
-
-#: ../pidgin/gtkdialogs.c:210
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../pidgin/gtkdialogs.c:211
-msgid "Thai"
-msgstr "Thai"
-
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
-msgid "Turkish"
-msgstr "Turkish"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "Vietnamese"
-msgstr "Vietnamese"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh and the Gnome-Vi Team"
-
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
-msgid "Simplified Chinese"
-msgstr "Simplified Chinese"
-
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
-msgid "Hong Kong Chinese"
-msgstr "Hong Kong Chinese"
-
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
-msgid "Traditional Chinese"
-msgstr "Traditional Chinese"
-
-#: ../pidgin/gtkdialogs.c:225
-msgid "Amharic"
-msgstr "Amharic"
-
-#: ../pidgin/gtkdialogs.c:357
-#, c-format
-msgid "About %s"
-msgstr "About %s"
-
-#: ../pidgin/gtkdialogs.c:400
-#, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:423
-msgid "Current Developers"
-msgstr "Current Developers"
-
-#: ../pidgin/gtkdialogs.c:438
-msgid "Crazy Patch Writers"
-msgstr "Crazy Patch Writers"
-
-#: ../pidgin/gtkdialogs.c:453
-msgid "Retired Developers"
-msgstr "Retired Developers"
-
-#: ../pidgin/gtkdialogs.c:468
-msgid "Retired Crazy Patch Writers"
-msgstr "Retired Crazy Patch Writers"
-
-#: ../pidgin/gtkdialogs.c:483
-msgid "Artists"
-msgstr "Artists"
-
-#: ../pidgin/gtkdialogs.c:498
-msgid "Current Translators"
-msgstr "Current Translators"
-
-#: ../pidgin/gtkdialogs.c:518
-msgid "Past Translators"
-msgstr "Past Translators"
-
-#: ../pidgin/gtkdialogs.c:536
-msgid "Debugging Information"
-msgstr "Debugging Information"
-
-#: ../pidgin/gtkdialogs.c:906
-msgid "Get User Info"
-msgstr "Get User Info"
-
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-
-#: ../pidgin/gtkdialogs.c:998
-msgid "View User Log"
-msgstr "View User Log"
-
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-
-#: ../pidgin/gtkdialogs.c:1020
-msgid "Alias Contact"
-msgstr "Alias Contact"
-
-#: ../pidgin/gtkdialogs.c:1021
-msgid "Enter an alias for this contact."
-msgstr "Enter an alias for this contact."
-
-#: ../pidgin/gtkdialogs.c:1043
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Enter an alias for %s."
-
-#: ../pidgin/gtkdialogs.c:1045
-msgid "Alias Buddy"
-msgstr "Alias Buddy"
-
-#: ../pidgin/gtkdialogs.c:1066
-msgid "Alias Chat"
-msgstr "Alias Chat"
-
-#: ../pidgin/gtkdialogs.c:1067
-msgid "Enter an alias for this chat."
-msgstr "Enter an alias for this chat."
-
-#: ../pidgin/gtkdialogs.c:1106
-#, 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] ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgstr[1] ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-
-#: ../pidgin/gtkdialogs.c:1114
-msgid "Remove Contact"
-msgstr "Remove Contact"
-
-#: ../pidgin/gtkdialogs.c:1117
-msgid "_Remove Contact"
-msgstr "_Remove Contact"
-
-#: ../pidgin/gtkdialogs.c:1148
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-
-#: ../pidgin/gtkdialogs.c:1155
-msgid "Merge Groups"
-msgstr "Merge Groups"
-
-#: ../pidgin/gtkdialogs.c:1158
-msgid "_Merge Groups"
-msgstr "_Merge Groups"
-
-#: ../pidgin/gtkdialogs.c:1208
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-
-#: ../pidgin/gtkdialogs.c:1211
-msgid "Remove Group"
-msgstr "Remove Group"
-
-#: ../pidgin/gtkdialogs.c:1214
-msgid "_Remove Group"
-msgstr "_Remove Group"
-
-#: ../pidgin/gtkdialogs.c:1247
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-
-#: ../pidgin/gtkdialogs.c:1250
-msgid "Remove Buddy"
-msgstr "Remove Buddy"
-
-#: ../pidgin/gtkdialogs.c:1253
-msgid "_Remove Buddy"
-msgstr "_Remove Buddy"
-
-#: ../pidgin/gtkdialogs.c:1274
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-
-#: ../pidgin/gtkdialogs.c:1277
-msgid "Remove Chat"
-msgstr "Remove Chat"
-
-#: ../pidgin/gtkdialogs.c:1280
-msgid "_Remove Chat"
-msgstr "_Remove Chat"
-
-#: ../pidgin/gtkdocklet.c:150
-msgid "Right-click for more unread messages...\n"
-msgstr "Right-click for more unread messages...\n"
-
-#: ../pidgin/gtkdocklet.c:435
-msgid "Change Status"
-msgstr "Change Status"
-
-#: ../pidgin/gtkdocklet.c:487
-msgid "Show Buddy List"
-msgstr "Show Buddy List"
-
-#: ../pidgin/gtkdocklet.c:513
-msgid "New Message..."
-msgstr "New Message..."
-
-#: ../pidgin/gtkdocklet.c:528
-msgid "Mute Sounds"
-msgstr "Mute Sounds"
-
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
-msgstr "Blink on new message"
-
-#: ../pidgin/gtkdocklet.c:542
-msgid "Quit"
-msgstr "Quit"
-
-#: ../pidgin/gtkft.c:154
-msgid "Not started"
-msgstr "Not started"
-
-#: ../pidgin/gtkft.c:274
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Receiving As:</b>"
-
-#: ../pidgin/gtkft.c:276
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Receiving From:</b>"
-
-#: ../pidgin/gtkft.c:280
-msgid "<b>Sending To:</b>"
-msgstr "<b>Sending To:</b>"
-
-#: ../pidgin/gtkft.c:282
-msgid "<b>Sending As:</b>"
-msgstr "<b>Sending As:</b>"
-
-#: ../pidgin/gtkft.c:498
-msgid "There is no application configured to open this type of file."
-msgstr "There is no application configured to open this type of file."
-
-#: ../pidgin/gtkft.c:503
-msgid "An error occurred while opening the file."
-msgstr "An error occurred while opening the file."
-
-#: ../pidgin/gtkft.c:540
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Error launching %s: %s"
-
-#: ../pidgin/gtkft.c:549
-#, c-format
-msgid "Error running %s"
-msgstr "Error running %s"
-
-#: ../pidgin/gtkft.c:550
-#, c-format
-msgid "Process returned error code %d"
-msgstr "Process returned error code %d"
-
-#: ../pidgin/gtkft.c:697
-msgid "Filename:"
-msgstr "Filename:"
-
-#: ../pidgin/gtkft.c:698
-msgid "Local File:"
-msgstr "Local File:"
-
-#: ../pidgin/gtkft.c:700
-msgid "Speed:"
-msgstr "Speed:"
-
-#: ../pidgin/gtkft.c:701
-msgid "Time Elapsed:"
-msgstr "Time Elapsed:"
-
-#: ../pidgin/gtkft.c:702
-msgid "Time Remaining:"
-msgstr "Time Remaining:"
-
-#: ../pidgin/gtkft.c:784
-msgid "Close this window when all transfers _finish"
-msgstr "Close this window when all transfers _finish"
-
-#: ../pidgin/gtkft.c:794
-msgid "C_lear finished transfers"
-msgstr "C_lear finished transfers"
-
-#. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
-msgid "File transfer _details"
-msgstr "File transfer _details"
-
-#. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
-msgid "_Pause"
-msgstr "_Pause"
-
-#. Resume button
-#: ../pidgin/gtkft.c:843
-msgid "_Resume"
-msgstr "_Resume"
-
-#: ../pidgin/gtkimhtml.c:816
-msgid "Paste as Plain _Text"
-msgstr "Paste as Plain _Text"
-
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
-msgid "_Reset formatting"
-msgstr "_Reset formatting"
-
-#: ../pidgin/gtkimhtml.c:1373
-msgid "Hyperlink color"
-msgstr "Hyperlink colour"
-
-#: ../pidgin/gtkimhtml.c:1374
-msgid "Color to draw hyperlinks."
-msgstr "Colour to draw hyperlinks."
-
-#: ../pidgin/gtkimhtml.c:1377
-msgid "Hyperlink prelight color"
-msgstr "Hyperlink prelight colour"
-
-#: ../pidgin/gtkimhtml.c:1378
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Colour to draw hyperlinks when mouse is over them."
-
-#: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_Copy E-Mail Address"
-
-#: ../pidgin/gtkimhtml.c:1610
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-#: ../pidgin/gtkimhtml.c:1620
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../pidgin/gtkimhtml.c:3369
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Unrecognised file type</span>\n"
-"\n"
-"Defaulting to PNG."
-
-#: ../pidgin/gtkimhtml.c:3372
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Unrecognised file type\n"
-"\n"
-"Defaulting to PNG."
-
-#: ../pidgin/gtkimhtml.c:3401
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtml.c:3404
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Error saving image\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
-msgid "Save Image"
-msgstr "Save Image"
-
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
-msgid "_Save Image..."
-msgstr "_Save Image..."
-
-#: ../pidgin/gtkimhtmltoolbar.c:163
-msgid "Select Font"
-msgstr "Select Font"
-
-#: ../pidgin/gtkimhtmltoolbar.c:242
-msgid "Select Text Color"
-msgstr "Select Text Colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:321
-msgid "Select Background Color"
-msgstr "Select Background Colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:410
-msgid "_URL"
-msgstr "_URL"
-
-#: ../pidgin/gtkimhtmltoolbar.c:418
-msgid "_Description"
-msgstr "_Description"
-
-#: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-
-#: ../pidgin/gtkimhtmltoolbar.c:425
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Please enter the URL of the link that you want to insert."
-
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
-msgid "Insert Link"
-msgstr "Insert Link"
-
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
-msgid "_Insert"
-msgstr "_Insert"
-
-#: ../pidgin/gtkimhtmltoolbar.c:514
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Failed to store image: %s\n"
-
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
-msgid "Insert Image"
-msgstr "Insert Image"
-
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
-msgstr "This theme has no available smileys."
-
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
-msgid "Smile!"
-msgstr "Smile!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-msgid "_Font"
-msgstr "_Font"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Group Items"
-msgstr "Group Items"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Ungroup Items"
-msgstr "Ungroup Items"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Bold"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Italic"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Underline"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-msgid "Strikethrough"
-msgstr "Strikethrough"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr "Increase Font Size"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr "Decrease Font Size"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-msgid "Font Face"
-msgstr "Font Face"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-msgid "Background Color"
-msgstr "Background Colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-msgid "Foreground Color"
-msgstr "Foreground Colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "Reset Formatting"
-msgstr "Reset Formatting"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-msgid "Insert IM Image"
-msgstr "Insert IM Image"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-msgid "Insert Smiley"
-msgstr "Insert Smiley"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-msgid "<b>_Bold</b>"
-msgstr "<b>_Bold</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-msgid "<i>_Italic</i>"
-msgstr "<i>_Italic</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-msgid "<u>_Underline</u>"
-msgstr "<u>_Underline</u>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span strikethrough='true'>Strikethrough</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-msgid "<span size='larger'>_Larger</span>"
-msgstr "<span size='larger'>_Larger</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1187
-msgid "<span size='smaller'>_Smaller</span>"
-msgstr "<span size='smaller'>_Smaller</span>"
-
-#. If we want to show the formatting for the following items, we would
-#. * need to update them when formatting changes. The above items don't need
-#. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
-msgid "_Font face"
-msgstr "_Font face"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-msgid "Foreground _color"
-msgstr "Foreground _colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-msgid "Bac_kground color"
-msgstr "Bac_kground colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Smiley"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-msgid "_Image"
-msgstr "_Image"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-msgid "_Link"
-msgstr "_Link"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1288
-msgid "_Horizontal rule"
-msgstr "_Horizontal rule"
-
-#: ../pidgin/gtklog.c:293
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-
-#: ../pidgin/gtklog.c:304
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-
-#: ../pidgin/gtklog.c:309
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-
-#: ../pidgin/gtklog.c:453
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-
-#: ../pidgin/gtklog.c:456
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "No logs were found"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
-msgid "_Browse logs folder"
-msgstr "_Browse logs folder"
-
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Total log size:"
-
-#: ../pidgin/gtklog.c:709
-#, c-format
-msgid "Conversations in %s"
-msgstr "Conversations in %s"
-
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
-#, c-format
-msgid "Conversations with %s"
-msgstr "Conversations with %s"
-
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "System Log"
-
-#: ../pidgin/gtkmain.c:386
-#, c-format
-msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s. Try `%s -h' for more information.\n"
-
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, 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"
-"  -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"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%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"
-"  -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"
-"  -v, --version       display the current version and exit\n"
-
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, 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 developers\n"
-"by reporting a bug at:\n"
-"%ssimpleticket/\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%swiki/GetABacktrace\n"
-"\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"
-"%swiki/DeveloperPages\n"
-msgstr ""
-"%s has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the developers\n"
-"by reporting a bug at:\n"
-"%ssimpleticket/\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%swiki/GetABacktrace\n"
-"\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"
-"%swiki/DeveloperPages\n"
-
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../pidgin/gtknotify.c:349
-msgid "Open All Messages"
-msgstr "Open All Messages"
-
-#: ../pidgin/gtknotify.c:402
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-
-#: ../pidgin/gtknotify.c:540
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s has %d new message."
-msgstr[1] "%s has %d new messages."
-
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>You have %d new e-mail.</b>"
-msgstr[1] "<b>You have %d new e-mails.</b>"
-
-#: ../pidgin/gtknotify.c:989
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "The browser command \"%s\" is invalid."
-
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
-msgid "Unable to open URL"
-msgstr "Unable to open URL"
-
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Error launching \"%s\": %s"
-
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-
-#: ../pidgin/gtkplugin.c:265
-msgid "The following plugins will be unloaded."
-msgstr "The following plug-ins will be unloaded."
-
-#: ../pidgin/gtkplugin.c:284
-msgid "Multiple plugins will be unloaded."
-msgstr "Multiple plug-ins will be unloaded."
-
-#: ../pidgin/gtkplugin.c:288
-msgid "Unload Plugins"
-msgstr "Unload Plug-ins"
-
-#: ../pidgin/gtkplugin.c:400
-#, 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\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t%s"
-
-#: ../pidgin/gtkplugin.c:410
-#, 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\">Error: %s\n"
-"Check the plug-in website for an update.</span>"
-
-#: ../pidgin/gtkplugin.c:536
-msgid "Configure Pl_ugin"
-msgstr "Configure Pl_ug-in"
-
-#: ../pidgin/gtkplugin.c:599
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Plug-in Details</b>"
-
-#: ../pidgin/gtkpounce.c:157
-msgid "Select a file"
-msgstr "Select a file"
-
-#. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
-msgid "Pounce on Whom"
-msgstr "Pounce on Whom"
-
-#: ../pidgin/gtkpounce.c:559
-msgid "_Buddy name:"
-msgstr "_Buddy name:"
-
-#: ../pidgin/gtkpounce.c:593
-msgid "Si_gns on"
-msgstr "Si_gns on"
-
-#: ../pidgin/gtkpounce.c:595
-msgid "Signs o_ff"
-msgstr "Signs o_ff"
-
-#: ../pidgin/gtkpounce.c:597
-msgid "Goes a_way"
-msgstr "Goes a_way"
-
-#: ../pidgin/gtkpounce.c:599
-msgid "Ret_urns from away"
-msgstr "Ret_urn from away"
-
-#: ../pidgin/gtkpounce.c:601
-msgid "Becomes _idle"
-msgstr "Becomes _idle"
-
-#: ../pidgin/gtkpounce.c:603
-msgid "Is no longer i_dle"
-msgstr "Is no longer i_dle"
-
-#: ../pidgin/gtkpounce.c:605
-msgid "Starts _typing"
-msgstr "Starts _typing"
-
-#: ../pidgin/gtkpounce.c:607
-msgid "P_auses while typing"
-msgstr "P_auses while typing"
-
-#: ../pidgin/gtkpounce.c:609
-msgid "Stops t_yping"
-msgstr "Stops t_yping"
-
-#: ../pidgin/gtkpounce.c:611
-msgid "Sends a _message"
-msgstr "Sends a _message"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "Ope_n an IM window"
-msgstr "Ope_n a message window"
-
-#: ../pidgin/gtkpounce.c:656
-msgid "_Pop up a notification"
-msgstr "_Pop up a notification"
-
-#: ../pidgin/gtkpounce.c:658
-msgid "Send a _message"
-msgstr "Send a _message"
-
-#: ../pidgin/gtkpounce.c:660
-msgid "E_xecute a command"
-msgstr "E_xecute a command"
-
-#: ../pidgin/gtkpounce.c:662
-msgid "P_lay a sound"
-msgstr "P_lay a sound"
-
-#: ../pidgin/gtkpounce.c:668
-msgid "Brows_e..."
-msgstr "Brows_e..."
-
-#: ../pidgin/gtkpounce.c:670
-msgid "Br_owse..."
-msgstr "Br_owse..."
-
-#: ../pidgin/gtkpounce.c:671
-msgid "Pre_view"
-msgstr "Pre_view"
-
-#: ../pidgin/gtkpounce.c:798
-msgid "P_ounce only when my status is not Available"
-msgstr "P_ounce only when my status is not Available"
-
-#: ../pidgin/gtkpounce.c:803
-msgid "_Recurring"
-msgstr "_Recurring"
-
-#: ../pidgin/gtkpounce.c:1246
-msgid "Pounce Target"
-msgstr "Pounce Target"
-
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Default"
-
-#: ../pidgin/gtkprefs.c:517
-msgid "Smiley theme failed to unpack."
-msgstr "Smiley theme failed to unpack."
-
-#: ../pidgin/gtkprefs.c:644
-msgid "Install Theme"
-msgstr "Install Theme"
-
-#: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"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."
-
-#: ../pidgin/gtkprefs.c:732
-msgid "Icon"
-msgstr "Icon"
-
-#: ../pidgin/gtkprefs.c:894
-msgid "System Tray Icon"
-msgstr "System Tray Icon"
-
-#: ../pidgin/gtkprefs.c:895
-msgid "_Show system tray icon:"
-msgstr "_Show system tray icon:"
-
-#: ../pidgin/gtkprefs.c:899
-msgid "On unread messages"
-msgstr "On unread messages"
-
-#: ../pidgin/gtkprefs.c:904
-msgid "Conversation Window Hiding"
-msgstr "Conversation Window Hiding"
-
-#: ../pidgin/gtkprefs.c:905
-msgid "_Hide new IM conversations:"
-msgstr "_Hide new IM conversations:"
-
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
-msgid "When away"
-msgstr "When away"
-
-#. All the tab options!
-#: ../pidgin/gtkprefs.c:916
-msgid "Tabs"
-msgstr "Tabs"
-
-#: ../pidgin/gtkprefs.c:918
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Show IMs and chats in _tabbed windows"
-
-#: ../pidgin/gtkprefs.c:932
-msgid "Show close b_utton on tabs"
-msgstr "Show close b_utton on tabs"
-
-#: ../pidgin/gtkprefs.c:935
-msgid "_Placement:"
-msgstr "_Placement"
-
-#: ../pidgin/gtkprefs.c:937
-msgid "Top"
-msgstr "Top"
-
-#: ../pidgin/gtkprefs.c:938
-msgid "Bottom"
-msgstr "Bottom"
-
-#: ../pidgin/gtkprefs.c:939
-msgid "Left"
-msgstr "Left"
-
-#: ../pidgin/gtkprefs.c:940
-msgid "Right"
-msgstr "Right"
-
-#: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr "Left Vertical"
-
-#: ../pidgin/gtkprefs.c:943
-msgid "Right Vertical"
-msgstr "Right Vertical"
-
-#: ../pidgin/gtkprefs.c:950
-msgid "N_ew conversations:"
-msgstr "N_ew conversations:"
-
-#: ../pidgin/gtkprefs.c:995
-msgid "Show _formatting on incoming messages"
-msgstr "Show _formatting on incoming messages"
-
-#: ../pidgin/gtkprefs.c:998
-msgid "Show _detailed information"
-msgstr "Show _detailed information"
-
-#: ../pidgin/gtkprefs.c:1000
-msgid "Enable buddy ic_on animation"
-msgstr "Enable buddy ic_on animation"
-
-#: ../pidgin/gtkprefs.c:1007
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Notify buddies that you are typing to them"
-
-#: ../pidgin/gtkprefs.c:1010
-msgid "Highlight _misspelled words"
-msgstr "Highlight _misspelled words"
-
-#: ../pidgin/gtkprefs.c:1014
-msgid "Use smooth-scrolling"
-msgstr "Use smooth-scrolling"
-
-#: ../pidgin/gtkprefs.c:1017
-msgid "F_lash window when IMs are received"
-msgstr "F_lash window when IMs are received"
-
-#: ../pidgin/gtkprefs.c:1019
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_ze new conversation windows"
-
-#: ../pidgin/gtkprefs.c:1023
-msgid "Font"
-msgstr "Font"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr "Use document font from _theme"
-
-#: ../pidgin/gtkprefs.c:1027
-msgid "Use font from _theme"
-msgstr "Use font from _theme"
-
-#: ../pidgin/gtkprefs.c:1029
-msgid "Conversation _font:"
-msgstr "Conversation _font:"
-
-#: ../pidgin/gtkprefs.c:1043
-msgid "Default Formatting"
-msgstr "Default Formatting"
-
-#: ../pidgin/gtkprefs.c:1062
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-
-#: ../pidgin/gtkprefs.c:1128
-msgid "ST_UN server:"
-msgstr "ST_UN Server:"
-
-#: ../pidgin/gtkprefs.c:1140
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Example: stunserver.org</span>"
-
-#: ../pidgin/gtkprefs.c:1144
-msgid "_Autodetect IP address"
-msgstr "_Autodetect IP address"
-
-#: ../pidgin/gtkprefs.c:1153
-msgid "Public _IP:"
-msgstr "Public _IP:"
-
-#: ../pidgin/gtkprefs.c:1182
-msgid "Ports"
-msgstr "Ports"
-
-#: ../pidgin/gtkprefs.c:1185
-msgid "_Manually specify range of ports to listen on"
-msgstr "_Manually specify range of ports to listen on"
-
-#: ../pidgin/gtkprefs.c:1188
-msgid "_Start port:"
-msgstr "_Start port:"
-
-#: ../pidgin/gtkprefs.c:1195
-msgid "_End port:"
-msgstr "_End port:"
-
-#: ../pidgin/gtkprefs.c:1203
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#: ../pidgin/gtkprefs.c:1207
-msgid "No proxy"
-msgstr "No proxy"
-
-#: ../pidgin/gtkprefs.c:1263
-msgid "_User:"
-msgstr "_User:"
-
-#: ../pidgin/gtkprefs.c:1328
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../pidgin/gtkprefs.c:1329
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1330
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../pidgin/gtkprefs.c:1331
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../pidgin/gtkprefs.c:1332
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../pidgin/gtkprefs.c:1333
-msgid "GNOME Default"
-msgstr "GNOME Default"
-
-#: ../pidgin/gtkprefs.c:1334
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../pidgin/gtkprefs.c:1335
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../pidgin/gtkprefs.c:1336
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../pidgin/gtkprefs.c:1337
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../pidgin/gtkprefs.c:1346
-msgid "Manual"
-msgstr "Manual"
-
-#: ../pidgin/gtkprefs.c:1399
-msgid "Browser Selection"
-msgstr "Browser Selection"
-
-#: ../pidgin/gtkprefs.c:1403
-msgid "_Browser:"
-msgstr "_Browser:"
-
-#: ../pidgin/gtkprefs.c:1411
-msgid "_Open link in:"
-msgstr "_Open Link in:"
-
-#: ../pidgin/gtkprefs.c:1413
-msgid "Browser default"
-msgstr "Browser default"
-
-#: ../pidgin/gtkprefs.c:1414
-msgid "Existing window"
-msgstr "Existing window"
-
-#: ../pidgin/gtkprefs.c:1416
-msgid "New tab"
-msgstr "New tab"
-
-#: ../pidgin/gtkprefs.c:1430
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Manual:\n"
-"(%s for URL)"
-
-#: ../pidgin/gtkprefs.c:1470
-msgid "Log _format:"
-msgstr "Log _format:"
-
-#: ../pidgin/gtkprefs.c:1475
-msgid "Log all _instant messages"
-msgstr "Log all _instant messages"
-
-#: ../pidgin/gtkprefs.c:1477
-msgid "Log all c_hats"
-msgstr "Log all c_hats"
-
-#: ../pidgin/gtkprefs.c:1479
-msgid "Log all _status changes to system log"
-msgstr "Log all _status changes to system log"
-
-#: ../pidgin/gtkprefs.c:1625
-msgid "Sound Selection"
-msgstr "Sound Selection"
-
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
-msgid "Quietest"
-msgstr "Quietest"
-
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
-msgid "Quieter"
-msgstr "Quieter"
-
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
-msgid "Quiet"
-msgstr "Quiet"
-
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
-msgid "Loud"
-msgstr "Loud"
-
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
-msgid "Louder"
-msgstr "Louder"
-
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
-msgid "Loudest"
-msgstr "Loudest"
-
-#: ../pidgin/gtkprefs.c:1713
-msgid "_Method:"
-msgstr "_Method:"
-
-#: ../pidgin/gtkprefs.c:1715
-msgid "Console beep"
-msgstr "Console beep"
-
-#: ../pidgin/gtkprefs.c:1722
-msgid "No sounds"
-msgstr "No sounds"
-
-#: ../pidgin/gtkprefs.c:1730
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-
-#: ../pidgin/gtkprefs.c:1757
-msgid "Sounds when conversation has _focus"
-msgstr "Sounds when conversation has _focus"
-
-#: ../pidgin/gtkprefs.c:1759
-msgid "Enable sounds:"
-msgstr "Enable sounds:"
-
-#: ../pidgin/gtkprefs.c:1770
-msgid "Volume:"
-msgstr "Volume:"
-
-#: ../pidgin/gtkprefs.c:1850
-msgid "Play"
-msgstr "Play"
-
-#: ../pidgin/gtkprefs.c:1927
-msgid "_Report idle time:"
-msgstr "_Report idle time:"
-
-#: ../pidgin/gtkprefs.c:1932
-msgid "Based on keyboard or mouse use"
-msgstr "Based on keyboard or mouse use"
-
-#: ../pidgin/gtkprefs.c:1941
-msgid "_Auto-reply:"
-msgstr "_Auto-reply:"
-
-#: ../pidgin/gtkprefs.c:1945
-msgid "When both away and idle"
-msgstr "When both away and idle"
-
-#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
-msgid "Auto-away"
-msgstr "Auto-away"
-
-#: ../pidgin/gtkprefs.c:1953
-msgid "Change status when _idle"
-msgstr "Change status when _idle"
-
-#: ../pidgin/gtkprefs.c:1957
-msgid "_Minutes before becoming idle:"
-msgstr "_Minutes before becoming idle:"
-
-#: ../pidgin/gtkprefs.c:1965
-msgid "Change _status to:"
-msgstr "Change _status to:"
-
-#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
-msgid "Status at Startup"
-msgstr "Status at Startup"
-
-#: ../pidgin/gtkprefs.c:1988
-msgid "Use status from last _exit at startup"
-msgstr "Use status from last _exit at startup"
-
-#: ../pidgin/gtkprefs.c:1994
-msgid "Status to a_pply at startup:"
-msgstr "Status to a_pply at startup:"
-
-#: ../pidgin/gtkprefs.c:2032
-msgid "Interface"
-msgstr "Interface"
-
-#: ../pidgin/gtkprefs.c:2034
-msgid "Smiley Themes"
-msgstr "Smiley Themes"
-
-#: ../pidgin/gtkprefs.c:2041
-msgid "Browser"
-msgstr "Browser"
-
-#: ../pidgin/gtkprefs.c:2045
-msgid "Status / Idle"
-msgstr "Status / Idle"
-
-#: ../pidgin/gtkprivacy.c:80
-msgid "Allow all users to contact me"
-msgstr "Allow all users to contact me"
-
-#: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users on my buddy list"
-msgstr "Allow only the users on my buddy list"
-
-#: ../pidgin/gtkprivacy.c:82
-msgid "Allow only the users below"
-msgstr "Allow only the users below"
-
-#: ../pidgin/gtkprivacy.c:83
-msgid "Block all users"
-msgstr "Block all users"
-
-#: ../pidgin/gtkprivacy.c:84
-msgid "Block only the users below"
-msgstr "Block only the users below"
-
-#: ../pidgin/gtkprivacy.c:370
-msgid "Privacy"
-msgstr "Privacy"
-
-#: ../pidgin/gtkprivacy.c:382
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Changes to privacy settings take effect immediately."
-
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
-msgid "Set privacy for:"
-msgstr "Set privacy for:"
-
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
-msgid "Permit User"
-msgstr "Permit User"
-
-#: ../pidgin/gtkprivacy.c:558
-msgid "Type a user you permit to contact you."
-msgstr "Type a user you permit to contact you."
-
-#: ../pidgin/gtkprivacy.c:559
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Please enter the name of the user you wish to be able to contact you."
-
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Permit"
-
-#: ../pidgin/gtkprivacy.c:568
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Allow %s to contact you?"
-
-#: ../pidgin/gtkprivacy.c:570
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Are you sure you wish to allow %s to contact you?"
-
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
-msgid "Block User"
-msgstr "Block User"
-
-#: ../pidgin/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Type a user to block."
-
-#: ../pidgin/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Please enter the name of the user you wish to block."
-
-#: ../pidgin/gtkprivacy.c:609
-#, c-format
-msgid "Block %s?"
-msgstr "Block %s?"
-
-#: ../pidgin/gtkprivacy.c:611
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Are you sure you want to block %s?"
-
-#: ../pidgin/gtkrequest.c:272
-msgid "Apply"
-msgstr "Apply"
-
-#: ../pidgin/gtkrequest.c:1507
-msgid "That file already exists"
-msgstr "That file already exists"
-
-#: ../pidgin/gtkrequest.c:1508
-msgid "Would you like to overwrite it?"
-msgstr "Would you like to overwrite it?"
-
-#: ../pidgin/gtkrequest.c:1511
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#: ../pidgin/gtkrequest.c:1512
-msgid "Choose New Name"
-msgstr "Choose New Name"
-
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
-msgid "Select Folder..."
-msgstr "Select Folder..."
-
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "Room List"
-
-#. list button
-#: ../pidgin/gtkroomlist.c:443
-msgid "_Get List"
-msgstr "_Get List"
-
-#. add button
-#: ../pidgin/gtkroomlist.c:451
-msgid "_Add Chat"
-msgstr "_Add Chat"
-
-#: ../pidgin/gtksavedstatuses.c:337
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Are you sure you want to delete the selected saved statuses?"
-
-#. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
-msgid "_Use"
-msgstr "_Use"
-
-#: ../pidgin/gtksavedstatuses.c:780
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Title already in use.  You must choose a unique title."
-
-#: ../pidgin/gtksavedstatuses.c:970
-msgid "Different"
-msgstr "Different"
-
-#: ../pidgin/gtksavedstatuses.c:1159
-msgid "_Title:"
-msgstr "_Title:"
-
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
-msgid "_Status:"
-msgstr "_Status:"
-
-#. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
-msgid "Use a _different status for some accounts"
-msgstr "Use a _different status for some accounts"
-
-#. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
-msgid "Sa_ve & Use"
-msgstr "Sa_ve & Use"
-
-#: ../pidgin/gtksavedstatuses.c:1480
-#, c-format
-msgid "Status for %s"
-msgstr "Status for %s"
-
-#: ../pidgin/gtkstatusbox.c:664
-msgid "Waiting for network connection"
-msgstr "Waiting for network connection"
-
-#: ../pidgin/gtkutils.c:632
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "The following error has occurred loading %s: %s"
-
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
-msgid "Failed to load image"
-msgstr "Failed to load image"
-
-#: ../pidgin/gtkutils.c:1498
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Cannot send folder %s."
-
-#: ../pidgin/gtkutils.c:1499
-#, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
-msgid "You have dragged an image"
-msgstr "You have dragged an image"
-
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
-msgid "Set as buddy icon"
-msgstr "Set as buddy icon"
-
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
-msgid "Send image file"
-msgstr "Send image file"
-
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
-msgid "Insert in message"
-msgstr "Insert in message"
-
-#: ../pidgin/gtkutils.c:1544
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Would you like to set it as the buddy icon for this user?"
-
-#: ../pidgin/gtkutils.c:1551
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
-msgid "Cannot send launcher"
-msgstr "Cannot send launcher"
-
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-
-#: ../pidgin/gtkutils.c:2345
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2641
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "The file '%s' is too large for %s.  Please try a smaller image.\n"
-
-#: ../pidgin/gtkutils.c:2643
-msgid "Icon Error"
-msgstr "Icon Error"
-
-#: ../pidgin/gtkutils.c:2644
-msgid "Could not set icon"
-msgstr "Could not set icon"
-
-#: ../pidgin/gtkutils.c:2744
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Failed to open file \"%s\": %s"
-
-#: ../pidgin/gtkutils.c:2793
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Failed to load image \"%s\": reason not known; probably a corrupt image file"
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
-msgid "Save File"
-msgstr "Save File"
-
-#: ../pidgin/gtkwhiteboard.c:861
-msgid "Select color"
-msgstr "Select colour"
-
-#: ../pidgin/pidginstock.c:87
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../pidgin/pidginstock.c:89
-msgid "Close _tabs"
-msgstr "Close _tabs"
-
-#: ../pidgin/pidginstock.c:91
-msgid "_Get Info"
-msgstr "_Get Info"
-
-#: ../pidgin/pidginstock.c:92
-msgid "_Invite"
-msgstr "_Invite"
-
-#: ../pidgin/pidginstock.c:93
-msgid "_Modify"
-msgstr "_Modify"
-
-#: ../pidgin/pidginstock.c:94
-msgid "_Open Mail"
-msgstr "_Open Mail"
-
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-msgid "Pidgin smileys"
-msgstr "Pidgin smileys"
-
-#: ../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 "Selecting this disables graphical emoticons."
-
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-msgid "none"
-msgstr "none"
-
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "Display Statistics"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
-msgid "Response Probability:"
-msgstr "Responses Probability:"
-
-#: ../pidgin/plugins/cap/cap.c:811
-msgid "Statistics Configuration"
-msgstr "Statistics Configuration"
-
-#. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
-msgid "Maximum response timeout:"
-msgstr "Maximum response timeout:"
-
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
-msgid "minutes"
-msgstr "minutes"
-
-#. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
-msgid "Maximum last-seen difference:"
-msgstr "Maximum last-seen difference:"
-
-#. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
-msgid "Threshold:"
-msgstr "Threshold:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/cap/cap.c:936
-msgid "Contact Availability Prediction"
-msgstr "Contact Availability Prediction"
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/cap/cap.c:938
-msgid "Contact Availability Prediction plugin."
-msgstr "Contact Availability Prediction plugin."
-
-#. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-
-#: ../pidgin/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Buddy is idle"
-
-#: ../pidgin/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Buddy is away"
-
-#: ../pidgin/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Buddy is away for an extended period"
-
-#. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Buddy is mobile"
-
-#: ../pidgin/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Buddy is offline"
-
-#: ../pidgin/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Point values to use when..."
-
-#: ../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 ""
-"The buddy with the <i>highest score</i> is the buddy who will have priority "
-"in the contact.\n"
-
-#: ../pidgin/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Use last buddy when scores are equal"
-
-#: ../pidgin/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Point values to use for account..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/contact_priority.c:187
-msgid "Contact Priority"
-msgstr "Contact Priority"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Allows for controlling the values associated with different buddy states."
-
-#. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-
-#: ../pidgin/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Conversation Colours"
-
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "Customise colours in the conversation window"
-
-#: ../pidgin/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Error Messages"
-
-#: ../pidgin/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "Highlighted Messages"
-
-#: ../pidgin/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "System Messages"
-
-#: ../pidgin/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Sent Messages"
-
-#: ../pidgin/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Received Messages"
-
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
-#, c-format
-msgid "Select Color for %s"
-msgstr "Select Colour for %s"
-
-#: ../pidgin/plugins/convcolors.c:310
-msgid "Ignore incoming format"
-msgstr "Ignore incoming format"
-
-#: ../pidgin/plugins/convcolors.c:311
-msgid "Apply in Chats"
-msgstr "Apply in Chats"
-
-#: ../pidgin/plugins/convcolors.c:312
-msgid "Apply in IMs"
-msgstr "Apply in IMs"
-
-#: ../pidgin/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "By conversation count"
-
-#: ../pidgin/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Conversation Placement"
-
-#. 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 ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-
-#: ../pidgin/plugins/extplacement.c:111
-msgid "Number of conversations per window"
-msgstr "Number of conversations per window"
-
-#: ../pidgin/plugins/extplacement.c:117
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separate IM and Chat windows when placing by number"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/extplacement.c:146
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/extplacement.c:148
-msgid "Extra conversation placement options."
-msgstr "Extra conversation placement options."
-
-#. *< summary
-#. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-
-#. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Mouse Gestures Configuration"
-
-#: ../pidgin/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Middle mouse button"
-
-#: ../pidgin/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Right mouse button"
-
-#. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Visual gesture display"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
-msgid "Mouse Gestures"
-msgstr "Mouse Gestures"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
-msgid "Provides support for mouse gestures"
-msgstr "Provides support for mouse gestures"
-
-#. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
-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 ""
-"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."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Instant Messaging"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Select a person from your address book below, or add a new person."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
-msgid "Group:"
-msgstr "Group:"
-
-#. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
-msgid "New Person"
-msgstr "New Person"
-
-#. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
-msgid "Select Buddy"
-msgstr "Select Buddy"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-
-#. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
-msgid "User _details"
-msgstr "User _details"
-
-#. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
-msgid "_Associate Buddy"
-msgstr "_Associate Buddy"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "Unable to send e-mail"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:241
-msgid "The evolution executable was not found in the PATH."
-msgstr "The evolution executable was not found in the PATH."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
-msgstr "An e-mail address was not found for this buddy."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:273
-msgid "Add to Address Book"
-msgstr "Add to Address Book"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "Send E-Mail"
-
-#. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
-msgid "Evolution Integration Configuration"
-msgstr "Evolution Integration Configuration"
-
-#. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Select all accounts that buddies should be auto-added to."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution Integration"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Provides integration with Evolution."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
-msgid "Please enter the person's information below."
-msgstr "Please enter the person's information below."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Please enter the buddy's screen name and account type below."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
-msgid "Account type:"
-msgstr "Account type:"
-
-#. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
-msgid "Optional information:"
-msgstr "Optional information:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
-msgid "First name:"
-msgstr "Forename"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
-msgid "Last name:"
-msgstr "Surname"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK Signals Test"
-
-#. *< 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 "Test to see that all UI signals are working properly."
-
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Buddy Note</b>: %s"
-
-#: ../pidgin/plugins/history.c:188
-msgid "History"
-msgstr "History"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Iconify on Away"
-
-#. *< 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 "Iconifies the buddy list and your conversations when you go away."
-
-#: ../pidgin/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Mail Checker"
-
-#: ../pidgin/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Checks for new local mail."
-
-#: ../pidgin/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Adds a small box to the buddy list that shows if you have new mail."
-
-#: ../pidgin/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Markerline"
-
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Draw a line to indicate new messages in a conversation."
-
-#: ../pidgin/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "Draw Markerline in "
-
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
-msgid "_IM windows"
-msgstr "_IM windows"
-
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
-msgid "C_hat windows"
-msgstr "C_hat windows"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Music messaging session confirmed."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
-msgid "Music Messaging"
-msgstr "Music Messaging"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
-msgid "There was a conflict in running the command:"
-msgstr "There was a conflict in running the command:"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
-msgid "Error Running Editor"
-msgstr "Error Running Editor"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
-msgid "The following error has occurred:"
-msgstr "The following error has occurred:"
-
-#. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
-msgid "Music Messaging Configuration"
-msgstr "Music Messaging Configuration"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
-msgid "Score Editor Path"
-msgstr "Score Editor Path"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
-msgid "_Apply"
-msgstr "_Apply"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Music Messaging Plugin for collaborative composition."
-
-#. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"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."
-
-#. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
-msgid "Notify For"
-msgstr "Notify For"
-
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Only when someone says your screen name"
-
-#: ../pidgin/plugins/notify.c:707
-msgid "_Focused windows"
-msgstr "_Focused windows"
-
-#. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
-msgid "Notification Methods"
-msgstr "Notification Methods"
-
-#: ../pidgin/plugins/notify.c:722
-msgid "Prepend _string into window title:"
-msgstr "Prepend _string into window title:"
-
-#. Count method button
-#: ../pidgin/plugins/notify.c:741
-msgid "Insert c_ount of new messages into window title"
-msgstr "Insert c_ount of new messages into window title"
-
-#. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
-msgid "Insert count of new message into _X property"
-msgstr "Insert count of new messages into _X property"
-
-#. Urgent method button
-#: ../pidgin/plugins/notify.c:758
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Set window manager \"_URGENT\" hint"
-
-#. Raise window method button
-#: ../pidgin/plugins/notify.c:767
-msgid "R_aise conversation window"
-msgstr "R_aise conversation window"
-
-#. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
-msgid "Notification Removal"
-msgstr "Notification Removal"
-
-#. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
-msgid "Remove when conversation window _gains focus"
-msgstr "Remove when conversation window _gains focus"
-
-#. Remove on click button
-#: ../pidgin/plugins/notify.c:787
-msgid "Remove when conversation window _receives click"
-msgstr "Remove when conversation window _receives click"
-
-#. Remove on type button
-#: ../pidgin/plugins/notify.c:795
-msgid "Remove when _typing in conversation window"
-msgstr "Remove when _typing in conversation window"
-
-#. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
-msgid "Remove when a _message gets sent"
-msgstr "Remove when a _message gets sent"
-
-#. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
-msgid "Remove on switch to conversation ta_b"
-msgstr "Remove on switch to conversation ta_b"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/notify.c:907
-msgid "Message Notification"
-msgstr "Message Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Provides a variety of ways of notifying you of unread messages."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/pidgininc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin Demonstration Plug-in"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "An example plug-in that does stuff - see the description."
-
-#. *  description
-#: ../pidgin/plugins/pidgininc.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 ""
-"This is a really cool plug-in 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"
-
-#: ../pidgin/plugins/pidginrc.c:41
-msgid "Cursor Color"
-msgstr "Cursor Colour"
-
-#: ../pidgin/plugins/pidginrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Secondary Cursor Colour"
-
-#: ../pidgin/plugins/pidginrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hyperlink Colour"
-
-#: ../pidgin/plugins/pidginrc.c:54
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView Horizontal Separation"
-
-#: ../pidgin/plugins/pidginrc.c:73
-msgid "Conversation Entry"
-msgstr "Conversation Entry"
-
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Conversation History"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Log Viewer"
-
-#: ../pidgin/plugins/pidginrc.c:76
-msgid "Request Dialog"
-msgstr "Request Dialog"
-
-#: ../pidgin/plugins/pidginrc.c:77
-msgid "Notify Dialog"
-msgstr "Notify Dialog"
-
-#: ../pidgin/plugins/pidginrc.c:253
-msgid "Select Color"
-msgstr "Select Colour"
-
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
-msgid "Select Interface Font"
-msgstr "Select Interface Font"
-
-#: ../pidgin/plugins/pidginrc.c:303
-#, c-format
-msgid "Select Font for %s"
-msgstr "Select Font for %s"
-
-#: ../pidgin/plugins/pidginrc.c:371
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Interface Font"
-
-#: ../pidgin/plugins/pidginrc.c:391
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Text Shortcut Theme"
-
-#.
-#. 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:428
-msgid "Interface colors"
-msgstr "Interface colours"
-
-#: ../pidgin/plugins/pidginrc.c:452
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
-
-#: ../pidgin/plugins/pidginrc.c:473
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../pidgin/plugins/pidginrc.c:497
-msgid "Gtkrc File Tools"
-msgstr "Gtkrc File Tools"
-
-#: ../pidgin/plugins/pidginrc.c:502
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Write settings to %s%sgtkrc-2.0"
-
-#: ../pidgin/plugins/pidginrc.c:511
-msgid "Re-read gtkrc files"
-msgstr "Re-read gtkrc files"
-
-#: ../pidgin/plugins/pidginrc.c:544
-msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ Theme Control"
-
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provides access to commonly used gtkrc settings."
-
-#: ../pidgin/plugins/raw.c:175
-msgid "Raw"
-msgstr "Raw"
-
-#: ../pidgin/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Lets you send raw input to text-based protocols."
-
-#: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"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."
-
-#: ../pidgin/plugins/relnot.c:71
-#, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-
-#: ../pidgin/plugins/relnot.c:79
-#, c-format
-msgid "<b>ChangeLog:</b><br>%s"
-msgstr "<b>ChangeLog:</b><br>%s"
-
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "New Version Available"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Release Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Checks periodically for new releases."
-
-#. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-
-#: ../pidgin/plugins/spellchk.c:1962
-msgid "Duplicate Correction"
-msgstr "Duplicate Correction"
-
-#: ../pidgin/plugins/spellchk.c:1963
-msgid "The specified word already exists in the correction list."
-msgstr "The specified word already exists in the correction list."
-
-#: ../pidgin/plugins/spellchk.c:2177
-msgid "Text Replacements"
-msgstr "Text Replacements"
-
-#: ../pidgin/plugins/spellchk.c:2200
-msgid "You type"
-msgstr "You type"
-
-#: ../pidgin/plugins/spellchk.c:2214
-msgid "You send"
-msgstr "You send"
-
-#: ../pidgin/plugins/spellchk.c:2228
-msgid "Whole words only"
-msgstr "Whole words only"
-
-#: ../pidgin/plugins/spellchk.c:2240
-msgid "Case sensitive"
-msgstr "Case sensitive"
-
-#: ../pidgin/plugins/spellchk.c:2266
-msgid "Add a new text replacement"
-msgstr "Add a new text replacement"
-
-#: ../pidgin/plugins/spellchk.c:2282
-msgid "You _type:"
-msgstr "You _type:"
-
-#: ../pidgin/plugins/spellchk.c:2299
-msgid "You _send:"
-msgstr "You _send:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Exact case match (uncheck for automatic case handling)"
-
-#: ../pidgin/plugins/spellchk.c:2313
-msgid "Only replace _whole words"
-msgstr "Only replace _whole words"
-
-#: ../pidgin/plugins/spellchk.c:2338
-msgid "General Text Replacement Options"
-msgstr "General Text Replacement Options"
-
-#: ../pidgin/plugins/spellchk.c:2339
-msgid "Enable replacement of last word on send"
-msgstr "Enable replacement of last word on send"
-
-#: ../pidgin/plugins/spellchk.c:2370
-msgid "Text replacement"
-msgstr "Text replacement"
-
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Replaces text in outgoing messages according to user-defined rules."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
-msgid "Buddy Ticker"
-msgstr "Buddy Ticker"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "A horizontal scrolling version of the buddy list."
-
-#: ../pidgin/plugins/timestamp.c:137
-msgid "Display Timestamps Every"
-msgstr "Display Timestamps Every"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp.c:202
-msgid "Timestamp"
-msgstr "Timestamp"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp.c:205
-msgid "Display iChat-style timestamps"
-msgstr "Display iChat-style timestamps"
-
-#. *  description
-#: ../pidgin/plugins/timestamp.c:207
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Display iChat-style timestamps every N minutes."
-
-#: ../pidgin/plugins/timestamp_format.c:23
-msgid "Timestamp Format Options"
-msgstr "Timestamp Format Options"
-
-#: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Force 24-hour time format"
-
-#: ../pidgin/plugins/timestamp_format.c:33
-msgid "Show dates in..."
-msgstr "Show dates in..."
-
-#: ../pidgin/plugins/timestamp_format.c:38
-msgid "Co_nversations:"
-msgstr "Co_nversations"
-
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
-msgid "For delayed messages"
-msgstr "For delayed messages"
-
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
-msgid "For delayed messages and in chats"
-msgstr "For delayed messages and in chats"
-
-#: ../pidgin/plugins/timestamp_format.c:47
-msgid "_Message Logs:"
-msgstr "_Message Logs:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
-msgid "Message Timestamp Formats"
-msgstr "Message Timestamp Formats"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
-msgid "Customizes the message timestamp formats."
-msgstr "Customises the message timestamp formats."
-
-#. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"This plug-in allows the user to customize conversation and logging message "
-"timestamp formats."
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
-msgid "Opacity:"
-msgstr "Opacity:"
-
-#. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
-msgid "IM Conversation Windows"
-msgstr "IM Conversation Windows"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
-msgid "_IM window transparency"
-msgstr "_IM window transparency"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
-msgid "_Show slider bar in IM window"
-msgstr "_Show slider bar in IM window"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
-msgid "Remove IM window transparency on focus"
-msgstr "Remove IM window transparency on focus"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
-msgid "Always on top"
-msgstr "Always on top"
-
-#. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
-msgid "Buddy List Window"
-msgstr "Buddy List Window"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
-msgid "_Buddy List window transparency"
-msgstr "_Buddy List window transparency"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Remove Buddy List window transparency on focus"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
-msgid "Transparency"
-msgstr "Transparency"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variable Transparency for the buddy list and conversations."
-
-#. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"This plug-in enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plug-in requires Win2000 or greater."
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime Version"
-
-#. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
-msgid "Startup"
-msgstr "Startup"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
-#, c-format
-msgid "_Start %s on Windows startup"
-msgstr "_Start %s on Windows startup"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
-msgid "_Dockable Buddy List"
-msgstr "_Dockable Buddy List"
-
-#. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
-msgid "_Keep Buddy List window on top:"
-msgstr "_Keep Buddy List window on top:"
-
-#. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
-msgid "Only when docked"
-msgstr "Only when docked"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
-msgid "_Flash window when chat messages are received"
-msgstr "_Flash window when chat messages are received"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-msgid "Windows Pidgin Options"
-msgstr "Windows Pidgin Options"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
-msgid "Options specific to Pidgin for Windows."
-msgstr "Options specific to Pidgin for Windows."
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"Provides options specific to Pidgin for Windows, such as buddy list docking."
-
-#: ../pidgin/plugins/xmppconsole.c:667
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Logged out.</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "XMPP Console"
-
-#: ../pidgin/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "Account: "
-
-#: ../pidgin/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Not connected to XMPP</font>"
-
-#: ../pidgin/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "Insert an <iq/> stanza."
-
-#: ../pidgin/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "Insert a <presence/> stanza."
-
-#: ../pidgin/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "Insert a <message/> stanza."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr "Send and receive raw XMPP stanzas."
-
-#. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "This plugin is useful for debugging XMPP servers or clients."
-
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Show All"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Show offline buddies"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "By status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "By log size"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Select Notes Address Book"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Current token"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger Protocol Plug-in"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Failure: Authentication failed"
-
-#, fuzzy
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s sent you a message"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Unknown error"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s changed status from %s to %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s is now %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s is no longer %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Message:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Send File"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Add Buddy Pounce..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Not allowed when offline"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Not allowed when offline"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Add Buddy"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Add Chat"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persian"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Accounts"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Send To"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Smile!"
+#: ../libpurple/protoc
\ No newline at end of file
diff -r d94432a338ab -r bedd56240914 po/lo.po
--- a/po/lo.po	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/lo.po	Fri Sep 28 20:30:26 2007 +0000
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 14:39-0500\n"
+"POT-Creation-Date: 2007-08-25 03:21-0400\n"
 "PO-Revision-Date: 2007-09-28 09:52+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,8 +16,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64
+#: ../finch/finch.c:300
+#: ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr ""
 
@@ -40,110 +43,129 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../finch/finch.c:327
+#: ../pidgin/gtkmain.c:711
+#, c-format
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr ""
+
+#: ../finch/gntaccount.c:123
+#: ../finch/gntaccount.c:483
+#: ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:445
+#: ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233
+#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:309
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1227
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/qq/im.c:576
+#: ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "ຜິດພາດ"
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr ""
 
-#: ../finch/gntaccount.c:125
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr ""
 
-#: ../finch/gntaccount.c:437
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr ""
 
-#: ../finch/gntaccount.c:447
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr ""
 
+#: ../finch/gntaccount.c:484
+msgid "There's no protocol plugins installed."
+msgstr ""
+
 #: ../finch/gntaccount.c:485
-msgid "There's no protocol plugins installed."
-msgstr ""
-
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:495
+#: ../pidgin/gtkaccount.c:1468
+#: ../pidgin/gtkblist.c:4025
 msgid "Modify Account"
 msgstr ""
 
-#: ../finch/gntaccount.c:496
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr ""
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:520
+#: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr ""
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../finch/gntaccount.c:528
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr ""
 
-#: ../finch/gntaccount.c:542
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr ""
 
-#: ../finch/gntaccount.c:552
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr ""
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../finch/gntaccount.c:574
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883
+#: ../finch/gntblist.c:343
+#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455
+#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100
+#: ../finch/gntblist.c:2221
+#: ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458
+#: ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609
+#: ../libpurple/account.c:984
+#: ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1173
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../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:6044
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -177,165 +199,226 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../pidgin/gtkaccount.c:1903
+#: ../pidgin/gtkaccount.c:2497
+#: ../pidgin/gtkblist.c:5927
+#: ../pidgin/gtkdialogs.c:750
+#: ../pidgin/gtkdialogs.c:888
+#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1024
+#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1135
+#: ../pidgin/gtkdialogs.c:1191
+#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1257
+#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkpounce.c:1100
+#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr ""
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../finch/gntaccount.c:578
+#: ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1051
+#: ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587
+#: ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr ""
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:631
+#: ../pidgin/gtkaccount.c:1895
+#: ../pidgin/gtksavedstatuses.c:332
+#: ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: ../finch/gntaccount.c:635
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr ""
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../finch/gntaccount.c:636
+#: ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665
+#: ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1902
+#: ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099
+#: ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343
+#: ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr ""
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668
+#: ../finch/gntblist.c:2118
+#: ../finch/gntui.c:81
+#: ../pidgin/gtkaccount.c:2320
+#: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr ""
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:697
+#: ../finch/gntaccount.c:882
+#: ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455
+#: ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:712
+#: ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/silc10/chat.c:599
+#: ../pidgin/gtkaccount.c:2496
+#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkconv.c:1624
+#: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr ""
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:702
+#: ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr ""
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:805
+#: ../pidgin/gtkaccount.c:2443
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:878
+#: ../pidgin/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr ""
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:938
+#: ../pidgin/gtkaccount.c:2553
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:963
+#: ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Authorize buddy?"
 msgstr ""
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:970
+#: ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2577
+#: ../pidgin/gtkaccount.c:2583
 msgid "Authorize"
 msgstr ""
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:971
+#: ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2578
+#: ../pidgin/gtkaccount.c:2584
 msgid "Deny"
 msgstr ""
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr ""
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr ""
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr ""
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr ""
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr ""
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:324
+#: ../libpurple/protocols/oscar/oscar.c:2858
+#: ../pidgin/gtkaccount.c:1976
+#: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr ""
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:409
+#: ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207
+#: ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr ""
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:330
+#: ../finch/gntblist.c:412
 msgid "Group"
 msgstr ""
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:334
+#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173
+#: ../finch/gntstatus.c:575
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2988
+#: ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr ""
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:340
+#: ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -344,182 +427,203 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
+#: ../pidgin/gtkblist.c:5433
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr ""
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr ""
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:369
+#: ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr ""
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:406
+#: ../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:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr ""
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:415
+#: ../finch/gntblist.c:818
 msgid "Auto-join"
 msgstr ""
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:418
+#: ../finch/gntblist.c:853
+#: ../pidgin/gtkblist.c:5812
 msgid "Add Chat"
 msgstr ""
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr ""
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr ""
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr ""
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr ""
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:5923
 msgid "Add Group"
 msgstr ""
 
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr ""
 
+#: ../finch/gntblist.c:801
+msgid "Edit Chat"
+msgstr ""
+
+#: ../finch/gntblist.c:801
+msgid "Please Update the necessary fields."
+msgstr ""
+
 #: ../finch/gntblist.c:802
-msgid "Edit Chat"
-msgstr ""
-
-#: ../finch/gntblist.c:802
-msgid "Please Update the necessary fields."
-msgstr ""
-
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr ""
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr ""
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:863
+#: ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr ""
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:863
+#: ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr ""
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:903
+#: ../finch/gntconv.c:436
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr ""
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr ""
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../finch/gntblist.c:914
+#: ../finch/gntconv.c:448
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:653
+#: ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1572
 msgid "Send File"
 msgstr ""
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr ""
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr ""
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1001
+#: ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr ""
 
+#: ../finch/gntblist.c:1001
+msgid "Set Alias"
+msgstr ""
+
 #: ../finch/gntblist.c:1002
-msgid "Set Alias"
-msgstr ""
-
-#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr ""
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 
-#: ../finch/gntblist.c:1087
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 
-#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr ""
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1099
+#: ../finch/gntblist.c:1251
+#: ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1621
+#: ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr ""
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1225
+#: ../finch/gntblist.c:2306
+#: ../finch/gntprefs.c:257
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkblist.c:4269
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr ""
 
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr ""
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../finch/gntblist.c:1297
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045
+#: ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../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:1002
@@ -529,93 +633,110 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
+#: ../pidgin/gtkblist.c:3012
 msgid "Nickname"
 msgstr ""
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319
+#: ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
+#: ../libpurple/protocols/msn/msn.c:516
+#: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3040
+#: ../pidgin/gtkblist.c:3445
+#: ../pidgin/gtkprefs.c:1920
 msgid "Idle"
 msgstr ""
 
-#: ../finch/gntblist.c:1334
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1415
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
 
-#: ../finch/gntblist.c:1424
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr ""
 
-#: ../finch/gntblist.c:1436
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1701
+#: ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr ""
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1708
+#: ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr ""
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2086
+#: ../finch/gntplugin.c:254
+#: ../finch/gntui.c:86
+#: ../pidgin/gtkdocklet.c:523
+#: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr ""
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
+#: ../finch/gntblist.c:2202
+#: ../pidgin/gtkdialogs.c:731
+#: ../pidgin/gtkdialogs.c:869
+#: ../pidgin/gtkdialogs.c:950
 msgid "_Name"
 msgstr ""
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
+#: ../finch/gntblist.c:2207
+#: ../pidgin/gtkdialogs.c:736
+#: ../pidgin/gtkdialogs.c:874
+#: ../pidgin/gtkdialogs.c:955
 msgid "_Account"
 msgstr ""
 
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2215
+#: ../pidgin/gtkdialogs.c:744
 msgid "New Instant Message"
 msgstr ""
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-
-#. Not multiline
-#. Not masked?
-#. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../finch/gntblist.c:2217
+#: ../pidgin/gtkdialogs.c:746
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+
+#: ../finch/gntblist.c:2220
+#: ../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:1383
+#: ../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:6043
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -632,332 +753,224 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
+#: ../libpurple/protocols/yahoo/yahoo.c:3471
+#: ../libpurple/protocols/yahoo/yahoo.c:3482
+#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkdialogs.c:749
+#: ../pidgin/gtkdialogs.c:887
+#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr ""
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2240
+#: ../finch/gntpounce.c:446
+#: ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr ""
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr ""
 
-#: ../finch/gntblist.c:2251
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr ""
 
-#: ../finch/gntblist.c:2257
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr ""
 
-#: ../finch/gntblist.c:2263
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr ""
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr ""
 
-#: ../finch/gntblist.c:2271
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-msgid "Certificate Import"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
-msgid "Specify a hostname"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
-msgid "Type the host name this certificate is for."
-msgstr ""
-
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
-#, c-format
-msgid ""
-"File %s could not be imported.\n"
-"Make sure that the file is readable and in PEM format.\n"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
-msgid "Certificate Import Error"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
-msgid "X.509 certificate import failed"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-msgid "Select a PEM certificate"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
-#, c-format
-msgid ""
-"Export to file %s failed.\n"
-"Check that you have write permission to the target path\n"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
-msgid "Certificate Export Error"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
-msgid "X.509 certificate export failed"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
-msgid "PEM X.509 Certificate Export"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:188
-#, c-format
-msgid "Certificate for %s"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:195
-#, c-format
-msgid ""
-"Common name: %s\n"
-"\n"
-"SHA1 fingerprint:\n"
-"%s"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:198
-msgid "SSL Host Certificate"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
-#, c-format
-msgid "Really delete certificate for %s?"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
-msgid "Confirm certificate delete"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
-msgid "Certificate Manager"
-msgstr ""
-
-#. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
-msgid "Info"
-msgstr ""
-
-#. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
-msgid "Close"
-msgstr ""
-
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr ""
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
-msgid "Re-enable Account"
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+msgstr ""
+
+#: ../finch/gntconv.c:118
+msgid "No such command."
+msgstr ""
+
+#: ../finch/gntconv.c:122
+#: ../pidgin/gtkconv.c:465
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+#: ../finch/gntconv.c:127
+#: ../pidgin/gtkconv.c:471
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+#: ../finch/gntconv.c:132
+#: ../pidgin/gtkconv.c:478
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+#: ../finch/gntconv.c:135
+#: ../pidgin/gtkconv.c:481
+msgid "That command only works in IMs, not chats."
 msgstr ""
 
 #: ../finch/gntconv.c:139
-msgid "No such command."
-msgstr ""
-
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
-msgid "Your command failed for an unknown reason."
-msgstr ""
-
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
-msgid "That command only works in chats, not IMs."
-msgstr ""
-
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
-msgid "That command only works in IMs, not chats."
-msgstr ""
-
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../pidgin/gtkconv.c:486
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
-#: ../finch/gntconv.c:168
+#: ../finch/gntconv.c:147
 msgid "Message was not sent, because you are not signed on."
 msgstr ""
 
-#: ../finch/gntconv.c:251
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr ""
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr ""
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:258
+#: ../finch/gntconv.c:677
 #, c-format
 msgid ""
 "\n"
 "%s is typing..."
 msgstr ""
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:277
 msgid "You have left this chat."
 msgstr ""
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:371
 msgid "Send To"
 msgstr ""
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:415
 msgid "Conversation"
 msgstr ""
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:421
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:425
+#: ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr ""
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:441
 msgid "Add Buddy Pounce..."
 msgstr ""
 
-#: ../finch/gntconv.c:527
-msgid "Enable Logging"
-msgstr ""
-
-#: ../finch/gntconv.c:533
-msgid "Enable Sounds"
-msgstr ""
-
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:643
 msgid "<AUTO-REPLY> "
 msgstr ""
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:765
 msgid "List of users:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:910
+#: ../pidgin/gtkconv.c:308
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:945
+#: ../pidgin/gtkconv.c:357
 msgid "No such command (in this context)."
 msgstr ""
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:948
+#: ../pidgin/gtkconv.c:360
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1006
+#: ../pidgin/gtkconv.c:7320
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr ""
+
+#: ../finch/gntconv.c:1009
+#: ../pidgin/gtkconv.c:7323
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1012
+#: ../pidgin/gtkconv.c:7326
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr ""
+
+#: ../finch/gntconv.c:1015
+#: ../pidgin/gtkconv.c:7329
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1018
+#: ../pidgin/gtkconv.c:7335
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1021
 msgid "users:  Show the list of users in the chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1026
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1029
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1032
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1035
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1038
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1041
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:234
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr ""
 
@@ -965,186 +978,242 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:255
+#: ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr ""
 
-#: ../finch/gntdebug.c:262
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr ""
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:265
+#: ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr ""
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:117
+#: ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr ""
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:122
+#: ../finch/gntft.c:195
+#: ../finch/gntui.c:85
+#: ../pidgin/gtkft.c:233
+#: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr ""
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:200
+#: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr ""
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:200
+#: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr ""
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:200
+#: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr ""
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr ""
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:200
+#: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr ""
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
+#: ../finch/gntft.c:200
+#: ../finch/gntstatus.c:546
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../libpurple/protocols/gg/gg.c:1034
+#: ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2670
+#: ../libpurple/protocols/oscar/oscar.c:3750
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/yahoo/yahoo.c:3222
+#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtksavedstatuses.c:998
+#: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr ""
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr ""
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr ""
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr ""
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#. Close button
+#: ../finch/gntft.c:236
+#: ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309
+#: ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:375
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2470
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr ""
+
+#: ../finch/gntft.c:304
+#: ../pidgin/gtkft.c:168
+#: ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:371
+#: ../pidgin/gtkft.c:165
+#: ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr ""
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:373
+#: ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr ""
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:419
+#: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr ""
 
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
 #: ../finch/gntft.c:431
-#, c-format
-msgid "The file was saved as %s."
-msgstr ""
-
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:432
+#: ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr ""
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr ""
 
-#: ../finch/gntnotify.c:165
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr ""
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:170
+#: ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr ""
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:173
+#: ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr ""
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:173
+#: ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr ""
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:224
+#: ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr ""
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:289
+#: ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr ""
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:290
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr ""
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:376
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr ""
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:382
+#: ../pidgin/gtkconv.c:1600
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr ""
+
+#: ../finch/gntnotify.c:385
+#: ../pidgin/gtkconv.c:1561
 msgid "IM"
 msgstr ""
 
-#: ../finch/gntnotify.c:389
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr ""
 
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr ""
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr ""
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:74
+#: ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr ""
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1155,19 +1224,19 @@
 "Filename: %s\n"
 msgstr ""
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr ""
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr ""
 
@@ -1176,362 +1245,414 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:370
+#: ../finch/gntplugin.c:377
+#: ../finch/gntprefs.c:263
+#: ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:524
+#: ../pidgin/gtkprefs.c:2062
 msgid "Preferences"
 msgstr ""
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:182
+#: ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:327
+#: ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:327
+#: ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr ""
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:335
+#: ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr ""
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr ""
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:373
+#: ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr ""
 
+#: ../finch/gntpounce.c:375
+msgid "Signs on"
+msgstr ""
+
 #: ../finch/gntpounce.c:376
-msgid "Signs on"
+msgid "Signs off"
 msgstr ""
 
 #: ../finch/gntpounce.c:377
-msgid "Signs off"
+msgid "Goes away"
 msgstr ""
 
 #: ../finch/gntpounce.c:378
-msgid "Goes away"
+msgid "Returns from away"
 msgstr ""
 
 #: ../finch/gntpounce.c:379
-msgid "Returns from away"
+msgid "Becomes idle"
 msgstr ""
 
 #: ../finch/gntpounce.c:380
-msgid "Becomes idle"
+msgid "Is no longer idle"
 msgstr ""
 
 #: ../finch/gntpounce.c:381
-msgid "Is no longer idle"
+msgid "Starts typing"
 msgstr ""
 
 #: ../finch/gntpounce.c:382
-msgid "Starts typing"
+msgid "Pauses while typing"
 msgstr ""
 
 #: ../finch/gntpounce.c:383
-msgid "Pauses while typing"
+msgid "Stops typing"
 msgstr ""
 
 #: ../finch/gntpounce.c:384
-msgid "Stops typing"
-msgstr ""
-
-#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr ""
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:413
+#: ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr ""
 
+#: ../finch/gntpounce.c:415
+msgid "Open an IM window"
+msgstr ""
+
 #: ../finch/gntpounce.c:416
-msgid "Open an IM window"
+msgid "Pop up a notification"
 msgstr ""
 
 #: ../finch/gntpounce.c:417
-msgid "Pop up a notification"
+msgid "Send a message"
 msgstr ""
 
 #: ../finch/gntpounce.c:418
-msgid "Send a message"
+msgid "Execute a command"
 msgstr ""
 
 #: ../finch/gntpounce.c:419
-msgid "Execute a command"
-msgstr ""
-
-#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr ""
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr ""
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:449
+#: ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr ""
 
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr ""
+
 #: ../finch/gntpounce.c:618
-msgid "Cannot create pounce"
+msgid "You do not have any accounts."
 msgstr ""
 
 #: ../finch/gntpounce.c:619
-msgid "You do not have any accounts."
-msgstr ""
-
-#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:661
+#: ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr ""
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:695
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr ""
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:809
+#: ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:811
+#: ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:815
+#: ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:827
+#: ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: ../finch/gntprefs.c:92
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:93
+#: ../pidgin/gtkprefs.c:1925
 msgid "From last sent message"
 msgstr ""
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:95
+#: ../pidgin/gtkprefs.c:897
+#: ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1924
+#: ../pidgin/gtkprefs.c:1938
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr ""
 
+#: ../finch/gntprefs.c:183
+msgid "Show Idle Time"
+msgstr ""
+
 #: ../finch/gntprefs.c:184
-msgid "Show Idle Time"
-msgstr ""
-
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr ""
 
-#: ../finch/gntprefs.c:192
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr ""
 
+#: ../finch/gntprefs.c:197
+msgid "Log format"
+msgstr ""
+
 #: ../finch/gntprefs.c:198
-msgid "Log format"
+msgid "Log IMs"
 msgstr ""
 
 #: ../finch/gntprefs.c:199
-msgid "Log IMs"
+msgid "Log chats"
 msgstr ""
 
 #: ../finch/gntprefs.c:200
-msgid "Log chats"
-msgstr ""
-
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr ""
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr ""
+
 #: ../finch/gntprefs.c:207
-msgid "Report Idle time"
+msgid "Change status when idle"
 msgstr ""
 
 #: ../finch/gntprefs.c:208
-msgid "Change status when idle"
+msgid "Minutes before changing status"
 msgstr ""
 
 #: ../finch/gntprefs.c:209
-msgid "Minutes before changing status"
-msgstr ""
-
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr ""
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:258
+#: ../pidgin/gtkprefs.c:992
+#: ../pidgin/gtkprefs.c:2028
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr ""
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:1464
+#: ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr ""
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr ""
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:635
+#: ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr ""
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:635
+#: ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr ""
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:94
+#: ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr ""
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:95
+#: ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr ""
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:96
+#: ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr ""
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr ""
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr ""
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr ""
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr ""
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:357
+#: ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr ""
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:358
+#: ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr ""
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:712
+#: ../finch/gntsound.c:798
+#: ../pidgin/gtkprefs.c:1584
+#: ../pidgin/gtkprefs.c:1673
+#: ../pidgin/gtkprefs.c:1867
 msgid "(default)"
 msgstr ""
 
-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:725
 msgid "Select Sound File ..."
 msgstr ""
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:900
 msgid "Sound Preferences"
 msgstr ""
 
-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:911
 msgid "Profiles"
 msgstr ""
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:950
+#: ../pidgin/gtkprefs.c:1712
 msgid "Automatic"
 msgstr ""
 
+#: ../finch/gntsound.c:953
+msgid "Console Beep"
+msgstr ""
+
+#: ../finch/gntsound.c:954
+#: ../pidgin/gtkprefs.c:1716
+msgid "Command"
+msgstr ""
+
+#: ../finch/gntsound.c:955
+msgid "No Sound"
+msgstr ""
+
 #: ../finch/gntsound.c:957
-msgid "Console Beep"
-msgstr ""
-
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
-msgid "Command"
-msgstr ""
-
-#: ../finch/gntsound.c:959
-msgid "No Sound"
-msgstr ""
-
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../pidgin/gtkprefs.c:1707
 msgid "Sound Method"
 msgstr ""
 
-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:962
 msgid "Method: "
 msgstr ""
 
-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:969
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1539,80 +1660,94 @@
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:977
+#: ../pidgin/gtkprefs.c:1751
 msgid "Sound Options"
 msgstr ""
 
-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:978
 msgid "Sounds when conversation has focus"
 msgstr ""
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:986
+#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr ""
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:987
+#: ../pidgin/gtkprefs.c:1756
 msgid "Only when available"
 msgstr ""
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:988
+#: ../pidgin/gtkprefs.c:1757
 msgid "Only when not available"
 msgstr ""
 
-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:995
 msgid "Volume(0-100):"
 msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1014
+#: ../pidgin/gtkprefs.c:1793
 msgid "Sound Events"
 msgstr ""
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1016
+#: ../pidgin/gtkprefs.c:1852
 msgid "Event"
 msgstr ""
 
-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1016
 msgid "File"
 msgstr ""
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1035
+#: ../pidgin/gtkprefs.c:1871
 msgid "Test"
 msgstr ""
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1038
+#: ../pidgin/gtkprefs.c:1875
 msgid "Reset"
 msgstr ""
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1041
+#: ../pidgin/gtkprefs.c:1879
 msgid "Choose..."
 msgstr ""
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr ""
 
-#: ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:175
+#: ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr ""
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
+#: ../finch/gntstatus.c:182
+#: ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:500
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr ""
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:182
+#: ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr ""
 
@@ -1624,31 +1759,37 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../finch/gntstatus.c:182
+#: ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:249
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/gg/gg.c:1072
+#: ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592
+#: ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608
+#: ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/myspace/myspace.c:269
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/oscar/oscar.c:5504
+#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5736
+#: ../libpurple/protocols/oscar/oscar.c:5752
+#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:5766
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1656,100 +1797,81 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/yahoo/yahoo.c:3725
+#: ../libpurple/protocols/yahoo/yahoo.c:3731
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:525
+#: ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr ""
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:193
+#: ../finch/gntstatus.c:592
 msgid "Use"
 msgstr ""
 
+#: ../finch/gntstatus.c:300
+msgid "Invalid title"
+msgstr ""
+
 #: ../finch/gntstatus.c:301
-msgid "Invalid title"
-msgstr ""
-
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr ""
 
+#: ../finch/gntstatus.c:309
+msgid "Duplicate title"
+msgstr ""
+
 #: ../finch/gntstatus.c:310
-msgid "Duplicate title"
-msgstr ""
-
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr ""
 
-#: ../finch/gntstatus.c:452
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr ""
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:463
+#: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr ""
 
-#: ../finch/gntstatus.c:479
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr ""
 
-#: ../finch/gntstatus.c:528
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:570
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr ""
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr ""
 
-#: ../finch/gntui.c:85
-msgid "Certificates"
-msgstr ""
-
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:87
+#: ../pidgin/gtkprefs.c:2030
 msgid "Sounds"
 msgstr ""
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-msgid "Error loading the plugin."
-msgstr ""
-
-#: ../finch/plugins/gntclipboard.c:116
-msgid "Couldn't find X display"
-msgstr ""
-
-#: ../finch/plugins/gntclipboard.c:122
-msgid "Couldn't find window"
-msgstr ""
-
-#: ../finch/plugins/gntclipboard.c:129
-msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
-
-#: ../finch/plugins/gntclipboard.c:158
+#: ../finch/plugins/gntclipboard.c:149
 msgid "GntClipboard"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:160
+#: ../finch/plugins/gntclipboard.c:151
 msgid "Clipboard plugin"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+#: ../finch/plugins/gntclipboard.c:152
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr ""
 
 #: ../finch/plugins/gntgf.c:231
@@ -1809,143 +1931,155 @@
 msgid "GntGf"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116
+#: ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138
+#: ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139
+#: ../pidgin/plugins/history.c: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)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181
+#: ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+#: ../finch/plugins/gnthistory.c:182
+#: ../pidgin/plugins/history.c:191
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr ""
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
 
-#. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:122
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:123
+#: ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr ""
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:937
+#: ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr ""
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr ""
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr ""
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr ""
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1010
+#: ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4021
 msgid "Connection Error"
 msgstr ""
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1170
+#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr ""
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr ""
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr ""
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr ""
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr ""
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr ""
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/account.c:1744
+#: ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr ""
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530
+#: ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5323
 #: ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr ""
 
@@ -1953,169 +2087,24 @@
 msgid "buddy list"
 msgstr ""
 
-#: ../libpurple/certificate.c:545
-msgid "(DOES NOT MATCH)"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:549
-#, c-format
-msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#: ../libpurple/certificate.c:550
-#, c-format
-msgid ""
-"Common name: %s %s\n"
-"Fingerprint (SHA1): %s"
-msgstr ""
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
-msgid "Single-use Certificate Verification"
-msgstr ""
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:872
-msgid "Certificate Authorities"
-msgstr ""
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:1040
-msgid "SSL Peers Cache"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:1171
-#, c-format
-msgid "Accept certificate for %s?"
-msgstr ""
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
-msgid "SSL Certificate Verification"
-msgstr ""
-
-#. Number of actions
-#: ../libpurple/certificate.c:1186
-msgid "Accept"
-msgstr ""
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr ""
-
-#: ../libpurple/certificate.c:1188
-msgid "_View Certificate..."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#: ../libpurple/certificate.c:1331
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr ""
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-msgid "SSL Certificate Error"
-msgstr ""
-
-#: ../libpurple/certificate.c:1340
-msgid "Invalid certificate chain"
-msgstr ""
-
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
-#: ../libpurple/certificate.c:1408
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-
-#: ../libpurple/certificate.c:1417
-msgid "Invalid certificate authority signature"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:1881
-#, c-format
-msgid ""
-"Common name: %s\n"
-"\n"
-"Fingerprint (SHA1): %s\n"
-"\n"
-"Activation date: %s\n"
-"Expiration date: %s\n"
-msgstr ""
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-msgid "Certificate Information"
-msgstr ""
-
-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr ""
 
-#: ../libpurple/connection.c:180
-msgid "Unregistration Error"
-msgstr ""
-
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr ""
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr ""
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
-#: ../libpurple/protocols/msn/servconn.c:141
+#: ../libpurple/connection.c:440
+#: ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr ""
@@ -2124,7 +2113,8 @@
 msgid "Unable to send message: The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr ""
@@ -2133,45 +2123,46 @@
 msgid "The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr ""
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr ""
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr ""
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
@@ -2191,110 +2182,112 @@
 msgid "Failed to get serv name: %s"
 msgstr ""
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:286
+#: ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:548
+#: ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:551
+#: ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:578
-#, c-format
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr ""
 
+#: ../libpurple/dnsquery.c:760
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
 #: ../libpurple/dnsquery.c:761
-#, c-format
-msgid "Thread creation failure: %s"
-msgstr ""
-
-#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr ""
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr ""
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr ""
 
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2302,63 +2295,61 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libpurple/ft.c:685
-#, c-format
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr ""
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr ""
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr ""
 
+#: ../libpurple/ft.c:1226
+#, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
 #: ../libpurple/ft.c:1228
 #, c-format
-msgid "File transfer to %s failed."
-msgstr ""
-
-#: ../libpurple/ft.c:1230
-#, c-format
 msgid "File transfer from %s failed."
 msgstr ""
 
@@ -2431,57 +2422,39 @@
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
 msgstr ""
 
 #: ../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."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
@@ -2516,54 +2489,52 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/log.c:183
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: ../libpurple/log.c:598
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr ""
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr ""
 
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr ""
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr ""
 
-#: ../libpurple/log.c:1366
-#, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: ../libpurple/log.c:1368
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1365
+#, c-format
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: ../libpurple/log.c:1367
+#, c-format
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: ../libpurple/log.c:1425
+#: ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437
+#: ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
@@ -2574,7 +2545,6 @@
 msgstr ""
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2594,9 +2564,7 @@
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr ""
 
 #: ../libpurple/plugin.c:552
@@ -2625,7 +2593,8 @@
 msgid "Autoaccept"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 
@@ -2651,16 +2620,19 @@
 msgid "_Save"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/plugins/autoaccept.c:165
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:6117
+#: ../libpurple/protocols/oscar/oscar.c:6187
+#: ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr ""
 
@@ -2697,8 +2669,9 @@
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr ""
 
@@ -2718,18 +2691,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr ""
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -2747,7 +2723,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
@@ -2784,26 +2761,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr ""
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr ""
 
@@ -2811,7 +2794,8 @@
 msgid "None of your accounts are idle."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr ""
 
@@ -2819,7 +2803,8 @@
 msgid "_Unset"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr ""
 
@@ -2827,7 +2812,8 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 
@@ -2850,9 +2836,7 @@
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
 msgstr ""
 
 #. *< type
@@ -2908,9 +2892,7 @@
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
 msgstr ""
 
 #. This is used in the place of a timezone abbreviation if the
@@ -2945,9 +2927,7 @@
 msgstr ""
 
 #: ../libpurple/plugins/log_reader.c:1628
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr ""
 
 #: ../libpurple/plugins/log_reader.c:1643
@@ -3044,11 +3024,9 @@
 #. * description
 #: ../libpurple/plugins/log_reader.c:2531
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
@@ -3081,69 +3059,70 @@
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:152
+#, c-format
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:156
-#, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr ""
 
+#: ../libpurple/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
 #: ../libpurple/plugins/offlinemsg.c:161
-msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-
-#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/msn/msn.c:522
+#: ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:304
+#: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/msn/msn.c:522
+#: ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:305
+#: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr ""
 
+#: ../libpurple/plugins/offlinemsg.c:189
+msgid "Save offline messages in pounce"
+msgstr ""
+
 #: ../libpurple/plugins/offlinemsg.c:193
-msgid "Save offline messages in pounce"
-msgstr ""
-
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -3160,7 +3139,8 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -3173,9 +3153,7 @@
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:72
@@ -3231,54 +3209,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr ""
 
-#. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
-msgid "X.509 Certificates"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
-msgid "GNUTLS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
-msgid "Provides SSL support through GNUTLS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
-msgid "NSS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
-msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3293,10 +3228,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -3354,23 +3328,20 @@
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr ""
 
 #: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr ""
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
 #: ../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"
+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
@@ -3379,30 +3350,29 @@
 msgstr ""
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
-msgid "First name"
-msgstr ""
-
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:614
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/jabber/jabber.c:828
+msgid "First name"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3411,13 +3381,13 @@
 msgid "E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
 msgid "AIM Account"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
 msgid "XMPP Account"
 msgstr ""
 
@@ -3431,18 +3401,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr ""
 
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
+msgid "Purple Person"
+msgstr ""
+
+#. Creating the user splits
 #: ../libpurple/protocols/bonjour/bonjour.c:610
-msgid "Purple Person"
-msgstr ""
-
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../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
@@ -3454,54 +3433,57 @@
 msgid "Bonjour"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:383
 #, c-format
 msgid "%s has closed the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:435
+#: ../libpurple/protocols/bonjour/jabber.c:658
+#: ../libpurple/protocols/bonjour/jabber.c:676
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:581
 msgid "Cannot open socket"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Error setting socket options"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Could not bind socket to port"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:621
 msgid "Could not listen on socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../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."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../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 ""
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269
+#: ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr ""
 
@@ -3509,7 +3491,8 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276
+#: ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr ""
 
@@ -3517,7 +3500,8 @@
 msgid "Buddylist saved successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307
+#: ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr ""
 
@@ -3553,293 +3537,322 @@
 msgid "Registration completed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:482
+#: ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:487
+#: ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:493
+#: ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:497
+#: ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3772
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr ""
 
+#: ../libpurple/protocols/gg/gg.c:642
+msgid "Year of birth"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:645
+#: ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/myspace/myspace.c:1953
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+msgid "Gender"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:646
+msgid "Male or female"
+msgstr ""
+
 #: ../libpurple/protocols/gg/gg.c:647
-msgid "Year of birth"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
-msgid "Gender"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:651
-msgid "Male or female"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:656
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:794
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:874
+#: ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/qq/qq.c:170
+#: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3073
+#: ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3421
+#: ../pidgin/gtkdocklet.c:450
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/msn/state.c:29
+#: ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3075
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr ""
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4506
+#: ../libpurple/protocols/oscar/oscar.c:5582
+#: ../libpurple/protocols/qq/qq.c:180
+#: ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3627
+#: ../libpurple/protocols/yahoo/yahoo.c:3701
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442
+#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1038
+#: ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3669
 msgid "UIN"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1041
+#: ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3680
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1106
+#: ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3881
 msgid "Unable to display the search results."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1305
+#: ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1504
+#: ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1616
+#: ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr ""
 
@@ -3854,16 +3867,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr ""
 
@@ -3893,7 +3906,7 @@
 #: ../libpurple/protocols/irc/dcc_send.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr ""
 
@@ -3919,9 +3932,11 @@
 msgid "MOTD for %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:127
+#: ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:614
+#: ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/myspace/myspace.c:3490
 msgid "Server has disconnected"
 msgstr ""
 
@@ -3929,13 +3944,15 @@
 msgid "View MOTD"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../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 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr ""
 
@@ -3946,59 +3963,71 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/myspace/myspace.c:637
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2918
+#: ../libpurple/protocols/zephyr/zephyr.c:1621
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr ""
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr ""
 
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
+#: ../libpurple/protocols/myspace/myspace.c:653
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/myspace/myspace.c:3603
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
+msgid "Connection Failed"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:611
+#: ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Read error"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1402
 msgid "Users"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../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:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1411
 msgid "Topic"
 msgstr ""
 
@@ -4010,33 +4039,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/irc/irc.c:942
+#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6621
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../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:1896
+#: ../libpurple/protocols/simple/simple.c:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr ""
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:945
+#: ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6624
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4045,13 +4076,13 @@
 msgid "Port"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
+#: ../libpurple/protocols/irc/irc.c:951
+#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4067,7 +4098,8 @@
 msgid "Username"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954
+#: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -4077,7 +4109,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr ""
 
@@ -4108,7 +4140,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3670
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4213,7 +4245,8 @@
 msgstr ""
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../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)"
@@ -4224,20 +4257,17 @@
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:908
+#: ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:910
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:915
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:954
@@ -4287,9 +4317,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:124
@@ -4297,46 +4325,31 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
 msgstr ""
 
 #: ../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."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
 msgstr ""
 
 #: ../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."
+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:129
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
+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."
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
 msgstr ""
 
 #: ../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>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:132
@@ -4348,15 +4361,11 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
 msgstr ""
 
 #: ../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)."
+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:136
@@ -4364,7 +4373,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
@@ -4373,15 +4382,11 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
 msgstr ""
 
 #: ../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."
+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:141
@@ -4389,21 +4394,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
+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:145
@@ -4415,9 +4414,7 @@
 msgstr ""
 
 #: ../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."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:148
@@ -4437,15 +4434,11 @@
 msgstr ""
 
 #: ../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."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
 msgstr ""
 
 #: ../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."
+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:154
@@ -4470,607 +4463,315 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c: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."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
-msgid "Unknown Error"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-msgid "Ad-Hoc Command Failed"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-msgid "execute"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
-#, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: ../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:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../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:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../libpurple/protocols/jabber/auth.c: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:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:572
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "Birthday"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
-msgid "Description"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
-msgid "Edit XMPP vCard"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:724
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
-msgid "Client"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
-msgid "Operating System"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-msgid "Service Discovery Info"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-msgid "Multi-User Chat"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-msgid "XHTML-IM"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-msgid "In-Band Registration"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-msgid "User Location"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Avatar"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "Chat State Notifications"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Software Version"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Stream Initiation"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-msgid "User Mood"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
-msgid "User Activity"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
-msgid "Entity Capabilities"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
-msgid "User Tune"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Reachability Address"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
-msgid "User Profile"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
-msgid "Jingle"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
-msgid "User Nickname"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkprefs.c:738
+msgid "Description"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
+msgid "Edit XMPP vCard"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:584
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
+msgid "Client"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
+msgid "Operating System"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:853
+msgid "Resource"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../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:1283
+msgid "Priority"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Middle Name"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-msgid "Jingle Video"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
-msgid "Message Receipts"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
-msgid "Public Key Publishing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
-msgid "User Chatting"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
-msgid "User Browsing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
-msgid "User Gaming"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
-msgid "User Viewing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-msgid "Stanza Encryption"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
-msgid "Entity Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
-msgid "Delayed Delivery"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
-msgid "Collaborative Data Objects"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
-msgid "File Repository and Sharing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
-msgid "Hop Check"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
-msgid "Capabilities"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
-msgid "Resource"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
-msgid "Priority"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
-msgid "Middle Name"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr ""
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-msgid "Log In"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
-msgid "Log Out"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5758
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3681
 msgid "Last Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr ""
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:1732
+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:1752
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr ""
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/oscar/oscar.c:3684
+#: ../libpurple/protocols/oscar/oscar.c:3693
 msgid "E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr ""
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5082,25 +4783,25 @@
 msgid "Search"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5244
+#: ../libpurple/protocols/yahoo/yahoochat.c:963
 msgid "_Room:"
 msgstr ""
 
@@ -5190,99 +4891,80 @@
 msgid "Find Rooms"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:92
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:145
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/yahoo/yahoo.c:2537
+#: ../libpurple/protocols/yahoo/yahoo.c:2569
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, c-format
-msgid "Registration to %s successful"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1524
+msgid "Unknown Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, c-format
-msgid "Registration from %s successfully removed"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-msgid "Unregistration Successful"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-msgid "Unregistration Failed"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3760
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "State"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:858
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -5292,572 +4974,396 @@
 msgid "Phone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-msgid "Unregister"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:881
 msgid "Register"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, c-format
-msgid "Change Account Registration at %s"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, c-format
-msgid "Register New Account at %s"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-msgid "Change Registration"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-msgid "Error unregistering account"
+#: ../libpurple/protocols/jabber/jabber.c:1050
+msgid "Initializing Stream"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/msn/session.c:351
+msgid "Authenticating"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1064
+msgid "Re-initializing Stream"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-msgid "Account successfully unregistered"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
-msgid "Initializing Stream"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1289
-msgid "Initializing SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
-msgid "Authenticating"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1302
-msgid "Re-initializing Stream"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5552
 msgid "Not Authorized"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-msgid "Mood Text"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-msgid "Tune Artist"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-msgid "Tune Title"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
-msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
-msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-msgid "Tune Comment"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
-msgid "Tune Track"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
-msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
-msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
-msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-msgid "Allow Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6338
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr ""
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6349
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr ""
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:1711
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:1730
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:1735
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, c-format
-msgid "Unable to ping user %s"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2213
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2295
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:1858
+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:1864
+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:1870
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2324
-msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
-msgid "buzz: Buzz a user to get their attention"
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
 #. *< type
@@ -5870,200 +5376,146 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-msgid "Require SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:4420
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr ""
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:4417
 #: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/silc10/silc.c:1857
+#: ../pidgin/gtkaccount.c:838
 msgid "Connect server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:106
+#: ../libpurple/protocols/jabber/message.c:102
 #, c-format
 msgid "%s has left the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:270
 msgid "XMPP Message Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "%s has buzzed you!"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:510
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:368
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../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:838
+#: ../libpurple/protocols/jabber/si.c:832
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../libpurple/protocols/jabber/si.c:834
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:842
+#: ../libpurple/protocols/jabber/si.c:836
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../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:873
+#: ../libpurple/protocols/jabber/si.c:867
 msgid "Select a Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-msgid "Edit User Mood"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:181
-msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:183
-#: ../libpurple/protocols/jabber/usernick.c:78
-msgid "Set"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:191
-msgid "Set Mood..."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:76
-msgid "Set User Nickname"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:76
-msgid "Please specify a new nickname for you."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
-msgid "Set Nickname..."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/xdata.c:378
-msgid "Actions"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/xdata.c:380
-msgid "Select an action"
-msgstr ""
-
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -6071,288 +5523,232 @@
 
 #: ../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?"
+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 ""
 
 #: ../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?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr ""
 
@@ -6366,180 +5762,172 @@
 msgid "MSN Error: %s\n"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:130
-msgid "Nudge"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:131
-#, c-format
-msgid "%s has nudged you!"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:132
-#, c-format
-msgid "Nudging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:121
+msgid "You have just sent a Nudge!"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:351
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../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:329
 msgid "Allow"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr ""
 
+#: ../libpurple/protocols/msn/msn.c:346
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:372
+msgid "Send a mobile message."
+msgstr ""
+
 #: ../libpurple/protocols/msn/msn.c:374
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:400
-msgid "Send a mobile message."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3735
 msgid "Be Right Back"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:583 ../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:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3738
 msgid "Busy"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:3061
+#: ../libpurple/protocols/yahoo/yahoo.c:3750
 msgid "On the Phone"
 msgstr ""
 
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:3065
+#: ../libpurple/protocols/yahoo/yahoo.c:3756
+msgid "Out to Lunch"
+msgstr ""
+
 #: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
-msgid "Out to Lunch"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1479
+#: ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550
+#: ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/myspace/myspace.c:1948
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/myspace/myspace.c:1957
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -6547,201 +5935,204 @@
 msgid "Location"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c: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:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c: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:1588
+msgid "Social"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+msgid "Marital Status"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1591
+msgid "Interests"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1592
+msgid "Pets"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1593
+msgid "Hometown"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1594
+msgid "Places Lived"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1595
+msgid "Fashion"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1596
+msgid "Humor"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1597
+msgid "Music"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+msgid "Favorite Quote"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1615
+msgid "Contact Info"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1616
+msgid "Personal"
+msgstr ""
+
 #: ../libpurple/protocols/msn/msn.c:1619
-msgid "Social"
+msgid "Significant Other"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1620
+msgid "Home Phone"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1621
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
-msgid "Marital Status"
+msgid "Home Phone 2"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1622
-msgid "Interests"
+#: ../libpurple/protocols/oscar/oscar.c:3763
+msgid "Home Address"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1623
-msgid "Pets"
+msgid "Personal Mobile"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1624
-msgid "Hometown"
+msgid "Home Fax"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1625
-msgid "Places Lived"
+msgid "Personal E-Mail"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1626
-msgid "Fashion"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1627
-msgid "Humor"
+msgid "Personal IM"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1628
-msgid "Music"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
-msgid "Favorite Quote"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1646
-msgid "Contact Info"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1647
-msgid "Personal"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1650
-msgid "Significant Other"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1651
-msgid "Home Phone"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1652
-msgid "Home Phone 2"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
-msgid "Home Address"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1654
-msgid "Personal Mobile"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1655
-msgid "Home Fax"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1657
-msgid "Personal IM"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../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:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Company"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3776
 msgid "Work Address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c: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:1824
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1860
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1864
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../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: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:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr ""
@@ -6756,28 +6147,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
+#: ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2199
-msgid "HTTP Method Server"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
 #: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
+#: ../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
@@ -6791,8 +6179,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1321
+#: ../libpurple/protocols/yahoo/yahoochat.c:1347
 msgid "Unable to connect"
 msgstr ""
 
@@ -6852,31 +6240,25 @@
 #: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -6911,8 +6293,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/session.c:325
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
 #: ../libpurple/protocols/msn/session.c:346
@@ -6969,20 +6350,22 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
 #: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
 #: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
+#: ../libpurple/protocols/msn/switchboard.c:963
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
 #: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
@@ -7002,390 +6385,369 @@
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:111
+#: ../libpurple/protocols/myspace/myspace.c:232
 msgid "Missing Cipher"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:112
+#: ../libpurple/protocols/myspace/myspace.c:233
 msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
+#: ../libpurple/protocols/myspace/myspace.c:234
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr ""
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/myspace.c:303
+msgid "zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:303
+#: ../libpurple/protocols/myspace/myspace.c:1696
+msgid "zapped"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:303
+msgid "Zapping"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:304
+msgid "whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:304
+#: ../libpurple/protocols/myspace/myspace.c:1697
+msgid "whacked"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:304
+msgid "Whacking"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:305
+msgid "torch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:305
+#: ../libpurple/protocols/myspace/myspace.c:1698
+msgid "torched"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:305
+msgid "Torching"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:306
+msgid "smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:306
+#: ../libpurple/protocols/myspace/myspace.c:1699
+msgid "smooched"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:306
+msgid "Smooching"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:307
+msgid "hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:307
+#: ../libpurple/protocols/myspace/myspace.c:1700
+msgid "hugged"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:307
+msgid "Hugging"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:308
+msgid "bslap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:308
+#: ../libpurple/protocols/myspace/myspace.c:1701
+msgid "bslapped"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:308
+msgid "Bslapping"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:309
+msgid "goose"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:309
+#: ../libpurple/protocols/myspace/myspace.c:1702
+msgid "goosed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:309
+msgid "Goosing"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:310
+msgid "hi-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:310
+#: ../libpurple/protocols/myspace/myspace.c:1703
+msgid "hi-fived"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:310
+msgid "Hi-fiving"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:311
+msgid "punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:311
+#: ../libpurple/protocols/myspace/myspace.c:1704
+msgid "punk'd"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:311
+msgid "Punking"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:312
+msgid "raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:312
+#: ../libpurple/protocols/myspace/myspace.c:1705
+msgid "raspberried"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:312
+msgid "Raspberry'ing"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:469
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:622
+#, c-format
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
 msgstr ""
 
 #. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:628
+#: ../libpurple/protocols/myspace/myspace.c:2953
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:684
 msgid "Reading challenge"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:690
 msgid "Unexpected challenge length from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:694
 msgid "Logging in"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1725
+#, c-format
+msgid "*** You have been %s! ***"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1933
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr ""
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/myspace.c:1940
+#: ../libpurple/protocols/oscar/oscar.c:2934
+msgid "Profile"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1962
+msgid "Headline"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1967
+msgid "Song"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1972
+msgid "Total Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1983
+#: ../libpurple/protocols/myspace/myspace.c:1986
+#: ../libpurple/protocols/myspace/myspace.c:1989
+msgid "Client Version"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2353
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:2411
 msgid "New mail messages"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:2412
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:2413
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:2414
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:2415
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:2445
 msgid "MySpace"
 msgstr ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:2537
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-msgid "No username set"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:2945
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:3105
+#: ../libpurple/protocols/myspace/myspace.c:3139
 msgid "Failed to add buddy"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:3105
 msgid "'addbuddy' command failed."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:3139
+#: ../libpurple/protocols/myspace/myspace.c:3381
 msgid "persist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:3249
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:3250
 msgid "User lookup"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:3362
+#: ../libpurple/protocols/myspace/myspace.c:3381
+#: ../libpurple/protocols/myspace/myspace.c:3403
 msgid "Failed to remove buddy"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:3362
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:3403
 msgid "blocklist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:3449
 msgid "Invalid input condition"
 msgstr ""
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:3467
+#: ../libpurple/protocols/myspace/myspace.c:3498
 msgid "Read buffer full"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:3536
 msgid "Unparseable message"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:3605
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:3948
 msgid "IM Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
-#, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:4045
+#, c-format
+msgid "%d buddies were added or updated"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:4047
 msgid "Add contacts from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:4072
+#: ../libpurple/protocols/myspace/myspace.c:4147
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:4073
 msgid "Importing friends failed"
 msgstr ""
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:4139
 msgid "Find people..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:4142
 msgid "Change IM name..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
-msgid "myim URL handler"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3157
-msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3158
-msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:4424
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:4427
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:4432
 msgid "Send emoticons"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:4437
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:4440
 msgid "Base font size (points)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr ""
-
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
-msgid "Profile"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:124
-msgid "Headline"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:129
-msgid "Song"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:134
-msgid "Total Friends"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-msgid "Client Version"
-msgstr ""
-
-#. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
-msgid "Zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:44
-#, c-format
-msgid "%s has zapped you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:44
-#, c-format
-msgid "Zapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-msgid "Whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, c-format
-msgid "%s has whacked you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, c-format
-msgid "Whacking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-msgid "Torch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, c-format
-msgid "%s has torched you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, c-format
-msgid "Torching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, c-format
-msgid "%s has smooched you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, c-format
-msgid "Smooching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-msgid "Hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
-msgid "%s has hugged you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
-msgid "Hugging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-msgid "Slap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, c-format
-msgid "%s has slapped you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, c-format
-msgid "Slapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:50
-msgid "Goose"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, c-format
-msgid "%s has goosed you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, c-format
-msgid "Goosing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-msgid "High-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
-msgid "%s has high-fived you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
-msgid "High-fiving %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
-msgid "Punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
-#, c-format
-msgid "%s has punk'd you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
-#, c-format
-msgid "Punking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
-msgid "Raspberry"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
-#, c-format
-msgid "%s has raspberried you!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
-#, c-format
-msgid "Raspberrying %s..."
+#. cmd
+#. args - accept a single word
+#. priority
+#. flags
+#. prpl_id
+#. func
+#: ../libpurple/protocols/myspace/myspace.c:4456
+msgid "zap: zap a user to get their attention"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
@@ -7469,9 +6831,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
@@ -7499,9 +6859,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
@@ -7552,16 +6910,12 @@
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:705
@@ -7682,8 +7036,7 @@
 
 #: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 #. TODO: Would be nice to prompt if not set!
@@ -7691,9 +7044,7 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../libpurple/protocols/novell/novell.c:2167
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:2195
@@ -7701,7 +7052,6 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -7729,19 +7079,25 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/yahoo/yahoo.c:2448
+#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/ycht.c:481
+#: ../libpurple/proxy.c:580
+#: ../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:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/yahoo/yahoo.c:2442
+#: ../libpurple/protocols/yahoo/yahoo.c:2609
+#: ../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"
@@ -7749,9 +7105,11 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../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 ""
 
@@ -7786,7 +7144,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4353
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr ""
@@ -7816,138 +7174,133 @@
 msgid "Direct IM established"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oft.c:656
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
+#: ../libpurple/protocols/oscar/oscar.c:115
+msgid "Invalid error"
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oscar.c:116
-msgid "Invalid error"
+msgid "Invalid SNAC"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:117
-msgid "Invalid SNAC"
+msgid "Rate to host"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:118
-msgid "Rate to host"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr ""
 
+#: ../libpurple/protocols/oscar/oscar.c:120
+msgid "Service unavailable"
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oscar.c:121
-msgid "Service unavailable"
+msgid "Service not defined"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:122
-msgid "Service not defined"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:123
-msgid "Obsolete SNAC"
+msgid "Not supported by host"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:124
-msgid "Not supported by host"
+msgid "Not supported by client"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:125
-msgid "Not supported by client"
+msgid "Refused by client"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:126
-msgid "Refused by client"
+msgid "Reply too big"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:127
-msgid "Reply too big"
+msgid "Responses lost"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:128
-msgid "Responses lost"
+msgid "Request denied"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:129
-msgid "Request denied"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:130
-msgid "Busted SNAC payload"
+msgid "Insufficient rights"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:131
-msgid "Insufficient rights"
+msgid "In local permit/deny"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:132
-msgid "In local permit/deny"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
+msgid "User temporarily unavailable"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:135
-msgid "User temporarily unavailable"
+msgid "No match"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:136
-msgid "No match"
+msgid "List overflow"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:137
-msgid "List overflow"
+msgid "Request ambiguous"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:138
-msgid "Request ambiguous"
+msgid "Queue full"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:139
-msgid "Queue full"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:348
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:457
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+#: ../libpurple/protocols/oscar/oscar.c:347
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:456
+#, c-format
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
+#: ../libpurple/protocols/oscar/oscar.c:638
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -7955,302 +7308,293 @@
 msgid "Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Get File"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Free For Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5765
 msgid "Not Available"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5751
 msgid "Occupied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:736
+#: ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3069
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3677
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr ""
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1258
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2084
 msgid "Invalid screen name."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Incorrect password."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:6116
+#: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5213
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "No reason given."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8259,7 +7603,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8268,7 +7612,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8277,61 +7621,60 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+#: ../libpurple/protocols/oscar/oscar.c:2584
+#, c-format
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
@@ -8339,523 +7682,482 @@
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2769
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2871
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2876
+msgid "Capabilities"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3396
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3202
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3366
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3449
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3699
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3729
 msgid "Personal Web Page"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr ""
 
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3774
+msgid "Zip Code"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3785
+msgid "Division"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3786
+msgid "Position"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3788
+msgid "Web Page"
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
-msgid "Zip Code"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3815
-msgid "Division"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3816
-msgid "Position"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3818
-msgid "Web Page"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3887
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Screen name"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3918
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3939
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3941
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:3972
 msgid "Error Changing Account Info"
 msgstr ""
 
+#: ../libpurple/protocols/oscar/oscar.c:3975
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3978
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3981
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3984
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3987
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3990
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3993
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4003
+#, c-format
+msgid "The e-mail address for %s is %s"
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oscar.c:4005
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4008
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4011
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4014
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4017
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4020
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4023
-#, c-format
-msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4033
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4177
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4448
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4449
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4463
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4468
+msgid "Profile too long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4513
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
-msgid "Profile too long."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4554
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4518
 msgid "Away message too long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4587
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4589
+#: ../libpurple/protocols/oscar/oscar.c:5022
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4698
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
-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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4699
+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 ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4881
+#: ../libpurple/protocols/oscar/oscar.c:4883
+#: ../libpurple/protocols/oscar/oscar.c:5091
+#: ../libpurple/protocols/oscar/oscar.c:5092
+#: ../libpurple/protocols/oscar/oscar.c:5097
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "(no name)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5034
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5128
+#, c-format
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5136
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5209
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5210
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:5213
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5214
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5250
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5290
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5359
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "Away Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "<i>(retrieving)</i>"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5832
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5833
 msgid "Buddy Comment:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5884
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get AIM Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5931
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:5952
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:5974
 msgid "Re-request Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6033
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6041
 msgid "ICQ Privacy Options"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6061
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
+#: ../libpurple/protocols/oscar/oscar.c:6114
+msgid "Change Address To:"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6160
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6163
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oscar.c:6164
-msgid "Change Address To:"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6210
-msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6213
-msgid "You are awaiting authorization from the following buddies"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6214
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6231
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6181
 msgid "Find Buddy by E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6182
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "_Search"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Set User Info (URL)..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6355
 msgid "Change Password (URL)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6359
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6369
 msgid "Set Privacy Options..."
 msgstr ""
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6376
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6380
 msgid "Display Currently Registered E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Currently Registered E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6391
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6397
 msgid "Search for Buddy by E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6402
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6470
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Show how long you have been idle"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../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 ""
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1037
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
+#: ../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 considered a privacy risk."
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
@@ -9025,9 +8327,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
@@ -9055,6 +8355,14 @@
 msgid "Sorry, you are not my type..."
 msgstr ""
 
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr ""
+
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr ""
@@ -9305,7 +8613,8 @@
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:139
+#: ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -9381,7 +8690,8 @@
 msgid "Set My Information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr ""
 
@@ -9407,7 +8717,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr ""
 
@@ -9558,8 +8869,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
@@ -9610,6 +8920,10 @@
 msgid "Video Camera"
 msgstr ""
 
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr ""
+
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
@@ -9626,9 +8940,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
@@ -9653,10 +8965,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
@@ -9671,7 +8980,8 @@
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4299
 msgid "Topic:"
 msgstr ""
 
@@ -9681,9 +8991,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
@@ -9694,7 +9002,8 @@
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:4026
 msgid "Connect"
 msgstr ""
 
@@ -9723,9 +9032,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
@@ -9738,9 +9045,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:4425
@@ -9812,10 +9117,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
@@ -9828,9 +9130,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
@@ -9838,9 +9138,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
@@ -9850,13 +9148,11 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr ""
 
@@ -9878,9 +9174,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
@@ -9993,9 +9287,7 @@
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:302
@@ -10100,9 +9392,7 @@
 
 #: ../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."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
 msgstr ""
 
 #. Open file selector to select the public key.
@@ -10119,9 +9409,7 @@
 
 #: ../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."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:1077
@@ -10136,16 +9424,12 @@
 
 #: ../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."
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:1187
 #: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:1474
@@ -10283,6 +9567,13 @@
 msgid "User Modes"
 msgstr ""
 
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr ""
+
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -10416,7 +9707,6 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
@@ -10455,13 +9745,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:444
@@ -10582,8 +9866,7 @@
 #: ../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"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:1047
@@ -10617,13 +9900,20 @@
 msgid "Unknown command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -10635,11 +9925,16 @@
 msgid "Secure File Transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -10649,11 +9944,13 @@
 msgid "Remote disconnected"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
@@ -10665,27 +9962,33 @@
 msgid "Creating connection failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr ""
 
@@ -10693,7 +9996,8 @@
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533
+#: ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -10732,7 +10036,8 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718
+#: ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -10741,7 +10046,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749
+#: ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -10927,6 +10233,13 @@
 msgstr ""
 
 #: ../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:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""
@@ -10973,19 +10286,20 @@
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
-#, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../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 ""
+
+#: ../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 ""
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -10994,17 +10308,20 @@
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr ""
 
@@ -11025,8 +10342,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:265
@@ -11047,7 +10363,6 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr ""
 
@@ -11076,8 +10391,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652
+#: ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr ""
 
@@ -11150,10 +10465,7 @@
 
 #: ../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 "
-"about yourself."
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:859
@@ -11362,16 +10674,12 @@
 
 #: ../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"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr ""
 
 #: ../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"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1724
@@ -11386,9 +10694,7 @@
 
 #: ../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"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1736
@@ -11428,9 +10734,7 @@
 
 #: ../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)"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
 msgstr ""
 
 #. *< type
@@ -11454,7 +10758,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853
+#: ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr ""
 
@@ -11624,19 +10929,20 @@
 msgid "Terminal"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/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/silc10/wb.c:288
-#, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:288
+#, c-format
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
@@ -11645,52 +10951,42 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr ""
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr ""
 
@@ -11717,30 +11013,26 @@
 msgstr ""
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1059
-msgid "Unknown server response."
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 
@@ -11752,36 +11044,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr ""
 
@@ -11826,7 +11118,6 @@
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
@@ -11851,47 +11142,38 @@
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr ""
 
@@ -11901,25 +11183,19 @@
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:560
@@ -11952,8 +11228,9 @@
 msgid "Password Change Successful"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:5532
+#: ../pidgin/gtkblist.c:5885
 msgid "_Group:"
 msgstr ""
 
@@ -11974,8 +11251,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr ""
 
@@ -12009,224 +11288,222 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:778
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:834
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:906
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1025
 msgid "Authorization denied message:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1043
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1046
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1976
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2042
+#, 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:2045
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2111
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2165
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2168
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2287
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2630
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoo.c:2654
+#: ../libpurple/protocols/yahoo/yahoo.c:2840
+#: ../libpurple/protocols/yahoo/yahoo.c:2943
+#: ../libpurple/protocols/yahoo/yahoo.c:2953
+#: ../libpurple/protocols/yahoo/yahoochat.c:1419
+#: ../libpurple/protocols/yahoo/yahoochat.c:1489
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2680
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2705
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3741
 msgid "Not at Home"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3057
+#: ../libpurple/protocols/yahoo/yahoo.c:3744
 msgid "Not at Desk"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3747
 msgid "Not in Office"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3063
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
 msgid "On Vacation"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3067
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3160
+#: ../libpurple/protocols/yahoo/yahoo.c:3190
 msgid "Not on server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3207
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3210
+#: ../libpurple/protocols/yahoo/yahoo.c:3286
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3271
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3280
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Join in Chat"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Initiate Conference"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3368
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3469
 msgid "Activate which ID?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3480
+msgid "Join who in chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate ID..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Join User in Chat..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3501
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4021
+msgid "You have just sent a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12240,59 +11517,126 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4301
+#: ../libpurple/protocols/yahoo/yahoo.c:4303
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4326
 msgid "Yahoo Japan"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4329
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4332
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4335
 msgid "Pager port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4338
 msgid "File transfer server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4341
 msgid "Japan file transfer server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4344
 msgid "File transfer port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4347
 msgid "Chat room locale"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4350
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
 msgid "Chat room list URL"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4361
 msgid "Yahoo Chat server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4364
 msgid "Yahoo Chat port"
 msgstr ""
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:207
+msgid "Invitation Rejected"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr ""
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:366
+msgid "Unknown room"
+msgstr ""
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:369
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:372
+msgid "Not available"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:376
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:454
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:630
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1321
+#: ../libpurple/protocols/yahoo/yahoochat.c:1347
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1405
+msgid "Voices"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1408
+msgid "Webcams"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1419
+#: ../libpurple/protocols/yahoo/yahoochat.c:1489
+msgid "Unable to fetch room list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1482
+msgid "User Rooms"
+msgstr ""
+
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -12302,7 +11646,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -12320,15 +11664,11 @@
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
@@ -12372,97 +11712,21 @@
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
-msgid "Invitation Rejected"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
-msgid "Failed to join chat"
-msgstr ""
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
-msgid "Unknown room"
-msgstr ""
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
-msgid "Maybe the room is full"
-msgstr ""
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
-msgid "Not available"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
-#, c-format
-msgid "You are now chatting in %s."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
-msgid "Failed to join buddy in chat"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
-msgid "Maybe they're not in a chat?"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
-msgid "Voices"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
-msgid "Webcams"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-msgid "Unable to fetch room list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
-msgid "User Rooms"
-msgstr ""
-
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr ""
@@ -12475,9 +11739,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
@@ -12543,26 +11805,19 @@
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
 #: ../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;"
+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: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;"
+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:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
+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:2744
@@ -12624,261 +11879,237 @@
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:458
+#: ../libpurple/proxy.c:877
+#: ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../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 ""
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr ""
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr ""
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr ""
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr ""
 
-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr ""
 
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr ""
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr ""
 
-#: ../libpurple/sslconn.c:164
-msgid "SSL Connection Failed"
-msgstr ""
-
-#: ../libpurple/sslconn.c:166
-msgid "SSL Handshake Failed"
-msgstr ""
-
-#: ../libpurple/sslconn.c:168
-msgid "SSL peer presented an invalid certificate"
-msgstr ""
-
-#: ../libpurple/sslconn.c:171
-msgid "Unknown SSL error"
-msgstr ""
-
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr ""
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:155
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr ""
 
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr ""
+
 #: ../libpurple/status.c:159
-msgid "Extended away"
-msgstr ""
-
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr ""
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr ""
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr ""
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr ""
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr ""
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr ""
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr ""
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr ""
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr ""
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2702
 #, c-format
 msgid "Error Reading %s"
 msgstr ""
 
-#: ../libpurple/util.c:2723
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:2703
+#, c-format
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr ""
+
+#: ../libpurple/util.c:3203
 msgid "Calculating..."
 msgstr ""
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3206
 msgid "Unknown."
 msgstr ""
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3232
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3244
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3258
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3266
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3569
+#: ../libpurple/util.c:3864
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3712
-#, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3692
+#, 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:3727
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3758
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3783
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
@@ -12904,71 +12135,72 @@
 msgstr ""
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr ""
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr ""
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:732
 #, c-format
 msgid "%s Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:936
-msgid "Use GNOME Proxy Settings"
-msgstr ""
-
 #: ../pidgin/gtkaccount.c:937
+msgid "Use GNOME Proxy Settings"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:938
 msgid "Use Global Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:944
 msgid "No Proxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:950
 msgid "HTTP"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:956
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:962
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:968
+#: ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr ""
 
@@ -12977,768 +12209,767 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1007
 msgid "If you look real closely"
 msgstr ""
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1010
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1031
 msgid "Proxy Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1045
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1054
+#: ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1058
+#: ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1066
 msgid "_Username:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1073
+#: ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1195
-msgid "Unable to save new account"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1196
-msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1468
 msgid "Add Account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1487
 msgid "_Basic"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1494
 msgid "Create this new account on the server"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1510
 msgid "_Advanced"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1968
+#: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:1996
 msgid "Protocol"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2196
 #, 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"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:767
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:760
 msgid "Join a Chat"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+#: ../pidgin/gtkblist.c:781
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr ""
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:792
+#: ../pidgin/gtkblist.c:5480
+#: ../pidgin/gtkblist.c:5846
+#: ../pidgin/gtkpounce.c:538
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1081
 msgid "Un_block"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1132
 msgid "Get _Info"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr ""
 
+#: ../pidgin/gtkblist.c:1141
+msgid "_Send File"
+msgstr ""
+
 #: ../pidgin/gtkblist.c:1148
-msgid "_Send File"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1155
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1153
+#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1262
+#: ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1170
+#: ../pidgin/gtkblist.c:1179
+#: ../pidgin/gtkblist.c:1270
+#: ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1173
+#: ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1272
+#: ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1241
+#: ../pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1237
 msgid "_Delete Group"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr ""
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1258
+#: ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459
+#: ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1327
 msgid "_Expand"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1572
+#: ../pidgin/gtkblist.c:1584
+#: ../pidgin/gtkblist.c:4574
+#: ../pidgin/gtkblist.c:4584
 msgid "/Tools/Mute Sounds"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../pidgin/gtkblist.c:2044
+#: ../pidgin/gtkconv.c:4701
+#: ../pidgin/gtkpounce.c:429
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2852
 msgid "/_Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/New Instant _Message..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Join a _Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Get User _Info..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/View User _Log..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2876
-msgid "/Buddies/Show/_Offline Buddies"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2877
-msgid "/Buddies/Show/_Empty Groups"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2878
-msgid "/Buddies/Show/Buddy _Details"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2879
-msgid "/Buddies/Show/Idle _Times"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2880
-msgid "/Buddies/Show/_Protocol Icons"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2858
+msgid "/Buddies/Show _Offline Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2859
+msgid "/Buddies/Show _Empty Groups"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2860
+msgid "/Buddies/Show Buddy _Details"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2861
+msgid "/Buddies/Show Idle _Times"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Sort Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/_Add Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:2865
 msgid "/Buddies/Add C_hat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/Add _Group..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/_Quit"
 msgstr ""
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:2871
 msgid "/_Accounts"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:6544
 msgid "/Accounts/Add\\/Edit"
 msgstr ""
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:2875
 msgid "/_Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Buddy _Pounces"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2896
-msgid "/Tools/_Certificates"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Plu_gins"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/Pr_eferences"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/_File Transfers"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2882
 msgid "/Tools/R_oom List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/System _Log"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:2885
 msgid "/Tools/Mute _Sounds"
 msgstr ""
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Help"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2888
 msgid "/Help/Online _Help"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:2889
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2893
 msgid "/Help/_About"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:2922
 #, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3000
 msgid "Buddy Alias"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3029
 msgid "Logged In"
 msgstr ""
 
+#: ../pidgin/gtkblist.c:3075
+msgid "Last Seen"
+msgstr ""
+
 #: ../pidgin/gtkblist.c:3095
-msgid "Last Seen"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3097
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3099
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3438
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3442
 #, c-format
 msgid "Idle %dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/New Instant Message..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3621
 msgid "/Buddies/Join a Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3589
 msgid "/Buddies/Get User Info..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3624
 msgid "/Buddies/Add Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3592
 msgid "/Buddies/Add Group..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3627
 msgid "/Tools/Privacy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3630
 msgid "/Tools/Room List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3727
+#: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:3807
 msgid "Manually"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3824
+#: ../pidgin/gtkblist.c:3809
 msgid "Alphabetically"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:3810
 msgid "By status"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:3811
 msgid "By log size"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4016
+#: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4026
+msgid "Re-enable Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4052
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4204
 msgid "<b>Username:</b>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4211
 msgid "<b>Password:</b>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4222
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4305
 msgid "/Accounts"
 msgstr ""
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
+#: ../pidgin/gtkblist.c:4319
 #, 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."
+"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 ""
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-msgid "/Buddies/Show/Offline Buddies"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4600
-msgid "/Buddies/Show/Empty Groups"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4606
-msgid "/Buddies/Show/Buddy Details"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4609
-msgid "/Buddies/Show/Idle Times"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4612
-msgid "/Buddies/Show/Protocol Icons"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
+#: ../pidgin/gtkblist.c:4568
+msgid "/Buddies/Show Offline Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4571
+msgid "/Buddies/Show Empty Groups"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4577
+msgid "/Buddies/Show Buddy Details"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4580
+msgid "/Buddies/Show Idle Times"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5457
+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 ""
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5492
 msgid "_Screen name:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5514
+#: ../pidgin/gtkblist.c:5867
 msgid "A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5779
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5842
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:5883
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:5795
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5836
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5924
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
+#: ../pidgin/gtkblist.c:6564
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6588
+msgid "_Edit Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6601
+#: ../pidgin/gtkconv.c:3007
+msgid "No actions available"
+msgstr ""
+
 #: ../pidgin/gtkblist.c:6609
-msgid "<PurpleMain>/Accounts/"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6633
-msgid "_Edit Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
-msgid "No actions available"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:6621
 msgid "Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:6627
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:6676
 msgid "/Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:6746
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
-#. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-msgid "SSL Servers"
-msgstr ""
-
-#: ../pidgin/gtkconn.c:180
+#: ../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 ""
-
-#: ../pidgin/gtkconv.c:482
+"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:458
 msgid "Unknown command."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:730
+#: ../pidgin/gtkconv.c:756
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:750
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:803
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:833
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:854
 msgid "_Buddy:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:874
+#: ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
+#: ../pidgin/gtkconv.c:931
+#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:937
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:973
 msgid "Save Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1122
+#: ../pidgin/gtkdebug.c:166
+#: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1148
+#: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1331
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1339
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1587
 msgid "Un-Ignore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1590
 msgid "Ignore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1610
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1633
 msgid "Last said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2522
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2573
 msgid "Save Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2625
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2630
 msgid "Hide Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2633
 msgid "Save Icon As..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2637
 msgid "Set Custom Icon..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2650
 msgid "Remove Custom Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2861
-msgid "Show All"
-msgstr ""
-
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2792
 msgid "/_Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/New Instant _Message..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2799
 msgid "/Conversation/_Find..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/View _Log"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2809
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/_Get Info"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/In_vite..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/M_ore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/Al_ias..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2821
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/_Unblock..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2825
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/Insert Lin_k..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2834
 msgid "/Conversation/Insert Imag_e..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2840
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2844
 msgid "/_Options"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2845
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2846
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2847
+msgid "/Options/Show Buddy _Icon"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2849
 msgid "/Options/Show Formatting _Toolbars"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:2850
 msgid "/Options/Show Ti_mestamps"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:2995
 msgid "/Conversation/More"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3051
 msgid "/Options"
 msgstr ""
 
@@ -13747,758 +12978,783 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3086
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/View Log"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3132
 msgid "/Conversation/Send File..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3136
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3142
 msgid "/Conversation/Get Info"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3146
 msgid "/Conversation/Invite..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3152
 msgid "/Conversation/Alias..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3156
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3160
 msgid "/Conversation/Unblock..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3168
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3174
 msgid "/Conversation/Insert Link..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Insert Image..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3184
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3200
 msgid "/Options/Show Formatting Toolbars"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3203
 msgid "/Options/Show Timestamps"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3206
+msgid "/Options/Show Buddy Icon"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3290
+#: ../pidgin/gtkconv.c:3332
 msgid "User is typing..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3335
 msgid "User has typed something and stopped"
 msgstr ""
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+#: ../pidgin/gtkconv.c:3518
+#: ../pidgin/gtkconv.c:7782
 msgid "_Send To"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4231
 msgid "_Send"
 msgstr ""
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4335
 msgid "0 people in room"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5603
+#: ../pidgin/gtkconv.c:5724
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6327
+#: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6331
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6334
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6337
+#: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6340
 msgid "New Event"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7332
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7496
 msgid "Confirm close"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7528
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8114
 msgid "Close other tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8120
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8128
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8134
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8632
 msgid "Close conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9232
 msgid "Last created window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9234
 msgid "Separate IM and Chat windows"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9236
+#: ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9238
 msgid "By group"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9240
 msgid "By account"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr ""
 
+#: ../pidgin/gtkdebug.c:651
+msgid "_Icon Only"
+msgstr ""
+
 #: ../pidgin/gtkdebug.c:652
-msgid "_Icon Only"
+msgid "_Text Only"
 msgstr ""
 
 #: ../pidgin/gtkdebug.c:653
-msgid "_Text Only"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr ""
 
+#: ../pidgin/gtkdebug.c:823
+msgid "Level "
+msgstr ""
+
 #: ../pidgin/gtkdebug.c:824
-msgid "Level "
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr ""
 
+#: ../pidgin/gtkdebug.c:832
+msgid "All"
+msgstr ""
+
 #: ../pidgin/gtkdebug.c:833
-msgid "All"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr ""
 
+#: ../pidgin/gtkdebug.c:835
+msgid "Warning"
+msgstr ""
+
 #: ../pidgin/gtkdebug.c:836
-msgid "Warning"
+msgid "Error "
 msgstr ""
 
 #: ../pidgin/gtkdebug.c:837
-msgid "Error "
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71
+#: ../pidgin/gtkdialogs.c:113
 msgid "lead developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr ""
 
+#: ../pidgin/gtkdialogs.c:86
+msgid "support"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:87
-msgid "support"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:108
 msgid "developer & webmaster"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:99
-msgid "Senior Contributor/QA"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:104
 msgid "win32 port"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:105
+#: ../pidgin/gtkdialogs.c:106
 msgid "maintainer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:107
 msgid "libfaim maintainer"
 msgstr ""
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:110
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:111
 msgid "XMPP developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:112
 msgid "original author"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
 msgstr ""
 
+#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:218
+msgid "Bulgarian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 #: ../pidgin/gtkdialogs.c:135
-msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
-msgid "Bulgarian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:221
 msgid "Czech"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Danish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:222
 msgid "German"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:149
 msgid "Greek"
 msgstr ""
 
+#: ../pidgin/gtkdialogs.c:150
+msgid "Australian English"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:151
+msgid "Canadian English"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:152
+msgid "British English"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:153
+msgid "Esperanto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
+msgid "Spanish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:155
+msgid "Estonian"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:156
-msgid "Australian English"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:157
-msgid "Canadian English"
+msgid "Euskera(Basque)"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:158
-msgid "British English"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:159
-msgid "Esperanto"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
-msgid "Spanish"
+#: ../pidgin/gtkdialogs.c:160
+msgid "Persian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:161
-msgid "Estonian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
-msgid "Euskera(Basque)"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-msgid "Persian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "French"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:233
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Gujarati"
 msgstr ""
 
+#: ../pidgin/gtkdialogs.c:166
+msgid "Gujarati Language Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:234
+msgid "Hebrew"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:168
+msgid "Hindi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:169
+msgid "Hungarian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:170
+msgid "Indonesian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:235
+msgid "Italian"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:172
-msgid "Gujarati Language Team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
-msgid "Hebrew"
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
+msgid "Japanese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:239
+msgid "Georgian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Ubuntu Georgian Translators"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:174
-msgid "Hindi"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
-msgid "Hungarian"
+msgid "Kannada"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Kannada Translation team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
+msgid "Korean"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:176
-msgid "Indonesian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
-msgid "Italian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-msgid "Japanese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-msgid "Georgian"
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
+msgid "Kurdish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:179
-msgid "Ubuntu Georgian Translators"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada"
+#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
+msgid "Lithuanian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:180
-msgid "Kannada Translation team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
-msgid "Korean"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:244
+msgid "Macedonian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:245
+msgid "Bokmål Norwegian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Nepali"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:184
-msgid "Kurdish"
+msgid "Dutch, Flemish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:185
-msgid "Lao"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
-msgid "Lithuanian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
-msgid "Macedonian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
-msgid "Bokmål Norwegian"
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:246
+msgid "Polish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Portuguese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:190
+msgid "Portuguese-Brazil"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:191
-msgid "Nepali"
+msgid "Pashto"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
+msgid "Romanian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:193
-msgid "Norwegian Nynorsk"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
-msgid "Polish"
+#: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
+msgid "Russian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
+msgid "Slovak"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:252
+msgid "Slovenian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:197
-msgid "Portuguese"
+msgid "Albanian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:199
-msgid "Pashto"
+msgid "Serbian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:200
-msgid "Romanian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
-msgid "Russian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
-msgid "Slovak"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
-msgid "Slovenian"
+#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
+msgid "Swedish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:201
+msgid "Tamil"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:202
+msgid "Telugu"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:203
+msgid "Thai"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:255
+msgid "Turkish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:205
-msgid "Albanian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
-msgid "Serbian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
-msgid "Swedish"
-msgstr ""
-
+msgid "Vietnamese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:205
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:256
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
 #: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
+msgid "Hong Kong Chinese"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:210
-msgid "Telugu"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:211
-msgid "Thai"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
-msgid "Turkish"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "Vietnamese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:257
+msgid "Traditional Chinese"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:217
-msgid "Hong Kong Chinese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
-msgid "Traditional Chinese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:342
 #, c-format
 msgid "About %s"
 msgstr ""
 
+#: ../pidgin/gtkdialogs.c:380
+#, 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 ""
+
+#: ../pidgin/gtkdialogs.c:395
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:400
-#, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:423
 msgid "Current Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:415
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:430
 msgid "Retired Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:445
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:460
 msgid "Artists"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:475
 msgid "Current Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:495
 msgid "Past Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:513
 msgid "Debugging Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:882
 msgid "Get User Info"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:884
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:974
 msgid "View User Log"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:976
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Contact"
 msgstr ""
 
+#: ../pidgin/gtkdialogs.c:997
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1019
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:1021
-msgid "Enter an alias for this contact."
+msgid "Alias Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1042
+msgid "Alias Chat"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:1043
-#, c-format
-msgid "Enter an alias for %s."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1045
-msgid "Alias Buddy"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1066
-msgid "Alias Chat"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1106
-#, 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?"
+#: ../pidgin/gtkdialogs.c:1082
+#, 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] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1090
 msgid "Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1093
 msgid "_Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1148
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1124
+#, c-format
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1131
 msgid "Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1134
 msgid "_Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1208
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1184
+#, 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 ""
+
+#: ../pidgin/gtkdialogs.c:1187
 msgid "Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1190
 msgid "_Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1247
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../pidgin/gtkdialogs.c:1223
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1226
+msgid "Remove Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1229
+msgid "_Remove Buddy"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:1250
-msgid "Remove Buddy"
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:1253
-msgid "_Remove Buddy"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1274
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1256
 msgid "_Remove Chat"
 msgstr ""
 
@@ -14530,143 +13786,145 @@
 msgid "Quit"
 msgstr ""
 
-#: ../pidgin/gtkft.c:154
+#: ../pidgin/gtkft.c:153
 msgid "Not started"
 msgstr ""
 
-#: ../pidgin/gtkft.c:274
+#: ../pidgin/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:276
+#: ../pidgin/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:280
+#: ../pidgin/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:282
+#: ../pidgin/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:498
+#: ../pidgin/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr ""
 
-#: ../pidgin/gtkft.c:503
+#: ../pidgin/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr ""
 
-#: ../pidgin/gtkft.c:540
+#: ../pidgin/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr ""
 
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr ""
+
 #: ../pidgin/gtkft.c:549
 #, c-format
-msgid "Error running %s"
-msgstr ""
-
-#: ../pidgin/gtkft.c:550
-#, c-format
 msgid "Process returned error code %d"
 msgstr ""
 
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr ""
+
 #: ../pidgin/gtkft.c:697
-msgid "Filename:"
-msgstr ""
-
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr ""
 
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr ""
+
 #: ../pidgin/gtkft.c:700
-msgid "Speed:"
+msgid "Time Elapsed:"
 msgstr ""
 
 #: ../pidgin/gtkft.c:701
-msgid "Time Elapsed:"
-msgstr ""
-
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr ""
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr ""
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr ""
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:832
+#: ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr ""
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832
+#: ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
 msgstr ""
 
+#: ../pidgin/gtkimhtml.c:1372
+msgid "Hyperlink color"
+msgstr ""
+
 #: ../pidgin/gtkimhtml.c:1373
-msgid "Hyperlink color"
-msgstr ""
-
-#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr ""
 
+#: ../pidgin/gtkimhtml.c:1376
+msgid "Hyperlink prelight color"
+msgstr ""
+
 #: ../pidgin/gtkimhtml.c:1377
-msgid "Hyperlink prelight color"
-msgstr ""
-
-#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -14674,7 +13932,7 @@
 "%s"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -14682,266 +13940,193 @@
 "%s"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:411
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:424
+#: ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:519
+#: ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr ""
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:820
+#: ../pidgin/gtkimhtmltoolbar.c:1164
 msgid "_Font"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Group Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-msgid "Strikethrough"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-msgid "Font Face"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-msgid "Background Color"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-msgid "Foreground Color"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "Reset Formatting"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-msgid "Insert IM Image"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-msgid "Insert Smiley"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1124
 msgid "<b>_Bold</b>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1125
 msgid "<i>_Italic</i>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1126
 msgid "<u>_Underline</u>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1127
 msgid "<span size='larger'>_Larger</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1129
 msgid "_Normal"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1131
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr ""
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Font face"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1136
 msgid "Foreground _color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1137
 msgid "Bac_kground color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Smiley"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
-msgid "_Horizontal rule"
-msgstr ""
-
-#: ../pidgin/gtklog.c:293
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:304
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:309
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:453
+#: ../pidgin/gtklog.c:292
+#, c-format
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:303
+#, c-format
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:308
+#, c-format
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:456
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:503
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr ""
 
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:561
+#: ../pidgin/gtklog.c:549
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:553
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:556
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr ""
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr ""
 
-#: ../pidgin/gtklog.c:640
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr ""
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr ""
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:716
+#: ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr ""
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr ""
 
@@ -14990,65 +14175,68 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:699
+#: ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtknotify.c:564
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:959
+#: ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984
+#: ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-
-#: ../pidgin/gtkplugin.c:265
+#: ../pidgin/gtknotify.c:1113
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15056,7 +14244,7 @@
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -15064,753 +14252,748 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:157
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr ""
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr ""
 
+#: ../pidgin/gtkpounce.c:669
+msgid "Br_owse..."
+msgstr ""
+
 #: ../pidgin/gtkpounce.c:670
-msgid "Br_owse..."
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:386
+#: ../pidgin/gtkprefs.c:385
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:643
 msgid "Install Theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:696
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:893
+msgid "System Tray Icon"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:894
-msgid "System Tray Icon"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:903
+msgid "Conversation Window Hiding"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:904
-msgid "Conversation Window Hiding"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr ""
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:936
+msgid "Top"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:937
-msgid "Top"
+msgid "Bottom"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:938
-msgid "Bottom"
+msgid "Left"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:939
-msgid "Left"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:941
+msgid "Left Vertical"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _detailed information"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1018
 msgid "Minimi_ze new conversation windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1062
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1059
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:1179
+msgid "Ports"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:1182
-msgid "Ports"
+msgid "_Manually specify range of ports to listen on"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1185
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:1325
+msgid "Seamonkey"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1326
+msgid "Opera"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1327
+msgid "Netscape"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:1328
-msgid "Seamonkey"
+msgid "Mozilla"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1329
-msgid "Opera"
+msgid "Konqueror"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1330
-msgid "Netscape"
+msgid "GNOME Default"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1331
-msgid "Mozilla"
+msgid "Galeon"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1332
-msgid "Konqueror"
+msgid "Firefox"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1333
-msgid "GNOME Default"
+msgid "Firebird"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1334
-msgid "Galeon"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1335
-msgid "Firefox"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1336
-msgid "Firebird"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:1408
+msgid "_Open link in:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1410
+msgid "Browser default"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:1411
-msgid "_Open link in:"
+msgid "Existing window"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1413
-msgid "Browser default"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1414
-msgid "Existing window"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all c_hats"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1642
 msgid "Louder"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1754
 msgid "Enable sounds:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr ""
 
+#: ../pidgin/gtkprefs.c:1922
+msgid "_Report idle time:"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:1927
-msgid "_Report idle time:"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr ""
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1952
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr ""
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr ""
 
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr ""
+
 #: ../pidgin/gtkprivacy.c:80
-msgid "Allow all users to contact me"
+msgid "Allow only the users on my buddy list"
 msgstr ""
 
 #: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users on my buddy list"
+msgid "Allow only the users below"
 msgstr ""
 
 #: ../pidgin/gtkprivacy.c:82
-msgid "Allow only the users below"
+msgid "Block all users"
 msgstr ""
 
 #: ../pidgin/gtkprivacy.c:83
-msgid "Block all users"
-msgstr ""
-
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:556
+#: ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr ""
 
+#: ../pidgin/gtkprivacy.c:557
+msgid "Type a user you permit to contact you."
+msgstr ""
+
 #: ../pidgin/gtkprivacy.c:558
-msgid "Type a user you permit to contact you."
-msgstr ""
-
-#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:598
+#: ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr ""
 
+#: ../pidgin/gtkprivacy.c:599
+msgid "Type a user to block."
+msgstr ""
+
 #: ../pidgin/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr ""
-
-#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:271
 msgid "Apply"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr ""
 
+#: ../pidgin/gtkrequest.c:1505
+msgid "Would you like to overwrite it?"
+msgstr ""
+
 #: ../pidgin/gtkrequest.c:1508
-msgid "Would you like to overwrite it?"
-msgstr ""
-
-#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1647
+#: ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr ""
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr ""
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr ""
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:337
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr ""
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:619
+#: ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1177
+#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr ""
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr ""
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1398
+#: ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1401
+#: ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr ""
 
+#: ../pidgin/gtkutils.c:1497
+#, c-format
+msgid "Cannot send folder %s."
+msgstr ""
+
 #: ../pidgin/gtkutils.c:1498
 #, c-format
-msgid "Cannot send folder %s."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1499
-#, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1530
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1531
+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:1537
+#: ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1538
+#: ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 
+#: ../pidgin/gtkutils.c:1550
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgstr ""
+
 #: ../pidgin/gtkutils.c:1551
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr ""
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -15818,17 +15001,15 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:1609
+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
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15836,31 +15017,31 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
+#: ../pidgin/gtkutils.c:2642
+msgid "Icon Error"
+msgstr ""
+
 #: ../pidgin/gtkutils.c:2643
-msgid "Icon Error"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2793
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkutils.c:2792
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr ""
 
@@ -15868,27 +15049,27 @@
 msgid "Select color"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:91
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr ""
 
@@ -15912,7 +15093,8 @@
 msgid "Display Statistics"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:462
+#: ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr ""
 
@@ -15925,8 +15107,10 @@
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817
+#: ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831
+#: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr ""
 
@@ -15958,9 +15142,7 @@
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:61
@@ -15989,9 +15171,7 @@
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:125
@@ -16016,22 +15196,20 @@
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr ""
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
 msgstr ""
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr ""
 
@@ -16055,11 +15233,24 @@
 msgid "Received Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210
+#: ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr ""
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr ""
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr ""
@@ -16082,9 +15273,7 @@
 
 #. 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\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
 msgstr ""
 
 #: ../pidgin/plugins/extplacement.c:111
@@ -16114,9 +15303,7 @@
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr ""
 
 #. Configuration frame
@@ -16175,27 +15362,25 @@
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr ""
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr ""
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr ""
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
 msgstr ""
 
 #. Add the expander
@@ -16258,35 +15443,42 @@
 msgid "Provides integration with Evolution."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr ""
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr ""
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -16306,13 +15498,6 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr ""
@@ -16331,7 +15516,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 
@@ -16351,7 +15537,8 @@
 msgid "Markerline"
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 
@@ -16359,50 +15546,50 @@
 msgid "Draw Markerline in "
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:683
 msgid "C_hat windows"
 msgstr ""
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
 msgstr ""
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr ""
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr ""
 
@@ -16414,86 +15601,84 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
+#: ../pidgin/plugins/notify.c:672
 msgid "Notify For"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:697
+#: ../pidgin/plugins/notify.c:691
 msgid "\t_Only when someone says your screen name"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:707
+#: ../pidgin/plugins/notify.c:701
 msgid "_Focused windows"
 msgstr ""
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
+#: ../pidgin/plugins/notify.c:709
 msgid "Notification Methods"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:722
+#: ../pidgin/plugins/notify.c:716
 msgid "Prepend _string into window title:"
 msgstr ""
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
+#: ../pidgin/plugins/notify.c:735
 msgid "Insert c_ount of new messages into window title"
 msgstr ""
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
+#: ../pidgin/plugins/notify.c:744
 msgid "Insert count of new message into _X property"
 msgstr ""
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
+#: ../pidgin/plugins/notify.c:752
 msgid "Set window manager \"_URGENT\" hint"
 msgstr ""
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
+#: ../pidgin/plugins/notify.c:761
 msgid "R_aise conversation window"
 msgstr ""
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
+#: ../pidgin/plugins/notify.c:769
 msgid "Notification Removal"
 msgstr ""
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
+#: ../pidgin/plugins/notify.c:774
 msgid "Remove when conversation window _gains focus"
 msgstr ""
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
+#: ../pidgin/plugins/notify.c:781
 msgid "Remove when conversation window _receives click"
 msgstr ""
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
+#: ../pidgin/plugins/notify.c:789
 msgid "Remove when _typing in conversation window"
 msgstr ""
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
+#: ../pidgin/plugins/notify.c:797
 msgid "Remove when a _message gets sent"
 msgstr ""
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
+#: ../pidgin/plugins/notify.c:806
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -16503,7 +15688,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr ""
 
@@ -16511,7 +15696,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:904
+#: ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -16582,7 +15768,6 @@
 msgstr ""
 
 #: ../pidgin/plugins/pidginrc.c:300
-#, c-format
 msgid "Select Interface Font"
 msgstr ""
 
@@ -16648,7 +15833,8 @@
 msgid "Pidgin GTK+ Theme Control"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 
@@ -16661,16 +15847,12 @@
 msgstr ""
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 
 #: ../pidgin/plugins/relnot.c:79
@@ -16678,7 +15860,8 @@
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr ""
 
@@ -16701,9 +15884,7 @@
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
 msgstr ""
 
 #: ../pidgin/plugins/spellchk.c:1962
@@ -16767,7 +15948,8 @@
 msgid "Text replacement"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
@@ -16777,7 +15959,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -16785,7 +15968,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:357
+#: ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
@@ -16820,7 +16004,6 @@
 msgstr ""
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr ""
 
@@ -16865,49 +16048,47 @@
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr ""
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "ຢູ່ຂ້າງເທີງ ເລຶ້ອຍ ຯ "
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 
@@ -16917,22 +16098,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -16978,8 +16158,7 @@
 msgstr ""
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 
 #: ../pidgin/plugins/xmppconsole.c:667
@@ -16992,7 +16171,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746
+#: ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "ຈໍ XMPP "
@@ -17028,3 +16208,4 @@
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
+
diff -r d94432a338ab -r bedd56240914 po/pa.po
--- a/po/pa.po	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/pa.po	Fri Sep 28 20:30:26 2007 +0000
@@ -10332,7455 +10332,4 @@
 #: ../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: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: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: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: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:723
-#: ../libpurple/protocols/silc10/buddy.c:735
-#, c-format
-msgid "The %s buddy is not trusted"
-msgstr "%s ਸਨੇਹੀ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"ਤੁਸੀਂ ਸਨੇਹੀ ਸੂਚਨਾ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਉਸ ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਨੂੰ ਆਯਾਤ ਨਹੀਂ "
-"ਕਰਦੇ ਹੋ। ਤੁਹਾਨੂੰ Get Public Key ਕਮਾਂਡ ਦੀ ਵਰਤੋਂ ਕੁੰਜੀ ਆਯਾਤ ਕਰਨ ਲਈ ਚਾਹੀਦੀ ਹੈ।"
-
-#. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
-msgid "Open..."
-msgstr "ਖੋਲੋ..."
-
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
-#, c-format
-msgid "The %s buddy is not present in the network"
-msgstr "%s ਸਨੇਹੀ ਨੈਟਵਰਕ ਉੱਤੇ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"ਸਨੇਹੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਉਸਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਪਵੇਗਾ। ਸਵਰਜਨਕ ਕੁੰਜੀ ਨੂੰ ਆਯਾਤ ਕਰਨ "
-"ਕਈ ਆਯਾਤ ਨੂੰ ਦਬਾਉ।"
-
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
-msgid "_Import..."
-msgstr "ਆਯਾਤ(_I)..."
-
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
-msgid "Select correct user"
-msgstr "ਠੀਕ ਉਪਭੋਗੀ ਚੁਣੋ"
-
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਉਪਭੋਗੀ ਇੱਕ ਸਵਰਜਨਕ ਕੁੰਜੀ ਨਾਲ ਮਿਲੇ ਹਨ। ਸੂਚੀ ਵਿੱਚ ਸਨੇਹੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਠੀਕ "
-"ਉਪਭੋਗੀ ਚੁਣੋ।"
-
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਉਪਭੋਗੀ ਇਸੇ ਨਾਂ ਨਾਲ ਹੀ ਲੱਭੇ ਹਨ। ਸੂਚੀ ਵਿੱਚ ਸਨੇਹੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਠੀਕ ਉਪਭੋਗੀ ਚੁਣੋ।"
-
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
-msgid "Detached"
-msgstr "ਅੱਡ"
-
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../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: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: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: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: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: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: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: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: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: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: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: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: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: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:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
-msgid "User Modes"
-msgstr "ਉਪਭੋਗੀ ਢੰਗ"
-
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../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: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: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: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:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
-msgid "Geolocation"
-msgstr "ਭੂਗੋਲਿਕ ਸਥਿਤੀ"
-
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
-msgid "Reset IM Key"
-msgstr "IM ਕੁੰਜੀ ਮੁੜ-ਦਿਓ"
-
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
-msgid "IM with Key Exchange"
-msgstr "ਕੁੰਜੀ ਤਬਾਦਲੇ ਨਾਲ IM"
-
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
-msgid "IM with Password"
-msgstr "ਗੁਪਤ-ਕੋਡ ਨਾਲ IM"
-
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
-msgid "Get Public Key..."
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਪ੍ਰਾਪਤੀ..."
-
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
-#: ../libpurple/protocols/silc10/ops.c:1624
-msgid "Kill User"
-msgstr "ਉਪਭੋਗੀ ਬਾਹਰ ਸੁੱਟੋ"
-
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
-#: ../libpurple/protocols/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: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: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: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:153
-#: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
-msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>ਚੈਨਲ ਢੰਗ:</b> "
-
-#: ../libpurple/protocols/silc/chat.c:166
-#: ../libpurple/protocols/silc10/chat.c:165
-#, c-format
-msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>ਮੋਢੀ ਕੁੰਜੀ ਫਿੰਗਰਪ੍ਰਿੰਟ:</b><br>%s"
-
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:166
-#, c-format
-msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>ਮੋਢੀ ਕੁੰਜੀ ਬੱਬਲਪ੍ਰਿੰਟ:</b><br>%s"
-
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
-msgid "Add Channel Public Key"
-msgstr "ਚੈਨਲ ਸਵਰਜਨਕ ਕੁੰਜੀ ਸ਼ਾਮਿਲ"
-
-#. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
-msgid "Open Public Key..."
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਖੋਲ੍ਹੋ..."
-
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
-msgid "Channel Passphrase"
-msgstr "ਚੈਨਲ ਪ੍ਹੈਰਾ"
-
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
-msgid "Channel Public Keys List"
-msgstr "ਚੈਨਲ ਸਵਰਜਨਕ ਕੁੰਜੀ ਸੂਚੀ"
-
-#: ../libpurple/protocols/silc/chat.c:435
-#: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../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: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:597
-#: ../libpurple/protocols/silc10/chat.c:581
-msgid "Group Name"
-msgstr "ਗਰੁੱਪ ਨਾਂ"
-
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
-msgid "Passphrase"
-msgstr "ਪ੍ਹੈਰਾ"
-
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:596
-#, c-format
-msgid "Please enter the %s channel private group name and passphrase."
-msgstr "%s ਚੈਨਲ ਨਿੱਜੀ ਗਰੁੱਪ ਨਾਂ ਅਤੇ ਪ੍ਹੈਰਾ ਦਿਓ ਜੀ।"
-
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
-msgid "Add Channel Private Group"
-msgstr "ਚੈਨਲ ਨਿੱਜੀ ਗਰੁੱਪ ਸ਼ਾਮਿਲ"
-
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
-msgid "User Limit"
-msgstr "ਉਪਭੋਗੀ ਸੀਮਾ"
-
-#: ../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 "ਚੈਨਲ ਉੱਤੇ ਉਪਭੋਗੀ ਗਿਣਤੀ ਦਿਓ। ਬੇਅੰਤ ਸੀਮਾ ਦੇਣ ਲਈ 0 ਦਿਓ।"
-
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
-msgid "Invite List"
-msgstr "ਸੱਦਾ ਸੂਚੀ"
-
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
-msgid "Ban List"
-msgstr "ਪਾਬੰਦੀ ਸੂਚੀ"
-
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
-msgid "Add Private Group"
-msgstr "ਨਿੱਜੀ ਗਰੁੱਪ ਸ਼ਾਮਿਲ"
-
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
-msgid "Reset Permanent"
-msgstr "ਪੱਕਾ ਮੁੜ-ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
-msgid "Set Permanent"
-msgstr "ਪੱਕਾ ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
-msgid "Set User Limit"
-msgstr "ਉਪਭੋਗੀ ਸੀਮਾ ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
-msgid "Reset Topic Restriction"
-msgstr "ਵਿਸ਼ਾ ਪਾਬੰਦੀ ਮੁੜ-ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
-msgid "Set Topic Restriction"
-msgstr "ਵਿਸ਼ਾ ਪਾਬੰਦੀ ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
-msgid "Reset Private Channel"
-msgstr "ਨਿੱਜੀ ਚੈਨਲ ਮੁੜ-ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
-msgid "Set Private Channel"
-msgstr "ਨਿੱਜੀ ਚੈਨਲ ਬਣਾਓ"
-
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
-msgid "Reset Secret Channel"
-msgstr "ਗੁਪਤ ਚੈਨਲ ਮੁੜ ਦਿਓ"
-
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
-msgid "Set Secret Channel"
-msgstr "ਗੁਪਤ ਚੈਨਲ ਬਣਾਓ"
-
-#: ../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:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
-msgid "Join Private Group"
-msgstr "ਨਿੱਜੀ ਗਰੁੱਪ 'ਚ ਦਾਖਲ"
-
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
-msgid "Cannot join private group"
-msgstr "ਨਿੱਜੀ ਗਰੁੱਪ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋ ਸਕਦੇ"
-
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
-msgid "Call Command"
-msgstr "ਕਾਲ ਕਮਾਂਡ"
-
-#: ../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: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: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: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:87
-#, fuzzy
-msgid "Remote disconnected"
-msgstr "%s ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕੀਤਾ"
-
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
-msgid "Permission denied"
-msgstr "ਅਧਿਕਾਰ ਨਹੀ ਹੈ"
-
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
-msgid "Key agreement failed"
-msgstr "ਕੁੰਜੀ ਸਹਮਿਤੀ ਅਸਫਲ"
-
-#: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
-msgid "Connection timed out"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮਾਂ-ਸਮਾਪਤ"
-
-#: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
-msgid "Creating connection failed"
-msgstr "ਸੰਬੰਧ ਅਸਫਲ"
-
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
-msgid "File transfer session does not exist"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸ਼ੈਸ਼ਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
-msgid "No file transfer session active"
-msgstr "ਕੋਈ ਫਾਇਲ ਭੇਜਣ ਵਾਲਾ ਅਜਲਾਸ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
-msgid "File transfer already started"
-msgstr "ਫਾਇਲ ਭੇਜੀ ਸ਼ੁਰੂ ਹੋ ਚੁੱਕੀ ਹੈ"
-
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
-msgid "Could not perform key agreement for file transfer"
-msgstr "ਫਾਇਲ ਭੇਜਣ ਲਈ ਕੁੰਜੀ ਸਹਮਿਤੀ ਨਹੀਂ ਹੋ ਸਕੀ"
-
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
-msgid "Could not start the file transfer"
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
-
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
-msgid "Cannot send file"
-msgstr "ਫਾਇਲ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
-
-#: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
-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: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: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: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: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: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: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: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:796
-#: ../libpurple/protocols/silc10/ops.c:829
-msgid "Server signoff"
-msgstr "ਸਰਵਰ ਬੰਦ"
-
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
-msgid "Personal Information"
-msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
-msgid "Birth Day"
-msgstr "ਜਨਮ ਦਿਨ"
-
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
-msgid "Job Role"
-msgstr "ਕੰਮ ਅਹੁਦਾ"
-
-#: ../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:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
-msgid "Unit"
-msgstr "ਇਕਾਈ"
-
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
-msgid "Note"
-msgstr "ਸੂਚਨਾ"
-
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
-msgid "Join Chat"
-msgstr "ਗੱਲਬਾਤ 'ਚ ਦਾਖਲ"
-
-#: ../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:1071
-msgid "Real Name"
-msgstr "ਅਸਲੀ ਨਾਂ"
-
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
-msgid "Status Text"
-msgstr "ਸਥਿਤੀ ਪਾਠ"
-
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
-msgid "Public Key Fingerprint"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਫਿੰਗਰਪ੍ਰਿੰਟ"
-
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
-msgid "Public Key Babbleprint"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਬੱਬਲੀਪ੍ਰਿੰਟ"
-
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
-msgid "_More..."
-msgstr "ਹੋਰ(_M)..."
-
-#: ../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:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
-msgid "Cannot detach"
-msgstr "ਵੱਖ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
-msgid "Cannot set topic"
-msgstr "ਵਿਸ਼ਾ ਦਿੱਤਾ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
-msgid "Failed to change nickname"
-msgstr "ਨਾਂ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ"
-
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
-msgid "Roomlist"
-msgstr "ਰੂਮ-ਸੂਚੀ"
-
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
-msgid "Cannot get room list"
-msgstr "ਰੂਮ ਸੂਚੀ ਮਿਲ ਨਹੀਂ ਸਕਦੀ"
-
-#: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
-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: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:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
-msgid "Cannot get server information"
-msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕੀ"
-
-#: ../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:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
-msgid "Cannot get server statistics"
-msgstr "ਸਰਵਰ ਅੰਕੜੇ ਮਿਲ ਨਹੀਂ ਸਕਦੇ"
-
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
-#, c-format
-msgid ""
-"Local server start time: %s\n"
-"Local server uptime: %s\n"
-"Local server clients: %d\n"
-"Local server channels: %d\n"
-"Local server operators: %d\n"
-"Local router operators: %d\n"
-"Local cell clients: %d\n"
-"Local cell channels: %d\n"
-"Local cell servers: %d\n"
-"Total clients: %d\n"
-"Total channels: %d\n"
-"Total servers: %d\n"
-"Total routers: %d\n"
-"Total server operators: %d\n"
-"Total router operators: %d\n"
-msgstr ""
-"ਸਥਾਨਕ ਸਰਵਰ ਸ਼ੁਰੂ ਸਮਾਂ: %s\n"
-"ਸਥਾਨਕ ਸਰਵਰ ਚਾਲੂ ਸਮਾਂ: %s\n"
-"ਸਥਾਨਕ ਸਰਵਰ ਕਲਾਂਇਟ: %d\n"
-"ਸਥਾਨਕ ਸਰਵਰ ਚੈਨਲ: %d\n"
-"ਸਥਾਨਕ ਸਰਵਰ ਓਪਰੇਟਰ: %d\n"
-"ਸਥਾਨਕ ਰਾਊਟਰ ਓਪਰੇਟਰ: %d\n"
-"ਸਥਾਨਕ ਸੈਲ ਕਲਾਂਇਟ: %d\n"
-"ਸਥਾਨਕ ਸੈਲ ਕਲਾਂਇਟ: %d\n"
-"ਸਥਾਨਕ ਸੈਲ ਸਰਵਰ: %d\n"
-"ਕੁੱਲ ਕਲਾਂਇਟ: %d\n"
-"ਕੁੱਲ ਚੈਨਲ: %d\n"
-"ਕੁੱਲ ਸਰਵਰ: %d\n"
-"ਕੁੱਲ ਰਾਊਟਰ: %d\n"
-"ਕੁੱਲ ਸਰਵਰ ਓਪਰੇਟਰ: %d\n"
-"ਕੁੱਲ ਰਾਊਟਰ ਓਪਰੇਟਰ: %d\n"
-
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
-msgid "Network Statistics"
-msgstr "ਨੈਟਵਰਕ ਅੰਕੜੇ"
-
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
-msgid "Ping failed"
-msgstr "ਪਿੰਗ ਅਸਫਲ"
-
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping reply received from server"
-msgstr "ਸਰਵਰ ਤੋਂ ਪਿੰਗ ਜਵਾਬ ਆਇਆ"
-
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
-msgid "Could not kill user"
-msgstr "ਉਪਭੋਗੀ ਖਤਮ ਨਹੀਂ ਹੋ ਸਕਦਾ"
-
-#: ../libpurple/protocols/silc/ops.c:1648
-msgid "WATCH"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
-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:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
-msgid "Authenticating connection"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਪ੍ਰਮਾਣਕਿਤਾ ਜਾਰੀ"
-
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
-msgid "Verifying server public key"
-msgstr "ਸਰਵਰ ਸਵਰਜਨਕ ਕੁੰਜੀ ਪੜਤਾਲ ਜਾਰੀ ਹੈ"
-
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
-msgid "Passphrase required"
-msgstr "ਪ੍ਹੈਰਾ ਲੋੜੀਦਾ ਹੈ"
-
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
-#, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"%s ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਮਿਲੀ ਹੈ। ਤੁਹਾਡੀ ਸਥਾਨਿਕ ਕੁੰਜੀ ਇਸ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਹਾਲੇ "
-"ਵੀ ਇਸ ਸਵਰਜਨਕ ਕੁੰਜੀ ਨੂੰ ਸਵੀਕਾਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
-#, c-format
-msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "%s ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਮਿਲੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਹ ਕੁੰਜੀ ਸਵੀਕਾਰ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
-#, c-format
-msgid ""
-"Fingerprint and babbleprint for the %s key are:\n"
-"\n"
-"%s\n"
-"%s\n"
-msgstr ""
-"%s ਕੁੰਜੀ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਤੇ ਬੱਬਲਪ੍ਰਿੰਟ ਹਨ:\n"
-"\n"
-"%s\n"
-"%s\n"
-
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
-msgid "Verify Public Key"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਜਾਂਚ"
-
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
-msgid "_View..."
-msgstr "ਵੇਖੋ(_V)..."
-
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
-msgid "Unsupported public key type"
-msgstr "ਨਾ ਸਹਾਇਕ ਸਵਰਜਨਕ ਕੁੰਜੀ ਕਿਸਮ"
-
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/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:280
-#: ../libpurple/protocols/silc10/silc.c:193
-msgid "Performing key exchange"
-msgstr "ਕੁੰਜੀ ਤਬਾਦਲਾ ਜਾਰੀ"
-
-#. 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
-#, fuzzy, c-format
-msgid "Could not load SILC key pair"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
-
-#: ../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:438
-#: ../libpurple/protocols/silc10/silc.c:313
-msgid "Cannot initialize SILC protocol"
-msgstr "SILC ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-
-#: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
-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:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
-msgid "Normal"
-msgstr "ਸਧਾਰਨ"
-
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
-msgid "In love"
-msgstr "ਪਿਆਰ ਨਾਲ"
-
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
-msgid ""
-"\n"
-"Your Preferred Contact Methods"
-msgstr ""
-"\n"
-"ਤੁਹਾਡਾ ਪਸੰਦੀਦਾ ਸੰਪਰਕ ਢੰਗ"
-
-#: ../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: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:778
-#: ../libpurple/protocols/silc10/silc.c:689
-msgid "Video conferencing"
-msgstr "ਵੀਡਿਓ ਕਾਨਫਰੰਸ"
-
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
-msgid "Your Current Status"
-msgstr "ਤੁਹਾਡਾ ਮੌਜੂਦਾ ਸਥਿਤੀ"
-
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
-msgid "Online Services"
-msgstr "ਆਨਲਾਇਨ ਸੇਵਾਵਾਂ"
-
-#: ../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:799
-#: ../libpurple/protocols/silc10/silc.c:710
-msgid "Let others see what computer you are using"
-msgstr "ਹੋਰਾਂ ਨੂੰ ਇਹ ਵੇਖਣ ਦਿਓ ਕਿ ਤੁਸੀਂ ਕਿਹੜਾ ਕੰਪਿਊਟਰ ਵਰਤ ਰਹੇ ਹੋ"
-
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
-msgid "Your VCard File"
-msgstr "ਤੁਹਾਡੀ VCard ਫਾਇਲ"
-
-#: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
-msgid "Timezone (UTC)"
-msgstr "ਸਮਾਂ-ਖੇਤਰ"
-
-#: ../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: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 "
-"about yourself."
-msgstr ""
-"ਤੁਸੀਂ ਹੋਰ ਲੋਕਾਂ ਨੂੰ ਆਪਣੀ ਆਨਲਾਇਨ (ਮੌਕਾ) ਸਥਿਤੀ ਅਤੇ ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਵੇਖਣ ਦੀ ਇਜ਼ਾਜਤ ਦੇ ਸਕਦੇ "
-"ਹੋ। ਆਪਣੇ ਬਾਰੇ ਉਹ ਜਾਣਕਾਰੀ ਭਰੋ ਜੀ, ਜੋ ਕਿ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਹੋਰ ਵਿਅਕਤੀ ਵੇਖ ਸਕਣ।"
-
-#: ../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:859
-#: ../libpurple/protocols/silc10/silc.c:772
-msgid "No Message of the Day available"
-msgstr "ਦਿਨ ਦੇ ਸੁਨੇਹੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/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: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
-#, fuzzy
-msgid "Create New SILC Key Pair"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
-msgid "Passphrases do not match"
-msgstr "ਪ੍ਹੈਰਾ ਨਹੀਂ ਮਿਲਦਾ ਹੈ"
-
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
-msgid "Key Pair Generation failed"
-msgstr "ਕੁੰਜੀ ਪੇਅਰ ਬਣਾਉਣਾ ਫੇਲ੍ਹ"
-
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
-msgid "Key length"
-msgstr "ਕੁੰਜੀ ਲੰਬਾਈ"
-
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
-msgid "Public key file"
-msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਫਾਇਲ"
-
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
-msgid "Private key file"
-msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਫਾਇਲ"
-
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
-msgid "Passphrase (retype)"
-msgstr "ਪ੍ਹੈਰਾ (ਮੁੜ-ਲਿਖੋ)"
-
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
-msgid "Generate Key Pair"
-msgstr "ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਓ"
-
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
-msgid "Online Status"
-msgstr "ਆਨਲਾਇਨ ਸਥਿਤੀ"
-
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
-msgid "View Message of the Day"
-msgstr "ਦਿਨ ਦਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
-
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
-msgid "Create SILC Key Pair..."
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਓ..."
-
-#: ../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:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
-msgid "Topic too long"
-msgstr "ਵਿਸ਼ਾ ਬਹੁਤ ਲੰਮਾ ਹੋ ਗਿਆ ਹੈ"
-
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
-msgid "You must specify a nick"
-msgstr "ਤੁਹਾਨੂੰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
-
-#: ../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:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
-#, c-format
-msgid "channel modes for %s: %s"
-msgstr "%s ਲਈ cmodes ਢੰਗ: %s"
-
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
-#, c-format
-msgid "no channel modes are set on %s"
-msgstr "%s ਉੱਤੇ ਕੋਈ ਵੀ cmodes ਢੰਗ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
-#, c-format
-msgid "Failed to set cmodes for %s"
-msgstr "%s ਲਈ cmodes ਦੇਣ ਲਈ ਅਸਫਲ"
-
-#: ../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:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
-msgid "part [channel]:  Leave the chat"
-msgstr "part [channel]:  Leave the chat"
-
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
-msgid "leave [channel]:  Leave the chat"
-msgstr "leave [channel]:  Leave the chat"
-
-#: ../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;new topic&gt;]:  View or change the topic"
-
-#: ../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;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
-msgid "list:  List channels on this network"
-msgstr "list:  List channels on this network"
-
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
-msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;nick&gt;:  View nick's information"
-
-#: ../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;nick&gt; &lt;message&gt;:  Send a private message to a user"
-
-#: ../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;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
-msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  View the server's Message Of The Day"
-
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
-msgid "detach:  Detach this session"
-msgstr "detach:  Detach this session"
-
-#: ../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 [message]:  Disconnect from the server, with an optional message"
-
-#: ../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;command&gt;:  Call any silc client command"
-
-#: ../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;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;newnick&gt;:  Change your nickname"
-
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
-msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;nick&gt;:  View nick's information"
-
-#: ../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;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-
-#: ../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;usermodes&gt;:  Set your modes in the network"
-
-#: ../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;nick&gt; [-pubkey]:  Get server operator privileges"
-
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-
-#: ../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;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
-msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  View server administrative details"
-
-#: ../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;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-
-#: ../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;nick|server&gt;:  Retrieve client's or server's public key"
-
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
-msgid "stats:  View server and network statistics"
-msgstr "stats:  View server and network statistics"
-
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
-msgid "ping:  Send PING to the connected server"
-msgstr "ping:  Send PING to the connected server"
-
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
-msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;channel&gt;:  List users in channel"
-
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
-msgid "SILC Protocol Plugin"
-msgstr "SILC Protocol Plugin"
-
-#. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
-msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Secure Internet Live Conferencing (SILC) ਪ੍ਰੋਟੋਕਾਲ"
-
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
-msgid "Network"
-msgstr "ਨੈੱਟਵਰਕ"
-
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
-msgid "Public Key file"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਫਾਇਲ"
-
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
-msgid "Private Key file"
-msgstr "ਨਿੱਜੀ ਕੁੰਜੀ ਫਾਇਲ"
-
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
-msgid "Cipher"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
-msgid "HMAC"
-msgstr "HMAC"
-
-#: ../libpurple/protocols/silc/silc.c:1948
-msgid "Use Perfect Forward Secrecy"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
-msgid "Public key authentication"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਪ੍ਰਮਾਣਕਿਤਾ"
-
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
-msgid "Block IMs without Key Exchange"
-msgstr "ਕੁੰਜੀ ਤਬਾਦਲੇ ਬਿਨਾਂ IM ਪਾਬੰਦੀ"
-
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
-msgid "Block messages to whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
-msgid "Automatically open whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
-msgid "Digitally sign and verify all messages"
-msgstr "ਡਿਜ਼ੀਟਲ ਦਸਤਖਤ ਅਤੇ ਸਭ ਸੁਨੇਹੇ ਜਾਂਚ"
-
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
-msgid "Creating SILC key pair..."
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Hint for translators: Please check the tabulator width here and in
-#. the next strings (short strings: 2 tabs, longer strings 1 tab,
-#. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
-#, c-format
-msgid "Real Name: \t%s\n"
-msgstr "ਅਸਲੀ ਨਾਂ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
-#, c-format
-msgid "User Name: \t%s\n"
-msgstr "ਉਪਭੋਗੀ ਨਾਂ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
-#, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "ਈਮੇਲ: \t\t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
-#, c-format
-msgid "Host Name: \t%s\n"
-msgstr "ਮੇਜ਼ਬਾਨ ਨਾਂ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
-#, c-format
-msgid "Organization: \t%s\n"
-msgstr "ਸੰਗਠਨ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
-#, c-format
-msgid "Country: \t%s\n"
-msgstr "ਦੇਸ਼: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
-#, c-format
-msgid "Algorithm: \t%s\n"
-msgstr "ਐਲੋਗ੍ਰਥਿਮ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
-#, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "ਕੁੰਜੀ ਲੰਬਾਈ: \t%d ਬਿੱਟ\n"
-
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
-msgid "Version: \t%s\n"
-msgstr "ਕਾਰਨ: %s"
-
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
-#, c-format
-msgid ""
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
-#, c-format
-msgid ""
-"Public Key Babbleprint:\n"
-"%s"
-msgstr ""
-"Public Key Babbleprint:\n"
-"%s"
-
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
-msgid "Public Key Information"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਜਾਣਕਾਰੀ"
-
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
-msgid "Paging"
-msgstr "ਪੇਜ਼ਿੰਗ"
-
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
-msgid "Video Conferencing"
-msgstr "ਵੀਡਿਓ ਕਾਨਫਰੰਸ"
-
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
-msgid "Computer"
-msgstr "ਕੰਪਿਊਟਰ"
-
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
-msgid "PDA"
-msgstr "PDA"
-
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
-msgid "Terminal"
-msgstr "ਟਰਮੀਨਲ"
-
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
-#, c-format
-msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
-#, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
-msgid "Whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc10/ops.c:1559
-msgid "No server statistics available"
-msgstr "ਕੋਈ ਸਰਵਰ ਅੰਕੜੇ ਉਪਲੱਬਧ ਨਹੀਂ"
-
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "ਅਸਫਲ: ਵਰਜਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਨਵੇਂ ਕਲਾਂਇਟ ਦੀ ਲੋੜ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਤੁਹਾਡੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਉੱਤੇ ਭਰੋਸਾ/ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ KE ਗਰੁੱਪ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ ਗੁਪਤ-ਲੇਖਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ PKCS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ ਹੈਂਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ HMAC ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
-msgid "Failure: Incorrect signature"
-msgstr "ਗਲਸ: ਗਲਤ ਦਸਤਖਤ"
-
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
-msgid "Failure: Invalid cookie"
-msgstr "ਅਸਫਲ: ਗਲਤ ਕੂਕੀ"
-
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
-msgid "Failure: Authentication failed"
-msgstr "ਅਸਫ਼ਲ: ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫ਼ਲ"
-
-#: ../libpurple/protocols/silc10/silc.c:182
-msgid "Cannot initialize SILC Client connection"
-msgstr "SILC ਕਲਾਂਇਟ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
-
-#: ../libpurple/protocols/silc10/silc.c:290
-msgid "John Noname"
-msgstr "ਜਾਨ ਬਿਨ-ਨਾਂ"
-
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "~/.silc ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਭੀ/ਵਰਤੀ ਜਾ ਸਕਦੀ"
-
-#: ../libpurple/protocols/silc10/silc.c:334
-#, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
-
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
-msgid "Could not write"
-msgstr "ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
-msgid "Could not connect"
-msgstr "ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
-msgid "Unknown server response."
-msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
-msgid "Could not create listen socket"
-msgstr "ਸੁਣਨ ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
-
-#: ../libpurple/protocols/simple/simple.c:1586
-#, fuzzy
-msgid "Couldn't resolve host"
-msgstr "ਮੇਜ਼ਬਾਨ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: ../libpurple/protocols/simple/simple.c:1677
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: ../libpurple/protocols/simple/simple.c:1694
-#, fuzzy
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "IRC ਨਾਂਵਾਂ 'ਚ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE ਪ੍ਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-#. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE ਪ੍ਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-#: ../libpurple/protocols/simple/simple.c:1899
-msgid "Publish status (note: everyone may watch you)"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1905
-msgid "Use UDP"
-msgstr "UDP ਵਰਤੋਂ"
-
-#: ../libpurple/protocols/simple/simple.c:1907
-msgid "Use proxy"
-msgstr "ਪਰਾਕਸੀ ਵਰਤੋਂ"
-
-#: ../libpurple/protocols/simple/simple.c:1909
-msgid "Proxy"
-msgstr "ਪਰਾਕਸੀ"
-
-#: ../libpurple/protocols/simple/simple.c:1911
-#, fuzzy
-msgid "Auth User"
-msgstr "AP ਉਪਭੋਗੀ"
-
-#: ../libpurple/protocols/simple/simple.c:1913
-#, fuzzy
-msgid "Auth Domain"
-msgstr "ਸਵੈ-ਚਾਲਿਤ"
-
-#: ../libpurple/protocols/toc/toc.c:139
-#, c-format
-msgid "Looking up %s"
-msgstr "%s ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
-
-#: ../libpurple/protocols/toc/toc.c:148
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ"
-
-#: ../libpurple/protocols/toc/toc.c:201
-#, c-format
-msgid "Signon: %s"
-msgstr "ਦਾਖਲ: %s"
-
-#: ../libpurple/protocols/toc/toc.c:488
-#, c-format
-msgid "Unable to write file %s."
-msgstr "ਫਾਇਲ %s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:491
-#, c-format
-msgid "Unable to read file %s."
-msgstr "ਫਾਇਲ %s ਪੜਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:494
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "ਸੁਨੇਹਾ ਬਹੁਤ ਲੰਮਾ ਹੈ, ਆਖਰੀ %s ਬਾਈਟ ਹਟਾਏ ਗਏ ਹਨ।"
-
-#: ../libpurple/protocols/toc/toc.c:497
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ਇਸ ਸਮੇਂ ਲਾਗਇਨ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:500
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s ਲਈ ਉਡੀਕ ਸਵੀਕਾਰ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:503
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "ਇੱਕ ਸੁਨੇਹਾ ਗੁਆ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਤੁਸੀਂ ਸਰਵਰ ਗਤੀ ਸੀਮਾ ਤੋਂ ਵੱਧ ਗਏ ਹੋ।"
-
-#: ../libpurple/protocols/toc/toc.c:506
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s ਵਿੱਚ ਗੱਲਬਾਤ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:509
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "ਤੁਸੀਂ %s ਨੂੰ ਸੁਨੇਹੇ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜ ਰਹੇ ਹੋ।"
-
-#: ../libpurple/protocols/toc/toc.c:512
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "ਤੁਸੀਂ %s ਤੋਂ ਇੱਕ IM ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਵੱਡਾ ਸੀ"
-
-#: ../libpurple/protocols/toc/toc.c:515
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "ਤੁਸੀਂ %s ਤੋਂ ਇੱਕ IM ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜਿਆ ਗਿਆ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:518
-#, c-format
-msgid "Failure."
-msgstr "ਅਸਫਲ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:521
-#, c-format
-msgid "Too many matches."
-msgstr "ਬਹੁਤ ਮੇਲ ਹਨ।"
-
-#: ../libpurple/protocols/toc/toc.c:524
-#, c-format
-msgid "Need more qualifiers."
-msgstr "ਹੋਰ ਯੋਗਤਾ ਦੀ ਲੋੜ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:527
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "ਡਾਈ ਸੇਵਾ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:530
-#, c-format
-msgid "E-mail lookup restricted."
-msgstr "ਈ-ਪੱਤਰ ਖੋਜ ਪਾਬੰਦੀ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:533
-#, c-format
-msgid "Keyword ignored."
-msgstr "ਸ਼ਬਦ ਅਣਡਿੱਠਾ"
-
-#: ../libpurple/protocols/toc/toc.c:536
-#, c-format
-msgid "No keywords."
-msgstr "ਕੋਈ ਸ਼ਬਦ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:539
-#, c-format
-msgid "User has no directory information."
-msgstr "ਉਪਭੋਗੀ ਦੀ ਕੋਈ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:543
-#, c-format
-msgid "Country not supported."
-msgstr "ਦੇਸ਼ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:546
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "ਅਣਜਾਣੀ ਅਸਫਲਤਾ: %s"
-
-#: ../libpurple/protocols/toc/toc.c:549
-#, c-format
-msgid "Incorrect screen name or password."
-msgstr "ਗਲਤ ਸਕਰੀਨ ਨਾਂ ਜਾਂ ਗੁਪਤ-ਕੋਡ।"
-
-#: ../libpurple/protocols/toc/toc.c:552
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "ਸੇਵਾ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:555
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "ਤੁਹਾਡਾ ਚੇਤਾਵਨੀ ਪੱਧਰ ਇੰਨਾ ਜ਼ਿਆਦਾ ਹੈ ਕਿ ਦਾਖਲ (ਲਾਗਇਨ) ਨਹੀਂ ਹੋਇਆ ਜਾਦਾ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"ਤੁਸੀਂ ਲਗਾਤਾਰ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਹੇ ਹੋ। ਦਸ ਮਿੰਟ ਦੀ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ "
-"ਕੀਤੀ ਤਾਂ ਹੋਰ ਵੀ ਵਧੇਰੇ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
-
-#: ../libpurple/protocols/toc/toc.c:560
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "ਇੱਕ ਅਣਜਾਣੀ ਦਾਖਲਾ ਗਲਤੀ ਆਈ ਹੈ: %s"
-
-#: ../libpurple/protocols/toc/toc.c:563
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ, %d,ਆਈ ਹੈ।  ਜਾਣਕਾਰੀ: %s"
-
-#: ../libpurple/protocols/toc/toc.c:590
-msgid "Invalid Groupname"
-msgstr ""
-
-#: ../libpurple/protocols/toc/toc.c:674
-msgid "Connection Closed"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
-
-#: ../libpurple/protocols/toc/toc.c:714
-msgid "Waiting for reply..."
-msgstr "ਜਵਾਬ ਦੀ ਉਡੀਕ ਜਾਰੀ ਹੈ..."
-
-#: ../libpurple/protocols/toc/toc.c:792
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC ਆਪਣੀ ਵਿਰਾਮ ਸਥਿਤੀ ਤੋਂ ਵਾਪਿਸ ਹੋਇਆ। ਹੁਣ ਤੁਸੀਂ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ।"
-
-#: ../libpurple/protocols/toc/toc.c:995
-msgid "Password Change Successful"
-msgstr "ਗੁਪਤ-ਕੋਡ ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤਾ ਗਿਆ"
-
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
-msgid "_Group:"
-msgstr "ਗਰੁੱਪ(_G):"
-
-#: ../libpurple/protocols/toc/toc.c:1535
-msgid "Get Dir Info"
-msgstr "ਡਾਇ ਜਾਣਕਾਰੀ ਲਵੋ"
-
-#: ../libpurple/protocols/toc/toc.c:1675
-msgid "Set Dir Info"
-msgstr "ਡਾਇ ਜਾਣਕਾਰੀ ਦਿਓ"
-
-#: ../libpurple/protocols/toc/toc.c:1797
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
-
-#: ../libpurple/protocols/toc/toc.c:1833
-msgid "File transfer failed; other side probably canceled."
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
-msgid "Could not connect for transfer."
-msgstr "ਭੇਜਣ ਲਈ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
-
-#: ../libpurple/protocols/toc/toc.c:2075
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ਫਾਇਲ ਸਿਰਲੇਖ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਇਹ ਫਾਇਲ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੇਗੀ।"
-
-#: ../libpurple/protocols/toc/toc.c:2175
-msgid "Save As..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
-
-#: ../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"
-msgstr[0] "%s ਨੇ %s ਨੂੰ %d ਫਾਇਲ ਸਵੀਕਾਰ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ: %s (%.2f %s)%s%s"
-msgstr[1] "%s ਨੇ %s ਨੂੰ %d ਫਾਇਲਾਂ ਸਵੀਕਾਰ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ: %s (%.2f %s)%s%s"
-
-#: ../libpurple/protocols/toc/toc.c:2216
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਫਾਇਲ ਭੇਜਣ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol ਪਲੱਗਇਨ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:782
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:838
-msgid "Your Yahoo! message did not get sent."
-msgstr "ਤੁਹਾਡਾ Yahoo! ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:960
-#, c-format
-msgid "Yahoo! system message for %s:"
-msgstr "Yahoo! %s ਲਈ ਸਿਸਟਮ ਸੁਨੇਹਾ:"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
-#, fuzzy
-msgid "Authorization denied message:"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਪਾਬੰਦੀ ਸੁਨੇਹਾ:"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s ਨੇ ਤੁਹਾਨੂੰ ਉਸ ਦੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਦੀ ਮੰਗ ਨੂੰ ਹੇਠ ਦਿੱਤੇ ਕਾਰਨ ਕਰਕੇ ਠੁਕਰਾ ਦਿੱਤਾ ਹੈ: %"
-"s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਉਸ ਦੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਦੀ ਮੰਗ ਨੂੰ ਠੁਕਰਾ ਦਿੱਤਾ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
-msgid "Add buddy rejected"
-msgstr "ਸਨੇਹੀ ਸ਼ਾਮਿਲ ਕਰਨਾ ਠੁਕਰਾਇਆ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
-#, fuzzy, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"ਯਾਹੂ ਸਰਵਰ ਨੇ ਇੱਕ ਅਣਜਾਣ ਪ੍ਰਮਾਣਿਕਤਾ ਢੰਗ ਦੀ ਮੰਗ ਕੀਤੀ ਹੈ। ਗੇਮ ਦਾ ਇਹ ਵਰਜਨ ਯਾਹੂ (Yahoo) ਲਈ "
-"ਸਫਲਤਾਪੂਰਕ ਲਾਗਇਨ ਕਰਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ %s ਵੇਖੋ।"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
-msgid "Failed Yahoo! Authentication"
-msgstr "Yahoo! ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"ਤੁਸੀਂ %s ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਹੈ, ਪਰ ਉਪਭੋਗੀ ਤੁਹਾਡੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ ਹੈ। \"ਹਾਂ\" ਨੂੰ "
-"ਦਬਾਉਣ ਨਾਲ ਸਨੇਹੀ ਨੂੰ ਹਟਾ ਅਤੇ ਅਣਡਿੱਠਾ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
-msgid "Ignore buddy?"
-msgstr "ਕੀ ਸਨੇਹੀ ਅਣਡਿੱਠਾ?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "ਤੁਹਾਡਾ ਖਾਤਾ ਤਾਲਾਬੰਦ ਹੈ, Yahoo! ਦੀ ਵੈਬਸਾਇਟ ਨੂੰ ਖੋਲ੍ਹੋ ਜੀ।"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
-#, c-format
-msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
-#, 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:2189
-msgid "Could not add buddy to server list"
-msgstr "ਸਰਵਰ ਸੂਚੀ ਵਿੱਚ ਸਨੇਹੀ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
-#, c-format
-msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
-#, fuzzy
-msgid "Received unexpected HTTP response from server."
-msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
-msgid "Connection problem"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ:\n"
-"%s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
-#, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ:\n"
-"%s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
-msgid "Not at Home"
-msgstr "ਘਰੇ ਨਹੀਂ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
-msgid "Not at Desk"
-msgstr "ਡੈਸਕ ਉੱਤੇ ਨਹੀਂ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
-msgid "Not in Office"
-msgstr "ਦਫ਼ਤਰ 'ਚ ਨਹੀਂ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "On Vacation"
-msgstr "ਛੁੱਟੀ 'ਤੇ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
-msgid "Stepped Out"
-msgstr "ਬਾਹਰ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
-msgid "Not on server list"
-msgstr "ਸਰਵਰ ਸੂਚੀ ਤੇ ਨਹੀਂ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
-msgid "Appear Online"
-msgstr "ਆਨਲਾਇਨ ਜਾਪਦਾ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
-msgid "Appear Permanently Offline"
-msgstr "ਪੱਕਾ ਆਫਲਾਇਨ ਜਾਪਦਾ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
-msgid "Presence"
-msgstr "ਮੌਜੂਦਗੀ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
-msgid "Appear Offline"
-msgstr "ਆਫਲਾਇਨ ਜਾਪਦਾ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
-msgid "Don't Appear Permanently Offline"
-msgstr "ਪੱਕਾ ਆਫਲਾਇਨ ਨਹੀਂ ਜਾਪਦਾ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
-msgid "Join in Chat"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
-msgid "Initiate Conference"
-msgstr "ਕਾਨਫਰੰਸ ਸੱਦਾ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
-msgid "Presence Settings"
-msgstr "ਮੌਜੂਦਗੀ ਸੈਟਿੰਗ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
-msgid "Start Doodling"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "ਕਿਹੜਾ ID ਸਰਗਰਮ ਕਰਨਾ ਹੈ?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਕੌਣ ਸ਼ਾਮਿਲ ?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
-msgid "Activate ID..."
-msgstr "ਸਰਗਰਮ ID..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
-#, fuzzy
-msgid "Join User in Chat..."
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਉਪਭੋਗੀ ਸ਼ਾਮਿਲ..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
-msgid "Open Inbox"
-msgstr "ਹਾਟਮੇਲ ਇਨ-ਬਾਕਸ ਖੋਲ੍ਹੋ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo ਪ੍ਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
-msgid "Yahoo Japan"
-msgstr "Yahoo ਜਾਪਾਨ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
-msgid "Pager server"
-msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
-msgid "Japan Pager server"
-msgstr "ਜਾਪਾਨ ਪੇਜ਼ਰ ਸਰਵਰ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
-msgid "Pager port"
-msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
-msgid "File transfer server"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
-msgid "Japan file transfer server"
-msgstr "ਜਾਪਾਨ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
-msgid "File transfer port"
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੋਰਟ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-msgid "Chat room locale"
-msgstr "ਗੱਲ-ਬਾਤ ਰੂਮ ਭਾਸ਼ਾ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
-msgid "Chat room list URL"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
-msgid "Yahoo Chat server"
-msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-msgid "Yahoo Chat port"
-msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
-
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
-msgid "Sent Doodle request."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
-msgid "Unable to establish file descriptor."
-msgstr "ਫਾਇਲ ਵੇਰਵਾ ਸਥਾਪਨ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "ਲਿਖਣ ਗਲਤੀ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
-msgid "Yahoo! Japan Profile"
-msgstr "Yahoo! ਜਾਪਾਨ ਪ੍ਰੋਫਾਇਲ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
-msgid "Yahoo! Profile"
-msgstr "Yahoo! ਪ੍ਰੋਫਾਇਲ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr "ਮੁਆਫੀ, ਬਾਲਗ ਭਾਗ ਰੱਖਣ ਵਾਲੇ ਪ੍ਰੋਫਾਇਲ ਇਸ ਸਮੇਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-#, fuzzy
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਪ੍ਰੋਫਾਇਲ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਤੁਹਾਨੂੰ ਆਪਣੇ ਵੈਬ ਝਲਕਾਰੇ ਵਿੱਚ ਇਸ ਸਬੰਧ ਨੂੰ ਖੋਲਣ ਦੀ ਲੋੜ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
-msgid "Hobbies"
-msgstr "ਮਨਪਸੰਦ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
-msgid "Latest News"
-msgstr "ਤਾਜ਼ੀਆਂ ਖਬਰਾਂ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
-msgid "Home Page"
-msgstr "ਮੁੱਖ ਸਫ਼ਾ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
-msgid "Cool Link 1"
-msgstr "ਸਬੰਧ 1"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
-msgid "Cool Link 2"
-msgstr "ਸਬੰਧ 2"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
-msgid "Cool Link 3"
-msgstr "ਸਬੰਧ 3"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
-msgid "Last Update"
-msgstr "ਆਖਰੀ ਅੱਪਡੇਟ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s ਲਈ ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-#, fuzzy
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr "ਮੁਆਫੀ, ਇਹ ਪ੍ਰੋਫਾਇਲ ਉਸ ਭਾਸ਼ਾ ਵਿੱਚ ਹੈ, ਜੋ ਕਿ ਅਜੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"ਉਪਭੋਗੀ ਪ੍ਰੋਫਾਇਲ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਇਸ ਦਾ ਅਰਥ ਹੈ ਕਿ ਸਰਵਰ-ਪਾਸੇ ਕੋਈ ਆਰਜ਼ੀ ਸਮੱਸਿਆ "
-"ਹੈ। ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"ਉਪਭੋਗੀ ਪ੍ਰੋਫਾਇਲ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਇਸ ਦਾ ਅਰਥ ਹੈ ਕਿ ਉਪਭੋਗੀ ਮੌਜੂਦ ਹੀ ਨਹੀਂ ਹੈ, ਪਰ "
-"Yahoo! ਕੁਝ ਵਾਰ ਉਪਭੋਗੀ ਦਾ ਪ੍ਰੋਫਾਇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ ਰਹਿੰਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਜਾਣਦੇ ਹੋ ਕਿ "
-"ਉਪਭੋਗੀ ਮੌਜੂਦ ਹੈ ਤਾਂ ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ ਕਰੋ।"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
-msgid "The user's profile is empty."
-msgstr "ਉਪਭੋਗੀ ਪ੍ਰੋਫਾਇਲ ਖਾਲੀ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ਨੇ ਰੂਮ \"%s\" ਵਿੱਚ ਤੁਹਾਡੀ ਕਾਨਫਰੰਸ ਦਾ ਸੱਦਾ ਨਾ-ਮੰਨਜ਼ੂਰ ਕਰ ਦਿੱਤਾ ਹੈ, ਕਿਉਕਿ \"%s\""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
-msgid "Invitation Rejected"
-msgstr "ਸੱਦਾ ਨਾ-ਮੰਨਜ਼ੂਰ ਹੋਇਆ"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
-msgid "Failed to join chat"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ ਹੋਣ ਵਿੱਚ ਅਸਫਲ"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
-msgid "Unknown room"
-msgstr "ਅਣਜਾਣ ਰੂਮ"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
-msgid "Maybe the room is full"
-msgstr "ਰੂਮ ਭਰਿਆ ਹੋ ਸਕਦਾ ਹੈ"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
-msgid "Not available"
-msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "ਹੁਣ ਤੁਸੀਂ %s ਵਿੱਚ ਗੱਲਬਾਤ ਕਰ ਰਹੇ ਹੋ।"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
-msgid "Failed to join buddy in chat"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸਨੇਹੀ ਆਉਣ ਲਈ ਅਸਫਲ"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
-msgid "Maybe they're not in a chat?"
-msgstr "ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਉਹ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾ ਹੋਣ?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Fetching the room list failed."
-msgstr "ਰੂਮ ਸੂਚੀ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
-msgid "Voices"
-msgstr "ਆਵਾਜ਼"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
-msgid "Webcams"
-msgstr "ਵੈਬਕੈਮ"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-msgid "Unable to fetch room list."
-msgstr "ਰੂਮ ਸੂਚੀ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
-msgid "User Rooms"
-msgstr "ਯੂਜਰ ਰੂਮ"
-
-#: ../libpurple/protocols/yahoo/ycht.c:456
-msgid "Connection problem with the YCHT server."
-msgstr "YCHT ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ ਹੈ।"
-
-#: ../libpurple/protocols/yahoo/ycht.c:475
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ\n"
-"%s"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr "(ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਬਦਲਣ ਲਈ ਗਲਤੀ ਆਈ ਹੈ।\t ਖਾਤਾ ਸੰਪਾਦਕ ਵਿੱਚ 'ਇੰਕੋਡਿੰਗ' ਚੋਣ ਵੇਖੋ)"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:752
-#, c-format
-msgid "Unable to send to chat %s,%s,%s"
-msgstr "ਗੱਲਬਾਤ %s,%s,%s ਨੂੰ ਭੇਜਣ ਲਈ ਅਸਫਲ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
-msgid "Hidden or not logged-in"
-msgstr "ਓਹਲੇ ਜਾਂ ਲਾਗਇਨ ਨਹੀਂ ਹੈ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
-#, c-format
-msgid "<br>At %s since %s"
-msgstr "<br>%s ਉੱਤੇ %s ਤੋਂ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
-msgid "Anyone"
-msgstr "ਕੋਈ ਵੀ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
-msgid "_Class:"
-msgstr "ਵਰਗ(_C):"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
-msgid "_Instance:"
-msgstr "ਮੌਕਾ(_I):"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
-msgid "_Recipient:"
-msgstr "ਸੁਨੇਹੀ(_R):"
-
-#: ../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:2690
-msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;nick&gt;: ਉਪਭੋਗੀ ਖੋਜ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
-msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;nick&gt;: ਉਪਭੋਗੀ ਖੋਜੋ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
-msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instance&gt;: ਇਸ ਕਲਾਸ ਨੂੰ ਵਰਤਣ ਲਈ ਮੌਕਾ ਦਿੱਤਾ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
-msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;:ਇਸ ਕਲਾਸ ਨੂੰ ਵਰਤਣ ਲਈ ਮੌਕਾ ਦਿੱਤਾ ਹੈ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
-msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;instance&gt;: &lt;message,<i>instance</i>,* ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</i>,* ਨੂੰ "
-"ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;:&lt;<i>class</i>,"
-"<i>instance</i>,<i>recipient ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instance&gt; &lt;recipient&gt;: ਇੱਕ &lt;ਸੁਨੇਹਾ,<i>instance</i>,"
-"<i>recipient</i> ਨੂੰ ਭੇਜਿਆ ਹੈ&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
-msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;class&gt;: ਨੇ &lt;<i>class</i>,ਨਿੱਜੀ, ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
-msgid "Resubscribe"
-msgstr "ਮੁੜ-ਮੈਂਬਰ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
-msgid "Retrieve subscriptions from server"
-msgstr "ਸਰਵਰ ਵਲੋਂ ਮੈਂਬਰੀ ਪ੍ਰਾਪਤ ਹੋਈ ਹੈ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
-msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr ਪ੍ਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
-msgid "Use tzc"
-msgstr "tzc ਵਰਤੋਂ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
-msgid "tzc command"
-msgstr "tzc ਕਮਾਂਡ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
-msgid "Export to .anyone"
-msgstr ".anyone ਲਈ ਨਿਰਯਾਤ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
-msgid "Export to .zephyr.subs"
-msgstr ".zephyr.subs ਲਈ ਨਿਰਯਾਤ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
-msgid "Import from .anyone"
-msgstr ".anyone ਲਈ ਆਯਾਤ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
-msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs ਲਈ ਆਯਾਤ"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
-msgid "Realm"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
-msgid "Exposure"
-msgstr "Exposure"
-
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
-"%s"
-
-#: ../libpurple/proxy.c:659
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
-#, c-format
-msgid "HTTP proxy connection error %d"
-msgstr "HTTP ਪਰਾਕਸੀ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ %d"
-
-#: ../libpurple/proxy.c:788
-#, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "ਪਹੁੰਚ ਪਾਬੰਦੀ ਹੈ: ਪਰਾਕਸੀ ਸਰਵਰ ਨੇ ਪੋਰਟ %d ਟਨਲਿੰਗ ਓਹਲੇ ਰੱਖੀ ਹੈ।"
-
-#: ../libpurple/proxy.c:1012
-#, c-format
-msgid "Error resolving %s"
-msgstr ""
-
-#: ../libpurple/proxy.c:1714
-msgid "Could not resolve host name"
-msgstr ""
-
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#.
-#: ../libpurple/request.h:1378
-msgid "_Yes"
-msgstr "ਹਾਂ(_Y)"
-
-#: ../libpurple/request.h:1378
-msgid "_No"
-msgstr "ਨਹੀਂ(_N)"
-
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#.
-#: ../libpurple/request.h:1398
-msgid "_Accept"
-msgstr "ਮਨਜ਼ੂਰ(_A)"
-
-#. *
-#. * The default message to use when the user becomes auto-away.
-#.
-#: ../libpurple/savedstatuses.c:48
-msgid "I'm not here right now"
-msgstr "ਮੈਂ ਹੁਣ ਇੱਥੇ ਨਹੀਂ ਹਾਂ"
-
-#: ../libpurple/savedstatuses.c:535
-msgid "saved statuses"
-msgstr "ਸੰਭਾਲੇ ਹਾਲਤ"
-
-#: ../libpurple/server.c:234
-#, c-format
-msgid "%s is now known as %s.\n"
-msgstr "%s ਹੁਣ %s ਦੇ ਤੌਰ ਤੇ ਜਾਣਿਆ ਜਾਵੇਗਾ।\n"
-
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
-#, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr ""
-"%s ਨੇ %s ਨੂੰ ਗੱਲਬਾਤ ਰੂਮ %s ਵਿੱਚ ਸੱਦਿਆ ਹੈ:\n"
-"%s"
-
-#: ../libpurple/server.c:801
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s ਨੇ %s ਨੂੰ ਗੱਲਬਾਤ ਰੂਮ %s ਵਿੱਚ ਸੱਦਿਆ ਹੈ\n"
-
-#: ../libpurple/server.c:805
-msgid "Accept chat invitation?"
-msgstr "ਕੀ ਗੱਲਬਾਤ ਸੱਦਾ ਮੰਨਜ਼ੂਰ ਕਰਨਾ ਹੈ?"
-
-#: ../libpurple/sslconn.c:164
-#, fuzzy
-msgid "SSL Connection Failed"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ"
-
-#: ../libpurple/sslconn.c:166
-msgid "SSL Handshake Failed"
-msgstr ""
-
-#: ../libpurple/sslconn.c:168
-msgid "SSL peer presented an invalid certificate"
-msgstr ""
-
-#: ../libpurple/sslconn.c:171
-#, fuzzy
-msgid "Unknown SSL error"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
-
-#: ../libpurple/status.c:153
-msgid "Unset"
-msgstr "ਅਣ-ਸੈੱਟ"
-
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
-msgid "Do not disturb"
-msgstr "ਤੰਗ ਨਾ ਕਰੋ"
-
-#: ../libpurple/status.c:159
-#, fuzzy
-msgid "Extended away"
-msgstr "ਜਦੋਂ ਦੂਰ"
-
-#: ../libpurple/status.c:160
-msgid "Mobile"
-msgstr "ਮੋਬਾਇਲ"
-
-#: ../libpurple/status.c:609
-#, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s ਨੇ ਹਾਲਤ %s ਤੋਂ %s ਬਦਲਿਆ ਹੈ"
-
-#: ../libpurple/status.c:619
-#, c-format
-msgid "%s is now %s"
-msgstr "%s ਹੁਣ %s"
-
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s ਹੁਣ %s ਨਹੀਂ ਰਿਹਾ"
-
-#: ../libpurple/status.c:1234
-#, c-format
-msgid "%s became idle"
-msgstr "%s ਵੇਹਲਾ ਹੋਇਆ"
-
-#: ../libpurple/status.c:1251
-#, c-format
-msgid "%s became unidle"
-msgstr "%s ਨਾ-ਵੇਹਲਾ ਹੋਇਆ"
-
-#: ../libpurple/status.c:1314
-#, c-format
-msgid "+++ %s became idle"
-msgstr "+++ %s ਵੇਹਲਾ ਹੋ ਗਿਆ"
-
-#: ../libpurple/status.c:1316
-#, fuzzy, c-format
-msgid "+++ %s became unidle"
-msgstr "%s ਨਾ-ਵੇਹਲਾ ਹੋਇਆ"
-
-#: ../libpurple/util.c:718
-#, c-format
-msgid "%x %X"
-msgstr "%x %X"
-
-#: ../libpurple/util.c:2722
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../libpurple/util.c:2723
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"ਤੁਹਾਡੀ ਸਨੇਹੀ ਸੂਚੀ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਇਸ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਅਤੇ ਪੁਰਾਣੀ "
-"ਫਾਇਲ ਨੂੰ blist.xml~ ਵਿੱਚ ਭੇਜਿਆ ਗਿਆ ਹੈ।"
-
-#: ../libpurple/util.c:3223
-msgid "Calculating..."
-msgstr "ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ...."
-
-#: ../libpurple/util.c:3226
-msgid "Unknown."
-msgstr "ਅਣਜਾਣ"
-
-#: ../libpurple/util.c:3252
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ਸਕਿੰਟ"
-msgstr[1] "%d ਸਕਿੰਟ"
-
-#: ../libpurple/util.c:3264
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d ਦਿਨ"
-msgstr[1] "%d ਦਿਨ"
-
-#: ../libpurple/util.c:3272
-#, c-format
-msgid "%s, %d hour"
-msgid_plural "%s, %d hours"
-msgstr[0] "%s, %d ਘੰਟਾ"
-msgstr[1] "%s, %d ਘੰਟੇ"
-
-#: ../libpurple/util.c:3278
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ਘੰਟਾ"
-msgstr[1] "%d ਘੰਟੇ"
-
-#: ../libpurple/util.c:3286
-#, c-format
-msgid "%s, %d minute"
-msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d ਮਿੰਟ"
-msgstr[1] "%s, %d ਮਿੰਟ"
-
-#: ../libpurple/util.c:3292
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d ਮਿੰਟ"
-msgstr[1] "%d ਮਿੰਟ"
-
-#: ../libpurple/util.c:3552
-#, c-format
-msgid "Could not open %s: Redirected too many times"
-msgstr ""
-
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
-#, c-format
-msgid "Unable to connect to %s"
-msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../libpurple/util.c:3712
-#, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-
-#: ../libpurple/util.c:3747
-#, c-format
-msgid "Error reading from %s: %s"
-msgstr "%s ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../libpurple/util.c:3778
-#, c-format
-msgid "Error writing to %s: %s"
-msgstr "%s ਲਈ ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../libpurple/util.c:3803
-#, c-format
-msgid "Unable to connect to %s: %s"
-msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ: %s"
-
-#: ../pidgin.desktop.in.h:1
-msgid "Internet Messenger"
-msgstr "ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ"
-
-#: ../pidgin.desktop.in.h:2
-msgid "Pidgin Internet Messenger"
-msgstr "ਪਿਡਗਿਨ ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ"
-
-#: ../pidgin.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr ""
-
-#: ../pidgin/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "ਸਥਿਤੀ"
-
-#: ../pidgin/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
-
-#. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
-msgid "Login Options"
-msgstr "ਲਾਗਇਨ ਚੋਣ"
-
-#: ../pidgin/gtkaccount.c:428
-#, fuzzy
-msgid "Pro_tocol:"
-msgstr "ਪ੍ਰੋਟੋਕਾਲ:"
-
-#: ../pidgin/gtkaccount.c:439
-#, fuzzy
-msgid "Screen _name:"
-msgstr "ਸਕਰੀਨ ਨਾਂ:"
-
-#: ../pidgin/gtkaccount.c:529
-#, fuzzy
-msgid "_Local alias:"
-msgstr "ਲੋਕਲ ਉਪ-ਨਾਂ:"
-
-#: ../pidgin/gtkaccount.c:533
-#, fuzzy
-msgid "Remember pass_word"
-msgstr "ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ"
-
-#. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
-msgid "User Options"
-msgstr "ਉਪਭੋਗੀ ਚੋਣ"
-
-#: ../pidgin/gtkaccount.c:604
-#, fuzzy
-msgid "New _mail notifications"
-msgstr "ਨਵੀਂ ਚਿੱਠੀ ਸੂਚਨਾ"
-
-#. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-#, fuzzy
-msgid "Use this buddy _icon for this account:"
-msgstr "ਇਹ ਖਾਤੇ ਲਈ ਇਹ ਬੱਡੀ ਆਈਕਾਨ ਵਰਤੋਂ:"
-
-#. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
-#, c-format
-msgid "%s Options"
-msgstr "%s ਚੋਣ"
-
-#: ../pidgin/gtkaccount.c:936
-msgid "Use GNOME Proxy Settings"
-msgstr "ਗਨੋਮ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋਂ"
-
-#: ../pidgin/gtkaccount.c:937
-msgid "Use Global Proxy Settings"
-msgstr "ਵਿਆਪਕ ਪਰਾਕਸੀ ਵਿਵਸਥਾ ਵਰਤੋਂ"
-
-#: ../pidgin/gtkaccount.c:943
-msgid "No Proxy"
-msgstr "ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ"
-
-#: ../pidgin/gtkaccount.c:949
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../pidgin/gtkaccount.c:955
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../pidgin/gtkaccount.c:961
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
-msgid "Use Environmental Settings"
-msgstr "ਵਾਤਾਵਰਣ ਵਿਵਸਥਾ ਵਰਤੋਂ"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
-msgid "If you look real closely"
-msgstr "ਜੇਕਰ ਤੁਸੀਂ ਧਿਆਨ ਨਾਲ ਵੇਖੋ"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
-msgid "you can see the butterflies mating"
-msgstr "ਤੁਸੀਂ ਤਿੱਤਲੀ ਮੇਲ ਵੇਖ ਸਕਦੇ ਹੋ"
-
-#: ../pidgin/gtkaccount.c:1030
-msgid "Proxy Options"
-msgstr "ਪਰਾਕਸੀ ਚੋਣ"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
-msgid "Proxy _type:"
-msgstr "ਪਰਾਕਸੀ ਕਿਸਮ(_t):"
-
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
-msgid "_Host:"
-msgstr "ਮੇਜ਼ਬਾਨ:"
-
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
-msgid "_Port:"
-msgstr "ਪੋਰਟ(_P):"
-
-#: ../pidgin/gtkaccount.c:1065
-msgid "_Username:"
-msgstr "ਉਪਭੋਗੀ ਨਾਂ(_U):"
-
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
-msgid "Pa_ssword:"
-msgstr "ਗੁਪਤ-ਕੋਡ(_s):"
-
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
-msgid "Unable to save new account"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#: ../pidgin/gtkaccount.c:1196
-msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
-msgid "Add Account"
-msgstr "ਖਾਤਾ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/gtkaccount.c:1492
-msgid "_Basic"
-msgstr "ਮੁੱਢਲਾ(_B)"
-
-#: ../pidgin/gtkaccount.c:1499
-msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1515
-msgid "_Advanced"
-msgstr "ਤਕਨੀਕੀ(_A)"
-
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
-msgid "Enabled"
-msgstr "ਯੋਗ ਕੀਤਾ"
-
-#: ../pidgin/gtkaccount.c:2001
-msgid "Protocol"
-msgstr "ਪ੍ਰੋਟੋਕਾਲ"
-
-#: ../pidgin/gtkaccount.c:2201
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "ਉਸ ਗੱਲਬਾਤ ਬਾਰੇ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਵਿੱਚ ਤੁਸੀਂ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
-msgid "_Account:"
-msgstr "ਖਾਤਾ(_A):"
-
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
-msgid "_Block"
-msgstr "ਪਾਬੰਦੀ(_B)"
-
-#: ../pidgin/gtkblist.c:1088
-msgid "Un_block"
-msgstr "ਪਾਬੰਦੀ ਹਟਾਓ(_b)"
-
-#: ../pidgin/gtkblist.c:1139
-msgid "Get _Info"
-msgstr "ਜਾਣਕਾਰੀ(_I)"
-
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
-msgid "I_M"
-msgstr "I_M"
-
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "ਫਾਇਲ ਭੇਜੋ"
-
-#: ../pidgin/gtkblist.c:1155
-#, fuzzy
-msgid "Add Buddy _Pounce"
-msgstr "ਝੱਟਪਟ ਸਨੇਹੀ ਸ਼ਾਮਿਲ(_P)"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
-msgid "View _Log"
-msgstr "ਲਾਗ ਵੇਖਾਓ(_L)"
-
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
-msgid "_Alias..."
-msgstr "ਉਪ-ਨਾਂ(_A)..."
-
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
-msgid "_Remove"
-msgstr "ਹਟਾਓ(_R)"
-
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "ਸਨੇਹੀ ਸ਼ਾਮਿਲ(_B)"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਿਲ(_h)"
-
-#: ../pidgin/gtkblist.c:1244
-msgid "_Delete Group"
-msgstr "ਗਰੁੱਪ ਹਟਾਓ(_D)"
-
-#: ../pidgin/gtkblist.c:1246
-msgid "_Rename"
-msgstr "ਨਾਂ-ਤਬਦੀਲ(_R)"
-
-#. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
-msgid "_Join"
-msgstr "ਦਾਖਲ(_J)"
-
-#: ../pidgin/gtkblist.c:1267
-msgid "Auto-Join"
-msgstr "ਸਵੈ-ਚਾਲਤ ਦਾਖਲ"
-
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
-msgid "_Collapse"
-msgstr "ਸਮੇਟੋ(_C)"
-
-#: ../pidgin/gtkblist.c:1334
-msgid "_Expand"
-msgstr "ਫੈਲਾਓ(_E)"
-
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
-msgid "/Tools/Mute Sounds"
-msgstr "/ਸੰਦੀ/ਆਵਾਜ਼ ਚੁੱਪ ਰੱਖੋ"
-
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਇੱਕ ਖਾਤੇ ਨਾਲ ਲਾਗਇਨ ਨਹੀਂ ਹੋ, ਤਾਂ ਕਿ ਸਨੇਹੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਜਾ ਸਕੇ।"
-
-#. Buddies menu
-#: ../pidgin/gtkblist.c:2869
-msgid "/_Buddies"
-msgstr "/ਸਨੇਹੀ(_B)"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Buddies/New Instant _Message..."
-msgstr "/ਸਨੇਹੀ/ਨਵਾਂ ਤਰੁੰਤ ਸਨੇਹਾ(_M)..."
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Buddies/Join a _Chat..."
-msgstr "/ਸਨੇਹੀ/ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ(_C)..."
-
-#: ../pidgin/gtkblist.c:2872
-msgid "/Buddies/Get User _Info..."
-msgstr "/ਸਨੇਹੀ/ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ ਲਵੋ(_I)..."
-
-#: ../pidgin/gtkblist.c:2873
-msgid "/Buddies/View User _Log..."
-msgstr "/ਸਨੇਹੀ/ਉਪਭੋਗੀ ਲਾਗ ਵੇਖਾਓ(_L)..."
-
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/ਸਨੇਹੀ(_B)"
-
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
-msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/ਸਨੇਹੀ/ਆਫਲਾਇਨ ਸਨੇਹੀ ਵੇਖਾਓ(_O)"
-
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
-msgid "/Buddies/Show/_Empty Groups"
-msgstr "/ਸਨੇਹੀ/ਖਾਲੀ ਗਰੁੱਪ ਵੇਖਾਓ(_E)"
-
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
-msgid "/Buddies/Show/Buddy _Details"
-msgstr "/ਸਨੇਹੀ/ਸਨੇਹੀ ਵੇਰਵਾ ਵੇਖਾਓ(_D)"
-
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
-msgid "/Buddies/Show/Idle _Times"
-msgstr "/ਬੱਡੀ/ਵੇਹਲਾ ਸਮਾਂ ਵੇਖਾਓ(_T)"
-
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
-msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/ਸਨੇਹੀ/ਖਾਲੀ ਗਰੁੱਪ ਵੇਖਾਓ(_E)"
-
-#: ../pidgin/gtkblist.c:2881
-#, fuzzy
-msgid "/Buddies/_Sort Buddies"
-msgstr "/ਸਨੇਹੀ/ਸਨੇਹੀ ਕ੍ਰਮਬੱਧ"
-
-#: ../pidgin/gtkblist.c:2883
-msgid "/Buddies/_Add Buddy..."
-msgstr "/ਸਨੇਹੀ/ਸਨੇਹੀ ਸ਼ਾਮਿਲ(_A)..."
-
-#: ../pidgin/gtkblist.c:2884
-msgid "/Buddies/Add C_hat..."
-msgstr "/ਸਨੇਹੀ/ਗੱਲਬਾਤ ਸ਼ਾਮਿਲ(_h)..."
-
-#: ../pidgin/gtkblist.c:2885
-msgid "/Buddies/Add _Group..."
-msgstr "/ਸਨੇਹੀ/ਗਰੁੱਪ ਸ਼ਾਮਿਲ(_G)..."
-
-#: ../pidgin/gtkblist.c:2887
-msgid "/Buddies/_Quit"
-msgstr "/ਸਨੇਹੀ/ਬੰਦ ਕਰੋ(_Q)"
-
-#. Accounts menu
-#: ../pidgin/gtkblist.c:2890
-msgid "/_Accounts"
-msgstr "/ਖਾਤੇ(_A)"
-
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/ਖਾਤੇ/ਸ਼ਾਮਲ\\/ਸੋਧ"
-
-#. Tools
-#: ../pidgin/gtkblist.c:2894
-msgid "/_Tools"
-msgstr "/ਸੰਦ(_T)"
-
-#: ../pidgin/gtkblist.c:2895
-#, fuzzy
-msgid "/Tools/Buddy _Pounces"
-msgstr "/ਸੰਦ/ਝੱਟਪਟ ਸਨੇਹੀ(_P)"
-
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
-msgid "/Tools/_Certificates"
-msgstr "/ਸੰਦ/ਮੇਰੀ ਪਸੰਦ(_e)"
-
-#: ../pidgin/gtkblist.c:2897
-msgid "/Tools/Plu_gins"
-msgstr "/ਸੰਦ/ਪਲੱਗਇਨ(_G)"
-
-#: ../pidgin/gtkblist.c:2898
-msgid "/Tools/Pr_eferences"
-msgstr "/ਸੰਦ/ਮੇਰੀ ਪਸੰਦ(_e)"
-
-#: ../pidgin/gtkblist.c:2899
-msgid "/Tools/Pr_ivacy"
-msgstr "/ਸੰਦ/ਰਹੱਸ(_i)"
-
-#: ../pidgin/gtkblist.c:2901
-msgid "/Tools/_File Transfers"
-msgstr "/ਸੰਦ/ਫਾਇਲ ਸੰਚਾਰ(_F)"
-
-#: ../pidgin/gtkblist.c:2902
-msgid "/Tools/R_oom List"
-msgstr "/ਸੰਦ/ਰੂਮ ਸੂਚੀ(_o)"
-
-#: ../pidgin/gtkblist.c:2903
-msgid "/Tools/System _Log"
-msgstr "/ਸੰਦ/ਸਿਸਟਮ ਲਾਗ ਵੇਖੋ(_L)"
-
-#: ../pidgin/gtkblist.c:2905
-msgid "/Tools/Mute _Sounds"
-msgstr "/ਸੰਦ/ਆਵਾਜ਼ ਚੁੱਪ ਰੱਖੋ(_S)"
-
-#. Help
-#: ../pidgin/gtkblist.c:2907
-msgid "/_Help"
-msgstr "/ਸਹਾਇਤਾ(_H)"
-
-#: ../pidgin/gtkblist.c:2908
-msgid "/Help/Online _Help"
-msgstr "/ਸਹਾਇਤਾ/ਆਨਲਾਇਨ ਸਹਾਇਤਾ(_H)"
-
-#: ../pidgin/gtkblist.c:2909
-msgid "/Help/_Debug Window"
-msgstr "/ਸਹਾਇਤਾ/ਡੀਬੱਗ ਝਰੋਖਾ(_D)"
-
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
-msgid "/Help/_About"
-msgstr "/ਸਹਾਇਤਾ/ਇਸ ਬਾਰੇ(_A)"
-
-#: ../pidgin/gtkblist.c:2942
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>ਖਾਤਾ:</b> %s"
-
-#: ../pidgin/gtkblist.c:3020
-msgid "Buddy Alias"
-msgstr "ਬੱਡੀ ਉਪ-ਨਾਂ"
-
-#: ../pidgin/gtkblist.c:3049
-msgid "Logged In"
-msgstr "ਲਾਗਇਨ ਹੈ"
-
-#: ../pidgin/gtkblist.c:3095
-msgid "Last Seen"
-msgstr "ਆਖਰੀ ਵਾਰ ਵੇਖਿਆ"
-
-#: ../pidgin/gtkblist.c:3116
-msgid "Spooky"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3118
-msgid "Awesome"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3120
-msgid "Rockin'"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
-msgid "Idle %dd %dh %02dm"
-msgstr "ਵੇਹਲਾ %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3455
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "ਵੇਹਲਾ %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3457
-#, c-format
-msgid "Idle %dm"
-msgstr "ਵੇਹਲਾ %dm"
-
-#: ../pidgin/gtkblist.c:3602
-msgid "/Buddies/New Instant Message..."
-msgstr "/ਸਨੇਹੀ/ਨਵਾਂ ਤਰੁੰਤ ਸਨੇਹਾ.."
-
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
-msgid "/Buddies/Join a Chat..."
-msgstr "/ਸਨੇਹੀ/ਗੱਲਬਾਤ 'ਚ ਸ਼ਾਮਿਲ..."
-
-#: ../pidgin/gtkblist.c:3604
-msgid "/Buddies/Get User Info..."
-msgstr "/ਸਨੇਹੀ/ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ ਲਵੋ..."
-
-#: ../pidgin/gtkblist.c:3605
-msgid "/Buddies/Add Buddy..."
-msgstr "/ਸਨੇਹੀ/ਸਨੇਹੀ ਸ਼ਾਮਿਲ..."
-
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
-msgid "/Buddies/Add Chat..."
-msgstr "/ਸਨੇਹੀ/ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ..."
-
-#: ../pidgin/gtkblist.c:3607
-msgid "/Buddies/Add Group..."
-msgstr "/ਸਨੇਹੀ/ਗਰੁੱਪ 'ਚ ਸ਼ਾਮਿਲ..."
-
-#: ../pidgin/gtkblist.c:3642
-msgid "/Tools/Privacy"
-msgstr "/ਸੰਦ/ਰਹੱਸ"
-
-#: ../pidgin/gtkblist.c:3645
-msgid "/Tools/Room List"
-msgstr "/ਸੰਦ/ਰੂਮ ਸੂਚੀ"
-
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%2$s ਵਲੋਂ %1$d ਅਣ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ ਹੈ\n"
-msgstr[1] "%2$s ਵਲੋਂ %1$d ਅਣ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਹਨ\n"
-
-#: ../pidgin/gtkblist.c:3822
-msgid "Manually"
-msgstr "ਖੁਦ"
-
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "ਵਰਣਨਮਾਲਾ ਅਨੁਸਾਰ"
-
-#: ../pidgin/gtkblist.c:3825
-msgid "By status"
-msgstr "ਅਕਾਰ"
-
-#: ../pidgin/gtkblist.c:3826
-msgid "By log size"
-msgstr "ਲਾਗ ਅਕਾਰ"
-
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
-#, c-format
-msgid "%s disconnected"
-msgstr "%s ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕੀਤਾ"
-
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s ਖਾਤਾ ਬੰਦ ਕੀਤਾ: %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
-msgid "<b>Username:</b>"
-msgstr "<b>ਉਪਭੋਗੀ ਨਾਂ:</b>"
-
-#: ../pidgin/gtkblist.c:4226
-msgid "<b>Password:</b>"
-msgstr "<b>ਗੁਪਤ-ਕੋਡ:</b>"
-
-#: ../pidgin/gtkblist.c:4237
-msgid "_Login"
-msgstr "ਲਾਗਇਨ(_L)"
-
-#: ../pidgin/gtkblist.c:4320
-msgid "/Accounts"
-msgstr "/ਖਾਤੇ"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, 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 ""
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
-msgid "/Buddies/Show/Offline Buddies"
-msgstr "/ਸਨੇਹੀ/ਆਫਲਾਇਨ ਸੁਨੇਹੀ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
-msgid "/Buddies/Show/Empty Groups"
-msgstr "/ਸਨੇਹੀ/ਖਾਲੀ ਗਰੁੱਪ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
-msgid "/Buddies/Show/Buddy Details"
-msgstr "/ਸਨੇਹੀ/ਸਨੇਹੀ ਵੇਰਵਾ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
-msgid "/Buddies/Show/Idle Times"
-msgstr "/ਸਨੇਹੀ/ਆਫਲਾਇਨ ਸੁਨੇਹੀ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
-msgid "/Buddies/Show/Protocol Icons"
-msgstr "/ਸਨੇਹੀ/ਖਾਲੀ ਗਰੁੱਪ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-
-#. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
-msgid "_Screen name:"
-msgstr "ਸਕਰੀਨ ਨਾਂ:"
-
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
-msgid "A_lias:"
-msgstr "ਉਪ-ਨਾਂ:"
-
-#: ../pidgin/gtkblist.c:5826
-msgid "This protocol does not support chat rooms."
-msgstr "ਇਹ ਪ੍ਰੋਟੋਕਾਲ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#: ../pidgin/gtkblist.c:5842
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਕਿਸੇ ਪ੍ਰੋਟੋਕਾਲ ਉੱਤੇ ਲਾਗਇਨ ਨਹੀਂ ਹੋ, ਜਿਸ ਰਾਹੀਂ ਗੱਲਬਾਤ ਕੀਤੀ ਜਾ ਸਕੇ।"
-
-#: ../pidgin/gtkblist.c:5883
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"ਇੱਕ ਉਪ-ਨਾਂ ਅਤੇ ਗੱਲਬਾਤ ਲਈ ਠੀਕ ਨਾਂ ਦਿਓ ਜੀ, ਜਿਸ ਲਈ ਤੁਸੀਂ ਸਨੇਹੀ ਸੂਚੀ ਸ਼ਾਮਿਲ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।\n"
-
-#: ../pidgin/gtkblist.c:5964
-msgid "Please enter the name of the group to be added."
-msgstr "ਗਰੁੱਪ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਨਾਂ ਦਿਓ ਜੀ3।"
-
-#: ../pidgin/gtkblist.c:6609
-msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/ਖਾਤੇ/"
-
-#: ../pidgin/gtkblist.c:6633
-msgid "_Edit Account"
-msgstr "ਖਾਤਾ ਸੋਧ(_E)"
-
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
-msgid "No actions available"
-msgstr "ਕੋਈ ਕਾਰਵਾਈ ਉਪਲੱਬਧ ਨਹੀਂ"
-
-#: ../pidgin/gtkblist.c:6654
-msgid "_Disable"
-msgstr "ਆਯੋਗ(_D)"
-
-#: ../pidgin/gtkblist.c:6666
-msgid "Enable Account"
-msgstr "ਖਾਤਾ ਯੋਗ"
-
-#: ../pidgin/gtkblist.c:6672
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/ਖਾਤੇ/ਖਾਤਾ ਯੋਗ"
-
-#: ../pidgin/gtkblist.c:6721
-msgid "/Tools"
-msgstr "/ਸੰਦ"
-
-#: ../pidgin/gtkblist.c:6791
-msgid "/Buddies/Sort Buddies"
-msgstr "/ਸਨੇਹੀ/ਸਨੇਹੀ ਕ੍ਰਮਬੱਧ"
-
-#. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
-msgid "SSL Servers"
-msgstr "ਸਰਵਰ"
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
-msgid "Unknown command."
-msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
-
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "ਉਸ ਸਨੇਹੀ ਕੋਈ ਉਹ ਪ੍ਰੋਟੋਕਾਲ ਨਹੀਂ ਹੈ, ਜੋ ਕਿ ਇਸ ਗੱਲਬਾਤ ਦਾ"
-
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਇਸ ਖਾਤੇ ਨਾਲ ਲਾਗਇਨ ਨਹੀਂ ਹੋ, ਜਿਸ ਨਾਲ ਸਨੇਹੀ ਨੂੰ ਸੱਦਿਆ ਜਾ ਸਕੇ।"
-
-#: ../pidgin/gtkconv.c:827
-msgid "Invite Buddy Into Chat Room"
-msgstr "ਸਨੇਹੀ ਨੂੰ ਗੱਲਬਾਤ ਰੂਮ ਵਿੱਚ ਸੱਦੋ"
-
-#. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "ਸੱਦਾ ਭੇਜਣ ਲਈ ਉਪਭੋਗੀ ਦਾ ਨਾਂ ਦਿਓ, ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਸੱਦਾ ਸੁਨੇਹਾ ਵੀ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../pidgin/gtkconv.c:878
-msgid "_Buddy:"
-msgstr "ਸਨੇਹੀ(_B):"
-
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
-msgid "_Message:"
-msgstr "ਸੁਨੇਹਾ(_M):"
-
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "ਫਾਇਲ ਖੋਲਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#: ../pidgin/gtkconv.c:953
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>%s ਨਾਲ ਗੱਲਬਾਤ</h1>\n"
-
-#: ../pidgin/gtkconv.c:991
-msgid "Save Conversation"
-msgstr "ਗੱਲਬਾਤ ਸੰਭਾਲੋ"
-
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
-msgid "Find"
-msgstr "ਖੋਜ"
-
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
-msgid "_Search for:"
-msgstr "ਖੋਜ(_S):"
-
-#: ../pidgin/gtkconv.c:1622
-msgid "Un-Ignore"
-msgstr "ਨਾ-ਅਣਡਿੱਠਾ"
-
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "ਅਣਡਿੱਠਾ"
-
-#: ../pidgin/gtkconv.c:1645
-msgid "Get Away Message"
-msgstr "ਦੂਰ ਸੁਨੇਹਾ ਲਵੋ"
-
-#: ../pidgin/gtkconv.c:1668
-msgid "Last said"
-msgstr "ਆਖਰੀ ਵਾਰ ਕਿਹਾ"
-
-#: ../pidgin/gtkconv.c:2606
-msgid "Unable to save icon file to disk."
-msgstr "ਡਿਸਕ ਉੱਤੇ ਆਈਕਾਨ ਸੰਭਾਲ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#: ../pidgin/gtkconv.c:2657
-msgid "Save Icon"
-msgstr "ਆਈਕਾਨ ਸੰਭਾਲੋ"
-
-#: ../pidgin/gtkconv.c:2709
-msgid "Animate"
-msgstr "ਸਜੀਵਤਾ"
-
-#: ../pidgin/gtkconv.c:2714
-msgid "Hide Icon"
-msgstr "ਆਈਕਾਨ ਓਹਲੇ"
-
-#: ../pidgin/gtkconv.c:2717
-msgid "Save Icon As..."
-msgstr "ਆਈਕਾਨ ਇੰਝ ਸੰਭਾਲੋ..."
-
-#: ../pidgin/gtkconv.c:2721
-msgid "Set Custom Icon..."
-msgstr "ਕਸਟਮ ਆਈਕਾਨ ਸੈੱਟ..."
-
-#: ../pidgin/gtkconv.c:2734
-msgid "Remove Custom Icon"
-msgstr "ਕਸਟਮ ਆਈਕਾਨ ਹਟਾਓ"
-
-#: ../pidgin/gtkconv.c:2861
-msgid "Show All"
-msgstr ""
-
-#. Conversation menu
-#: ../pidgin/gtkconv.c:2880
-msgid "/_Conversation"
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ(_C)"
-
-#: ../pidgin/gtkconv.c:2882
-msgid "/Conversation/New Instant _Message..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਨਵਾਂ ਤਰੁੰਤ ਸਨੇਹਾ(_M).."
-
-#: ../pidgin/gtkconv.c:2887
-msgid "/Conversation/_Find..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਖੋਜ(_F)..."
-
-#: ../pidgin/gtkconv.c:2889
-msgid "/Conversation/View _Log"
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਲਾਗ ਵੇਖਾਓ(_L)"
-
-#: ../pidgin/gtkconv.c:2890
-msgid "/Conversation/_Save As..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਇੰਝ ਸੰਭਾਲੋ(_S)..."
-
-#: ../pidgin/gtkconv.c:2892
-#, fuzzy
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਸਾਫ਼ ਕਰੋ"
-
-#: ../pidgin/gtkconv.c:2896
-msgid "/Conversation/Se_nd File..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਫਾਇਲ ਭੇਜੋ(_n)..."
-
-#: ../pidgin/gtkconv.c:2897
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਝੱਟਪੱਟ ਸਨੇਹੀ ਸ਼ਾਮਿਲ(_P)..."
-
-#: ../pidgin/gtkconv.c:2899
-msgid "/Conversation/_Get Info"
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਜਾਣਕਾਰੀ ਲਵੋ(_G)"
-
-#: ../pidgin/gtkconv.c:2901
-msgid "/Conversation/In_vite..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਸੱਦਾ(_v)..."
-
-#: ../pidgin/gtkconv.c:2903
-#, fuzzy
-msgid "/Conversation/M_ore"
-msgstr "/ਗੱਲਬਾਤ/ਬੰਦ ਕਰੋ(_C)"
-
-#: ../pidgin/gtkconv.c:2907
-msgid "/Conversation/Al_ias..."
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ/ਉਪ ਨਾਂ(_i)..."
-
-#: ../pidgin/gtkconv.c:2909
-msgid "/Conversation/_Block..."
-msgstr "/ਗੱਲਬਾਤ/ਪਾਬੰਦੀ(_B)..."
-
-#: ../pidgin/gtkconv.c:2911
-#, fuzzy
-msgid "/Conversation/_Unblock..."
-msgstr "/ਗੱਲਬਾਤ/ਪਾਬੰਦੀ(_B)..."
-
-#: ../pidgin/gtkconv.c:2913
-msgid "/Conversation/_Add..."
-msgstr "/ਗੱਲਬਾਤ/ਸ਼ਾਮਿਲ(_A)..."
-
-#: ../pidgin/gtkconv.c:2915
-msgid "/Conversation/_Remove..."
-msgstr "/ਗੱਲਬਾਤ/ਹਟਾਓ(_R)..."
-
-#: ../pidgin/gtkconv.c:2920
-#, fuzzy
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/ਗੱਲਬਾਤ/ਸੱਦਾ..."
-
-#: ../pidgin/gtkconv.c:2922
-#, fuzzy
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/ਗੱਲਬਾਤ/ਸੱਦਾ..."
-
-#: ../pidgin/gtkconv.c:2928
-msgid "/Conversation/_Close"
-msgstr "/ਗੱਲਬਾਤ/ਬੰਦ ਕਰੋ(_C)"
-
-#. Options
-#: ../pidgin/gtkconv.c:2932
-msgid "/_Options"
-msgstr "/ਚੋਣ(_O)"
-
-#: ../pidgin/gtkconv.c:2933
-msgid "/Options/Enable _Logging"
-msgstr "/ਚੋਣ/ਲਾਗ ਯੋਗ(_L)"
-
-#: ../pidgin/gtkconv.c:2934
-msgid "/Options/Enable _Sounds"
-msgstr "/ਚੋਣ/ਆਵਾਜ਼ ਯੋਗ(_S)"
-
-#: ../pidgin/gtkconv.c:2936
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/ਚੋਣ/ਫਾਰਮੈਟ ਸੰਦ-ਪੱਟੀ ਵੇਖਾਓ(_T)"
-
-#: ../pidgin/gtkconv.c:2937
-msgid "/Options/Show Ti_mestamps"
-msgstr "/ਚੋਣ/ਸਮਾਂ-ਮੋਹਰ ਵੇਖਾਓ(_M)"
-
-#: ../pidgin/gtkconv.c:3061
-#, fuzzy
-msgid "/Conversation/More"
-msgstr "/ਗੱਲਬਾਤ/ਬੰਦ ਕਰੋ(_C)"
-
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
-msgid "/Options"
-msgstr "/ਚੋਣ(_O)"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
-msgid "/Conversation"
-msgstr "/ਗੱਲਾਂ-ਬਾਤਾਂ"
-
-#: ../pidgin/gtkconv.c:3192
-msgid "/Conversation/View Log"
-msgstr "/ਗੱਲਬਾਤ/ਲਾਗ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkconv.c:3198
-msgid "/Conversation/Send File..."
-msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ..."
-
-#: ../pidgin/gtkconv.c:3202
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/ਗੱਲਬਾਤ/ਝਟਪਟ ਸਨੇਹੀ ਸ਼ਾਮਿਲ..."
-
-#: ../pidgin/gtkconv.c:3208
-msgid "/Conversation/Get Info"
-msgstr "/ਗੱਲਬਾਤ/ਜਾਣਕਾਰੀ ਲਵੋ"
-
-#: ../pidgin/gtkconv.c:3212
-msgid "/Conversation/Invite..."
-msgstr "/ਗੱਲਬਾਤ/ਸੱਦਾ..."
-
-#: ../pidgin/gtkconv.c:3218
-msgid "/Conversation/Alias..."
-msgstr "/ਗੱਲਬਾਤ/ਉਪ ਨਾਂ..."
-
-#: ../pidgin/gtkconv.c:3222
-msgid "/Conversation/Block..."
-msgstr "/ਗੱਲਬਾਤ/ਪਾਬੰਦੀ..."
-
-#: ../pidgin/gtkconv.c:3226
-#, fuzzy
-msgid "/Conversation/Unblock..."
-msgstr "/ਗੱਲਬਾਤ/ਪਾਬੰਦੀ..."
-
-#: ../pidgin/gtkconv.c:3230
-msgid "/Conversation/Add..."
-msgstr "/ਗੱਲਬਾਤ/ਸ਼ਾਮਿਲ..."
-
-#: ../pidgin/gtkconv.c:3234
-msgid "/Conversation/Remove..."
-msgstr "/ਗੱਲਬਾਤ/ਹਟਾਓ..."
-
-#: ../pidgin/gtkconv.c:3240
-#, fuzzy
-msgid "/Conversation/Insert Link..."
-msgstr "/ਗੱਲਬਾਤ/ਸੱਦਾ..."
-
-#: ../pidgin/gtkconv.c:3244
-#, fuzzy
-msgid "/Conversation/Insert Image..."
-msgstr "/ਗੱਲਬਾਤ/ਸੱਦਾ..."
-
-#: ../pidgin/gtkconv.c:3250
-msgid "/Options/Enable Logging"
-msgstr "/ਚੋਣ/ਲਾਗ ਰੱਖੋ"
-
-#: ../pidgin/gtkconv.c:3253
-msgid "/Options/Enable Sounds"
-msgstr "/ਚੋਣ/ਆਵਾਜ਼ ਯੋਗ"
-
-#: ../pidgin/gtkconv.c:3266
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/ਚੋਣ/ਫਾਰਮੈਟ ਸੰਦ-ਪੱਟੀ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkconv.c:3269
-msgid "/Options/Show Timestamps"
-msgstr "/ਚੋਣ/ਸਮਾਂ-ਮੋਹਰ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
-msgid "User is typing..."
-msgstr "ਉਹ ਲਿਖ ਰਿਹਾ/ਰਹੀ ਹੈ..."
-
-#: ../pidgin/gtkconv.c:3391
-#, fuzzy
-msgid "User has typed something and stopped"
-msgstr "ਉਸ ਨੇ ਕੁਝ ਲਿਖਿਆ ਅਤੇ ਰੁਕ ਗਿਆ"
-
-#. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "ਭੇਜੋ(_S)"
-
-#: ../pidgin/gtkconv.c:4286
-msgid "_Send"
-msgstr "ਭੇਜੋ(_S)"
-
-#. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
-msgid "0 people in room"
-msgstr "ਰੂਮ ਵਿੱਚ 0 ਵਿਅਕਤੀ"
-
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "ਰੂਮ ਵਿੱਚ %d ਵਿਅਕਤੀ"
-msgstr[1] "ਰੂਮ ਵਿੱਚ %d ਵਿਅਕਤੀ"
-
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
-msgid "Typing"
-msgstr "ਲਿਖ ਰਿਹਾ ਹੈ"
-
-#: ../pidgin/gtkconv.c:6490
-msgid "Stopped Typing"
-msgstr "ਲਿਖਣ ਤੋਂ ਰੁਕਿਆ/ਰੁਕੀ"
-
-#: ../pidgin/gtkconv.c:6493
-msgid "Nick Said"
-msgstr "ਨਾਂ ਨੇ ਕਿਹਾ"
-
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
-msgid "Unread Messages"
-msgstr "ਅਣ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
-
-#: ../pidgin/gtkconv.c:6499
-msgid "New Event"
-msgstr "ਨਵੀਂ ਘਟਨਾ"
-
-#: ../pidgin/gtkconv.c:7572
-#, fuzzy
-msgid "clear: Clears all conversation scrollbacks."
-msgstr "ਸਾਫ਼: ਪਿਛਲੀਆਂ ਗੱਲਾਂ-ਬਾਤਾਂ ਸਾਫ਼ ਕਰੋ ਦਿਓ।"
-
-#: ../pidgin/gtkconv.c:7736
-msgid "Confirm close"
-msgstr "ਬੰਦ ਕਰਨ ਪੁਸ਼ਟੀ"
-
-#: ../pidgin/gtkconv.c:7768
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਝਰੋਖਾ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkconv.c:8355
-msgid "Close other tabs"
-msgstr "ਹੋਰ ਟੈਬਾਂ ਬੰਦ ਕਰੋ"
-
-#: ../pidgin/gtkconv.c:8361
-msgid "Close all tabs"
-msgstr "ਸਭ ਟੈਬਾਂ ਬੰਦ ਕਰੋ"
-
-#: ../pidgin/gtkconv.c:8369
-msgid "Detach this tab"
-msgstr "ਇਹ ਟੈਬ ਵੱਖ ਕਰੋ"
-
-#: ../pidgin/gtkconv.c:8375
-msgid "Close this tab"
-msgstr "ਇਹ ਟੈਬ ਬੰਦ ਕਰੋ"
-
-#: ../pidgin/gtkconv.c:8875
-msgid "Close conversation"
-msgstr "ਗੱਲਬਾਤ ਬੰਦ"
-
-#: ../pidgin/gtkconv.c:9477
-msgid "Last created window"
-msgstr "ਆਖਰੀ ਬਣਾਇਆ ਝਰੋਖਾ"
-
-#: ../pidgin/gtkconv.c:9479
-msgid "Separate IM and Chat windows"
-msgstr "ਵੱਖਰੇ IM ਅਤੇ ਗੱਲਬਾਤ ਝਰੋਖੇ"
-
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
-msgid "New window"
-msgstr "ਨਵਾਂ ਝਰੋਖਾ"
-
-#: ../pidgin/gtkconv.c:9483
-msgid "By group"
-msgstr "ਗਰੁੱਪ"
-
-#: ../pidgin/gtkconv.c:9485
-msgid "By account"
-msgstr "ਖਾਤਾ"
-
-#: ../pidgin/gtkdebug.c:234
-msgid "Save Debug Log"
-msgstr "ਡੀਬੱਗ ਲਾਗ ਸੰਭਾਲੋ"
-
-#: ../pidgin/gtkdebug.c:582
-msgid "Invert"
-msgstr "ਉਲਟ"
-
-#: ../pidgin/gtkdebug.c:585
-msgid "Highlight matches"
-msgstr "ਮਿਲਦੇ ਉਘਾੜੋ"
-
-#: ../pidgin/gtkdebug.c:652
-msgid "_Icon Only"
-msgstr "ਕੇਵਲ ਆਈਕਾਨ(_I)"
-
-#: ../pidgin/gtkdebug.c:653
-msgid "_Text Only"
-msgstr "ਕੇਵਲ ਪਾਠ(_T)"
-
-#: ../pidgin/gtkdebug.c:654
-msgid "_Both Icon & Text"
-msgstr "ਆਈਕਾਨ ਅਤੇ ਪਾਠ ਦੋਵੇਂ(_B)"
-
-#: ../pidgin/gtkdebug.c:775
-msgid "Filter"
-msgstr "ਫਿਲਟਰ"
-
-#: ../pidgin/gtkdebug.c:794
-msgid "Right click for more options."
-msgstr "ਹੋਰ ਚੋਣਾਂ ਲਈ ਸੱਜਾ ਬਟਨ ਦਬਾਓ।"
-
-#: ../pidgin/gtkdebug.c:824
-msgid "Level "
-msgstr "ਪੱਧਰ "
-
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
-msgid "Select the debug filter level."
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:833
-msgid "All"
-msgstr "ਸਭ"
-
-#: ../pidgin/gtkdebug.c:834
-msgid "Misc"
-msgstr "ਫੁਟਕਲ"
-
-#: ../pidgin/gtkdebug.c:836
-msgid "Warning"
-msgstr "ਚੇਤਾਵਨੀ"
-
-#: ../pidgin/gtkdebug.c:837
-msgid "Error "
-msgstr "ਗਲਤੀ "
-
-#: ../pidgin/gtkdebug.c:838
-msgid "Fatal Error"
-msgstr "ਘਾਤਕ ਗਲਤੀ"
-
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
-msgstr "ਮੁੱਖ ਖੋਜੀ"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
-msgid "developer"
-msgstr "ਖੋਜੀ"
-
-#: ../pidgin/gtkdialogs.c:87
-msgid "support"
-msgstr "ਸਹਿਯੋਗ"
-
-#: ../pidgin/gtkdialogs.c:88
-msgid "support/QA"
-msgstr "ਸਹਿਯੋਗ/QA"
-
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
-msgid "developer & webmaster"
-msgstr "ਖੋਜੀ ਤੇ ਵੈਬ ਮਾਸਟਰ"
-
-#: ../pidgin/gtkdialogs.c:99
-msgid "Senior Contributor/QA"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:108
-msgid "win32 port"
-msgstr "win32 port"
-
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
-msgid "maintainer"
-msgstr "ਪ੍ਰਬੰਧਕ"
-
-#: ../pidgin/gtkdialogs.c:111
-msgid "libfaim maintainer"
-msgstr "libfaim ਪਰਬੰਧਕ"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
-msgid "hacker and designated driver [lazy bum]"
-msgstr "ਹੈਂਕਰ ਅਤੇ ਢਾਂਚਾ ਡਰਾਇਵਰ [lazy bum]"
-
-#: ../pidgin/gtkdialogs.c:115
-msgid "XMPP developer"
-msgstr "XMPP ਡੀਵੈਲਪਰ"
-
-#: ../pidgin/gtkdialogs.c:116
-msgid "original author"
-msgstr "ਅਸਲੀ ਲੇਖਕ"
-
-#: ../pidgin/gtkdialogs.c:133
-msgid "Afrikaans"
-msgstr "ਅਫ਼ਰੀਕੀ"
-
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
-msgid "Arabic"
-msgstr "ਅਰਬੀ"
-
-#: ../pidgin/gtkdialogs.c:135
-msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
-msgid "Bulgarian"
-msgstr "ਬੁਲਗਾਰੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-msgid "Bengali"
-msgstr "ਬੰਗਾਲੀ"
-
-#: ../pidgin/gtkdialogs.c:142
-msgid "Bosnian"
-msgstr "ਬੋਸਨੀਆਈ"
-
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
-msgid "Catalan"
-msgstr "ਕੇਟੇਲਨ"
-
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
-msgid "Valencian-Catalan"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
-msgid "Czech"
-msgstr "ਚੈੱਕ"
-
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
-msgid "Danish"
-msgstr "ਡੈਨਿਸ਼"
-
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
-msgid "German"
-msgstr "ਜਰਮਨ"
-
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-msgid "Dzongkha"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
-msgid "Greek"
-msgstr "ਗਰੀਕ"
-
-#: ../pidgin/gtkdialogs.c:156
-msgid "Australian English"
-msgstr "ਆਸਟਰੇਲੀਅਨ ਅੰਗਰੇਜ਼ੀ"
-
-#: ../pidgin/gtkdialogs.c:157
-msgid "Canadian English"
-msgstr "ਕੈਨੇਡੀਅਨ ਅੰਗਰੇਜ਼ੀ"
-
-#: ../pidgin/gtkdialogs.c:158
-msgid "British English"
-msgstr "ਬਰਤਾਨੀਵੀਂ ਅੰਗਰੇਜ਼ੀ"
-
-#: ../pidgin/gtkdialogs.c:159
-msgid "Esperanto"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
-msgid "Spanish"
-msgstr "ਸਪੇਨੀ"
-
-#: ../pidgin/gtkdialogs.c:161
-#, fuzzy
-msgid "Estonian"
-msgstr "ਬੋਸਨੀਆਈ"
-
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
-msgid "Euskera(Basque)"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-msgid "Persian"
-msgstr "ਫਾਰਸੀ"
-
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-msgid "Finnish"
-msgstr "ਫੈਨਿਸ਼"
-
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
-msgid "French"
-msgstr "ਫਰੈਂਚ"
-
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
-msgid "Galician"
-msgstr "ਗਾਲਿਸਿਕ"
-
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-msgid "Gujarati"
-msgstr "ਗੁਜਰਾਤੀ"
-
-#: ../pidgin/gtkdialogs.c:172
-msgid "Gujarati Language Team"
-msgstr "ਗੁਜਰਾਤੀ ਭਾਸ਼ਾ ਟੀਮ"
-
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
-msgid "Hebrew"
-msgstr "ਹੈਬਰਿਊ"
-
-#: ../pidgin/gtkdialogs.c:174
-msgid "Hindi"
-msgstr "ਹਿੰਦੀ"
-
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
-msgid "Hungarian"
-msgstr "ਹੰਗਰੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:176
-msgid "Indonesian"
-msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
-
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
-msgid "Italian"
-msgstr "ਇਤਾਲਵੀ"
-
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-msgid "Japanese"
-msgstr "ਜਾਪਾਨੀ"
-
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-msgid "Georgian"
-msgstr "ਜਾਰਜੀਆਨ"
-
-#: ../pidgin/gtkdialogs.c:179
-msgid "Ubuntu Georgian Translators"
-msgstr "ਉਬਤੂੰ ਜਾਰਜੀਆਈ ਅਨੁਵਾਦਕ"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada"
-msgstr "ਕੰਨੜ"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada Translation team"
-msgstr "ਕੰਨੜ ਅਨੁਵਾਦਕ ਟੀਮ"
-
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
-msgid "Korean"
-msgstr "ਕੋਰੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
-msgid "Kurdish"
-msgstr "ਕੁਰਦ"
-
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
-msgid "Lao"
-msgstr "ਲਿਓ"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
-msgid "Lithuanian"
-msgstr "ਲੀਥੂਵਨੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
-msgid "Macedonian"
-msgstr "ਮੈਕਡੋਨੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
-msgid "Bokmål Norwegian"
-msgstr "ਬੋਕਮਾਲ ਨਾਰਵੇਆਈ"
-
-#: ../pidgin/gtkdialogs.c:191
-msgid "Nepali"
-msgstr "ਨੇਪਾਲੀ"
-
-#: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr "ਡੱਚ, ਫਲੀਮਿਸ਼"
-
-#: ../pidgin/gtkdialogs.c:193
-#, fuzzy
-msgid "Norwegian Nynorsk"
-msgstr "ਨਾਰਵੇਗੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
-msgid "Polish"
-msgstr "ਪੋਲਿਸ਼"
-
-#: ../pidgin/gtkdialogs.c:197
-msgid "Portuguese"
-msgstr "ਪੁਰਤਗਾਲੀ"
-
-#: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr "ਪੁਰਤਗਾਲੀ-ਬਰਾਜ਼ੀਲ"
-
-#: ../pidgin/gtkdialogs.c:199
-msgid "Pashto"
-msgstr "ਪੁਸ਼ਤੋ"
-
-#: ../pidgin/gtkdialogs.c:200
-msgid "Romanian"
-msgstr "ਰੋਮਾਨੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
-msgid "Russian"
-msgstr "ਰੂਸੀ"
-
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
-msgid "Slovak"
-msgstr "ਸਲੋਵਾਕ"
-
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
-msgid "Slovenian"
-msgstr "ਸਲੋਵੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:205
-msgid "Albanian"
-msgstr "ਅਲਬਨੀਆਈ"
-
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
-msgid "Serbian"
-msgstr "ਸਰਬੀਅਨ"
-
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
-msgid "Swedish"
-msgstr "ਸਵੀਡਸ਼"
-
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "ਤਾਮਿਲ"
-
-#: ../pidgin/gtkdialogs.c:210
-msgid "Telugu"
-msgstr "ਤੇਲਗੂ"
-
-#: ../pidgin/gtkdialogs.c:211
-msgid "Thai"
-msgstr "ਥਾਈ"
-
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
-msgid "Turkish"
-msgstr "ਤੁਰਕ"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "Vietnamese"
-msgstr "ਵੀਅਤਨਾਮੀ"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh ਅਤੇ Gnome-Vi ਟੀਮ"
-
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
-msgid "Simplified Chinese"
-msgstr "ਸਧਾਰਨ ਚੀਨੀ"
-
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
-msgid "Hong Kong Chinese"
-msgstr "ਹਾਂਗਕਾਂਗ ਚੀਨੀ"
-
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
-msgid "Traditional Chinese"
-msgstr "ਮੂਲ ਚੀਨੀ"
-
-#: ../pidgin/gtkdialogs.c:225
-msgid "Amharic"
-msgstr "ਅਮਹਾਰਿਕ"
-
-#: ../pidgin/gtkdialogs.c:357
-#, c-format
-msgid "About %s"
-msgstr "%s ਬਾਰੇ"
-
-#: ../pidgin/gtkdialogs.c:400
-#, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT>irc.freenode.net ਤੇ #pidgin<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:423
-msgid "Current Developers"
-msgstr "ਮੌਜੂਦਾ ਡੀਵੈਲਪਰ"
-
-#: ../pidgin/gtkdialogs.c:438
-msgid "Crazy Patch Writers"
-msgstr "ਪੈਂਚ ਲੇਖਕ"
-
-#: ../pidgin/gtkdialogs.c:453
-msgid "Retired Developers"
-msgstr "ਪੁਰਾਣੇ ਖੋਜੀ"
-
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
-msgid "Retired Crazy Patch Writers"
-msgstr "ਪੈਂਚ ਲੇਖਕ"
-
-#: ../pidgin/gtkdialogs.c:483
-msgid "Artists"
-msgstr "ਕਲਾਕਾਰ"
-
-#: ../pidgin/gtkdialogs.c:498
-msgid "Current Translators"
-msgstr "ਮੌਜੂਦਾ ਅਨੁਵਾਦਕ"
-
-#: ../pidgin/gtkdialogs.c:518
-msgid "Past Translators"
-msgstr "ਪੁਰਾਣੀ ਅਨੁਵਾਦਕ"
-
-#: ../pidgin/gtkdialogs.c:536
-msgid "Debugging Information"
-msgstr "ਡੱਬਿੰਗ ਜਾਣਕਾਰੀ"
-
-#: ../pidgin/gtkdialogs.c:906
-msgid "Get User Info"
-msgstr "ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ ਲਵੋ"
-
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "ਵਿਅਕਤੀ ਦਾ ਸਕਰੀਨ ਨਾਂ ਜਾਂ ਉਪ-ਨਾਂ ਦਿਓ ਜੀ , ਜਿਸ ਦੀ ਜਾਣਕਾਰੀ ਤੁਸੀਂ ਵੇਖਣੀ ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkdialogs.c:998
-msgid "View User Log"
-msgstr "ਉਪਭੋਗੀ ਲਾਗ ਵੇਖੋ"
-
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "ਉਸ ਵਿਅਕਤੀ ਦਾ ਸਕਰੀਨ ਨਾਂ ਜਾਂ ਉਪ-ਨਾਂ ਦਿਓ ਜੀ, ਜਿਸ ਦਾ ਲਾਗ ਤੁਸੀਂ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkdialogs.c:1020
-msgid "Alias Contact"
-msgstr "ਉਪ ਨਾਂ ਸੰਪਰਕ"
-
-#: ../pidgin/gtkdialogs.c:1021
-msgid "Enter an alias for this contact."
-msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਉਪ ਨਾਂ ਦਿਓ।"
-
-#: ../pidgin/gtkdialogs.c:1043
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "%s ਲਈ ਉਪ ਨਾਂ ਦਿਓ"
-
-#: ../pidgin/gtkdialogs.c:1045
-msgid "Alias Buddy"
-msgstr "ਸਨੇਹੀ ਉਪ ਨਾਂ"
-
-#: ../pidgin/gtkdialogs.c:1066
-msgid "Alias Chat"
-msgstr "ਗੱਲਬਾਤ ਉਪ-ਨਾਂ"
-
-#: ../pidgin/gtkdialogs.c:1067
-msgid "Enter an alias for this chat."
-msgstr "ਇਸ ਗੱਲਬਾਤ ਲਈ ਉਪ ਨਾਂ ਦਿਓ।"
-
-#: ../pidgin/gtkdialogs.c:1106
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"ਤੁਸੀਂ ਆਪਣੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ %s ਅਤੇ %d ਹੋਰ ਸਨੇਹੀ ਰੱਖਣ ਵਾਲਾ ਸੰਪਰਕ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ "
-"ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-msgstr[1] ""
-"ਤੁਸੀਂ ਆਪਣੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ %sਅਤੇ %d ਹੋਰ ਸਨੇਹੀ ਰੱਖਣ ਵਾਲਾ ਸੰਪਰਕ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ "
-"ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkdialogs.c:1114
-msgid "Remove Contact"
-msgstr "ਸੰਪਰਕ ਹਟਾਓ"
-
-#: ../pidgin/gtkdialogs.c:1117
-msgid "_Remove Contact"
-msgstr "ਸੰਪਰਕ ਹਟਾਓ(_R)"
-
-#: ../pidgin/gtkdialogs.c:1148
-#, fuzzy, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"ਤੁਸੀਂ ਆਪਣੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ %s ਗਰੁੱਪ ਅਤੇ ਇਸ ਦੇ ਸਭ ਮੈਂਬਰ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ "
-"ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkdialogs.c:1155
-msgid "Merge Groups"
-msgstr "ਗਰੁੱਪ ਮਿਲਾਓ"
-
-#: ../pidgin/gtkdialogs.c:1158
-msgid "_Merge Groups"
-msgstr "ਗਰੁੱਪ ਮਿਲਾਓ(_M)"
-
-#: ../pidgin/gtkdialogs.c:1208
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"ਤੁਸੀਂ ਆਪਣੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ %s ਗਰੁੱਪ ਅਤੇ ਇਸ ਦੇ ਸਭ ਮੈਂਬਰ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ "
-"ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkdialogs.c:1211
-msgid "Remove Group"
-msgstr "ਗਰੁੱਪ ਹਟਾਓ"
-
-#: ../pidgin/gtkdialogs.c:1214
-msgid "_Remove Group"
-msgstr "ਗਰੁੱਪ ਹਟਾਓ(_R)"
-
-#: ../pidgin/gtkdialogs.c:1247
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "ਤੁਸੀਂ %s ਨੂੰ ਆਪਣੀ ਸੁਨੇਹੀ ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkdialogs.c:1250
-msgid "Remove Buddy"
-msgstr "ਸਨੇਹੀ ਹਟਾਓ"
-
-#: ../pidgin/gtkdialogs.c:1253
-msgid "_Remove Buddy"
-msgstr "ਸਨੇਹੀ ਹਟਾਓ(_R)"
-
-#: ../pidgin/gtkdialogs.c:1274
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "ਤੁਸੀਂ ਆਪਣੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ %s ਗੱਲਬਾਤ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkdialogs.c:1277
-msgid "Remove Chat"
-msgstr "ਗੱਲਬਾਤ ਹਟਾਓ"
-
-#: ../pidgin/gtkdialogs.c:1280
-msgid "_Remove Chat"
-msgstr "ਗੱਲਬਾਤ ਹਟਾਓ(_R)"
-
-#: ../pidgin/gtkdocklet.c:150
-#, fuzzy
-msgid "Right-click for more unread messages...\n"
-msgstr "ਹੋਰ ਚੋਣਾਂ ਲਈ ਸੱਜਾ ਬਟਨ ਦਬਾਓ।"
-
-#: ../pidgin/gtkdocklet.c:435
-msgid "Change Status"
-msgstr "ਹਾਲਤ ਬਦਲੋ"
-
-#: ../pidgin/gtkdocklet.c:487
-msgid "Show Buddy List"
-msgstr "ਸਨੇਹੀ ਸੂਚੀ ਵੇਖਾਓ"
-
-#: ../pidgin/gtkdocklet.c:513
-msgid "New Message..."
-msgstr "ਨਵਾਂ ਸੁਨੇਹਾ..."
-
-#: ../pidgin/gtkdocklet.c:528
-msgid "Mute Sounds"
-msgstr "ਆਵਾਜ਼ ਚੁੱਪ ਰੱਖੋ"
-
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
-msgstr "ਨਵੇਂ ਸੁਨੇਹੇ ਉੱਤੇ ਝਪਕਾਓ"
-
-#: ../pidgin/gtkdocklet.c:542
-msgid "Quit"
-msgstr "ਬਾਹਰ"
-
-#: ../pidgin/gtkft.c:154
-msgid "Not started"
-msgstr "ਸ਼ੁਰੂ ਨਹੀਂ"
-
-#: ../pidgin/gtkft.c:274
-msgid "<b>Receiving As:</b>"
-msgstr "<b>ਇਸਤਰਾਂ ਪ੍ਰਾਪਤ:</b>"
-
-#: ../pidgin/gtkft.c:276
-msgid "<b>Receiving From:</b>"
-msgstr "<b>ਇਹਨਾਂ ਤੋਂ ਪ੍ਰਾਪਤ:</b>"
-
-#: ../pidgin/gtkft.c:280
-msgid "<b>Sending To:</b>"
-msgstr "<b>ਨੂੰ ਭੇਜੀ ਜਾਦੀ ਹੈ:</b>"
-
-#: ../pidgin/gtkft.c:282
-msgid "<b>Sending As:</b>"
-msgstr "<b>ਏਦਾਂ ਭੇਜੀ ਜਾਦੀ ਹੈ:</b>"
-
-#: ../pidgin/gtkft.c:498
-msgid "There is no application configured to open this type of file."
-msgstr "ਇਸ ਕਿਸਮ ਦੀ ਫਾਇਲ ਖੋਲਣ ਲਈ ਕੋਈ ਵੀ ਕਾਰਜ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।"
-
-#: ../pidgin/gtkft.c:503
-msgid "An error occurred while opening the file."
-msgstr "ਫਾਇਲ ਖੋਲਣ ਲਈ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../pidgin/gtkft.c:540
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "%s ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../pidgin/gtkft.c:549
-#, c-format
-msgid "Error running %s"
-msgstr "%s ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../pidgin/gtkft.c:550
-#, c-format
-msgid "Process returned error code %d"
-msgstr "ਕਾਰਵਾਈ ਨੇ ਗਲਤੀ ਕੋਡ %d ਦਿੱਤਾ"
-
-#: ../pidgin/gtkft.c:697
-msgid "Filename:"
-msgstr "ਫਾਇਲ ਨਾਂ:"
-
-#: ../pidgin/gtkft.c:698
-msgid "Local File:"
-msgstr "ਲੋਕਲ ਫਾਇਲ:"
-
-#: ../pidgin/gtkft.c:700
-msgid "Speed:"
-msgstr "ਗਤੀ:"
-
-#: ../pidgin/gtkft.c:701
-msgid "Time Elapsed:"
-msgstr "ਲੱਗਾ ਸਮਾਂ:"
-
-#: ../pidgin/gtkft.c:702
-msgid "Time Remaining:"
-msgstr "ਬਾਕੀ ਸਮਾਂ:"
-
-#: ../pidgin/gtkft.c:784
-msgid "Close this window when all transfers _finish"
-msgstr ""
-
-#: ../pidgin/gtkft.c:794
-msgid "C_lear finished transfers"
-msgstr "ਮੁਕੰਮਲ ਟਰਾਂਸਫਰ ਸਾਫ਼ ਕਰੋ(_L)"
-
-#. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
-msgid "File transfer _details"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਵੇਰਵਾ(_d)"
-
-#. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
-msgid "_Pause"
-msgstr "ਵਿਰਾਮ(_P)"
-
-#. Resume button
-#: ../pidgin/gtkft.c:843
-msgid "_Resume"
-msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ(_R)"
-
-#: ../pidgin/gtkimhtml.c:816
-msgid "Paste as Plain _Text"
-msgstr "ਸਧਾਰਨ ਪਾਠ ਵਾਂਗ ਚੇਪੋ(_T)"
-
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
-msgid "_Reset formatting"
-msgstr "ਫਾਰਮੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ ਕਰੋ(_R)"
-
-#: ../pidgin/gtkimhtml.c:1373
-msgid "Hyperlink color"
-msgstr "ਹਾਇਪਰਲਿੰਕ ਰੰਗ"
-
-#: ../pidgin/gtkimhtml.c:1374
-msgid "Color to draw hyperlinks."
-msgstr "ਹਾਇਪਰਲਿੰਕ ਲਈ ਰੰਗ ਦਿਓ।"
-
-#: ../pidgin/gtkimhtml.c:1377
-msgid "Hyperlink prelight color"
-msgstr "ਹਾਇਪਰਲਿੰਕ ਪ੍ਰੀ-ਲਾਇਟ ਰੰਗ"
-
-#: ../pidgin/gtkimhtml.c:1378
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "ਹਾਇਪਰਲਿੰਕ ਲਈ ਰੰਗ, ਜਦੋਂ ਮਾਊਂਸ ਉਨ੍ਹਾਂ ਉੱਤੇ ਹੋਵੇ।"
-
-#: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਨਕਲ(_C)"
-
-#: ../pidgin/gtkimhtml.c:1610
-msgid "_Open Link in Browser"
-msgstr "ਝਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲੋ(_O)"
-
-#: ../pidgin/gtkimhtml.c:1620
-msgid "_Copy Link Location"
-msgstr "ਸੰਬੰਧ ਸਥਿਤੀ ਦੀ ਨਕਲ(_C)"
-
-#: ../pidgin/gtkimhtml.c:3369
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>ਬੇ-ਪਛਾਣ ਫਾਇਲ ਕਿਸਮ</span>\n"
-"\n"
-"ਮੂਲ PNG ਹੈ।"
-
-#: ../pidgin/gtkimhtml.c:3372
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ਅਣਜਾਣ ਫਾਇਲ ਕਿਸਮ ਹੈ।\n"
-"\n"
-"ਮੂਲ PNG ਹੈ।"
-
-#: ../pidgin/gtkimhtml.c:3401
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>ਚਿੱਤਰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ</span>\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtml.c:3404
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"ਚਿੱਤਰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
-msgid "Save Image"
-msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
-
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
-msgid "_Save Image..."
-msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ(_S)..."
-
-#: ../pidgin/gtkimhtmltoolbar.c:163
-msgid "Select Font"
-msgstr "ਫੋਂਟ ਚੁਣੋ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:242
-msgid "Select Text Color"
-msgstr "ਪਾਠ ਰੰਗ ਚੁਣੋ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:321
-msgid "Select Background Color"
-msgstr "ਪਿੱਠਭੂਮੀ ਰੰਗ ਚੁਣੋ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:410
-msgid "_URL"
-msgstr "_URL"
-
-#: ../pidgin/gtkimhtmltoolbar.c:418
-msgid "_Description"
-msgstr "ਵੇਰਵਾ(_D)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr "ਸ਼ਾਮਿਲ ਕਰਨ ਵਾਲੇ ਸੰਬੰਧ ਦਾ URL ਅਤੇ ਵੇਰਵਾ ਦਿਓ। ਵੇਰਵਾ ਚੋਣਵਾਂ ਹੈ।"
-
-#: ../pidgin/gtkimhtmltoolbar.c:425
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "ਸ਼ਾਮਿਲ ਕਰਨ ਵਾਲੇ ਸੰਬੰਧ ਦਾ URL ਦਿਓ।"
-
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
-msgid "Insert Link"
-msgstr "ਸਬੰਧ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
-msgid "_Insert"
-msgstr "ਸ਼ਾਮਿਲ(_I)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:514
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "ਚਿੱਤਰ ਸੰਭਾਲਣ ਲਈ ਅਸਫਲ:%s\n"
-
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
-msgid "Insert Image"
-msgstr "ਚਿੱਤਰ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
-msgstr "ਇਸ ਸਰੂਪ ਵਿੱਚ ਕੋਈ ਸਮਾਈਲ ਨਹੀਂ ਹਨ।"
-
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
-msgid "Smile!"
-msgstr "ਸਮਾਈਲ!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
-msgid "_Font"
-msgstr "ਫੋਂਟ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
-msgid "Group Items"
-msgstr "ਗਰੁੱਪ ID"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "ਗੂੜੇ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "ਤਿਰਛੇ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "ਹੇਠਾਂ ਰੇਖਾ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-msgid "Strikethrough"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
-msgid "Font Face"
-msgstr "ਫੋਂਟ ਮੁੱਖ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
-msgid "Background Color"
-msgstr "ਪਿੱਠਭੂਮੀ ਰੰਗ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
-msgid "Foreground Color"
-msgstr "ਮੁੱਖਭੂਮੀ ਫੋਂਟ ਰੰਗ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
-msgid "Reset Formatting"
-msgstr "ਫਾਰਮੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
-msgid "Insert IM Image"
-msgstr "ਚਿੱਤਰ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
-msgid "Insert Smiley"
-msgstr "ਖੁਸ਼ ਪਾਓ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
-msgid "<b>_Bold</b>"
-msgstr "<b>ਗੁਪਤ-ਕੋਡ:</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
-msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
-msgid "<u>_Underline</u>"
-msgstr "ਹੇਠਾਂ ਰੇਖਾ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
-msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>ਚਿੱਤਰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ</span>\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
-msgid "_Normal"
-msgstr "ਸਧਾਰਨ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1187
-msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
-
-#. If we want to show the formatting for the following items, we would
-#. * need to update them when formatting changes. The above items don't need
-#. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
-#, fuzzy
-msgid "_Font face"
-msgstr "ਫੋਂਟ ਮੁੱਖ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
-msgid "Foreground _color"
-msgstr "ਮੁੱਖਭੂਮੀ ਫੋਂਟ ਰੰਗ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
-msgid "Bac_kground color"
-msgstr "ਪਿੱਠਭੂਮੀ ਰੰਗ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "ਸਮਾਈਲ!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
-msgid "_Image"
-msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
-msgid "_Link"
-msgstr "ਲਾਗਇਨ(_L)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1288
-msgid "_Horizontal rule"
-msgstr ""
-
-#: ../pidgin/gtklog.c:293
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:304
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:309
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:453
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'> =%2$s ਉੱਤੇ %1$s ਵਿੱਚ ਗੱਲਬਾਤ</span>"
-
-#: ../pidgin/gtklog.c:456
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>%2$s ਉੱਤੇ %1$s ਨਾਲ ਗੱਲਬਾਤ</span>"
-
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:557
-#, fuzzy
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "ਗੱਲਾਂ ਦੀ ਲਾਗ ਤਾਂ ਹੀ ਰੱਖਿਆ ਜਾਵੇਗਾ, ਜੇ \"ਸਭ ਗੱਲਾਂ ਪਸੰਦਾਂ ਦਾ ਲਾਗ ਰੱਖੋ\" ਯੋਗ ਕੀਤਾ ਹੋਵੇਗਾ।"
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "ਕੋਈ ਲਾਗ ਨਹੀਂ ਮਿਲਿਆ"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
-msgid "_Browse logs folder"
-msgstr "ਲਾਗ ਫੋਲਡਰ ਝਲਕ(_B)"
-
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "ਕੁੱਲ ਲਾਗ ਆਕਾਰ:"
-
-#: ../pidgin/gtklog.c:709
-#, c-format
-msgid "Conversations in %s"
-msgstr "%s ਨਾਲ ਗੱਲਾਂ-ਬਾਤਾਂ"
-
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
-#, c-format
-msgid "Conversations with %s"
-msgstr "%s ਨਾਲ ਗੱਲਬਾਤ"
-
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "ਸਿਸਟਮ ਲਾਗ"
-
-#: ../pidgin/gtkmain.c:386
-#, c-format
-msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s -h' ਵੇਖੋ।\n"
-
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, 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"
-"  -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"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"ਵਰਤੋਂ: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-
-#: ../pidgin/gtkmain.c:512
-#, 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 developers\n"
-"by reporting a bug at:\n"
-"%ssimpleticket/\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%swiki/GetABacktrace\n"
-"\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"
-"%swiki/DeveloperPages\n"
-msgstr ""
-
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
-msgid "Pidgin"
-msgstr "ਪਿਡਗਿਨ"
-
-#: ../pidgin/gtknotify.c:349
-msgid "Open All Messages"
-msgstr "ਸਭ ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ"
-
-#: ../pidgin/gtknotify.c:402
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਚਿੱਠੀ ਆਈ ਹੈ!</span>"
-
-#: ../pidgin/gtknotify.c:540
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s ਨੂੰ %d ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ।"
-msgstr[1] "%s ਨੂੰ %d ਨਵੇਂ ਸੁਨੇਹੇ ਹਨ।"
-
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>ਤੁਹਾਨੂੰ %d ਨਵੀਂ ਮੇਲ ਆਈ ਹੈ।</b>"
-msgstr[1] "<b>ਤੁਹਾਨੂੰ %d ਨਵੀਂ ਮੇਲਾਂ ਆਈਆਂ ਹਨ।</b>"
-
-#: ../pidgin/gtknotify.c:989
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "ਝਲਕਾਰਾ ਕਮਾਂਡ \"%s\" ਗਲਤ ਹੈ।"
-
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
-msgid "Unable to open URL"
-msgstr "URL ਖੋਲਣ ਲਈ ਅਸਫਲ ਹੈ"
-
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "\"%s\" ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "'ਦਸਤੀ' ਝਲਕਾਰਾ ਕਮਾਂਡ ਚੁਣੀ ਗਈ ਹੈ, ਪਰ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ।"
-
-#: ../pidgin/gtkplugin.c:265
-msgid "The following plugins will be unloaded."
-msgstr ""
-
-#: ../pidgin/gtkplugin.c:284
-msgid "Multiple plugins will be unloaded."
-msgstr ""
-
-#: ../pidgin/gtkplugin.c:288
-msgid "Unload Plugins"
-msgstr "ਪਲੱਗਇਨ ਅਣ-ਲੋਡ"
-
-#: ../pidgin/gtkplugin.c:400
-#, 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 ""
-
-#: ../pidgin/gtkplugin.c:410
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-
-#: ../pidgin/gtkplugin.c:536
-msgid "Configure Pl_ugin"
-msgstr "ਪਲੱਗਇਨ ਸੰਰਚਨਾ(_u)"
-
-#: ../pidgin/gtkplugin.c:599
-msgid "<b>Plugin Details</b>"
-msgstr "<b>ਪਲੱਗਇਨ ਵੇਰਵਾ</b>"
-
-#: ../pidgin/gtkpounce.c:157
-msgid "Select a file"
-msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
-
-#. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
-#, fuzzy
-msgid "Pounce on Whom"
-msgstr "ਝੱਟਪਟ ਕੌਣ"
-
-#: ../pidgin/gtkpounce.c:559
-msgid "_Buddy name:"
-msgstr "ਸਨੇਹੀ ਨਾਂ(_B):"
-
-#: ../pidgin/gtkpounce.c:593
-msgid "Si_gns on"
-msgstr "ਸਾਇਨ ਆਨ(_g)"
-
-#: ../pidgin/gtkpounce.c:595
-msgid "Signs o_ff"
-msgstr "ਸਾਇਨ ਆਫ਼(_f)"
-
-#: ../pidgin/gtkpounce.c:597
-msgid "Goes a_way"
-msgstr "ਦੂਰ ਗਿਆ/ਗਈ(_w)"
-
-#: ../pidgin/gtkpounce.c:599
-msgid "Ret_urns from away"
-msgstr "ਦੂਰ ਤੋਂ ਵਾਪਸ ਆਇਆ(_u)"
-
-#: ../pidgin/gtkpounce.c:601
-msgid "Becomes _idle"
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:603
-msgid "Is no longer i_dle"
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:605
-msgid "Starts _typing"
-msgstr "ਲਿਖ ਰਿਹਾ/ਰਹੀ ਹੈ(_t)"
-
-#: ../pidgin/gtkpounce.c:607
-msgid "P_auses while typing"
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:609
-msgid "Stops t_yping"
-msgstr "ਲਿਖਣੋਂ ਹਟਿਆ/ਹਟੀ(_y)"
-
-#: ../pidgin/gtkpounce.c:611
-msgid "Sends a _message"
-msgstr "ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ(_m)"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "Ope_n an IM window"
-msgstr "ਇੱਕ IM ਝਰੋਖੇ ਵਿੱਚ ਖੋਲ੍ਹੋ(_n)"
-
-#: ../pidgin/gtkpounce.c:656
-msgid "_Pop up a notification"
-msgstr "ਇੱਕ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ(_P)"
-
-#: ../pidgin/gtkpounce.c:658
-msgid "Send a _message"
-msgstr "ਸੁਨੇਹਾ ਭੇਜੋ(_m)"
-
-#: ../pidgin/gtkpounce.c:660
-msgid "E_xecute a command"
-msgstr "ਕਮਾਂਡ ਚਲਾਓ(_x)"
-
-#: ../pidgin/gtkpounce.c:662
-msgid "P_lay a sound"
-msgstr "ਆਵਾਜ਼ ਚਲਾਓ(_l)"
-
-#: ../pidgin/gtkpounce.c:668
-msgid "Brows_e..."
-msgstr "ਝਲਕ(_e)..."
-
-#: ../pidgin/gtkpounce.c:670
-msgid "Br_owse..."
-msgstr "ਝਲਕ(_o)..."
-
-#: ../pidgin/gtkpounce.c:671
-msgid "Pre_view"
-msgstr "ਝਲਕ(_v)"
-
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
-msgid "P_ounce only when my status is not Available"
-msgstr "ਕੇਵਲ ਜਦੋਂ ਨਾ ਉਪਲੱਬਧ ਹੋਵੇ"
-
-#: ../pidgin/gtkpounce.c:803
-msgid "_Recurring"
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:1246
-msgid "Pounce Target"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
-msgid "Default"
-msgstr "(ਮੂਲ)"
-
-#: ../pidgin/gtkprefs.c:517
-msgid "Smiley theme failed to unpack."
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:644
-msgid "Install Theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:732
-msgid "Icon"
-msgstr "ਆਈਕਾਨ"
-
-#: ../pidgin/gtkprefs.c:894
-msgid "System Tray Icon"
-msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ"
-
-#: ../pidgin/gtkprefs.c:895
-msgid "_Show system tray icon:"
-msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(_S):"
-
-#: ../pidgin/gtkprefs.c:899
-msgid "On unread messages"
-msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ"
-
-#: ../pidgin/gtkprefs.c:904
-msgid "Conversation Window Hiding"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖਾ ਓਹਲੇ"
-
-#: ../pidgin/gtkprefs.c:905
-msgid "_Hide new IM conversations:"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
-msgid "When away"
-msgstr "ਜਦੋਂ ਦੂਰ"
-
-#. All the tab options!
-#: ../pidgin/gtkprefs.c:916
-msgid "Tabs"
-msgstr "ਟੈਬਾਂ"
-
-#: ../pidgin/gtkprefs.c:918
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "ਟੈਬ ਝਰੋਖਿਆਂ ਵਿੱਚ IM ਅਤੇ ਗੱਲਬਾਤ ਵੇਖਾਓ(_t)"
-
-#: ../pidgin/gtkprefs.c:932
-msgid "Show close b_utton on tabs"
-msgstr "ਟੈਬਾਂ ਉੱਤੇ ਬੰਦ ਬਟਨ ਵੇਖਾਓ(_u)"
-
-#: ../pidgin/gtkprefs.c:935
-msgid "_Placement:"
-msgstr "ਥਾਂ(_P):"
-
-#: ../pidgin/gtkprefs.c:937
-msgid "Top"
-msgstr "ਉੱਪਰ"
-
-#: ../pidgin/gtkprefs.c:938
-msgid "Bottom"
-msgstr "ਹੇਠਾਂ"
-
-#: ../pidgin/gtkprefs.c:939
-msgid "Left"
-msgstr "ਖੱਬਾ"
-
-#: ../pidgin/gtkprefs.c:940
-msgid "Right"
-msgstr "ਸੱਜਾ"
-
-#: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr "ਖੱਬੇ ਖਿਤਿਜੀ"
-
-#: ../pidgin/gtkprefs.c:943
-msgid "Right Vertical"
-msgstr "ਸੱਜੇ ਖਿਤਿਜੀ"
-
-#: ../pidgin/gtkprefs.c:950
-msgid "N_ew conversations:"
-msgstr "ਨਵੀਂਆਂ ਗੱਲਾਂਬਾਤਾਂ(_e):"
-
-#: ../pidgin/gtkprefs.c:995
-msgid "Show _formatting on incoming messages"
-msgstr "ਆਉਣ ਵਾਲੇ ਸੁਨੇਹਿਆਂ ਉੱਤੇ ਫਾਰਮੈਟ ਵੇਖਾਓ(_f)"
-
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
-msgid "Show _detailed information"
-msgstr "ਲਾਗਇਨ ਜਾਣਕਾਰੀ ਵੇਖੋ"
-
-#: ../pidgin/gtkprefs.c:1000
-msgid "Enable buddy ic_on animation"
-msgstr "ਸਨੇਹੀ ਆਈਕਾਨ ਸਜੀਵਤਾ ਯੋਗ(_o)"
-
-#: ../pidgin/gtkprefs.c:1007
-msgid "_Notify buddies that you are typing to them"
-msgstr "ਜਦੋਂ ਤੁਸੀਂ ਲਿਖ ਰਹੇ ਹੋਵੋ ਤਾਂ ਸਨੇਹੀਆਂ ਨੂੰ ਵੇਖਾਉ(_N)"
-
-#: ../pidgin/gtkprefs.c:1010
-msgid "Highlight _misspelled words"
-msgstr "ਗਲਤ ਸ਼ਬਦ ਉਘਾੜੋ(_m)"
-
-#: ../pidgin/gtkprefs.c:1014
-msgid "Use smooth-scrolling"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1017
-msgid "F_lash window when IMs are received"
-msgstr "IM ਪ੍ਰਾਪਤ ਹੋਣ ਉੱਤੇ ਝਰੋਖਾ ਝਲਕਾਓ(_l)"
-
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "ਗੱਲ ਝਰੋਖਾ ਉਭਾਰੋ(_a)"
-
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
-msgid "Font"
-msgstr "ਫੋਂਟ"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1027
-msgid "Use font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
-msgid "Conversation _font:"
-msgstr "ਗੱਲਬਾਤ ਇੰਦਰਾਜ਼"
-
-#: ../pidgin/gtkprefs.c:1043
-msgid "Default Formatting"
-msgstr "ਮੂਲ ਫਾਰਮੈਟਿੰਗ"
-
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"ਇਹ ਉਹ ਢੰਗ ਹੈ, ਜਿਸ ਨਾਲ ਭੇਜੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਵੇਖਾਈ ਦੇਵੇਗਾ, ਜਦੋਂ ਕਿ ਤੁਹਾਡਾ ਪ੍ਰੋਟੋਕਾਲ ਉਸ ਫਾਰਮਿਟ "
-"ਲਈ ਸਹਾਇਕ ਹੋਵੇਗਾ। :)"
-
-#: ../pidgin/gtkprefs.c:1128
-msgid "ST_UN server:"
-msgstr "ST_UN ਸਰਵਰ:"
-
-#: ../pidgin/gtkprefs.c:1140
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1144
-msgid "_Autodetect IP address"
-msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਸਿਰਨਾਵਾਂ(_A)"
-
-#: ../pidgin/gtkprefs.c:1153
-msgid "Public _IP:"
-msgstr "ਸਵਰਜਨਕ _IP:"
-
-#: ../pidgin/gtkprefs.c:1182
-msgid "Ports"
-msgstr "ਪੋਰਟ"
-
-#: ../pidgin/gtkprefs.c:1185
-msgid "_Manually specify range of ports to listen on"
-msgstr "ਸੁਣਨ ਲਈ ਦਸਤੀ ਪੋਰਟ ਸੀਮਾ ਦਿਓ(_M)"
-
-#: ../pidgin/gtkprefs.c:1188
-msgid "_Start port:"
-msgstr "ਸ਼ੁਰੂ ਪੋਰਟ(_S):"
-
-#: ../pidgin/gtkprefs.c:1195
-msgid "_End port:"
-msgstr "ਅੰਤ ਪੋਰਟ(_E):"
-
-#: ../pidgin/gtkprefs.c:1203
-msgid "Proxy Server"
-msgstr "ਪਰਾਕਸੀ ਸਰਵਰ"
-
-#: ../pidgin/gtkprefs.c:1207
-msgid "No proxy"
-msgstr "ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ"
-
-#: ../pidgin/gtkprefs.c:1263
-msgid "_User:"
-msgstr "ਉਪਭੋਗੀ(_U):"
-
-#: ../pidgin/gtkprefs.c:1328
-msgid "Seamonkey"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1329
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1330
-msgid "Netscape"
-msgstr "ਨੈੱਟਸਕੇਪ"
-
-#: ../pidgin/gtkprefs.c:1331
-msgid "Mozilla"
-msgstr "ਮੌਜੀਲਾ"
-
-#: ../pidgin/gtkprefs.c:1332
-msgid "Konqueror"
-msgstr "ਕੌਨਕਿਉਰੋਰ"
-
-#: ../pidgin/gtkprefs.c:1333
-msgid "GNOME Default"
-msgstr "ਗਨੋਮ ਮੂਲ"
-
-#: ../pidgin/gtkprefs.c:1334
-msgid "Galeon"
-msgstr "ਗਲੇਓਨ"
-
-#: ../pidgin/gtkprefs.c:1335
-msgid "Firefox"
-msgstr "ਫਾਇਰਫਾਕਸ"
-
-#: ../pidgin/gtkprefs.c:1336
-msgid "Firebird"
-msgstr "ਫਾਇਰਬਰਡ"
-
-#: ../pidgin/gtkprefs.c:1337
-msgid "Epiphany"
-msgstr "ਏਪਾਫਨੀ"
-
-#: ../pidgin/gtkprefs.c:1346
-msgid "Manual"
-msgstr "ਦਸਤੀ"
-
-#: ../pidgin/gtkprefs.c:1399
-msgid "Browser Selection"
-msgstr "ਝਲਕਾਰਾ ਚੋਣ"
-
-#: ../pidgin/gtkprefs.c:1403
-msgid "_Browser:"
-msgstr "ਝਲਕਾਰਾ(_B):"
-
-#: ../pidgin/gtkprefs.c:1411
-msgid "_Open link in:"
-msgstr "ਸਬੰਧ ਖੋਲੋ(_O):"
-
-#: ../pidgin/gtkprefs.c:1413
-msgid "Browser default"
-msgstr "ਮੂਲ ਝਲਕਾਰਾ"
-
-#: ../pidgin/gtkprefs.c:1414
-msgid "Existing window"
-msgstr "ਮੌਜੂਦਾ ਝਰੋਖਾ"
-
-#: ../pidgin/gtkprefs.c:1416
-msgid "New tab"
-msgstr "ਨਵਾਂ ਟੈਬ"
-
-#: ../pidgin/gtkprefs.c:1430
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Manual:\n"
-"(URL ਲਈ %s)"
-
-#: ../pidgin/gtkprefs.c:1470
-msgid "Log _format:"
-msgstr "ਲਾਗ ਫਾਰਮੈਟ(_F):"
-
-#: ../pidgin/gtkprefs.c:1475
-msgid "Log all _instant messages"
-msgstr "ਸਭ ਤਰੁੰਤ ਸੁਨੇਹਿਆਂ ਦਾ ਲਾਗ(_i)"
-
-#: ../pidgin/gtkprefs.c:1477
-msgid "Log all c_hats"
-msgstr "ਸਭ ਗੱਲਾਬਾਤਾਂ ਦਾ ਲਾਗ(_h)"
-
-#: ../pidgin/gtkprefs.c:1479
-msgid "Log all _status changes to system log"
-msgstr "ਸਭ ਹਾਲਤ ਤਬਦੀਲੀਆਂ ਸਿਸਟਮ ਲਾਗ 'ਚ ਸੰਭਾਲੋ(_s)"
-
-#: ../pidgin/gtkprefs.c:1625
-msgid "Sound Selection"
-msgstr "ਆਵਾਜ਼ ਚੋਣ"
-
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
-msgid "Quietest"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
-msgid "Quieter"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
-msgid "Quiet"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
-msgid "Loud"
-msgstr "ਉੱਚੀ"
-
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
-msgid "Louder"
-msgstr "ਹੋਰ ਉੱਚੀ"
-
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
-msgid "Loudest"
-msgstr "ਸਭ ਤੋਂ ਉੱਚੀ"
-
-#: ../pidgin/gtkprefs.c:1713
-msgid "_Method:"
-msgstr "ਢੰਗ(_M):"
-
-#: ../pidgin/gtkprefs.c:1715
-msgid "Console beep"
-msgstr "ਕੰਨਸੋਲ ਆਵਾਜ਼"
-
-#: ../pidgin/gtkprefs.c:1722
-msgid "No sounds"
-msgstr "ਕੋਈ ਆਵਾਜ਼ ਨਹੀਂ"
-
-#: ../pidgin/gtkprefs.c:1730
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Sound c_ommand:\n"
-"(ਫਾਇਲ ਨਾਂ ਲਈ %s)"
-
-#: ../pidgin/gtkprefs.c:1757
-msgid "Sounds when conversation has _focus"
-msgstr "ਗੱਲਬਾਤ ਉੱਤੇ ਕੇਂਦਰਿਤ ਹੋਣ ਸਮੇਂ ਆਵਾਜ਼(_f)"
-
-#: ../pidgin/gtkprefs.c:1759
-msgid "Enable sounds:"
-msgstr "ਸਾਊਂਡ ਯੋਗ:"
-
-#: ../pidgin/gtkprefs.c:1770
-msgid "Volume:"
-msgstr "ਵਾਲੀਅਮ:"
-
-#: ../pidgin/gtkprefs.c:1850
-msgid "Play"
-msgstr "ਚਲਾਓ"
-
-#: ../pidgin/gtkprefs.c:1927
-msgid "_Report idle time:"
-msgstr "ਵੇਹਲਾ ਸਮਾਂ ਗਿਣਾਓ(_R):"
-
-#: ../pidgin/gtkprefs.c:1932
-msgid "Based on keyboard or mouse use"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1941
-msgid "_Auto-reply:"
-msgstr "ਸਵੈ-ਜਵਾਬ(_A):"
-
-#: ../pidgin/gtkprefs.c:1945
-msgid "When both away and idle"
-msgstr "ਜਦੋਂ ਦੂਰ ਅਤੇ ਵੇਹਲਾ ਹੋਵਾਂ"
-
-#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
-msgid "Auto-away"
-msgstr "ਸਵੈ-ਦੂਰ"
-
-#: ../pidgin/gtkprefs.c:1953
-msgid "Change status when _idle"
-msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੋਵਾਂ ਤਾਂ ਹਾਲਤ ਬਦਲੋ(_i)"
-
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
-msgid "_Minutes before becoming idle:"
-msgstr "ਹਾਲਤ ਬਦਲਣ ਤੋਂ ਪਹਿਲਾਂ ਮਿੰਟ(_M):"
-
-#: ../pidgin/gtkprefs.c:1965
-msgid "Change _status to:"
-msgstr "ਹਾਲਤ ਬਦਲੋ(_s):"
-
-#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
-msgid "Status at Startup"
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਹਾਲਤ"
-
-#: ../pidgin/gtkprefs.c:1988
-msgid "Use status from last _exit at startup"
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਖਰੀ ਸਮੇਂ ਬੰਦ ਕਰਨ ਤੋਂ ਹਾਲਤ ਵਰਤੋਂ (_e)"
-
-#: ../pidgin/gtkprefs.c:1994
-msgid "Status to a_pply at startup:"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:2032
-msgid "Interface"
-msgstr "ਇੰਟਰਫੇਸ"
-
-#: ../pidgin/gtkprefs.c:2034
-msgid "Smiley Themes"
-msgstr "ਖੁਸ਼ ਸਰੂਪ"
-
-#: ../pidgin/gtkprefs.c:2041
-msgid "Browser"
-msgstr "ਝਲਕਾਰਾ"
-
-#: ../pidgin/gtkprefs.c:2045
-msgid "Status / Idle"
-msgstr "ਹਾਲਤ / ਵੇਹਲਾ"
-
-#: ../pidgin/gtkprivacy.c:80
-msgid "Allow all users to contact me"
-msgstr "ਸਭ ਵਿਅਕਤੀਆਂ ਨੂੰ ਮੈਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦਿਓ"
-
-#: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users on my buddy list"
-msgstr "ਮੇਰੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿਚਲੇ ਵਿਅਕਤੀ ਨੂੰ ਹੀ ਇਜ਼ਾਜਤ"
-
-#: ../pidgin/gtkprivacy.c:82
-msgid "Allow only the users below"
-msgstr "ਹੇਠ ਦਿੱਤੇ ਵਿਅਕਤੀਆਂ ਨੂੰ ਹੀ ਇਜ਼ਾਜਤ"
-
-#: ../pidgin/gtkprivacy.c:83
-msgid "Block all users"
-msgstr "ਸਭ ਵਿਅਕਤੀ ਬੰਦ"
-
-#: ../pidgin/gtkprivacy.c:84
-msgid "Block only the users below"
-msgstr "ਇਹ ਵਿਅਕਤੀ ਹੀ ਰੋਕੋ"
-
-#: ../pidgin/gtkprivacy.c:370
-msgid "Privacy"
-msgstr "ਰਹੱਸ"
-
-#: ../pidgin/gtkprivacy.c:382
-msgid "Changes to privacy settings take effect immediately."
-msgstr "ਰਹੱਸ ਵਿਵਸਥਾ ਤਰੁੰਤ ਪ੍ਰਭਾਵੀ ਹੋ ਜਾਵੇਗੀ।"
-
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
-msgid "Set privacy for:"
-msgstr "ਰਹੱਸ ਦਿਓ:"
-
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
-msgid "Permit User"
-msgstr "ਸਵੀਕਾਰ ਵਿਅਕਤੀ"
-
-#: ../pidgin/gtkprivacy.c:558
-msgid "Type a user you permit to contact you."
-msgstr "ਵਿਅਕਤੀ ਨਾਂ ਦਿਓ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਸੰਪਰਕ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkprivacy.c:559
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "ਨਾਂ ਦਿਓ ਜੀ, ਜਿਸ ਵਿਅਕਤੀ ਨੂੰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਉਹ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕੇ।"
-
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "ਮਨਜ਼ੂਰ(_P)"
-
-#: ../pidgin/gtkprivacy.c:568
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "ਕੀ %s ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੇਣਾ ਹੈ?"
-
-#: ../pidgin/gtkprivacy.c:570
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੇਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
-msgid "Block User"
-msgstr "ਵਿਅਕਤੀ ਪਾਬੰਦੀ"
-
-#: ../pidgin/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "ਪਾਬੰਦੀ ਲਗਾਉਣ ਲਈ ਵਿਅਕਤੀ ਲਿਖੋ।"
-
-#: ../pidgin/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "ਉਸ ਵਿਅਕਤੀ ਦਾ ਨਾਂ ਦਿਓ ਜੀ, ਜਿਸ ਉੱਤੇ ਤੁਸੀਂ ਪਾਬੰਦੀ ਲਗਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ।"
-
-#: ../pidgin/gtkprivacy.c:609
-#, c-format
-msgid "Block %s?"
-msgstr "ਕੀ %s ਉੱਤੇ ਪਾਬੰਦੀ?"
-
-#: ../pidgin/gtkprivacy.c:611
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "ਕੀ ਤੁਸੀਂ %s ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkrequest.c:272
-msgid "Apply"
-msgstr "ਲਾਗੂ ਕਰੋ"
-
-#: ../pidgin/gtkrequest.c:1507
-msgid "That file already exists"
-msgstr "ਉਹ ਫਾਇਲ ਤਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-
-#: ../pidgin/gtkrequest.c:1508
-msgid "Would you like to overwrite it?"
-msgstr "ਕੀ ਤੁਸੀਂ ਉੱਪਰ ਹੀ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkrequest.c:1511
-msgid "Overwrite"
-msgstr "ਉੱਤੇ ਲਿਖੋ"
-
-#: ../pidgin/gtkrequest.c:1512
-msgid "Choose New Name"
-msgstr "ਨਵਾਂ ਨਾਂ ਚੁਣੋ"
-
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
-msgid "Select Folder..."
-msgstr "ਫੋਲਡਰ ਚੁਣੋ..."
-
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "ਰੂਮ ਸੂਚੀ"
-
-#. list button
-#: ../pidgin/gtkroomlist.c:443
-msgid "_Get List"
-msgstr "ਸੂਚੀ ਲਵੋ(_G)"
-
-#. add button
-#: ../pidgin/gtkroomlist.c:451
-msgid "_Add Chat"
-msgstr "ਗੱਲਬਾਤ ਸ਼ਾਮਲ(_A)"
-
-#: ../pidgin/gtksavedstatuses.c:337
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr ""
-
-#. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
-msgid "_Use"
-msgstr "ਵਰਤੋਂ(_U)"
-
-#: ../pidgin/gtksavedstatuses.c:780
-msgid "Title already in use.  You must choose a unique title."
-msgstr "ਟਾਇਟਲ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ।  ਤੁਹਾਨੂੰ ਵਿਲੱਖਣ ਟਾਇਟਲ ਚੁਣਨਾ ਚਾਹੀਦਾ ਹੈ।"
-
-#: ../pidgin/gtksavedstatuses.c:970
-msgid "Different"
-msgstr "ਵੱਖਰਾ"
-
-#: ../pidgin/gtksavedstatuses.c:1159
-msgid "_Title:"
-msgstr "ਟਾਇਟਲ(_T):"
-
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
-msgid "_Status:"
-msgstr "ਹਾਲਤ(_S):"
-
-#. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
-msgid "Use a _different status for some accounts"
-msgstr "ਕੁਝ ਖਾਤਿਆਂ ਲਈ ਵੱਖਰੀ ਹਾਲਤ ਵਰਤੋਂ(_d)"
-
-#. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
-msgid "Sa_ve & Use"
-msgstr "ਸੰਭਾਲੋ ਅਤੇ ਵਰਤੋਂ(_v)"
-
-#: ../pidgin/gtksavedstatuses.c:1480
-#, c-format
-msgid "Status for %s"
-msgstr "%s ਲਈ ਹਾਲਤ"
-
-#: ../pidgin/gtkstatusbox.c:664
-msgid "Waiting for network connection"
-msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਲਈ ਉਡੀਕ ਜਾਰੀ"
-
-#: ../pidgin/gtkutils.c:632
-msgid "Google Talk"
-msgstr "ਗੂਗਲ ਟਾਕ"
-
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "%s ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਆਈ: %s"
-
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
-msgid "Failed to load image"
-msgstr "ਚਿੱਤਰ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../pidgin/gtkutils.c:1498
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-
-#: ../pidgin/gtkutils.c:1499
-#, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr "%s ਫੋਲਡਰ ਟਰਾਂਸਫਰ ਨਹੀਂ ਕਰ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇਸ ਵਿੱਚੋਂ ਇੱਕਲੀ ਇੱਕਲੀ ਫਾਇਲ ਭੇਜਣੀ ਪਵੇਗੀ।"
-
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
-msgid "You have dragged an image"
-msgstr "ਤੁਸੀਂ ਇੱਕ ਚਿੱਤਰ ਸੁੱਟਿਆ"
-
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"ਤੁਸੀਂ ਇਹ ਚਿੱਤਰ ਨੂੰ ਇੱਕ ਫਾਇਲ ਵਾਂਗ ਟਰਾਂਸਫਰ ਕਰ ਸਕਦੇ ਹੋ, ਇਹ ਸੁਨੇਹੇ 'ਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ "
-"ਉਪਭੋਗੀ ਲਈ ਸਨੇਹੀ ਆਈਕਾਨ ਵਾਂਗ ਵਰਤ ਸਕਦੇ ਹੋ।"
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
-msgid "Set as buddy icon"
-msgstr "ਸਨੇਹੀ ਆਈਕਾਨ ਵਾਂਗ ਰੱਖੋ"
-
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
-msgid "Send image file"
-msgstr "ਚਿੱਤਰ ਫਾਇਲ ਭੇਜੋ"
-
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
-msgid "Insert in message"
-msgstr "ਸਨੇਹੇ 'ਚ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/gtkutils.c:1544
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਉਪਭੋਗੀ ਲਈ ਸਨੇਹੀ ਆਈਕਾਨ ਵਾਂਗ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"ਤੁਸੀਂ ਇਹ ਚਿੱਤਰ ਨੂੰ ਇੱਕ ਫਾਇਲ ਵਾਂਗ ਟਰਾਂਸਫਰ ਕਰ ਸਕਦੇ ਹੋ, ਇਹ ਸੁਨੇਹੇ 'ਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ "
-"ਉਪਭੋਗੀ ਲਈ ਸਨੇਹੀ ਆਈਕਾਨ ਵਾਂਗ ਵਰਤ ਸਕਦੇ ਹੋ।"
-
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"ਤੁਸੀਂ ਇਹ ਚਿੱਤਰ ਨੂੰ ਇਹ ਸੁਨੇਹੇ 'ਚ ਸ਼ਾਮਿਲ ਕਰਨ ਸਕਦੇ ਹੋ ਜਾਂ ਇਸ ਉਪਭੋਗੀ ਲਈ ਸਨੇਹੀ ਆਈਕਾਨ ਵਾਂਗ ਵਰਤ "
-"ਸਕਦੇ ਹੋ।"
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
-msgid "Cannot send launcher"
-msgstr "ਲਾਂਚਰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:2345
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>ਫਾਇਲ:</b> %s\n"
-"<b>ਫਾਇਲ ਅਕਾਰ:</b> %s\n"
-"<b>ਚਿੱਤਰ ਅਕਾਰ:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2641
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "ਫਾਇਲ '%s' %s ਵਾਸਤੇ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਛੋਟਾ ਚਿੱਤਰ ਵਰਤ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।\n"
-
-#: ../pidgin/gtkutils.c:2643
-msgid "Icon Error"
-msgstr "ਆਈਕਾਨ ਗਲਤੀ"
-
-#: ../pidgin/gtkutils.c:2644
-msgid "Could not set icon"
-msgstr "ਆਈਕਾਨ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
-
-#: ../pidgin/gtkutils.c:2744
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "ਫਾਇਲ '%s' ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ: %s"
-
-#: ../pidgin/gtkutils.c:2793
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
-msgid "Save File"
-msgstr "ਫਾਇਲ ਸੰਭਾਲੋ"
-
-#: ../pidgin/gtkwhiteboard.c:861
-msgid "Select color"
-msgstr "ਰੰਗ ਚੁਣੋ"
-
-#: ../pidgin/pidginstock.c:87
-msgid "_Alias"
-msgstr "ਉਪ-ਨਾਂ(_A)"
-
-#: ../pidgin/pidginstock.c:89
-msgid "Close _tabs"
-msgstr "ਟੈਬਾਂ ਬੰਦ ਕਰੋ(_t)"
-
-#: ../pidgin/pidginstock.c:91
-msgid "_Get Info"
-msgstr "ਜਾਣਕਾਰੀ ਲਵੋ(_G)"
-
-#: ../pidgin/pidginstock.c:92
-msgid "_Invite"
-msgstr "ਸੱਦਾ(_I)"
-
-#: ../pidgin/pidginstock.c:93
-msgid "_Modify"
-msgstr "ਸੋਧ(_M)"
-
-#: ../pidgin/pidginstock.c:94
-msgid "_Open Mail"
-msgstr "ਪੱਤਰ ਖੋਲ੍ਹੋ(_O)"
-
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-#, fuzzy
-msgid "Pidgin smileys"
-msgstr "ਪਿਡਗਿਨ"
-
-#: ../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
-#, fuzzy
-msgid "none"
-msgstr "(ਕੋਈ ਨਹੀਂ)"
-
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "ਡਿਸਪਲੇਅ ਅੰਕੜੇ"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
-msgid "Response Probability:"
-msgstr "ਜਵਾਬ ਸੰਭਾਵਨਾ:"
-
-#: ../pidgin/plugins/cap/cap.c:811
-msgid "Statistics Configuration"
-msgstr "ਅੰਕੜੇ ਸੰਰਚਨਾ"
-
-#. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
-msgid "Maximum response timeout:"
-msgstr ""
-
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
-msgid "minutes"
-msgstr "ਮਿੰਟ"
-
-#. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
-msgid "Maximum last-seen difference:"
-msgstr ""
-
-#. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
-msgid "Threshold:"
-msgstr "ਥਰੈਸ਼ਹੋਲਡ:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/cap/cap.c:936
-msgid "Contact Availability Prediction"
-msgstr ""
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/cap/cap.c:938
-msgid "Contact Availability Prediction plugin."
-msgstr ""
-
-#. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-
-#: ../pidgin/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "ਬੱਡੀ ਵੇਹਲਾ ਹੈ"
-
-#: ../pidgin/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "ਬੱਡੀ ਦੂਰ ਹੈ"
-
-#: ../pidgin/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr ""
-
-#. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "ਬੱਡੀ ਮੋਬਾਇਲ ਉੱਤੇ ਹੈ"
-
-#: ../pidgin/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "ਬੱਡੀ ਆਫਲਾਇਨ ਹੈ"
-
-#: ../pidgin/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "ਵਰਤਣ ਲਈ ਮੁੱਲ, ਜਦੋਂ..."
-
-#: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-
-#: ../pidgin/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr ""
-
-#: ../pidgin/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "ਖਾਤੇ ਲਈ ਵਰਤਣ ਲਈ ਬਿੰਦੂ ਮੁੱਲ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/contact_priority.c:187
-msgid "Contact Priority"
-msgstr "ਸੰਪਰਕ ਤਰਜੀਹ"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "ਵੱਖਰੀ ਸਨੇਹੀ ਸਥਿਤੀ ਨਾਲ ਸਬੰਧਿਤ ਮੁੱਲਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਦਿਓ।"
-
-#. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"ਸੰਪਰਕ ਵਿੱਚ ਦਰਜੇ ਦੇ ਆਧਾਰ ਉੱਤੇ ਸਨੇਹੀਆਂ ਲਈ ਵੇਹਲਾ/ਦੂਰ/ਆਫਲਾਇਨ ਸਥਿਤੀ ਦਾ ਮੁੱਲ ਤਬਦੀਲ ਕਰਨਾ ਸਵੀਕਾਰ "
-"ਹੈ।"
-
-#: ../pidgin/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "ਗੱਲਬਾਤ ਰੰਗ"
-
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖੇ ਵਿੱਚ ਪਸੰਦੀਦਾ ਰੰਗ"
-
-#: ../pidgin/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "ਗਲਤੀ ਸੁਨੇਹੇ"
-
-#: ../pidgin/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "ਉਘਾੜੇ ਸੁਨੇਹੇ"
-
-#: ../pidgin/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "ਸਿਸਟਮ ਸੁਨੇਹੇ"
-
-#: ../pidgin/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "ਭੇਜੇ ਸੁਨੇਹੇ"
-
-#: ../pidgin/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "ਪ੍ਰਾਪਤ ਹੋਏ ਸੁਨੇਹੇ"
-
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
-#, c-format
-msgid "Select Color for %s"
-msgstr "%s ਲਈ ਰੰਗ ਚੁਣੋ"
-
-#: ../pidgin/plugins/convcolors.c:310
-msgid "Ignore incoming format"
-msgstr "ਆਉਣ ਵਾਲਾ ਫਾਰਮੈਟ ਅਣਡਿੱਠਾ ਕਰੋ"
-
-#: ../pidgin/plugins/convcolors.c:311
-msgid "Apply in Chats"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਲਾਗੂ ਕਰੋ"
-
-#: ../pidgin/plugins/convcolors.c:312
-msgid "Apply in IMs"
-msgstr "IM ਵਿੱਚ ਲਾਗੂ ਕਰੋ"
-
-#: ../pidgin/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "ਗੱਲਬਾਤ ਗਿਣਤੀ ਨਾਲ"
-
-#: ../pidgin/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "ਗੱਲਬਾਤ ਥਾਂ"
-
-#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-
-#: ../pidgin/plugins/extplacement.c:111
-msgid "Number of conversations per window"
-msgstr "ਪ੍ਰਤੀ ਝਰੋਖਾ ਵਿੱਚ ਗੱਲਬਾਤਾਂ ਦੀ ਗਿਣਤੀ"
-
-#: ../pidgin/plugins/extplacement.c:117
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "ਅੰਕ ਰੱਖਣ ਸਮੇ ਵੱਖਰੇ IM ਅਤੇ ਗੱਲਬਾਤ ਝਰੋਖੇ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/extplacement.c:146
-msgid "ExtPlacement"
-msgstr "ਵਾਧੂ ਥਾਂ"
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/extplacement.c:148
-msgid "Extra conversation placement options."
-msgstr "ਵਾਧੂ ਗੱਲਬਾਤ ਥਾਂ ਚੋਣ ਹੈ।"
-
-#. *< summary
-#. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr "ਪ੍ਰਤੀ ਝਰੋਖਾ ਗੱਲਾਬਾਤਾਂ ਦੀ ਗਿਣਤੀ ਸੀਮਿਤ, ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਵੱਖਰੀ IM ਅਤੇ ਗੱਲਬਾਤ"
-
-#. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "ਮਾਊਸ ਇਸ਼ਾਰਾ ਸੰਰਚਨਾ"
-
-#: ../pidgin/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "ਮੱਧ ਮਾਊਸ ਬਟਨ"
-
-#: ../pidgin/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "ਸੱਜਾ ਮਾਊਸ ਬਟਨ"
-
-#. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "ਦਿੱਖ ਇਸ਼ਾਰੇ ਵੇਖਾਓ(_V)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
-msgid "Mouse Gestures"
-msgstr "ਮਾਊਸ ਇਸ਼ਾਰੇ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
-msgid "Provides support for mouse gestures"
-msgstr "ਮਾਊਸ ਇਸ਼ਾਰਿਆਂ ਲਈ ਸਹਿਯੋਗ ਦਿੰਦਾ ਹੈ"
-
-#. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
-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 ""
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "ਤਰੁੰਤ ਸੁਨੇਹੇਦਾਰ"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
-msgid "Select a person from your address book below, or add a new person."
-msgstr "ਆਪਣੀ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚੋਂ ਕੋਈ ਵਿਅਕਤੀ ਚੁਣੋ ਜਾਂ ਨਵਾਂ ਵਿਅਕਤੀ ਸ਼ਾਮਲ ਕਰੋ।"
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
-msgid "Group:"
-msgstr "ਗਰੁੱਪ:"
-
-#. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
-msgid "New Person"
-msgstr "ਨਵਾਂ ਵਿਅਕਤੀ"
-
-#. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
-msgid "Select Buddy"
-msgstr "ਸਨੇਹੀ ਚੁਣੋ"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"ਆਪਣੇ ਸਨੇਹੀਆਂ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚੋਂ ਵਿਅਕਤੀ ਚੁਣੋ ਜਾਂ ਨਵਾਂ ਵਿਅਕਤੀ ਬਣਾਓ।"
-
-#. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
-msgid "User _details"
-msgstr "ਯੂਜ਼ਰ ਵੇਰਵਾ(_d)"
-
-#. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
-msgid "_Associate Buddy"
-msgstr "ਸਬੰਧਤ ਸਨੇਹੀ(_A)"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "ਈ-ਮੇਲ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:241
-msgid "The evolution executable was not found in the PATH."
-msgstr "ਮਾਰਗ 'ਚ ਈਵੇਲੂਸ਼ਨ ਚੱਲਣਯੋਗ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
-msgstr ""
-
-#: ../pidgin/plugins/gevolution/gevolution.c:273
-msgid "Add to Address Book"
-msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "ਈ-ਮੇਲ ਭੇਜੋ"
-
-#. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
-msgid "Evolution Integration Configuration"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਜੋੜ ਸੰਰਚਨਾ"
-
-#. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "ਸਭ ਖਾਤੇ ਚੁਣੋ, ਜਿੱਥੇ ਸਨੇਹੀ ਖੁਦ ਹੀ ਸ਼ਾਮਿਲ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ।"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਜੋੜ"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਸਬੰਧ ਉਪਲੱਬਧ ਕਰਵਾਉਦਾ ਹੈ।"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
-msgid "Please enter the person's information below."
-msgstr "ਵਿਅਕਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ।"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "ਸਨੇਹੀ ਦਾ ਸਕਰੀਨ ਨਾਂ ਅਤੇ ਖਾਤਾ ਕਿਸਮ ਹੇਠਾਂ ਦਿਓ ਜੀ"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
-msgid "Account type:"
-msgstr "ਖਾਤਾ ਨਾਂ:"
-
-#. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
-msgid "Optional information:"
-msgstr "ਚੋਣਵੀਂ ਜਾਣਕਾਰੀ:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
-msgid "First name:"
-msgstr "ਪਹਿਲਾ ਨਾਂ:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
-msgid "Last name:"
-msgstr "ਆਖਰੀ ਨਾਂ:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "ਈ-ਪੱਤਰ:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK ਸਿਗਨਲ ਟੈਸਟ"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
-#, fuzzy
-msgid "Test to see that all ui signals are working properly."
-msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਸਭ ਸੰਕੇਤ ਠੀਕ ਤਰਾਂ ਕੰਮ ਕਰਦੇ ਹਨ।"
-
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr "ਬੱਡੀ ਸਨੇਹੀ"
-
-#: ../pidgin/plugins/history.c:188
-msgid "History"
-msgstr "ਅਤੀਤ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "ਦੂਰ ਜਾਣ ਲਈ ਆਈਕਾਨ ਬਣਾਓ"
-
-#. *< 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 "ਤੁਹਾਡੇ ਦੂਰ ਹੋਣ ਉੱਤੇ ਸਨੇਹੀ ਸੂਚੀ ਅਤੇ ਤੁਹਾਡੀ ਗੱਲਬਾਤ ਦਾ ਆਈਕਾਨ ਬਣਾਓ।"
-
-#: ../pidgin/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "ਪੱਤਰ ਜਾਂਚ"
-
-#: ../pidgin/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "ਨਵੀਆਂ ਸਥਾਨਕ ਆਉਣ ਵਾਲੇ ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ"
-
-#: ../pidgin/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "ਸਨੇਹੀ ਸੂਚੀ ਨਾਲ ਇੱਕ ਛੋਟਾ ਜਿਹਾ ਬਕਸਾ ਸ਼ਾਮਿਲ ਹੁੰਦਾ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਆਇਆ ਪੱਤਰ ਵੇਖਾਉਦਾ ਹੈ।"
-
-#: ../pidgin/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "ਮਾਰਕ ਲਾਇਨ"
-
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr ""
-
-#: ../pidgin/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr ""
-
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
-msgid "_IM windows"
-msgstr "_IM ਝਰੋਖਾ"
-
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
-msgid "C_hat windows"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖਾ(_h)"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
-msgid "Music Messaging"
-msgstr "ਸੰਗੀਤ ਸੁਨੇਹੇ"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
-msgid "There was a conflict in running the command:"
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
-msgid "Error Running Editor"
-msgstr "ਸੰਪਾਦਕ ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
-msgid "The following error has occurred:"
-msgstr "ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਆਈ ਹੈ:"
-
-#. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
-msgid "Music Messaging Configuration"
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
-msgid "Score Editor Path"
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
-msgid "_Apply"
-msgstr "ਲਾਗੂ ਕਰੋ(_A)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
-
-#. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-
-#. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
-msgid "Notify For"
-msgstr "ਸੂਚਨਾ"
-
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\tਜਦੋਂ ਕੋਈ ਤੁਹਾਡਾ ਸਕਰੀਨ ਨਾਂ ਲਵੇ(_O)"
-
-#: ../pidgin/plugins/notify.c:707
-msgid "_Focused windows"
-msgstr "ਕੇਂਦਰਿਤ ਝਰੋਖਾ(_F)"
-
-#. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
-msgid "Notification Methods"
-msgstr "ਸੂਚਨਾ ਢੰਗ"
-
-#: ../pidgin/plugins/notify.c:722
-msgid "Prepend _string into window title:"
-msgstr "ਝਰੋਖਾ ਨਾਂ ਵਿੱਚ ਸਤਰ(_s):"
-
-#. Count method button
-#: ../pidgin/plugins/notify.c:741
-msgid "Insert c_ount of new messages into window title"
-msgstr "ਝਰੋਖਾ ਸਿਰਲੇਖ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹੇ ਲਈ ਗਿਣਤੀ ਦਿਓ(_o)"
-
-#. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
-msgid "Insert count of new message into _X property"
-msgstr "X ਵਿਸ਼ੇਸ਼ਤਾ ਵਿੱਚ  ਨਵੇਂ ਸੁਨੇਹੇ ਲਈ ਗਿਣਤੀ ਦਿਓ(_X)"
-
-#. Urgent method button
-#: ../pidgin/plugins/notify.c:758
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ ਵਿੱਚ \"_URGENT\" ਸੰਕੇਤ ਦਿਓ"
-
-#. Raise window method button
-#: ../pidgin/plugins/notify.c:767
-msgid "R_aise conversation window"
-msgstr "ਗੱਲ ਝਰੋਖਾ ਉਭਾਰੋ(_a)"
-
-#. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
-msgid "Notification Removal"
-msgstr "ਸੂਚਨਾ ਹਟਾਓ"
-
-#. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
-msgid "Remove when conversation window _gains focus"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖਾ ਦੇ ਧਿਆਨ ਦੇਣ ਉੱਤੇ ਹਟਾਓ(_g)"
-
-#. Remove on click button
-#: ../pidgin/plugins/notify.c:787
-msgid "Remove when conversation window _receives click"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖੇ ਦੇ ਉੱਤੇ ਕਲਿੱਕ ਨਾਲ ਹਟਾਓ(_r)"
-
-#. Remove on type button
-#: ../pidgin/plugins/notify.c:795
-msgid "Remove when _typing in conversation window"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖੇ ਵਿੱਚ ਲਿਖਣ ਨਾਲ ਹਟਾਓ(_t)"
-
-#. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
-msgid "Remove when a _message gets sent"
-msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਉੱਤੇ ਹਟਾਓ(_m)"
-
-#. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
-msgid "Remove on switch to conversation ta_b"
-msgstr "ਗੱਲਬਾਤ ਟੈਬ ਬਦਲਣ ਉੱਤੇ ਹਟਾਓ(_b)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/notify.c:907
-msgid "Message Notification"
-msgstr "ਸੁਨੇਹਾ ਸੂਚਨਾ"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "ਤੁਹਾਨੂੰ ਨਾ-ਪੜੇ ਸੁਨੇਹੇ ਬਾਰੇ ਸੂਚਨਾ ਦੇਣ ਲਈ ਕਈ ਢੰਗ ਵਰਤਦਾ ਹੈ।"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/pidgininc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "ਪਿਡਗਿਨ ਪੇਸ਼ਕਾਰੀ ਪਲੱਗਇਨ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "ਇੱਕ ਉਦਾਹਰਨ ਪਲੱਗਇਨ ਹੈ - ਵੇਰਵਾ ਵੇਖੋ।"
-
-#. *  description
-#: ../pidgin/plugins/pidgininc.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 ""
-
-#: ../pidgin/plugins/pidginrc.c:41
-msgid "Cursor Color"
-msgstr "ਕਰਸਰ ਰੰਗ"
-
-#: ../pidgin/plugins/pidginrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "ਸੈਕੰਡਰੀ ਕਰਸਰ ਰੰਗ"
-
-#: ../pidgin/plugins/pidginrc.c:43
-msgid "Hyperlink Color"
-msgstr "ਹਾਇਪਰਲਿੰਕ ਰੰਗ"
-
-#: ../pidgin/plugins/pidginrc.c:54
-msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:73
-msgid "Conversation Entry"
-msgstr "ਗੱਲਬਾਤ ਇੰਦਰਾਜ਼"
-
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "ਗੱਲਬਾਤ ਅਤੀਤ"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "ਲਾਗ ਦਰਸ਼ਕ"
-
-#: ../pidgin/plugins/pidginrc.c:76
-msgid "Request Dialog"
-msgstr "ਬੇਨਤੀ ਵਾਰਤਾਲਾਪ"
-
-#: ../pidgin/plugins/pidginrc.c:77
-msgid "Notify Dialog"
-msgstr "ਸੂਚਨਾ ਵਾਰਤਾਲਾਪ"
-
-#: ../pidgin/plugins/pidginrc.c:253
-msgid "Select Color"
-msgstr "ਰੰਗ ਚੁਣੋ"
-
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
-msgid "Select Interface Font"
-msgstr "ਇੰਟਰਫੇਸ ਰੰਗ ਚੁਣੋ"
-
-#: ../pidgin/plugins/pidginrc.c:303
-#, c-format
-msgid "Select Font for %s"
-msgstr "%s ਲਈ ਫੋਂਟ ਚੁਣੋ"
-
-#: ../pidgin/plugins/pidginrc.c:371
-msgid "GTK+ Interface Font"
-msgstr "GTK+ ਇੰਟਰਫੇਸ ਫੋਂਟ"
-
-#: ../pidgin/plugins/pidginrc.c:391
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ ਪਾਠ ਸ਼ਾਰਟਕੱਟ ਥੀਮ"
-
-#.
-#. 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:428
-msgid "Interface colors"
-msgstr "ਇੰਟਰਫੇਸ ਰੰਗ"
-
-#: ../pidgin/plugins/pidginrc.c:452
-msgid "Widget Sizes"
-msgstr "ਵਿਦਗਿਟ ਆਕਾਰ"
-
-#: ../pidgin/plugins/pidginrc.c:473
-msgid "Fonts"
-msgstr "ਫੋਂਟ"
-
-#: ../pidgin/plugins/pidginrc.c:497
-msgid "Gtkrc File Tools"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:502
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:511
-msgid "Re-read gtkrc files"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:544
-msgid "Pidgin GTK+ Theme Control"
-msgstr "ਪਿਡਗਿਨ GTK+ ਸਰੂਪ ਕੰਟਰੋਲ"
-
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
-
-#: ../pidgin/plugins/raw.c:175
-msgid "Raw"
-msgstr "ਕੱਚਾ"
-
-#: ../pidgin/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "ਪਾਠ ਆਧਾਰਿਤ ਪ੍ਰੋਟੋਕਾਲਾਂ ਲਈ ਕੱਚੀ ਇੰਪੁੱਟ ਭੇਜਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
-
-#: ../pidgin/plugins/raw.c:178
-#, fuzzy
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"ਪਾਠ ਆਧਾਰਿਤ ਪ੍ਰੋਟੋਕਾਲਾਂ (Jabber, MSN, IRC, TOC) ਲਈ ਕੱਚੀ ਇੰਪੁੱਟ ਭੇਜਣ ਲਈ ਸਹਾਇਕ ਹੈ। ਪਾਠ ਨੂੰ "
-"ਬਕਸੇ ਵਿੱਚ ਭੇਜਣ ਲਈ 'Enter' ਦਬਾਉ। ਡੀਬੱਗ ਝਰੋਖਾ ਵੇਖੋ।"
-
-#: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ %s ਵਰਜਨ %s ਵਰਤ ਰਹੇ ਹੋ। ਮੌਜੂਦਾ ਵਰਜਨ %s ਹੈ। <hr>"
-
-#: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
-msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "ਨਵਾਂ ਵਰਜਨ ਉਪਲੱਬਧ ਹੈ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "ਜਾਰੀ ਸੂਚਨਾ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "ਨਵੀਂ ਵਰਜਨ ਲਈ ਨਿਯਮਤ ਜਾਂਚ ਕਰੋ।"
-
-#. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr "ਨਵੀਂ ਵਰਜਨ ਲਈ ਨਿਯਮਤ ਜਾਂਚ ਕਰੋ ਅਤੇ ਉਪਭੋਗੀ ਨੂੰ ChangeLog ਲਈ ਵੇਖੋ।"
-
-#: ../pidgin/plugins/spellchk.c:1962
-msgid "Duplicate Correction"
-msgstr "ਡੁਪਲੀਕੇਟ ਸੋਧ"
-
-#: ../pidgin/plugins/spellchk.c:1963
-msgid "The specified word already exists in the correction list."
-msgstr "ਦਿੱਤੇ ਸ਼ਬਦ ਸੋਧ ਸੂਚੀ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
-
-#: ../pidgin/plugins/spellchk.c:2177
-msgid "Text Replacements"
-msgstr "ਪਾਠ ਤਬਦੀਲੀਆਂ"
-
-#: ../pidgin/plugins/spellchk.c:2200
-msgid "You type"
-msgstr "ਤੁਸੀਂ ਲਿਖਿਆ"
-
-#: ../pidgin/plugins/spellchk.c:2214
-msgid "You send"
-msgstr "ਤੁਸੀਂ ਭੇਜਿਆ"
-
-#: ../pidgin/plugins/spellchk.c:2228
-msgid "Whole words only"
-msgstr "ਸਿਰਫ਼ ਸ਼ਬਦ ਹੀ"
-
-#: ../pidgin/plugins/spellchk.c:2240
-msgid "Case sensitive"
-msgstr "ਅੱਖਰ ਆਕਾਰ ਨਿਰਭਰ"
-
-#: ../pidgin/plugins/spellchk.c:2266
-msgid "Add a new text replacement"
-msgstr "ਨਵੀਂ ਪਾਠ ਤਬਦੀਲੀਆਂ ਸ਼ਾਮਿਲ"
-
-#: ../pidgin/plugins/spellchk.c:2282
-msgid "You _type:"
-msgstr "ਤੁਸੀ ਲਿਖਿਆ(_t):"
-
-#: ../pidgin/plugins/spellchk.c:2299
-msgid "You _send:"
-msgstr "ਤੁਸੀਂ ਭੇਜਿਆ(_s):"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-
-#: ../pidgin/plugins/spellchk.c:2313
-msgid "Only replace _whole words"
-msgstr "ਸਿਰਫ਼ ਪੂਰੇ ਸ਼ਬਦ ਹੀ ਬਦਲੋ(_w)"
-
-#: ../pidgin/plugins/spellchk.c:2338
-msgid "General Text Replacement Options"
-msgstr "ਆਮ ਪਾਠ ਤਬਦੀਲੀ ਚੋਣਾਂ"
-
-#: ../pidgin/plugins/spellchk.c:2339
-msgid "Enable replacement of last word on send"
-msgstr ""
-
-#: ../pidgin/plugins/spellchk.c:2370
-msgid "Text replacement"
-msgstr "ਪਾਠ ਤਬਦੀਲ"
-
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "ਉਪਭੋਗੀ ਰਾਹੀਂ ਪ੍ਰਭਾਸ਼ਿਤ ਨਿਯਮਾਂ ਮੁਤਾਬਕ ਭੇਜੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਤਬਦੀਲ ਕਰੋ।"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
-msgid "Buddy Ticker"
-msgstr "ਸਨੇਹੀ ਪੱਟੀ"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "ਸਨੇਹੀ ਖੋਜੀ ਦਾ ਖਿਤਿਜੀ ਸਕਰੋਲਿੰਗ ਵਰਜਨ ਹੈ"
-
-#: ../pidgin/plugins/timestamp.c:137
-msgid "Display Timestamps Every"
-msgstr "ਸਮਾਂ-ਮੋਹਰ ਵੇਖਾਓ ਹਰੇਕ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp.c:202
-msgid "Timestamp"
-msgstr "ਸਮਾਂ-ਮੋਹਰ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp.c:205
-msgid "Display iChat-style timestamps"
-msgstr "iChat ਸਮਾਂ-ਮੋਹਰ ਵੇਖਾਓ"
-
-#. *  description
-#: ../pidgin/plugins/timestamp.c:207
-msgid "Display iChat-style timestamps every N minutes."
-msgstr ""
-
-#: ../pidgin/plugins/timestamp_format.c:23
-msgid "Timestamp Format Options"
-msgstr "ਸਮਾਂ-ਮੋਹਰ ਫਾਰਮੈਟ ਚੋਣ"
-
-#: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force 24-hour time format"
-msgstr "24-ਘੰਟੇ ਸਮਾਂ ਫਾਰਮੈਟ ਲਈ ਮਜ਼ਬੂਰ(_F)"
-
-#: ../pidgin/plugins/timestamp_format.c:33
-msgid "Show dates in..."
-msgstr "ਮਿਤੀ ਵੇਖਾਓ..."
-
-#: ../pidgin/plugins/timestamp_format.c:38
-msgid "Co_nversations:"
-msgstr "ਗੱਲਬਾਤ(_n):"
-
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
-msgid "For delayed messages"
-msgstr ""
-
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
-msgid "For delayed messages and in chats"
-msgstr ""
-
-#: ../pidgin/plugins/timestamp_format.c:47
-msgid "_Message Logs:"
-msgstr "ਸੁਨੇਹਾ ਲਾਗ(_M):"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
-msgid "Message Timestamp Formats"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
-msgid "Customizes the message timestamp formats."
-msgstr ""
-
-#. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
-msgid "Opacity:"
-msgstr "ਧੁੰਦਲਾਪਨ:"
-
-#. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
-msgid "IM Conversation Windows"
-msgstr "IM ਗੱਲਬਾਤ ਝਰੋਖੇ"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
-msgid "_IM window transparency"
-msgstr "_IM ਝਰੋਖਾ ਪਾਰਦਰਸ਼ੀ"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
-msgid "_Show slider bar in IM window"
-msgstr "_IM ਝਰੋਖੇ ਵਿੱਚ ਸਲਾਇਡਰ ਪੱਟੀ ਵੇਖਾਓ(_S)"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
-msgid "Remove IM window transparency on focus"
-msgstr "ਫੋਕਸ ਹੋਣ ਤੇ _IM ਝਰੋਖਾ ਪਾਰਦਰਸ਼ਤਾ ਹਟਾਓ"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
-msgid "Always on top"
-msgstr "ਹਮੇਸ਼ਾਂ ਉੱਤੇ"
-
-#. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
-msgid "Buddy List Window"
-msgstr "ਸਨੇਹੀ ਸੂਚੀ ਝਰੋਖਾ"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
-msgid "_Buddy List window transparency"
-msgstr "ਸਨੇਹੀ ਸੂਚੀ ਝਰੋਖਾ ਪਾਰਦਰਸ਼ੀ(_B)"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
-msgid "Remove Buddy List window transparency on focus"
-msgstr "ਫੋਕਸ ਹੋਣ 'ਤੇ ਦੋਸਤ ਸੂਚੀ ਝਰੋਖਾ ਪਾਰਦਰਸ਼ਤਾ ਹਟਾਓ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
-msgid "Transparency"
-msgstr "ਪਾਰਦਰਸ਼ਤਾ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "ਸਨੇਹੀ ਸੂਚੀ ਅਤੇ ਗੱਲਬਾਤ ਲਈ ਬਦਲਦੀ ਪਾਰਦਰਸ਼ਤਾ"
-
-#. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"ਗੱਲਬਾਤ ਝਰੋਖਾ ਅਤੇ ਸੁਨੇਹੀ ਸੂਚੀ ਉੱਤੇ ਇਹ ਪਲੱਗਇਨ ਬਦਲਦੀ ਐਲਫ਼ਾ ਪਲੱਗਇਨ ਯੋਗ ਕਰਦੀ ਹੈ।\n"
-"\n"
-"*ਯਾਦ ਰੱਖੋ: ਇਹ ਪਲੱਗਇਨ ਲਈ Win2000 ਜਾਂ WinXP ਦੀ ਲੋੜ ਹੈ।"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime ਵਰਜਨ"
-
-#. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
-msgid "Startup"
-msgstr "ਸ਼ੁਰੂਆਤ"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
-#, c-format
-msgid "_Start %s on Windows startup"
-msgstr "Windows ਚੱਲਣ ਸਮੇਂ %s ਚਲਾਓ(_S)"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
-msgid "_Dockable Buddy List"
-msgstr "ਵੱਖਹੋਣ ਯੋਗ ਸਨੇਹੀ ਸੂਚੀ(_D)"
-
-#. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
-msgid "_Keep Buddy List window on top:"
-msgstr "ਸਨੇਹੀ ਸੂਚੀ ਝਰੋਖਾ ਹਮੇਸ਼ਾ ਉੱਪਰ ਰੱਖੋ(_K):"
-
-#. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
-msgid "Only when docked"
-msgstr "ਸਿਰਫ਼ ਜਦੋਂ ਡੋਕ ਹੋਵੇ"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
-msgid "_Flash window when chat messages are received"
-msgstr "ਗੱਲਬਾਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਹੋਣ ਉੱਤੇ ਝਰੋਖਾ ਝਲਕਾਓ(_F)"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-msgid "Windows Pidgin Options"
-msgstr "ਵਿੰਡੋ ਪਿਡਗਿਨ ਚੋਣਾਂ"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
-msgid "Options specific to Pidgin for Windows."
-msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਖਾਸ ਚੋਣਾਂ"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:667
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>ਲਾਗਆਉਟ।</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "ਖਾਤਾ: "
-
-#: ../pidgin/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "ਇੱਕ <message/> ਪ੍ਹੈਰਾ ਦਿਓ।"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr ""
-
-#. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "ਆਫਲਾਇਨ ਬੱਡੀ ਵੇਖਾਓ"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "ਪੋਰਟ"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "ਅਕਾਰ"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "ਲਾਗ ਅਕਾਰ"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "ਸੂਚਨਾ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਚੁਣੋ"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "ਮੌਜੂਦਾ ਟੋਕਨ"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger ਪ੍ਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "ਅਸਫ਼ਲ: ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫ਼ਲ"
-
-#, fuzzy
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s ਤੁਹਾਨੂੰ ਫਾਇਲ ਭੇਜਣੀ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s ਨੇ ਹਾਲਤ %s ਤੋਂ %s ਬਦਲਿਆ ਹੈ"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s ਹੁਣ %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s ਹੁਣ %s ਨਹੀਂ ਰਿਹਾ"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "ਸੁਨੇਹਾ(_M):"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "ਫਾਇਲ ਭੇਜੋ(_S)"
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਮਨਜ਼ੂਰ ਨਹੀਂ"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਮਨਜ਼ੂਰ ਨਹੀਂ"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "ਸਨੇਹੀ ਸ਼ਾਮਿਲ"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "ਗੱਲਬਾਤ ਸ਼ਾਮਲ"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "ਫਾਰਸੀ"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/ਖਾਤੇ"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "ਖਾਤਾ:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "ਭੇਜੋ"
-
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s ਦਾ ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਕਰਕੇ ਕੁਨੈਸ਼ਨ ਬੰਦ ਹੋ ਗਿਆ ਹੈ:\n"
-#~ "%s"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s ਲਈ ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ:"
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "ਤੁਸੀਂ ਇੱਕ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਬਾਹਰ ਆ ਗਏ।"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "ਸਨੇਹੀ %s ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ "
-#~ "ਆਪਣੀ ਸਨੇਹੀ ਸੂਚੀ ਵਿੱਚ ਇੰਨੇ ਸਨੇਹੀ ਸ਼ਾਮਿਲ ਕਰ ਲਏ ਹਨ, ਜਿੰਨੇ ਕਿ ਹੋ ਨਹੀਂ ਸਕਦੇ ਹਨ।"
-
-#~ msgid "_Connect"
-#~ msgstr "ਕੁਨੈਕਟ ਕਰੋ(_C)"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "ਕੀ ਤੁਸੀਂ ਇਹ Qun ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#~ msgid "Go ahead"
-#~ msgstr "ਅੱਗੇ ਜਾਓ"
-
-#~ msgid "Server ACK"
-#~ msgstr "ਸਰਵਰ ACK"
-
-#~ msgid "%s Address"
-#~ msgstr "%s ਸਿਰਨਾਵਾਂ"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: ਉਪਲੱਬਧ"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: ਦੂਰ"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: ਅਦਿੱਖ"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: ਆਫਲਾਇਨ"
-
-#~ msgid "Modify My Information"
-#~ msgstr "ਮੇਰੀ ਜਾਣਕਾਰੀ ਸੋਧ"
-
-#~ msgid "Login in TCP"
-#~ msgstr "TCP ਵਿੱਚ ਲਾਗਇਨ"
-
-#~ msgid "Login Hidden"
-#~ msgstr "ਲਾਗਇਨ ਓਹਲੇ"
-
-#~ msgid "Socket send error"
-#~ msgstr "ਸਾਕਟ ਭੇਜਣ ਗਲਤੀ"
-
-#~ msgid "Connection refused"
-#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "ਕੀ ਤੁਸੀਂ ਉਸ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "ਹੋਰ ਉਪਭੋਗੀਆਂ ਰਾਹੀਂ ਵੇਖਣਾ ਨਾ-ਮੰਨਜ਼ੂਰ"
-
-#~ msgid "Block invites"
-#~ msgstr "ਸੱਦਾ ਪਾਬੰਦੀ"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "ਆਨਲਾਇਨ ਸਥਿਤੀ ਗੁਣ ਬੇਨਤੀਆਂ ਰੱਦ ਕੀਤੀਆਂ"
-
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਬੱਜ਼ ਭੇਜਿਆ ਹੈ!"
-
-#~ msgid "Unavailable"
-#~ msgstr "ਨਾ-ਉਪਲੱਬਧ"
-
-#~ msgid "Alias..."
-#~ msgstr "ਉਪ-ਨਾਂ..."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/ਚੋਣ/ਸਨੇਹੀ ਆਈਕਾਨ ਵੇਖਾਓ(_i)"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/ਚੋਣ/ਸਨੇਹੀ ਆਈਕਾਨ ਵੇਖਾਓ"
-
-#~ 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 "Smaller font size"
-#~ msgstr "ਛੋਟਾ ਫੋਂਟ ਅਕਾਰ"
-
-#~ msgid "Insert link"
-#~ msgstr "ਸਬੰਧ ਸ਼ਾਮਿਲ"
-
-#~ msgid "Insert image"
-#~ msgstr "ਚਿੱਤਰ ਸ਼ਾਮਲ"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "ਸਨੇਹੀ ਆਈਕਾਨ ਵੇਖਾਓ(_i)"
-
-#~ msgid ""
-#~ "You can send this image as a file transfer or embed it into this message, "
-#~ "or use it as the buddy icon for this user."
-#~ msgstr ""
-#~ "ਤੁਸੀਂ ਇਹ ਚਿੱਤਰ ਨੂੰ ਇੱਕ ਫਾਇਲ ਵਾਂਗ ਟਰਾਂਸਫਰ ਕਰ ਸਕਦੇ ਹੋ, ਇਹ ਸੁਨੇਹੇ 'ਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ "
-#~ "ਉਪਭੋਗੀ ਲਈ ਸਨੇਹੀ ਆਈਕਾਨ ਵਾਂਗ ਵਰਤ ਸਕਦੇ ਹੋ।"
-
-#~ msgid "Tools"
-#~ msgstr "ਸੰਦ"
-
-#~ msgid ""
-#~ "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> ਤੋਂ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ।"
+#: ../libpurple/protoc
\ No newline at end of file
diff -r d94432a338ab -r bedd56240914 po/tr.po
--- a/po/tr.po	Fri Sep 28 20:30:07 2007 +0000
+++ b/po/tr.po	Fri Sep 28 20:30:26 2007 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: pigdin-new-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 14:39-0500\n"
+"POT-Creation-Date: 2007-09-25 01:15-0700\n"
 "PO-Revision-Date: 2007-09-11 01:37+0300\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team: Turkish <yerellestirme@kde.org.tr>\n"
@@ -58,7 +58,7 @@
 "  -n, --nologin       otomatik olarak bağlanmanızı engeller\n"
 "  -v, --version       geçerli sürümü gösterir ve çıkar\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -74,7 +74,7 @@
 #: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -109,8 +109,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Muhtemelen'make install' komutunu vermeyi unuttunuz.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
 msgid "Modify Account"
 msgstr "Hesabı Düzenle"
 
@@ -140,7 +140,7 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
 #: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
 #: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
@@ -150,8 +150,8 @@
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
@@ -160,10 +160,10 @@
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/oscar/oscar.c:6092
 #: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -198,16 +198,16 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
+#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
@@ -248,7 +248,7 @@
 msgid "Delete"
 msgstr "Sil"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Hesaplar"
@@ -261,15 +261,16 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Ekle"
@@ -329,19 +330,19 @@
 msgid "Error adding buddy"
 msgstr "Kişi ekleme hatası"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Kayıtlı İsim"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/msn/msn.c:1507
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Görünen İsim"
@@ -353,7 +354,7 @@
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
 #: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
+#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Hesap"
@@ -367,7 +368,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Kişi Ekle"
@@ -376,15 +377,15 @@
 msgid "Please enter buddy information."
 msgstr "Lütfen kişi bilgilerini girin."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Sohbetler"
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1786
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -396,7 +397,7 @@
 msgid "Auto-join"
 msgstr "Otomatik-katıl"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
 msgid "Add Chat"
 msgstr "Sohbet Ekle"
 
@@ -418,7 +419,7 @@
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
 msgid "Add Group"
 msgstr "Grup Ekle"
 
@@ -450,7 +451,7 @@
 msgid "Retrieving..."
 msgstr "Alınıyor..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -461,10 +462,10 @@
 msgstr "Kişi için Uyarıcı Ekle"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1660
 msgid "Send File"
 msgstr "Kişiye Dosya Gönder"
 
@@ -511,14 +512,14 @@
 msgstr "Kaldırmayı Onayla"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Kaldır"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Pidgin - Kişi Listesi"
@@ -537,15 +538,15 @@
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -555,7 +556,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "Takma ad"
 
@@ -564,12 +565,12 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "Boşta"
 
@@ -600,36 +601,36 @@
 "\n"
 "Son Görülme Zamanı: %s önce"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Yeni..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Kaydedilmiş..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
+#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
 msgid "_Name"
 msgstr "_İsim"
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
+#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
 msgid "_Account"
 msgstr "_Hesap"
 
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
 msgid "New Instant Message"
 msgstr "Yeni Anlık İleti"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -639,15 +640,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
+#: ../libpurple/protocols/oscar/oscar.c:6091
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -664,45 +665,57 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "Tamam"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Seçenekler"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2267
 msgid "Send IM..."
 msgstr "Anlık İleti Gönder..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
+#: ../finch/gntblist.c:2271
+#, fuzzy
+msgid "Show"
+msgstr "Tümünü Göster"
+
+#: ../finch/gntblist.c:2276
+#, fuzzy
+msgid "Empty groups"
 msgstr "Boş grupları göster"
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Çevrimdışı Kişileri Göster"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Duruma göre sırala"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Alfabetik olarak sırala"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Kayıt büyüklüğüne göre sırala"
+#: ../finch/gntblist.c:2282
+#, fuzzy
+msgid "Offline buddies"
+msgstr "Çevrimdışı kişileri göster"
+
+#: ../finch/gntblist.c:2288
+#, fuzzy
+msgid "Sort"
+msgstr "Port"
+
+#: ../finch/gntblist.c:2293
+#, fuzzy
+msgid "By Status"
+msgstr "Duruma göre"
+
+#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
+msgid "Alphabetically"
+msgstr "Alfabetik"
+
+#: ../finch/gntblist.c:2301
+#, fuzzy
+msgid "By Log Size"
+msgstr "Kayıt büyüklüğüne göre"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 #, fuzzy
@@ -801,7 +814,7 @@
 msgid "Hostname"
 msgstr "Barındırıcı adı"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Bilgi"
@@ -809,24 +822,24 @@
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
 #: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Kapat"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s kullanıcısının bağlantısı kesildi."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -839,7 +852,7 @@
 "Finch, siz hatayı düzeltip hesabınızı yeniden etkinleştirene kadar yeniden "
 "bağlanmayacak."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
 msgid "Re-enable Account"
 msgstr "Hesabı Yeniden Etkinleştir"
 
@@ -847,23 +860,23 @@
 msgid "No such command."
 msgstr "Böyle bir komut yok."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Söz Dizimi Hatası: Komut için yanlış sayıda parametre verdiniz."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
 msgid "Your command failed for an unknown reason."
 msgstr "Bilinmeyen bir sebepten dolayı verdiğiniz komut başarısız oldu."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
 msgid "That command only works in chats, not IMs."
 msgstr "Bu komut anlık iletiler için değildir, sadece sohbetlerde çalışır."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
 msgid "That command only works in IMs, not chats."
 msgstr "Bu komut sohbet için değildir, sadece anlık iletilerde çalışır."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
 msgid "That command doesn't work on this protocol."
 msgstr "Bu komut, bu protokol üzerinde çalışmaz."
 
@@ -881,7 +894,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -894,61 +907,61 @@
 msgid "You have left this chat."
 msgstr "Sobetten ayrıldınız."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Kayıt tutma başlatıldı. Bundan sonraki iletiler kaydedilecek."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Kayıt tutma durduruldu. Bundan sonraki iletiler kaydedilmeyecek."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "Gönder"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Yazışma"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Yazışma/Temi_zle"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Zaman Etiketlerini Göster"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Kişi için Uyarıcı Ekle..."
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
 msgstr "Kayıt Tutmayı Etkinleştir"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
 msgstr "Sesleri Etkinleştir"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<OTOMATİK-YANIT> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Kullanıcı listesi:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
 msgid "Supported debug options are:  version"
 msgstr "Desteklenen hata ayıklama seçenekleri:  versiyon"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "Böyle bir komut yok (burada)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090 ../pidgin/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"
@@ -957,58 +970,58 @@
 "alabilirsiniz.\n"
 "Aşağıdakiler burada geçerli olan komutlardır:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "say &lt;mesaj&gt;:  Komut kullanmıyormuşunuz gibi ileti göndermenizi sağlar."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;action&gt;:  Kişiye ya da sohbet odasına IRC stili hareket gönder."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;option&gt;:  Bu konuşmaya çeşitli hata ayıklama bilgileri yolla."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Konuşma ekranını temizler."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komut&gt;:  Belirtilen komutla ilgili yardım almanızı sağlar."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Sohbete katılan kullanıcıların listesini göster."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Eklentiler penceresini gösterir."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Kişi Listesini gösterir."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Hesaplar penceresini gösterir."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Hata ayıklama penceresini gösterir."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: Tercihler penceresini gösterir."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Kaydedilmiş durumlar penceresini gösterir."
 
@@ -1072,17 +1085,17 @@
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2696
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Durum"
@@ -1126,7 +1139,7 @@
 msgid "Finished"
 msgstr "Bitti"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
 msgid "Transferring"
 msgstr "Aktarılıyor"
 
@@ -1138,11 +1151,11 @@
 msgid "You have mail!"
 msgstr "E-postanız var!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
 msgid "Sender"
 msgstr "Gönderen"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
 msgid "Subject"
 msgstr "Konu"
 
@@ -1166,23 +1179,23 @@
 msgid "Buddy Information"
 msgstr "Kişi Bilgileri"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Devam Et"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
 msgid "IM"
 msgstr "Anında Mesajlaşma"
 
-#: ../finch/gntnotify.c:389
+#: ../finch/gntnotify.c:392
 msgid "Join"
 msgstr "Katıl"
 
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Davet Et"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:398
 msgid "(none)"
 msgstr "(hiçbiri)"
 
@@ -1237,7 +1250,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -1416,7 +1429,6 @@
 msgstr "%s size bir ileti göndermek istiyor, (%s)"
 
 #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Bilinmeyen uyarı olayı. Lütfen bunu raporlayın !"
 
@@ -1424,12 +1436,12 @@
 msgid "Based on keyboard use"
 msgstr "Klavye kullanımına göre"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "Gönderilen son iletiden"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Asla"
@@ -1479,12 +1491,12 @@
 msgstr "Durumu değiştir"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Yazışmalar"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "Kayıtlar"
 
@@ -1550,8 +1562,8 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer başlatılırken hata oluştu."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
 msgid "(default)"
 msgstr "(öntanımlı)"
 
@@ -1567,7 +1579,7 @@
 msgid "Profiles"
 msgstr "Profiller"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -1575,7 +1587,7 @@
 msgid "Console Beep"
 msgstr "Konsol Bip Sesi"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "Komut"
 
@@ -1583,7 +1595,7 @@
 msgid "No Sound"
 msgstr "Ses Yok"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "Ses Davranışları"
 
@@ -1601,7 +1613,7 @@
 "(dosya ismi için %s)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "Ses Seçenekleri"
 
@@ -1610,17 +1622,17 @@
 msgstr "Sohbet odaklandığında ses çıkarır"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Her zaman"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "Sadece erişilebilir olduğumda"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "Sadece erişilebilir olmadığımda"
 
@@ -1629,11 +1641,11 @@
 msgstr "Ses Düzeyi (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "Ses Olayları"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "Olay"
 
@@ -1641,15 +1653,15 @@
 msgid "File"
 msgstr "Dosya"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "Test Et"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "Seç..."
 
@@ -1669,7 +1681,7 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Başlık"
@@ -1700,17 +1712,20 @@
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5784
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:5807
+#: ../libpurple/protocols/oscar/oscar.c:5814
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1718,8 +1733,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/yahoo/yahoo.c:3750
+#: ../libpurple/protocols/yahoo/yahoo.c:3756
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1775,7 +1790,7 @@
 msgid "Certificates"
 msgstr "Sertifikalar"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "Sesler"
 
@@ -1875,16 +1890,16 @@
 msgid "Toaster plugin"
 msgstr "Toaster eklentisi"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b> %s ile %s üzerindeki diyalog:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
 msgid "History Plugin Requires Logging"
 msgstr "Geçmiş Eklentisi Kayıt Tutulmasını Gerektirir"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1901,11 +1916,11 @@
 msgid "GntHistory"
 msgstr "Geçmiş"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Son kaydedilen yazışmayı gösterir."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1917,16 +1932,15 @@
 msgid "Lastlog"
 msgstr "Son Kayıt"
 
-#. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Kayıtlar içerisinde bir ifadeyi aramanızı sağlar."
 
-#: ../finch/plugins/lastlog.c:122
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "Son Kayıt"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Son Kayıt eklentisi"
 
@@ -1958,7 +1972,7 @@
 msgstr "%s eklentisi için eksik protokol"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkblist.c:4318
 msgid "Connection Error"
 msgstr "Bağlantı Hatası"
 
@@ -2003,16 +2017,16 @@
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2153,7 +2167,7 @@
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1882
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2165,7 +2179,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1891
 #, fuzzy
 msgid "Certificate Information"
 msgstr "Sunucu Bilgileri"
@@ -2190,9 +2204,9 @@
 msgstr "+++ %s çıkış yaptı"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:361
 msgid "Unknown error"
 msgstr "Bilinmeyen Hata"
 
@@ -2308,7 +2322,6 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Çözümleme sürecinde dosyanın sonuna ulaşıldı"
 
@@ -2417,7 +2430,6 @@
 msgstr "%s transferi tamamlandı"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "Dosya transferi tamamlandı"
 
@@ -2427,7 +2439,6 @@
 msgstr "Dosya Transferinden Vazgeçildi (%s)"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Dosya transferinden vazgeçildi"
 
@@ -2686,7 +2697,6 @@
 msgstr "%s kullanıyorsunuz fakat bu eklenti %s gerektiriyor."
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Bu eklentinin bir kimliği yok."
 
@@ -2771,13 +2781,13 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "İp_tal"
 
@@ -2820,8 +2830,8 @@
 "Otomatik olarak kabul edilen bir dosya aktarımı bittiğinde uyar\n"
 "(sadece kullanıcı ile bir sohbet yoksa)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Notes"
 msgstr "Notlar"
 
@@ -3239,9 +3249,9 @@
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3251,9 +3261,9 @@
 msgstr "Evet"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3359,7 +3369,7 @@
 msgstr "Çoğu şeyin çalışıp çalışmadığını görmek için test edin."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
 #: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
 msgstr "X.509 Sertifikaları"
@@ -3370,7 +3380,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3378,8 +3388,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS üzerinden SSL desteği sağlar."
 
@@ -3484,15 +3494,15 @@
 "Kişinin durumundaki değişiklikleri (Dışarda!, burda, vs.) yazışma "
 "penceresinde belirtir."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Eklentisi Yükleyici"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl eklentilerini yükleme desteği sağlar"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3527,7 +3537,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3710,8 +3720,8 @@
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Şehir"
@@ -3720,9 +3730,9 @@
 msgid "Year of birth"
 msgstr "Doğum Yılı"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3735,14 +3745,14 @@
 msgstr "Bay veya Bayan"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr " Bay"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3802,25 +3812,25 @@
 msgstr "Sohbete ekle..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5602
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Çevrimdışı"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Çevrimiçi"
@@ -3830,32 +3840,31 @@
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4543
+#: ../libpurple/protocols/oscar/oscar.c:5630
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3652
+#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "Uzakta"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/oscar/oscar.c:2695
+#: ../libpurple/protocols/oscar/oscar.c:3695
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3706
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3866,7 +3875,7 @@
 msgstr "Doğum Yılı"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3907
 msgid "Unable to display the search results."
 msgstr "Arama sonuçları gösterilemedi."
 
@@ -3910,7 +3919,7 @@
 msgid "Connection failed."
 msgstr "Bağlantı kurulamadı."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
 msgid "Blocked"
 msgstr "Engellenmiş"
 
@@ -4048,7 +4057,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2354
 msgid "Server has disconnected"
 msgstr "Sunucu bağlantısı kesildi"
 
@@ -4074,14 +4083,14 @@
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
 #: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/yahoo/yahoo.c:2938
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Bağlanılıyor"
@@ -4095,20 +4104,20 @@
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
+#: ../libpurple/protocols/myspace/myspace.c:318
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/simple/simple.c:1633
 msgid "Couldn't create socket"
 msgstr "Soket yaratılamadı"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2467
 #: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Ana bilgisayara bağlanılamadı"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Read error"
 msgstr "Okuma hatası"
 
@@ -4148,22 +4157,22 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:6669
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../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:1896
+#: ../libpurple/protocols/simple/simple.c:1898
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Sunucu"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
+#: ../libpurple/protocols/oscar/oscar.c:6672
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4235,7 +4244,7 @@
 msgstr "<i>(tanımlandı)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3696
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4507,7 +4516,7 @@
 msgstr "names [channel]: Kanaldaki kullanıcıları listeler"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2299
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Nick (takma adınızı) değiştirir."
 
@@ -4651,7 +4660,7 @@
 msgid "Ad-Hoc Command Failed"
 msgstr "Komut pasifleştirildi"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 #, fuzzy
 msgid "execute"
 msgstr "Beklenmeyen"
@@ -4799,15 +4808,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/oscar/oscar.c:3745
 msgid "Birthday"
 msgstr "Doğum Günü"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Açıklama"
@@ -5121,7 +5130,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2902
 msgid "Capabilities"
 msgstr "Yetenekler"
 
@@ -5148,8 +5157,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5168,112 +5177,111 @@
 msgid "Logo"
 msgstr "Amblem"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Gizleme"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Geçici Olarak Gizlen"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Sunucuda Bulunma Bildirimini İptal Et"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Yeniden İzin İste"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Üyelikten Çık"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 #, fuzzy
 msgid "Log In"
 msgstr "Çevrimiçi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 #, fuzzy
 msgid "Log Out"
 msgstr "Sohbetleri kaydet"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Konuşkan"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Uzun Süreli Uzakta"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5806
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Rahatsız Etme"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3707
 msgid "Last Name"
 msgstr "Soyad"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Arama sonuçlarınız"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "Dizin Sorgusu Başarısız Oldu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "Dizin sunucu sorgulanamadı."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Sunucu Bilgileri: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Eşleşen bir XMPP kullanıcısını arama için en az bir alanı doldurun."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "E-Mail Address"
 msgstr "E-Posta Adresi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Bir XMPP kullanıcısı ara"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5285,24 +5293,24 @@
 msgid "Search"
 msgstr "Ara"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Geçersiz Klasör"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Bir Kullanıcı Dizini Seçin"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Aramak için bir kullanıcı dizini seçin"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Arama Dizini"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5290
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Oda:"
@@ -5413,9 +5421,9 @@
 msgstr "Okuma hatası"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2557
+#: ../libpurple/protocols/yahoo/yahoo.c:2589
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5480,8 +5488,8 @@
 msgstr "Zaten Kayıtlı"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "State"
 msgstr "Durum"
 
@@ -5565,7 +5573,7 @@
 msgstr "Yayın Başlatılıyor"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Authenticating"
 msgstr "Kimlik Doğrulaması Yapılıyor"
 
@@ -5578,7 +5586,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5600
 msgid "Not Authorized"
 msgstr "Yetki Verilmemiş"
 
@@ -5747,7 +5755,7 @@
 msgstr "Lütfen yeni parolanızı girin"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6386
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5755,7 +5763,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6397
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6016,33 +6024,52 @@
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "%s dosyası gönderilemedi, kullanıcı dosya aktarımlarını desteklemiyor"
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, fuzzy
+msgid "Buzz"
+msgstr "titreşim"
+
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s şimdi bağlı."
+
+#: ../libpurple/protocols/jabber/jabber.c:2252
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "Buzzing %s..."
+msgstr "Titreşim gönderiliyor"
+
+#: ../libpurple/protocols/jabber/jabber.c:2291
 msgid "config:  Configure a chat room."
 msgstr "config:  Sohbet odasını düzenle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Sohbet odasını düzenle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "part [room]:  Leave the room."
 msgstr "part [oda]:  Sohbetten ayrıl"
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "register:  Register with a chat room."
 msgstr "register:  Sohbet odasına kayıt ol"
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2315
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [yeni konu]:  Konuyu değiştir veya görüntüle"
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;user&gt; [room]:  Kullanıcıyı odadan uzun süreli uzaklaştırır "
 "(banlar)."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2327
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6050,7 +6077,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Bir "
 "kullanıcının odayla ilişkisini ayarlar."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2333
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6058,29 +6085,29 @@
 "role &lt;kullanıcı&gt; &lt;yönetici|katılımcı|ziyaretçi|hiçbiri&gt;: Bir "
 "kullanıcının odadaki rolünü ayarla."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2339
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Bir kullanıcıyı odaya davet eder"
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2345
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;oda&gt; [sunucu]:  Ağdaki sohbete katıl"
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Birini odadan atar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;takmaisim&gt; &lt;mesaj&gt;:  Kullanıcıya özel mesaj gönder"
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2362
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Kullanıcının sizi farketmesi için titreşim yollar"
 
@@ -6117,8 +6144,8 @@
 msgstr "Şifrelenmemiş sistemlerden gelen düzyazılara (plain text) izin ver."
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3275
+#: ../libpurple/protocols/simple/simple.c:1904
 msgid "Connect port"
 msgstr "Bağlantı portu"
 
@@ -6126,7 +6153,7 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3272
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6161,12 +6188,6 @@
 msgid "XMPP Message Error"
 msgstr "XMPP İleti Hatası"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s şimdi bağlı."
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6176,16 +6197,16 @@
 msgid "XML Parse error"
 msgstr "XML ayrıştırma hatası"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:422
 msgid "Unknown Error in presence"
 msgstr "Bilinmeyen Hata"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:503
+#: ../libpurple/protocols/jabber/presence.c:504
 msgid "Create New Room"
 msgstr "Yeni Oda Oluştur"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6193,20 +6214,20 @@
 "Yeni bir oda oluşturuyorsunuz.  Odayı yapılandırmak mı öntanımlı ayarları "
 "kullaanmak mı istersiniz?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:511
 msgid "_Configure Room"
 msgstr "_Odayı Düzenle"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Accept Defaults"
 msgstr "Varsayılanları _Kabul Et"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:554
 #, c-format
 msgid "Error in chat %s"
 msgstr "%s sohbetinde hata"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:558
 #, c-format
 msgid "Error joining chat %s"
 msgstr "%s sohbetine katılırken hata"
@@ -6283,7 +6304,7 @@
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "Takma ad"
@@ -6298,19 +6319,29 @@
 msgid "Select an action"
 msgstr "Bir dosya seçin"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:207
+#, fuzzy
+msgid "Unable to connect to contact server"
+msgstr "Sunucuya bağlanılamadı."
+
+#: ../libpurple/protocols/msn/contact.c:954
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Kişi Listesi Getirme Hatası"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, 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 ""
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6318,241 +6349,194 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "Mesaj ayrıştırılamıyor"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sözdizimi hatası (muhtemelen bir istemci hatası)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "Geçersiz e-posta adresi"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "Kullanıcı mevcut değil"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fully qualified domain name (FQDN) yok"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "Zaten çevrimiçi"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "Geçersiz kayıtlı isim"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Geçersiz arkadaşlık ismi"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "Tümünü listele"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "Zaten orada"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "Listede değil"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "Kullanıcı çevrimdışı"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "Zaten modda"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "Zaten karşı listede"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "Çok fazla grup"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "Geçersiz grup"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "Kişi grupta değil"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "Grup adı çok uzun"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Sıfır grup silinemez"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Bir kişi, henüz bulunmayan bir gruba eklenilmeye çalışıldı"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "Santral başarısız oldu"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Uyarı aktarımı başarısız oldu"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "Gerekli alanlar eksik"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND a çok fazla vuru"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "Oturum açılmamış"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Bu servis geçici olarak hizmet dışı"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "Veritabanı sunucusu hatası"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "Komut pasifleştirildi"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "Dosya işlemi hatası"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "Bellek ayırma hatası"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Yanlış CHL değeri sunucuya yollandı"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "Sunucu meşgul"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "Sunucu geçersiz"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr "Peer bildirim sunucusu çalışmıyor"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "Veritabanı bağlantı hatası"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Sunucu kapanıyor (terkedilmiş gemi)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr "Bağlantı oluşturma hatası"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametrelerinden biri veya hepsi bilinmiyor veya izin verilmiyor"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "Yazılamıyor"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "Oturuma aşırı yüklendi"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "Kullanıcı çok aktif"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "Çok fazla oturum"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport onaylanmadı"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "Kötü arkadaş dosyası"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "Beklenmeyen"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Arkadaşlık adı çok hızlı değişiyor"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "Sunucu çok yoğun"
 
@@ -6561,32 +6545,26 @@
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
 msgid "Authentication failed"
 msgstr "Kimlik denetimi başarısız"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Çevrim dışıyken izin verilmiyor"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "Yeni kullanıcı kabul edilmiyor"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Ebeveyn izinsiz Çocuk Passport hesabı"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport hesabı henüz doğrulanmadı"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "Kötü bilet"
 
@@ -6619,352 +6597,356 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "Yeni MSN arkadaşlık isminiz çok uzun."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:285
 msgid "Set your friendly name."
 msgstr "Arkadaşlık adınızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Bu isim MSN arkadaşlarınıza görünen isminizdir."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:304
 msgid "Set your home phone number."
 msgstr "Ev telefon numaranızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Set your work phone number."
 msgstr "İş telefon numaranızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:338
 msgid "Set your mobile phone number."
 msgstr "Mobil telefon numaranızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN Mobil Sayfalarına izin verilsin mi ?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:354
 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:357
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Allow"
 msgstr "İzin ver"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Disallow"
 msgstr "İzin verme"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:377
 msgid "This Hotmail account may not be active."
 msgstr "Bu Hotmail hesabı aktif olmayabilir."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:403
 msgid "Send a mobile message."
 msgstr "Bir SMS gönder."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:405
 msgid "Page"
 msgstr "Sayfa"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Sizi eklemiş mi ?"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+#, fuzzy
+msgid "Current media"
+msgstr "Geçerli ifade"
+
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3760
 msgid "Be Right Back"
 msgstr "Hemen Dönecek"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Busy"
 msgstr "Meşgul"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "On the Phone"
 msgstr "Telefonda"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Out to Lunch"
 msgstr "Yemekte"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:697
 msgid "Set Friendly Name..."
 msgstr "Arkadaşlık İsmi Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:702
 msgid "Set Home Phone Number..."
 msgstr "Ev Telefonu Numarası Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:706
 msgid "Set Work Phone Number..."
 msgstr "İş Telefonu Numarası Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:710
 msgid "Set Mobile Phone Number..."
 msgstr "Cep Telefonu Numarası Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:716
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobil Aygıtları Etkinleştir/Pasifleştir"
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:721
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobil Sayfalarına İzin Ver/Reddet"
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail Gelen Kutusunu Aç"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:756
 msgid "Send to Mobile"
 msgstr "Cebine Gönder"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Kişiyle Sohbete _Başla"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:804
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN için SSL desteği gereklidir. Lütfen geçerli bir SSL kütüphanesi yükleyin."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:832
 msgid "Failed to connect to server."
 msgstr "Sunucuya bağlanılamadı"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Profil alınırken hata"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Genel"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1698
 #: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Yaş"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1700
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Meslek"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1701
 #: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Konum"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
 msgid "Hobbies and Interests"
 msgstr "Hobiler ve İlgi Alanları"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
 msgid "A Little About Me"
 msgstr "Benim Hakkımda Birkaç Şey"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Social"
 msgstr "Sosyal"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1731
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Medeni Hali"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Interests"
 msgstr "İlgiler"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Pets"
 msgstr "Evcil hayvanlar"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Hometown"
 msgstr "Memleket"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1735
 msgid "Places Lived"
 msgstr "yaşadığı Yerler"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1736
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1737
 msgid "Humor"
 msgstr "Mizah"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1738
 msgid "Music"
 msgstr "Müzik"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msn/msn.c:1926
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "En Sevdiği Söz"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Contact Info"
 msgstr "Bağlantı Bilgileri"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Personal"
 msgstr "Kişisel"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Significant Other"
 msgstr "Önemli Diğerleri"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Home Phone 2"
 msgstr "Ev Telefonu2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Home Address"
 msgstr "Ev Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Personal Mobile"
 msgstr "Kişisel Cep Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1766
 msgid "Personal E-Mail"
 msgstr "Kişisel E-posta"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal IM"
 msgstr "Kişisel Anında Mesajlaşma Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1769
 msgid "Anniversary"
 msgstr "Yıldönümü"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Work"
 msgstr "İş"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1787
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "İşi"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/oscar/oscar.c:3810
 msgid "Company"
 msgstr "Şirket"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Departman"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Profession"
 msgstr "Uzmanlık"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Phone"
 msgstr "İş Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Phone 2"
 msgstr "İş Telefonu2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Address"
 msgstr "İş Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work Mobile"
 msgstr "İş Cep Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Work Pager"
 msgstr "İş Çağrı Cihazı"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Work Fax"
 msgstr "İş Faksı"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Work E-Mail"
 msgstr "İş E-Postası"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Work IM"
 msgstr "İş Anında Mesajlaşma Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1799
 msgid "Start Date"
 msgstr "Başlama Tarihi"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
+#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
 msgid "Favorite Things"
 msgstr "Sevdiği Şeyler"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1934
 msgid "Last Updated"
 msgstr "Son Güncelleme"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1945
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Anasayfa"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1969
 msgid "The user has not created a public profile."
 msgstr "Kullanıcı genel bir profil oluşturmamış."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1970
 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 "
@@ -6973,13 +6955,13 @@
 "MSN kulllanıcının profilini bulamıyor. Bu durumda kullanıcı mevcut değildir, "
 "ya da genel bir profil oluşturmamıştır."
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:1974
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1982
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profil URL"
@@ -6994,101 +6976,106 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protokol Eklentisi"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
+#, fuzzy
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger Protokolü Eklentisi"
+
+#: ../libpurple/protocols/msn/msn.c:2306
 msgid "Use HTTP Method"
 msgstr "HTTP Metodunu Kullan"
 
-#: ../libpurple/protocols/msn/msn.c:2199
+#: ../libpurple/protocols/msn/msn.c:2311
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "IPC Test Sunucusu"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2316
 msgid "Show custom smileys"
 msgstr "Özel gülenyüzleri göster"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2324
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : kullanıcıların sizi farketmesi için dürtme uyarısı"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Bağlanılamıyor"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:275
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "Hata: Kimlik denetimi başarısız"
+
+#: ../libpurple/protocols/msn/notification.c:191
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s geçerli bir grup değil."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:197
+#: ../libpurple/protocols/msn/notification.c:938
+#: ../libpurple/protocols/msn/session.c:369
 msgid "Unknown error."
 msgstr "Bilinmeyen Hata"
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:200
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s - %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:518
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s size bir titreşim gönderdi!"
+
+#: ../libpurple/protocols/msn/notification.c:843
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Bilinmeyen Hata"
+
+#: ../libpurple/protocols/msn/notification.c:844
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Kullanıcı eklenemedi"
+
+#: ../libpurple/protocols/msn/notification.c:904
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kullanıcı %s 'a eklenemiyor (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:908
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s içindeki kullanıcı engellenemiyor (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:912
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s içindeki kullanıcıya izin verilemiyor (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:920
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s eklenemiyor, çünkü listeniz dolu durumda."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:929
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s geçerli bir passport hesabı değil."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:934
 msgid "Service Temporarily Unavailable."
 msgstr "Bu Servis Geçici Olarak Hizmet Dışı"
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1272
 msgid "Unable to rename group"
 msgstr "Grup adı değiştirilemiyor"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1327
 msgid "Unable to delete group"
 msgstr "Grup silinemiyor"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1943
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7110,6 +7097,30 @@
 "\n"
 "Bakım tamamlandığında tekrar başarıyla oturum açabileceksiniz."
 
+#: ../libpurple/protocols/msn/oim.c:141
+#, fuzzy
+msgid "Unable to connect to OIM server"
+msgstr "Sunucuya bağlanılamadı."
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Bağlanılamıyor"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Yazma hatası"
@@ -7127,59 +7138,59 @@
 "%s sunucusuna bağlanma hatası:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:336
 msgid "Our protocol is not supported by the server."
 msgstr "Bu protokol sunucu tarafından desteklenmiyor."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:340
 msgid "Error parsing HTTP."
 msgstr "HTTP ayrıştırma hatası"
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Başka bir programla oturum açtınız."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:349
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN sunucular geçici olarak servis dışıdır. Lütfen bekleyin ve tekrar "
 "deneyin."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:354
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN sunucusu geçici olarak kapatılıyor"
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:359
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Doğruluk kanıtlanamıyor: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:364
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN listenize geçici olarak bağlanılamıyor. Lütfen daha sonra tekrar deneyin."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:385
+#: ../libpurple/protocols/msn/session.c:387
 msgid "Handshaking"
 msgstr "El Sıkışma"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:388
 msgid "Starting authentication"
 msgstr "Kimlik denetleniyor"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Getting cookie"
 msgstr "Çerez alınıyor"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Sending cookie"
 msgstr "Çerez gönderiliyor"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Retrieving buddy list"
 msgstr "Liste alınıyor"
 
@@ -7231,22 +7242,25 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana geldi:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s sizi kişi listesine ekledi."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s sizi kişi listesinden sildi."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" eklenemiyor."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Belirlenen görüntü adı geçersiz."
 
@@ -7273,7 +7287,7 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1798
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM Hatası"
 
@@ -7289,178 +7303,178 @@
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1278
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Sunucuya yapılan bağlantı kapandı (%d saniyedir veri alınamıyor)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1321
 msgid "New mail messages"
 msgstr "Yeni e-posta iletisi"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1322
 msgid "New blog comments"
 msgstr "Yeni günlük yorumları"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1323
 msgid "New profile comments"
 msgstr "Yeni profil yorumları"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1324
 msgid "New friend requests!"
 msgstr "Yeni arkadaşlık isteği!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1325
 msgid "New picture comments"
 msgstr "Yeni resim yorumları"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1355
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:1538
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1549
+#: ../libpurple/protocols/myspace/myspace.c:1551
 msgid "No username set"
 msgstr "Kullanıcı adı ayarlanmadı"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1550
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1777
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokol hatası, kod: %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:2004
 msgid "Failed to add buddy"
 msgstr "Kişi eklenemedi"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1970
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' komutu başarısız oldu."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:2245
 msgid "persist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2113
 #, c-format
 msgid "No such user: %s"
 msgstr "Böyle bir kullanıcı yok: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2114
 msgid "User lookup"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2267
 msgid "Failed to remove buddy"
 msgstr "Kişi silinemedi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2226
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' komutu başarısız oldu"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2267
 msgid "blocklist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2313
 msgid "Invalid input condition"
 msgstr "Geçersiz girdi durumu"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2362
 msgid "Read buffer full"
 msgstr "Okuma ara belleği dolu"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2400
 msgid "Unparseable message"
 msgstr "Ayrıştırılamayan ileti"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2469
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Bilgisayara bağlanılamadı: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2640
 msgid "IM Friends"
 msgstr "Hızlı Mesajlaşma Arkadaşları"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2739
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2740
 msgid "Add contacts from server"
 msgstr "Sunucudan kişileri ekle"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2792
+#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Add friends from MySpace.com"
 msgstr "MySpace.com adresinden yeni arkadaşlar ekle"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2793
 msgid "Importing friends failed"
 msgstr "Arkadaşları içeri aktarma işlemi başarısız oldu"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2849
 msgid "Find people..."
 msgstr "Kişi bul..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2852
 msgid "Change IM name..."
 msgstr "Hızlı Mesajlaşma adını değiştir..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3154
 msgid "myim URL handler"
 msgstr "myim adres yakalayıcı"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3155
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3279
 msgid "Show display name in status text"
 msgstr "Durum metninde görünen ismi göster"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3282
 msgid "Show headline in status text"
 msgstr "Durum metninde başlığı göster"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Send emoticons"
 msgstr "Duygu simgeleri gönder"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3292
 msgid "Screen resolution (dots per inch)"
 msgstr "Ekran Çözünürlüğü (her inç için nokta)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Base font size (points)"
 msgstr "Temel yazıtipi boyutu (pt)"
 
@@ -7472,7 +7486,7 @@
 
 #. TODO: link to username, if available
 #: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/oscar/oscar.c:2960
 msgid "Profile"
 msgstr "Profil"
 
@@ -7776,39 +7790,39 @@
 msgid "Login failed (%s)."
 msgstr "Oturum açma işlemi başarısız (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "İleti gönderilemedi. Kullanıcının ayrıntıları alınamadı (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "%s listenize eklenemedi (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "İleti gönderilemedi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kullanıcı davet edilemedi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "%s kullanıcısına ileti gönderilemedi. Konferans başlatılamıyor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "İleti gönderilemiyor. Konferans başlatılamadı (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7817,7 +7831,7 @@
 "Kullanıcı %s dizini %s sunucudaki listeye taşınamıyor. Dizin oluşturma "
 "hatası (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7826,61 +7840,61 @@
 "Kullanıcı listenize %s eklenemedi. Sunucudaki listede klasör oluşturma "
 "hatası (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "%s için bilgiler alınamadı (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kullanıcı özel listeye eklenemedi (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s engelleme listesine eklenemedi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s izin verilenler listesine eklenemedi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s ögesini gizlilik listesinden silerken hata (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Sunucu taraflı gizilik ayarlarını değiştirmede hata. (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Konferans oluşturulamadı (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Sunucuyla iletişimde kurulurken hata oluştu. Bağlantı kapatılıyor."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefon Numarası"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Başlık"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Kullanıcı Kimliği"
@@ -7891,41 +7905,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Tam Ad"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Konferansı %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Sunucuya SSL bağlantısı yapılamıyor."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Kimlik doğrulaması yapılıyor..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Sunucuya bağlanılamadı."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Sunucudan yanıt bekleniyor..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s bu yazışmaya davet edildi."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Yazışmaya Davet"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7936,16 +7950,15 @@
 "\n"
 "Gönderilen: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Yazışmaya katılmak istiyor musunuz?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Oturumunuz kapandı, çünkü başka bir yerden oturum açtınız."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7955,18 +7968,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "Hata. SSL desteği kurulmamış."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Bu konferans kapandı. Artık iletiler gönderilmeyecek."
 
@@ -7980,31 +7992,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokolü Eklentisi"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Sunucu adresi"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Sunucu portu"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2635
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "Sunucu bağlantıyı kapattı."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2462
+#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
@@ -8015,7 +8027,7 @@
 "Sunucu ile bağlantı kesildi:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/protocols/oscar/flap_connection.c:394
 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
 #: ../libpurple/proxy.c:1478
@@ -8053,7 +8065,7 @@
 msgstr "ICQ Protokolü Eklentisi"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodlama"
@@ -8224,7 +8236,7 @@
 msgstr "Sohbet"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Get File"
 msgstr "Dosyayı Al"
 
@@ -8297,49 +8309,43 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5778
 msgid "Free For Chat"
 msgstr "Sohbet için Hazır"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5813
 msgid "Not Available"
 msgstr "Erişilebilir Değil"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Occupied"
 msgstr "Meşgul"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "Web'e Açık"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
 msgid "Invisible"
 msgstr "Görünmez"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "Çevrimiçi"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP Adresi"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Warning Level"
 msgstr "Uyarı Seviyesi"
 
@@ -8390,14 +8396,14 @@
 "devam etmelidir."
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2104
 msgid "Invalid screen name."
 msgstr "Geçersiz kullanıcı adı"
 
 #: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:2125
 msgid "Incorrect password."
 msgstr "Yanlış parola."
 
@@ -8449,10 +8455,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_Tamam"
 
@@ -8489,31 +8495,31 @@
 msgid "Unable to initialize connection"
 msgstr "Bağlantı başlatılamadı"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2198
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2226
 msgid "Authorization Request Message:"
 msgstr "İzin İsteme İletisi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2227
 msgid "Please authorize me!"
 msgstr "Lütfen sizi eklememe izin verin!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2268
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "No reason given."
 msgstr "Sebep yazılmamış."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "İzin Reddetme İletisi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8524,17 +8530,17 @@
 "vermiyor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ izni (yetkisi) reddedildi."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "%u kullanıcısı onu kişi listenize eklemenize izin verdi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8547,7 +8553,7 @@
 "Kimden: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8560,7 +8566,7 @@
 "Kimden: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8573,36 +8579,36 @@
 "Mesaj:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ kullanıcısı %u size bir arkadaş yolladı: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Bunu arkadaş listenize eklemek istiyor musunuz?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Ekle"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Reddet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2592
 #, 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 mesajı %s gönderinden geçersiz olduğu için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2601
 #, 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 mesajı %s gönderinden çok uzun olduğu için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8610,19 +8616,19 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "%hu mesajı %s gönderinden limiti aştığınız için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2619
 #, 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 mesajı %s gönderinden, o çok günahkar olduğu için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2628
 #, 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 mesajı %s gönderinden çok günahkar olduğunuz için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2637
 #, 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."
@@ -8630,47 +8636,47 @@
 "%hu mesajı %s gönderinden bilinmeyen bir sebepten dolayı kaçırdınız."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesaj gönderilemedi: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2797
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Unknown reason."
 msgstr "Bilinmeyen Sebep."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2795
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Mesaj %s e gönderilemedi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2861
 #, c-format
 msgid "User information not available: %s"
 msgstr "%s kullanıcı bilgisi mevcut değil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Online Since"
 msgstr "Bağlı olduğu süre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2897
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Üye olduğu süre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2932
 msgid "Available Message"
 msgstr "Erişilebilir İletisi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3040
 msgid "Your AIM connection may be lost."
 msgstr "AIM bağlantınız kaybolmuş olabilir."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3228
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8678,7 +8684,7 @@
 "[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
 "gösterilemiyor.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3392
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8686,82 +8692,81 @@
 "Yaptığınız son işlem gerçekleştirilemiyor çünkü deneme limitini aştınız. "
 "Lütfen 10 saniye daha bekleyin ve tekrar deneyin."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3475
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s sohbet odasından bağlantınız koptu."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3755
 msgid "Personal Web Page"
 msgstr "Kişisel Web Sayfası"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Ek Bilgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/oscar/oscar.c:3800
 msgid "Zip Code"
 msgstr "Posta Kodu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Division"
 msgstr "Bölüm"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "Position"
 msgstr "Pozisyon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Web Page"
 msgstr "Web Sayfası"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Work Information"
 msgstr "İş Bilgileri"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3873
 msgid "Pop-Up Message"
 msgstr "Açılır Pencere Mesajı"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Katyıtlı olan şu isimler %s ile ilişkilendirilmiş"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3918
 msgid "Screen name"
 msgstr "Kayıtlı isim"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "%s e-posta adresi için sonuç bulunamadı"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3965
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s onayı soracak bir e-posta almalısınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3967
 msgid "Account Confirmation Requested"
 msgstr "Hesap Doğrulama İstendi"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:3998
 msgid "Error Changing Account Info"
 msgstr "Hesap Bilgileri Değiştirilirken Hata"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8769,12 +8774,12 @@
 msgstr ""
 "Hata 0x%04x: Görüntü adı biçimlendirilemiyor. Çünkü orjinal addan farklı."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Hata 0x%04x: Görüntü ismi biçimlendirilemiyor çünkü geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8783,7 +8788,7 @@
 "Hata 0x%04x: Görüntü ismi biçimlendirilemiyor çünkü istediğiniz isim çok "
 "uzun."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8792,7 +8797,7 @@
 "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü zaten bir görüntü adı "
 "değiştirmesi bekleniyor."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8801,39 +8806,39 @@
 "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü birden fazla görüntü "
 "adı bu adresle eşleştirilmiş."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Hata 0x%04x: Bilinöeyen hata"
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s için e-posta adresi %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4031
 msgid "Account Info"
 msgstr "Hesap Bilgileri"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4214
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "IM Resminiz gönderilemedi. Anlık ileti resminizi gönderebilmeniz için Direkt "
 "Bağlanmış olmanız gerekmektedir."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4485
 msgid "Unable to set AIM profile."
 msgstr "AIM profili belirlenemiyor"
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4486
 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 "
@@ -8843,7 +8848,7 @@
 "çalıştınız. Profiliniz belirsizleştirildi, tamamen bağlandığınızda tekrar "
 "ayarlamayı deneyin."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8854,11 +8859,11 @@
 msgstr[0] ""
 "Maksimum profil uzunluğu olan %d bayt aşıldığından profiliniz kısaltıldı."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "Profil çok uzun."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4550
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8869,11 +8874,11 @@
 msgstr[0] ""
 "Maksimum uzakta iletisi uzunluğu %d bayt aşıldığından iletiniz kısaltıldı."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4555
 msgid "Away message too long."
 msgstr "Uzakta iletiniz çok uzun."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8883,17 +8888,17 @@
 "%s kişisi eklenemiyor çünkü görünen adı geçersiz. Görüntü adı bir harfle "
 "başlamalı ve sadece harf, rakam, boşluk ve numaralarla devam etmelidir."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Eklenemiyor"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4735
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kişi Listesi Getirme Hatası"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4736
 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."
@@ -8902,15 +8907,15 @@
 "erişilemez durumda.  Kişi listeniz kaybolmadı, muhtemelen birkaç saat içinde "
 "yeniden aktif olacaktır."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4918
+#: ../libpurple/protocols/oscar/oscar.c:4920
+#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "Orphans"
 msgstr "Kimsesizler"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8919,39 +8924,39 @@
 "%s kişisi eklenemedi çünkü kişi listenizde çok kişi var. Bir tanesini silin "
 "ve işlemi tekrarlayın."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Bilinmeyen bir sebepten dolayı %s kişisi eklenemedi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5174
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5182
 msgid "Authorization Given"
 msgstr "Yetki Verildi"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5255
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "%s kullanıcısı onu listenize ekleme iznini sağladı."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5256
 msgid "Authorization Granted"
 msgstr "İzin Sağlandı"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8959,53 +8964,53 @@
 "%s"
 msgstr "%s kullanıcısı onu listenize ekleme iznini vermiyor. Şu sebepten: n%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Denied"
 msgstr "İzin Verilmedi"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5296
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Değişim:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5336
 msgid "Invalid chat name specified."
 msgstr "Geçersiz sohbet adı belirlendi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5405
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Anlık İletici (IM) resminiz yollanmadı. AIM sohbetlerinde kişisel "
 "görüntüleri yollayamazsınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5567
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "Away Message"
 msgstr "Uzakta İletisi"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(alınıyor)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5772
 msgid "iTunes Music Store Link"
 msgstr "iTunes Müzik Deposu Bağlantısı"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s kişisi için açıklama"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid "Buddy Comment:"
 msgstr "Kişi Açıklaması:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5928
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s ile direkt anlık mesajllaşma bağlantısını açmayı seçtiniz."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5932
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9013,64 +9018,64 @@
 "Çünkü bu IP adresinizi gösterir ve bu bir güvenlik tehdidi içerir.  Devam "
 "etmek istiyor musunuz?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:5938
 #: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "_Bağlan"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get AIM Info"
 msgstr "AIM Bilgilerini Al"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "Edit Buddy Comment"
 msgstr "Kişi Açıklaması Düzenle"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:5987
 msgid "Get Status Msg"
 msgstr "Durum İletisi Al"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "Direct IM"
 msgstr "Doğrudan IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6022
 msgid "Re-request Authorization"
 msgstr "Yeniden İzin İste"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6081
 msgid "Require authorization"
 msgstr "İzin gereksin"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web'e açık (SPAM iletiler almanıza neden olabilir!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "ICQ Privacy Options"
 msgstr "ICQ Gizlilik Seçenekleri"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6108
 msgid "The new formatting is invalid."
 msgstr "Yeni biçimlendirme geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6109
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "Change Address To:"
 msgstr "Adresi Şöyle Değiştir:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6208
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>izin için beklemiyorsunuz</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Şu kullanıcılardan izin bekliyorsunuz"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9078,73 +9083,73 @@
 "Kullanıcıya sağ tıklayıp \"Yeniden İzin İste\" ye tıklayarak yeniden bu "
 "kullanıcıdan izin isteyebilirsiniz."
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6229
 msgid "Find Buddy by E-Mail"
 msgstr "E-Posta ile Arkadaş Bul"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6230
 msgid "Search for a buddy by e-mail address"
 msgstr "E-Posta adresiyle bir arkadaş ara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Aradığınız arkadaşın e-posta adresini yazın."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "_Search"
 msgstr "_Ara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6392
 msgid "Set User Info (URL)..."
 msgstr "Kullanıcı Bilgisini Ayarla (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Change Password (URL)"
 msgstr "Parola değiştir (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6407
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM Yönlendirmeyi yapılandır (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6417
 msgid "Set Privacy Options..."
 msgstr "Gizlilik Seçeneklerini Ayarla..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6424
 msgid "Confirm Account"
 msgstr "Hesabı Doğrula"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6428
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Halen Kayıtlı Olan E-posta Adreslerini Göster"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Şimdiki Katıtlı Olunan E-posta Adresini Değiştir..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6439
 msgid "Show Buddies Awaiting Authorization"
 msgstr "İzin Bekleyen Kişileri Göster"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6445
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "E-Posta Adresine Göre Kişi Ara..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6450
 msgid "Search for Buddy by Information"
 msgstr "Kişi Bilgilerine Göre Kişi Ara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6518
 msgid "Use recent buddies group"
 msgstr "En son kişi grubunu kullan"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Show how long you have been idle"
 msgstr "Ne kadar süredir bağlı olduğunuzu göster"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6676
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9164,7 +9169,6 @@
 msgstr "%s kullanıcısına bağlantı sağlanmaya çalışılıyor:%hu."
 
 #: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Bir proxy sunucu üzerinden bağlanmaya çalışılıyor."
 
@@ -9625,7 +9629,7 @@
 msgid "Error requesting login token"
 msgstr ""
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "Oturum açılamıyor, hata aıklama kayıtlarına bakın"
 
@@ -9996,7 +10000,7 @@
 msgid "Send TEST Announcement"
 msgstr "TEST Anonsu Gönder"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
 msgid "Topic:"
 msgstr "Konu:"
 
@@ -10019,7 +10023,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -10068,10 +10072,6 @@
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Kullanıcı eklenemedi"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10183,7 +10183,7 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
 msgid "Search Results"
 msgstr "Arama Sonuçları"
 
@@ -10752,7 +10752,6 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanal Modları:</b> "
 
@@ -10791,7 +10790,6 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11407,7 +11405,6 @@
 msgstr "SILC sunucusuna bağlanılıyor"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr "SILC anahtar çifti yüklenemedi"
 
@@ -11436,8 +11433,7 @@
 msgstr "Ruh Haliniz"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "Normal"
 
@@ -11830,7 +11826,7 @@
 msgstr "Güvenli Internet Canlı Konferans (SILC) Protokolü"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "Ağ"
 
@@ -12026,52 +12022,42 @@
 msgstr "Sunucu istatistikleri mevcut değil"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Başarısız: Sürüm uyuşmazlığı, programı güncelleştirin"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Başarısız: Kontrol özel anahtarınıza güvenmiyor veya onu desteklemiyor"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Başarısız: Kontrol, KE grup teklifini desteklemiyor"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Başarısız: Kontrol, şifreleme teklifini desteklemiyor"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Başarısız: Kontrol, PKCS teklifini desteklemiyor"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Başarısız: Kontrol, hash fonksiyonunun teklifini desteklemiyor"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Başarısız: Kontrol, HMAC teklifini desteklemiyor."
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Hata: Yanlış imza"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Hata: Geçersiz çerez"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Hata: Kimlik denetimi başarısız"
 
@@ -12098,31 +12084,31 @@
 msgstr "Yazılamadı"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:1531
 msgid "Could not connect"
 msgstr "Bağlanılamadı"
 
-#: ../libpurple/protocols/simple/simple.c:1059
+#: ../libpurple/protocols/simple/simple.c:1061
 #, fuzzy
 msgid "Unknown server response."
 msgstr "Bilinmeyen Sebep."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1607
+#: ../libpurple/protocols/simple/simple.c:1620
+#: ../libpurple/protocols/simple/simple.c:1671
 msgid "Could not create listen socket"
 msgstr "Dinleme soketi yaratılamadı"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't resolve host"
 msgstr "Ana bilgisayar çözümlenemedi"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1679
 msgid "Could not resolve hostname"
 msgstr "Makine adı çözümlenemedi"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1696
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 
@@ -12134,36 +12120,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokol Eklentisi"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1901
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Durumu Yayımla (not: herkes sizi görebilir)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
-msgid "Use UDP"
-msgstr "UDP Kullan"
-
 #: ../libpurple/protocols/simple/simple.c:1907
+msgid "Use UDP"
+msgstr "UDP Kullan"
+
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Use proxy"
 msgstr "Proxy kullan"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth User"
 msgstr "Kullanıcı Kimliğini Doğrula"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1915
 msgid "Auth Domain"
 msgstr "Makine Kimliğini Doğrula"
 
@@ -12208,7 +12194,6 @@
 msgstr "%s 'nin uyarısına izin verilmiyor"
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Bir ileti düşürüldü, sunucunun hız limitini aşıyorsunuz."
 
@@ -12233,47 +12218,38 @@
 msgstr "%s tarafından gönderilen mesaj çok hızlı gönderildiği için alınamadı."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Başarısız."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Çok sonuç var."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Daha fazla niteleyici gerek."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Bu servis geçici olarak hizmet dışıdır."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-posta araması yasaklandı."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "İpucu gözardı edildi."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Anahtar sözcük yok."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Kullanıcı dizin bilgisine sahip değil."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Ülke desteklenmiyor."
 
@@ -12283,22 +12259,18 @@
 msgstr "Bilinmeyen hata: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Yanlış takma ad veya parola."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Bu servis geçici olarak hizmet dışıdır."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Uyarı düzeyiniz şuan oturum açabilmek için çok yüksek."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12339,8 +12311,8 @@
 msgid "Password Change Successful"
 msgstr "Şifreniz  Başarıyla Değiştirildi"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
+#: ../pidgin/gtkblist.c:6227
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -12399,41 +12371,41 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protokol Eklentisi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! mesajınız yollanamadı."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:959
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sistem mesajı %s için:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
 msgid "Authorization denied message:"
 msgstr "İzin reddetme iletisi:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1046
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1051
 msgid "Add buddy rejected"
 msgstr "Kişi ekleme reddedildi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1993
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12441,11 +12413,11 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! Kimlik Denetimi Başarısız"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2062
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12455,48 +12427,48 @@
 "listenizde. \"Evet\"e tıkladığınız takdirde bu kullanıcı listenizden "
 "silinecek ve yok sayılacaktır."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 msgid "Ignore buddy?"
 msgstr "Kişiyi yoksay?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2185
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 msgid "Could not add buddy to server list"
 msgstr "Arkadaşınız sunucu listesine eklenemedi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Sesli %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2650
 msgid "Received unexpected HTTP response from server."
 msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2674
+#: ../libpurple/protocols/yahoo/yahoo.c:2860
+#: ../libpurple/protocols/yahoo/yahoo.c:2963
+#: ../libpurple/protocols/yahoo/yahoo.c:2973
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Bağlantı sorunu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12505,7 +12477,7 @@
 "%s sunucusu ile bağlantı kesildi:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2725
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12514,113 +12486,103 @@
 "%s sunucusu ile bağlantı sağlanamadı:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Not at Home"
 msgstr "Evde Değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Desk"
 msgstr "Büroda Değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not in Office"
 msgstr "Ofiste Değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On Vacation"
 msgstr "Tatilde"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Stepped Out"
 msgstr "_Dışarı Çıktı"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3185
+#: ../libpurple/protocols/yahoo/yahoo.c:3215
 msgid "Not on server list"
 msgstr "Sunucu listesinde değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
 msgid "Appear Online"
 msgstr "Çevrimiçi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görün"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Presence"
 msgstr "Bulunma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3296
 msgid "Appear Offline"
 msgstr "Çevrimdışı Görün"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3305
 msgid "Don't Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görünme"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3353
 msgid "Join in Chat"
 msgstr "Sohbete Katıl"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3359
 msgid "Initiate Conference"
 msgstr "Konferans Başlat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3387
 msgid "Presence Settings"
 msgstr "Bulunma Ayarları"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3393
 msgid "Start Doodling"
 msgstr "Karalamaya Başla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Activate which ID?"
 msgstr "Hangi Kimlik etkinleştirilsin?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Join whom in chat?"
 msgstr "Kullanıcıyla sohbet et..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
 msgid "Activate ID..."
 msgstr "ID'yi aktifleştir..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3521
 msgid "Join User in Chat..."
 msgstr "Kullanıcıyla Sohbet Et..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3526
 msgid "Open Inbox"
 msgstr "Gelen Kutusunu Aç"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "titreşim"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, fuzzy, c-format
-msgid "Buzzing %s..."
-msgstr "Titreşim gönderiliyor"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4135
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4140
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Yahoo ağındaki kanalları listele"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4148
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12634,56 +12596,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
+#: ../libpurple/protocols/yahoo/yahoo.c:4359
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protokol Eklentisi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Pager server"
 msgstr "Çağrı cihazı sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Japan Pager server"
 msgstr "Japon Çağrı cihazı sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Pager port"
 msgstr "Çağrı cihazı portu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "File transfer server"
 msgstr "Dosya aktarım sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Japan file transfer server"
 msgstr "Japon dosya aktarım sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "File transfer port"
 msgstr "Dosya aktarım portu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Chat room locale"
 msgstr "Sohbet Odası Yereli"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferans ve sohbet odası davetlerini yok say"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Chat room list URL"
 msgstr "Sohbet Odası Listesi URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Yahoo Chat server"
 msgstr "Yahoo Sohbet sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat port"
 msgstr "Yahoo Sohbet portu"
 
@@ -13116,7 +13078,7 @@
 msgid "%s has requested your attention!"
 msgstr ""
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13125,12 +13087,12 @@
 "%s kullanıcısı %s tarafından %s sohbet odasınadavet edildi:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s kullanıcısı %s tarafından %s sohbet odasınadavet edildi\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Sohbet davetini kabul ediyor musunuz?"
 
@@ -13174,47 +13136,62 @@
 msgid "%s changed status from %s to %s"
 msgstr "%s %s durumundan %s durumuna geçti"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
+#, fuzzy, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s %s durumundan %s durumuna geçti"
+
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s şimdi %s olarak biliniyor"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
+#, fuzzy, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s şimdi %s olarak biliniyor"
+
+#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s artık %s değil"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
+#, fuzzy, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s artık %s değil"
+
+#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s şimdi uygun"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s şimdi uygun değil"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s şimdi boşta"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s şimdi boşta değil"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2705
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s Okuma Hatası"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2706
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13223,61 +13200,61 @@
 "%s okunurken bir hata oluştu.  Dosyalar yüklenmedi ve eski dosya %s~ olarak "
 "yeniden adlandırıldı."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3206
 msgid "Calculating..."
 msgstr "Hesaplanıyor..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3209
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3235
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d saniye"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d gün"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d saat"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3269
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d dakika"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3275
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3535
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s açılamadı. Birçok kez yeniden yönlendirildi"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%s konumuna bağlanılamadı"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3695
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13286,17 +13263,17 @@
 "%s içeriğini açmak için yeterli bellek konumlandırılamadı.  Web sunucu "
 "zararlı bir şeyler deniyor olabilir."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3730
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s konumundan okuma hatası: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3761
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s konumundan yazma hatası: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3786
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s konumuna bağlanılamadı: %s"
@@ -13386,7 +13363,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "Genel Ayarları Kullan"
 
@@ -13408,15 +13385,15 @@
 msgid "Proxy Options"
 msgstr "Proxy Seçenekleri"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "Proxy _tipi:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "_Host"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "_Port"
 
@@ -13424,7 +13401,7 @@
 msgid "_Username:"
 msgstr "_Kullanıcı adı:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "Par_ola:"
 
@@ -13484,11 +13461,30 @@
 "Bu pencereye daha sonra ulaşmak isterseniz Kişi Listesi Penceresindeki "
 "<b>Hesaplar->Ekle/Düzenle</b> yolunu takip etmelisiniz."
 
-#: ../pidgin/gtkblist.c:767
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:527
+#, fuzzy
+msgid "_Merge"
+msgstr "_İleti:"
+
+#: ../pidgin/gtkblist.c:924
 msgid "Join a Chat"
 msgstr "Bir Sohbete Katıl"
 
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13496,94 +13492,114 @@
 "Lütfen katılmak istediğiniz sohbet hakkında gereken bilgileri açık bir "
 "şekilde girin.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
+#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Hesap:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Engelle"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Engellemeyi _Kaldır"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "Kişi Bilgilerini _Al"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "Kişiye Anlık _İleti Göner"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Kişiye Dosya Gönder"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Kişi İçin Uyarıcı Ekle"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1337
+#, fuzzy
+msgid "_Send File..."
+msgstr "_Kişiye Dosya Gönder"
+
+#: ../pidgin/gtkblist.c:1344
+#, fuzzy
+msgid "Add Buddy _Pounce..."
+msgstr "Kişi için Uyarıcı Ekle..."
+
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "_Geçmiş Sohbetleri Göster"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Hide when offline"
+msgstr "Çevrim dışıyken izin verilmiyor"
+
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Show when offline"
+msgstr "Çevrim dışıyken izin verilmiyor"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "Kişi İçin _Görünen İsim Ayarla"
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Bir Kişi _Ekle"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "_Bir Sohbet Ekle"
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1434
+#, fuzzy
+msgid "Add _Buddy..."
+msgstr "Kişi Ekle"
+
+#: ../pidgin/gtkblist.c:1437
+#, fuzzy
+msgid "Add C_hat..."
+msgstr "Sohbet Ekle"
+
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "_Grubu Sil"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "_Yeniden Adlandır"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Katıl"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Otomatik-Katıl"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+#, fuzzy
+msgid "Persistent"
+msgstr "Farsça"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Daralt"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "_Genişlet"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
 msgid "/Tools/Mute Sounds"
 msgstr "/Araçlar/Sesleri Kapat"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
 #: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -13592,138 +13608,139 @@
 "gerekir."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/_Kişiler"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kişiler/Yeni _İleti..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kişiler/Bir Sohbete Ka_tıl..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kişiler/Kullanıcı B_ilgisi Al..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/Kişiler/Kişi Kayıtlarını Gö_ster..."
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:3073
 msgid "/Buddies/Show"
 msgstr "/_Kişiler/Göster"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Kişiler/Göster/_Çevrimdışı Kişileri Göster"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3075
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Kişiler/Göster/_Boş Grupları Göster"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Kişiler/Göster/Kişi _Ayrıntılarını Göster"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Kişiler/Göster/Boşta Sürelerini _Göster"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Kişiler/Göster/_Boş Grupları Göster"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kişiler/Kişileri _Sırala"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kişiler/_Kişi Ekle..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kişiler/Sohbet Ekle..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/Kişiler/_Grup Ekle..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/_Kişiler/_Çık"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/_Hesaplar"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Hesaplar/Ekle\\/Düzenle"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
+#, fuzzy
+msgid "/Accounts/Manage"
+msgstr "/Hesaplar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/_Araçlar"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Araçlar/Kişi _Uyarıcılar"
 
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
 msgstr "/Araçlar/_Sertifikalar"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/Araçlar/Eklentiler"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/Araçlar/_Tercihler"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/Araçlar/_Gizlilik"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/Araçlar/_Dosya Aktarımları"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/Araçlar/Oda Listesi"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/Araçlar/Sistem Kayıtlarını Göster"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/Araçlar/Sesleri _Kapat"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/Yardım/Çevrim_içi Yardım"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/Yardım/_Hata Yakalama Penceresi"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/Yardım/_Pidgin Hakkında"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -13732,133 +13749,129 @@
 "\n"
 "<b>Hesap:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "Kişi Takma Adı"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "Çevrimiçi"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "Son Görülme Zamanı"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr "Korkunç"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr "Harika"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr "Sallanan"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3657
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Boşta %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Boşta %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "Boşta %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3806
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kişiler/Yeni Anlık İleti..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kişiler/Bir Sohbete Katıl..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3808
 msgid "/Buddies/Get User Info..."
 msgstr "/Kişiler/Kullanıcı Bilgisi Al..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3809
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kişiler/Kişi Ekle..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
 msgid "/Buddies/Add Chat..."
 msgstr "/Kişiler/Sohbet Ekle..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3811
 msgid "/Buddies/Add Group..."
 msgstr "/Kişiler/Grup Ekle..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3846
 msgid "/Tools/Privacy"
 msgstr "/Araçlar/Gizlilik"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3849
 msgid "/Tools/Room List"
 msgstr "/Araçlar/Oda Listesi"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d okunmamış ileti, gönderen %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4104
 msgid "Manually"
 msgstr "El ile ayarla"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabetik"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4107
 msgid "By status"
 msgstr "Duruma göre"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4108
 msgid "By log size"
 msgstr "Kayıt büyüklüğüne göre"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bağlantıyı kesti"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4349
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s bağlantı kesildi: %s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4501
 msgid "<b>Username:</b>"
 msgstr "<b>Kullanıcı adı:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4508
 msgid "<b>Password:</b>"
 msgstr "<b>Parola:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4519
 msgid "_Login"
 msgstr "_Giriş yap"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4602
 msgid "/Accounts"
 msgstr "/Hesaplar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
+#: ../pidgin/gtkblist.c:4616
 #, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>%s'e Hoş Geldiniz!</span>\n"
@@ -13874,27 +13887,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:4879
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Kişiler/Göster/Çevrimdışı Kişileri Göster"
 
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4882
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Kişiler/Göster/Boş Grupları Göster"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:4888
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Kişiler/Göster/Kişi Ayrıntılarını Göster"
 
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:4891
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Kişiler/Göster/Boşta Süresini Göster"
 
-#: ../pidgin/gtkblist.c:4612
+#: ../pidgin/gtkblist.c:4894
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Kişiler/Göster/Boş Grupları Göster"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5796
 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. "
@@ -13904,26 +13917,32 @@
 "kişinin görünen ismini değiştirebilirsiniz. Böylece mümkün olduğu takdirde "
 "girdiğiniz isim, kişinin kayıtlı ismi yerine listenizde görünecektir.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5819
+#, fuzzy
+msgid "A_ccount:"
+msgstr "Hesap:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5831
 msgid "_Screen name:"
 msgstr "Kay_ıtlı isim:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
 msgid "A_lias:"
 msgstr "G_örünen isim:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6121
 msgid "This protocol does not support chat rooms."
 msgstr "Bu protokol sohbet odalarını desteklemiyor."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6137
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sohbet etmek için hiçbir sohbet protokolüne giriş yapmadınız."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6178
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -13931,39 +13950,47 @@
 "Lütfen bir görünen isim ve listeye eklemek istediğiniz sohbet hakkında uygun "
 "bir bilgi girin.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6237
+msgid "Autojoin when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6238
+msgid "Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6264
 msgid "Please enter the name of the group to be added."
 msgstr "Lütfen eklemek istediğiniz grubun ismini girin."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6909
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Hesaplar/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6933
 msgid "_Edit Account"
 msgstr "_Hesabı Düzenle"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
 msgid "No actions available"
 msgstr "Kullanılabilir işlem yok"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:6954
 msgid "_Disable"
 msgstr "_Hesabı Pasifleştir"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:6966
 msgid "Enable Account"
 msgstr "Hesabı Etkinleştir"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:6972
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Hesaplar/Hesabı Etkinleştir"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7021
 msgid "/Tools"
 msgstr "/Araçlar"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7091
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kişiler/Kişileri Sırala"
 
@@ -13973,7 +14000,7 @@
 msgid "SSL Servers"
 msgstr "Sunucu"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -13986,26 +14013,26 @@
 "%s siz hatayı düzeltip hesabınızı yeniden etkinleştirene kadar yeniden "
 "bağlanmayacak."
 
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:523
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Kişi bu sohbetle aynı protokol üzerinde değil."
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:815
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Bu kişiyi davet etmek için henüz geçerli bir hesaptan oturum açmadınız."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:868
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kişiyi Sohbet Odasına Davet Et"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:898
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14013,188 +14040,188 @@
 "İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
 "ismini girin."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:919
 msgid "_Buddy:"
 msgstr "_Kişi:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_İleti:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
 #: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Dosya açılamıyor."
 
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:994
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>%s ile yazışma</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1032
 msgid "Save Conversation"
 msgstr "Yazışmayı Kaydet"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Bul"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Şunu Ara:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1675
 msgid "Un-Ignore"
 msgstr "Yoksayma"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1678
 msgid "Ignore"
 msgstr "Yoksay"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1698
 msgid "Get Away Message"
 msgstr "Uzakta İletisi Al"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1721
 msgid "Last said"
 msgstr "Son söylenen"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2665
 msgid "Unable to save icon file to disk."
 msgstr "Simge dosyası diske kaydedilemedi."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2716
 msgid "Save Icon"
 msgstr "Simgeyi Kaydet"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2768
 msgid "Animate"
 msgstr "Oynat"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2773
 msgid "Hide Icon"
 msgstr "Simgeyi Gizle"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2776
 msgid "Save Icon As..."
 msgstr "Simgeyi Farklı Kaydet..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2780
 msgid "Set Custom Icon..."
 msgstr "Özel Simge Ayarla..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2793
 msgid "Remove Custom Icon"
 msgstr "Özel Simgeyi Kaldır"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2924
 msgid "Show All"
 msgstr "Tümünü Göster"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2943
 msgid "/_Conversation"
 msgstr "/_Yazışma"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Yazışma/Yeni _Anlık İleti..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/_Find..."
 msgstr "/Yazışma/_Bul..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/View _Log"
 msgstr "/Yazışma/_Kayıtları Göster"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/_Save As..."
 msgstr "/Yazışma/_Farklı Kaydet..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Yazışma/Temi_zle"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Se_nd File..."
 msgstr "/Yazışma/Kişiye _Dosya Gönder..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Yazışma/Kişi _Uyarıcı Ekle..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/_Get Info"
 msgstr "/Yazışma/_Bilgi Al..."
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/In_vite..."
 msgstr "/Yazışma/Davet Et..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/M_ore"
 msgstr "/Yazışma/_Daha Fazla"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Al_ias..."
 msgstr "/Yazışma/Görünen İs_im..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Block..."
 msgstr "/Yazışma/En_gelle..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Unblock..."
 msgstr "/Yazışma/Engellemeyi _Kaldır..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Add..."
 msgstr "/Yazışma/_Ekle..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/_Remove..."
 msgstr "/Yazışma/_Kaldır..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Yazışma/Bağlantı Ekl_e..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Yazışma/Resim Ekl_e..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2991
 msgid "/Conversation/_Close"
 msgstr "/Yazışma/_Kapat"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2995
 msgid "/_Options"
 msgstr "/_Seçenekler"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2996
 msgid "/Options/Enable _Logging"
 msgstr "/Seçenekler/_Kayıt Tutmayı Etkinleştir"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Enable _Sounds"
 msgstr "/Seçenekler/Sesleri E_tkinleştir"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2999
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Seçenekler/Biçimlendirme Çubuklarını Gös_ter"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3000
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Seçenekler/Za_manı Etiketlerini Göster"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3124
 msgid "/Conversation/More"
 msgstr "/Yazışma/Daha Fazla"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3180
 msgid "/Options"
 msgstr "/Seçenekler"
 
@@ -14203,172 +14230,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:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
 msgid "/Conversation"
 msgstr "/Yazışma"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3255
 msgid "/Conversation/View Log"
 msgstr "/Yazışma/Kayıtları Göster"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Send File..."
 msgstr "/Yazışma/Kişiye Dosya Gönder..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Yazışma/Kişi Uyarıcı Ekle..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Get Info"
 msgstr "/Yazışma/Bilgi Al..."
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Invite..."
 msgstr "/Yazışma/Davet Et..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Alias..."
 msgstr "/Yazışma/Görünen İsim..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Block..."
 msgstr "/Yazışma/Engelle..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Unblock..."
 msgstr "/Yazışma/Engellemeyi Kaldır..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Add..."
 msgstr "/Yazışma/Ekle..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3297
 msgid "/Conversation/Remove..."
 msgstr "/Yazışma/Kaldır..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Link..."
 msgstr "/Yazışma/Bağlantı Ekle..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Insert Image..."
 msgstr "/Yazışma/Resim Ekle..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3313
 msgid "/Options/Enable Logging"
 msgstr "/Seçenekler/Kayıt Tutmayı Etkinleştir"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3316
 msgid "/Options/Enable Sounds"
 msgstr "/Seçenekler/Sesleri Etkinleştir"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3329
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Seçenekler/Biçimlendirme Çubuklarını Göster"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3332
 msgid "/Options/Show Timestamps"
 msgstr "/Seçenekler/Zamanı Etiketlerini Göster"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
 msgid "User is typing..."
 msgstr "Kullanıcı yazıyor..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3454
 msgid "User has typed something and stopped"
 msgstr "Kullanıcı bir şeyler yazdı ve durdu"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Şuna Gönder"
-
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
+#, fuzzy
+msgid "S_end To"
+msgstr "Gönder"
+
+#: ../pidgin/gtkconv.c:4349
 msgid "_Send"
 msgstr "_Gönder"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4453
 msgid "0 people in room"
 msgstr "Odada kimse yok"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "Odada %d kişi var"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Yazıyor"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6554
 msgid "Stopped Typing"
 msgstr "Yazmayı Bıraktı"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6557
 msgid "Nick Said"
 msgstr "Takma Ad Söylüyor"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Okunmamış İletiler"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6563
 msgid "New Event"
 msgstr "Yeni Olay"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7654
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Konuşma ekranını temizler."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7817
 msgid "Confirm close"
 msgstr "Kapatmayı onayla"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7849
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Okunmamış iletileriniz var. Pencereyi kapatmak istediğinize emin misiniz?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8436
 msgid "Close other tabs"
 msgstr "Diğer sekmeleri kapat"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8442
 msgid "Close all tabs"
 msgstr "Tüm sekmeleri kapat"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8450
 msgid "Detach this tab"
 msgstr "Bu sekmeyi ayır"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8456
 msgid "Close this tab"
 msgstr "Bu sekmeyi kapat"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8951
 msgid "Close conversation"
 msgstr "Yazışmayı kapat"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9553
 msgid "Last created window"
 msgstr "Son açılan pencere"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9555
 msgid "Separate IM and Chat windows"
 msgstr "Mesaj ve sohbet pencerelerini ayır"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "Yeni pencere"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9559
 msgid "By group"
 msgstr "Gruba göre"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9561
 msgid "By account"
 msgstr "Hesaba göre"
 
@@ -14493,7 +14521,7 @@
 msgid "Afrikaans"
 msgstr "Afrikaanca (Hollanda Lehçesi)"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134
 msgid "Arabic"
 msgstr "Arapça"
 
@@ -14502,7 +14530,7 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:224
 msgid "Bulgarian"
 msgstr "Bulgarca"
 
@@ -14515,8 +14543,8 @@
 msgid "Bosnian"
 msgstr "Boşnakça"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Catalan"
 msgstr "Katalan dili"
 
@@ -14524,7 +14552,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valencian Katalan dili"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:227
 msgid "Czech"
 msgstr "Çekçe"
 
@@ -14533,7 +14561,7 @@
 msgstr "Danimarka dili"
 
 #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:228
 msgid "German"
 msgstr "Almanca"
 
@@ -14562,9 +14590,9 @@
 msgid "Esperanto"
 msgstr "Esperanto Dili"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Spanish"
 msgstr "İspanyolca"
 
@@ -14581,19 +14609,19 @@
 msgid "Persian"
 msgstr "Farsça"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Finnish"
 msgstr "Fince"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "French"
 msgstr "Fransızca"
 
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:239
 msgid "Galician"
 msgstr ""
 
@@ -14605,7 +14633,7 @@
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:240
 msgid "Hebrew"
 msgstr "İbranice"
 
@@ -14613,7 +14641,7 @@
 msgid "Hindi"
 msgstr "Hindu dili"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:241
 msgid "Hungarian"
 msgstr "Macarca"
 
@@ -14621,16 +14649,16 @@
 msgid "Indonesian"
 msgstr "Endonezya Dili"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245
 msgid "Japanese"
 msgstr "Japonca"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:246
 msgid "Georgian"
 msgstr "Gürcü Dili"
 
@@ -14646,8 +14674,8 @@
 msgid "Kannada Translation team"
 msgstr "Kanada Çeviri ekibi"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Korean"
 msgstr "Korece"
 
@@ -14656,136 +14684,129 @@
 msgid "Kurdish"
 msgstr "Kürtçe"
 
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
-msgid "Lao"
-msgstr "Aslan"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
 msgid "Lithuanian"
 msgstr "Litvanca"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:251
 msgid "Macedonian"
 msgstr "Makedonca"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:252
 msgid "Bokmål Norwegian"
 msgstr "Norveççe"
 
+#: ../pidgin/gtkdialogs.c:189
+msgid "Nepali"
+msgstr "Nepal Dili"
+
+#: ../pidgin/gtkdialogs.c:190
+msgid "Dutch, Flemish"
+msgstr "Hollandaca, Flamanca"
+
 #: ../pidgin/gtkdialogs.c:191
-msgid "Nepali"
-msgstr "Nepal Dili"
-
-#: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr "Hollandaca, Flamanca"
-
-#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr "Norveç Dili"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:253
 msgid "Polish"
 msgstr "Polonyaca"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:195
 msgid "Portuguese"
 msgstr "Portekizce"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:196
 msgid "Portuguese-Brazil"
 msgstr "Portekizce-Brezilyaca"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:197
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:198
 msgid "Romanian"
 msgstr "Romence"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Russian"
 msgstr "Rusça"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Slovak"
 msgstr "Slovak dili"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259
 msgid "Slovenian"
 msgstr "Sloven dili"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:203
 msgid "Albanian"
 msgstr "Arnavutça"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
 msgid "Serbian"
 msgstr "Sırpça"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Swedish"
 msgstr "İsveççe"
 
+#: ../pidgin/gtkdialogs.c:207
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:208
+msgid "Telugu"
+msgstr "Telugu"
+
 #: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "Tamil"
-
-#: ../pidgin/gtkdialogs.c:210
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "Tayvan Dili"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:211
 msgid "Vietnamese"
 msgstr "Vietnam Dili"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:211
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ve Gnome-Vi Takımı"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
 msgid "Simplified Chinese"
 msgstr "Çince (Basit)"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Çincesi"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:264
 msgid "Traditional Chinese"
 msgstr "Çince (Geleneksel)"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:223
 msgid "Amharic"
 msgstr "Habeşçe (EZ+)"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:351
 #, c-format
 msgid "About %s"
 msgstr "%s Hakkında"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:394
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14807,48 +14828,47 @@
 "aittir. Bilgi edinmek için COPYRIGHT dosyasına ya da katılımcıların tüm "
 "listesine bakabilirsiniz. Bu uygulama için garanti vermiyoruz.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net #pidgin<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Şimdiki Geliştiriciler"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Çılgın Yama Yazarları"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Önceki Geliştiriciler"
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Emekli Çılgın Yama Yazarları"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Sanatçılar"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Şimdiki Çevirmenler"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Önceki Çevirmenler"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Hata Ayıklama Bilgileri"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:900
 msgid "Get User Info"
 msgstr "Kullanıcı Bilgisini Al"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:902
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -14856,11 +14876,11 @@
 "Lütfen bilgilerini görmek istediğiniz kişinin görüntü veya etiket ismini "
 "giriniz."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:992
 msgid "View User Log"
 msgstr "Kullanıcı Kaydını Al"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:994
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -14868,32 +14888,32 @@
 "Lütfen kayıtlarını görmek istediğiniz kişinin görüntü veya etiket ismini "
 "giriniz."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Contact"
 msgstr "Görünen İsim"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this contact."
 msgstr "Bu kişi için görünen ismi girin."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1037
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s için görünen ismi girin."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Buddy"
 msgstr "Görünen İsim..."
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Alias Chat"
 msgstr "Görünen Sohbet"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Enter an alias for this chat."
 msgstr "Bu sohbet için görünen ismi girin."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1100
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -14905,15 +14925,15 @@
 "%s ve %d içeren kişiyi kişi listenizden silmek üzeresiniz. Devam etmek "
 "istiyor musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Remove Contact"
 msgstr "Kişiyi Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Remove Contact"
 msgstr "_Kişiyi Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1142
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -14921,15 +14941,15 @@
 msgstr ""
 "%s grubunu %s grubu ile birleştimek üzeresiniz. Devam etmek istiyor musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1149
 msgid "Merge Groups"
 msgstr "Grupları Birleştir"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1152
 msgid "_Merge Groups"
 msgstr "_Grupları Birleştir"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1202
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -14938,15 +14958,15 @@
 "%s grubu ve içerdiği üyeleri arkadaş listenizden silmek üzeresiniz.  Devam "
 "etmek istiyor musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1205
 msgid "Remove Group"
 msgstr "_Grubu Sil"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1208
 msgid "_Remove Group"
 msgstr "_Grubu Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1241
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -14954,15 +14974,15 @@
 "%s ögesini kullanıcı listenizden silmek üzeresiniz.  Devam etmek istiyor "
 "musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1244
 msgid "Remove Buddy"
 msgstr "Kişiyi Sil"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1247
 msgid "_Remove Buddy"
 msgstr "Kişiyi _Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1268
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -14971,11 +14991,11 @@
 "Kişi listenizdeki %s sohbetini kaldırmak üzeresiniz.  Devam etmek istiyor "
 "musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1271
 msgid "Remove Chat"
 msgstr "Sohbeti Sil"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1274
 msgid "_Remove Chat"
 msgstr "_Sohbeti Kaldır"
 
@@ -15001,7 +15021,7 @@
 
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on new message"
+msgid "Blink on New Message"
 msgstr "Yeni ileti gelince parla"
 
 #: ../pidgin/gtkdocklet.c:542
@@ -15098,7 +15118,7 @@
 msgid "Paste as Plain _Text"
 msgstr "_Düz Metin olarak Yapıştır"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Reset formatting"
 msgstr "_Biçimlemeyi temizle"
 
@@ -15177,7 +15197,6 @@
 msgstr "Resmi Kaydet"
 
 #: ../pidgin/gtkimhtml.c:3522
-#, c-format
 msgid "_Save Image..."
 msgstr "Resmi _Kaydet..."
 
@@ -15213,11 +15232,11 @@
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Lütfen eklemek istediğiniz bağlantıyı girin."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Insert Link"
 msgstr "Bağlantı Ekle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
 msgid "_Insert"
 msgstr "_Ekle"
 
@@ -15239,125 +15258,126 @@
 msgid "Smile!"
 msgstr "Gülenyüz!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
 msgid "_Font"
 msgstr "Y_azı tipleri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1051
 msgid "Group Items"
 msgstr "Ögeleri Grupla"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1051
 msgid "Ungroup Items"
 msgstr "Ögeleri Gruplama"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Kalın"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "İtalik"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Altı çizili"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1088
 msgid "Strikethrough"
 msgstr "Üzeri çizili"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1090
 msgid "Increase Font Size"
 msgstr "Yazıtipi Boyutunu Büyüt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Decrease Font Size"
 msgstr "Yazıtipi Boyutunu Küçült"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Font Face"
 msgstr "Yazı Tipi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Background Color"
 msgstr "Arkaplan Rengi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Foreground Color"
 msgstr "Yazı Rengi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Reset Formatting"
 msgstr "Biçimlemeyi Temizle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Insert IM Image"
 msgstr "Hızlı Mesajlaşma Resmi Ekle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Insert Smiley"
 msgstr "Gülenyüz Ekle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<b>_Bold</b>"
 msgstr "<b>_Kalın</b>"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<i>_Italic</i>"
+msgstr "<i>İtal_ik</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+msgid "<u>_Underline</u>"
+msgstr "<u>Altı ç_izili</u>"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1180
-msgid "<i>_Italic</i>"
-msgstr "<i>İtal_ik</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-msgid "<u>_Underline</u>"
-msgstr "<u>Altı ç_izili</u>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Üzeri çizili</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Daha Büyük</span>"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "_Normal"
+msgstr "_Normal"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1185
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>Daha _Küçük</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "_Font face"
 msgstr "Yazı _tipi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "Foreground _color"
 msgstr "Yazı _rengi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "Bac_kground color"
 msgstr "_Arkaplan rengi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Gülenyüz"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1268
 msgid "_Image"
 msgstr "_Resim"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1274
 msgid "_Link"
 msgstr "_Bağlantı"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1280
 msgid "_Horizontal rule"
 msgstr "_Yatay çizgi"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1302
+#, fuzzy
+msgid "_Smile!"
+msgstr "Gülenyüz!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15464,6 +15484,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15480,10 +15501,10 @@
 "kullanın)\n"
 "  -v, --version       geçerli sürümü gösterir ve çıkar\n"
 
-#: ../pidgin/gtkmain.c:512
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:516
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15504,7 +15525,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15516,16 +15537,16 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:537
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s, %d yeni ileti."
 
-#: ../pidgin/gtknotify.c:564
+#: ../pidgin/gtknotify.c:562
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d yeni e-postanız var.</b>"
 
 #: ../pidgin/gtknotify.c:989
@@ -15734,7 +15755,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "Uzaktayken"
 
@@ -15787,55 +15808,59 @@
 msgid "Show _formatting on incoming messages"
 msgstr "Gelen iletilerde _biçimlendirmeyi göster"
 
-#: ../pidgin/gtkprefs.c:998
-msgid "Show _detailed information"
-msgstr "Ayrıntılı _bilgi göster"
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
 
 #: ../pidgin/gtkprefs.c:1000
+msgid "Show _detailed information"
+msgstr "Ayrıntılı _bilgi göster"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "Kişi simgelerinde animasyonu e_tkinleştir"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "Kişileri ben onlara yazarken u_yar"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "Yanlış _yazılmış sözcükleri vurgula"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "Yumuşak geçiş kullan"
 
-#: ../pidgin/gtkprefs.c:1017
-msgid "F_lash window when IMs are received"
-msgstr "_Yeni ileti geldiğinde pencereyi canlandır"
-
 #: ../pidgin/gtkprefs.c:1019
+msgid "F_lash window when IMs are received"
+msgstr "_Yeni ileti geldiğinde pencereyi canlandır"
+
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "Yeni yazışma pencerelerini _küçült"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "Yazı tipi"
 
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr "T_emadan doküman yazı tipini kullan"
-
 #: ../pidgin/gtkprefs.c:1027
+msgid "Use document font from _theme"
+msgstr "T_emadan doküman yazı tipini kullan"
+
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "Yazı tipini _temadan kullan"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "Yazışma yaz_ı tipi:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "Öntanımlı Biçem"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1064
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -15843,119 +15868,119 @@
 "Bu, biçimlendirmeyi destekleyen protokollerde gönderdiğiniz iletinin nasıl "
 "görüneceğini gösterir."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "ST_UN sunucusu:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Örnek: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "_IP Adresini Otomatik Bul"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "Görünen _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "Portlar"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Dinlenecek portları el ile belirtin"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "Başlangıç _portu:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "Bitiş p_ortu:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "Proxy Sunucusu"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "Proxy yok"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "_Kullanıcı:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1330
-msgid "Netscape"
-msgstr "Netscape"
-
 #: ../pidgin/gtkprefs.c:1331
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "Opera"
+msgstr "Opera"
 
 #: ../pidgin/gtkprefs.c:1332
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: ../pidgin/gtkprefs.c:1333
-msgid "GNOME Default"
-msgstr "Gnome Varsayılanı"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: ../pidgin/gtkprefs.c:1334
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1335
+msgid "GNOME Default"
+msgstr "Gnome Varsayılanı"
+
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "El ile ayarla"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "Tarayıcı Seçimi"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "_Tarayıcı:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "_Bağlantıyı aç:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "Tarayıcı varsayılanı"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "Varolan pencere"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "Yeni sekme"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -15964,69 +15989,63 @@
 "_El ile ayarla:\n"
 "(Bağlantı için %s)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "Kayıt _biçemi:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "Tüm anlık _mesajları kaydet"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Tüm sohbetleri tut"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "Tüm durum değişikliklerini sistem günlüğüne kaydet"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "Ses Seçimi"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "En Düşük"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
-msgid "Quieter"
-msgstr "Daha Düşük"
-
 #: ../pidgin/gtkprefs.c:1639
-#, c-format
+msgid "Quieter"
+msgstr "Daha Düşük"
+
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "Düşük"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "Yüksek"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
-msgid "Louder"
-msgstr "Daha Yüksek"
-
 #: ../pidgin/gtkprefs.c:1647
-#, c-format
+msgid "Louder"
+msgstr "Daha Yüksek"
+
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "En Yüksek"
 
-#: ../pidgin/gtkprefs.c:1713
-msgid "_Method:"
-msgstr "_Davranış:"
-
 #: ../pidgin/gtkprefs.c:1715
+msgid "_Method:"
+msgstr "_Davranış:"
+
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "Konsol bip sesi"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "Ses Kullanma"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16035,81 +16054,81 @@
 "Ses komutu:\n"
 "(dosya ismi için %s)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "Yazışmaya sırasında sesler açık"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "Sesleri etkinleştir:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "Ses Düzeyi:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "Oynat"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "Boşta süresini _raporla:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "Klavye ya da fare kullanımına göre"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "_Otomatik-cevapla:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "Aynı anda meşgul ve boş olduğu zaman"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "Otomatik-uzakta"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "Boşken durumu değ_iştir"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "_Boşta durumuna geçmeden önceki süre"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "Durumu _değiştir:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "Başlangıç Durumu"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "Son çıkıştaki _durumu kullan"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "Başlangıçta uy_gulanacak durum:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "Arayüz"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Gülenyüz Temaları"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "Tarayıcı"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "Durum / Boşta"
 
@@ -16598,7 +16617,7 @@
 msgid "Received Messages"
 msgstr "Alınan İletiler"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "%s için Renk Ayarla"
@@ -16869,7 +16888,7 @@
 "\n"
 "<b>Kişi Notu</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:192
 msgid "History"
 msgstr "Geçmiş"
 
@@ -17123,45 +17142,36 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Yatay Dağılımı"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Yazışma Girdisi"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Yazışma Geçmişi"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Kayıt Görüntüleyicisi"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "İstek Diyaloğu"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Uyarı Diyaloğu"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Renk Seç"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "Arayüz Yazı Tipini Seç"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "%s için Yazıtipi Seç"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Arayüz Yazıtipi"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Metin Kısayol Teması"
 
@@ -17185,36 +17195,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Arayüz rekleri"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Parçacık Boyutları"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Yazıtipleri"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Dosyası Araçları"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Ayarları %s%sgtkrc-2.0 dosyasına yaz"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "gtkrc dosyalarını yeniden oku"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Tema Kontrolü"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Sıklıkla kullanılan gtkrc ayarlarına erişimi sağlar."
 
@@ -17391,7 +17401,6 @@
 msgstr "Zaman Etiketi Biçemi Seçenekleri"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "24 saat _biçemini zorla"
 
@@ -17608,116 +17617,14 @@
 "Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için "
 "kullanışlıdır."
 
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Tümünü Göster"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Çevrimdışı kişileri göster"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Duruma göre"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Kayıt büyüklüğüne göre"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Sunucuya bağlanılamadı."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Kişi Listesi Getirme Hatası"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Geçerli ifade"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger Protokolü Eklentisi"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Hata: Kimlik denetimi başarısız"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s size bir titreşim gönderdi!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Bilinmeyen Hata"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Sunucuya bağlanılamadı."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s %s durumundan %s durumuna geçti"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s şimdi %s olarak biliniyor"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s artık %s değil"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_İleti:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Kişiye Dosya Gönder"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Kişi için Uyarıcı Ekle..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Çevrim dışıyken izin verilmiyor"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Çevrim dışıyken izin verilmiyor"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Kişi Ekle"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Sohbet Ekle"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Farsça"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Hesaplar"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Hesap:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Gönder"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Gülenyüz!"
+#~ msgid "Sort by status"
+#~ msgstr "Duruma göre sırala"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "Alfabetik olarak sırala"
+
+#~ msgid "Sort by log size"
+#~ msgstr "Kayıt büyüklüğüne göre sırala"
 
 #~ msgid "nudged"
 #~ msgstr "uyarıldı"
@@ -17725,6 +17632,12 @@
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Şimdi bir Titreşim gönderdiniz!"
 
+#~ msgid "Has you"
+#~ msgstr "Sizi eklemiş mi ?"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protokol Eklentisi"
+
 #~ msgid "%s just sent you a Buzz!"
 #~ msgstr "%s size bir titreşim gönderdi!"
 
@@ -17742,3 +17655,27 @@
 
 #~ msgid "Attention! You have been %s."
 #~ msgstr "Dikkat! %s tarafından eklendiniz."
+
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "Kişi İçin Uyarıcı Ekle"
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "Bir Kişi _Ekle"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "_Bir Sohbet Ekle"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Hesaplar/Ekle\\/Düzenle"
+
+#~ msgid "_Send To"
+#~ msgstr "_Şuna Gönder"
+
+#~ msgid "_Smiley"
+#~ msgstr "_Gülenyüz"
+
+#~ msgid "Conversation History"
+#~ msgstr "Yazışma Geçmişi"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Kayıt Görüntüleyicisi"