changeset 25479:f35329c1094e

propagate from branch 'im.pidgin.pidgin' (head e1c76e1a6e09e3fb3697606e2d8f6b6327e7a7e9) to branch 'im.pidgin.pidgin.yaz' (head 63c9f47f9f122de5fb99e7b6b01916beb07cefeb)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 05 May 2007 08:00:03 +0000
parents f444605c27b6 (current diff) ff85eb760c7d (diff)
children 50a9c82d32a1
files configure.ac libpurple/conversation.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/message.c libpurple/protocols/msn/msn.c libpurple/protocols/oscar/oscar.c libpurple/util.c pidgin/gtkconv.c pidgin/pixmaps/about_menu.png
diffstat 87 files changed, 6197 insertions(+), 5757 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Thu May 03 10:14:49 2007 +0000
+++ b/AUTHORS	Sat May 05 08:00:03 2007 +0000
@@ -17,14 +17,15 @@
 	Jabber:  seanegn@jabber.org
 	Gadu-Gadu:  1511497
 
-Daniel 'datallah' Atallah
+Daniel 'datallah' Atallah - Developer
 Ethan 'Paco-Paco' Blanton - Developer
 Thomas Butter - Developer
 Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
 Christian 'ChipX86' Hammond - Developer & Webmaster
 Gary 'grim' Kramlich - Developer
-Richard 'rlaager' Laager
+Richard 'rlaager' Laager - Developer
+Richard 'wabz' Nelson - Developer
 Christopher 'siege' O'Brien - Developer
 Bartosz Oler - Developer
 Etan 'deryni' Reisner - Developer
@@ -37,9 +38,11 @@
 
 Crazy Patch Writers:
 -------------------
+John 'rekkanoryo' Bailey
 Ka-Hing 'javabsp' Cheung
 Felipe 'shx' Contreras
 Decklin Foster
+Casey Harkins
 Peter 'Bleeter' Lawler
 Robert 'Robot101' McQueen
 Benjamin Miller
--- a/COPYRIGHT	Thu May 03 10:14:49 2007 +0000
+++ b/COPYRIGHT	Sat May 05 08:00:03 2007 +0000
@@ -17,6 +17,7 @@
 Christopher Ayoup
 Alex Badea
 John Bailey
+R. Tyler Ballance
 Chris Banal
 Luca Barbato
 Levi Bard
@@ -73,6 +74,7 @@
 Eoin Coffey
 Jason Cohen
 Todd Cohen
+Graham Cole
 Jono Cole
 Lorenzo Colitti
 Jeff Connelly
--- a/ChangeLog	Thu May 03 10:14:49 2007 +0000
+++ b/ChangeLog	Sat May 05 08:00:03 2007 +0000
@@ -1,6 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.0.0:
+version 2.0.1 (??/??/????):
+	* Buddy list update speedups when buddy icons are not being
+	  displayed.  (Scott Wolchok)
+
+version 2.0.0 (5/3/2007):
 	* The project has new names - libpurple for the core, Pidgin for the
 	  GTK+ UI and Finch for the ncurses based console UI (AOL LLC)
 
@@ -199,8 +203,9 @@
 	* Removed the Napster and TOC protocols plugins
 
 	Other Noteworthy Changes:
-	* UPnP and NAT traversal support (Adam J. Warrington, Google Summer of
+	* NAT traversal support via UPnP (Adam J. Warrington, Google Summer of
 	  Code)
+	* NAT traversal support via NAT-PMP (Evan Schoenberg and R. Tyler Ballance)
 	* The modify account dialog now contains two tabs, which should display
 	  better at lower resolutions (Sadrul Habib Chowdhury)
 	* New "find buddy" results dialog (Alex Converse)
--- a/ChangeLog.API	Thu May 03 10:14:49 2007 +0000
+++ b/ChangeLog.API	Sat May 05 08:00:03 2007 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.0.0:
+version 2.0.0 (5/3/2007):
 	Please note all functions, defines, and data structures have been
 	re-namespaced to match the new names of Pidgin, Finch, and libpurple.
 	All gaim_gtk_* functions are now pidgin_*, former libgaim functions are
--- a/ChangeLog.win32	Thu May 03 10:14:49 2007 +0000
+++ b/ChangeLog.win32	Sat May 05 08:00:03 2007 +0000
@@ -1,4 +1,4 @@
-version 2.0.0:
+version 2.0.0 (5/3/2007):
 	* URI Handler support added via `pidgin.exe --protocolhandler=`
 	* Running a second instance will popup the Buddy List, if possible.
 	* Updated GTK+ to 2.10.11 (rev.a) (Win98/ME will need to use 2.6.10)
--- a/NEWS	Thu May 03 10:14:49 2007 +0000
+++ b/NEWS	Sat May 05 08:00:03 2007 +0000
@@ -1,5 +1,64 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.0.0 (5/3/2007):
+	Sean: 2.0.0! It's real exciting to finally release Pidgin 2.0.0! I'm
+	really proud of all the work we've all done. I'm pumped. And, while
+	I could go on about all the amazing thing that have been added since
+	1.5.0, what I'm really excited about is getting back to a regular,
+	rapid, release cycle of active, open development, unhindered by legal
+	quandries. Huge thanks to everyone involved.
+
+	Luke: We have finally managed to get 2.0.0 out the door, after nearly
+	but not quite 2 years of effort and fustration.  No one regrets more
+	than I that we were unable to make any of betas 3-6 the actual release.
+	But at long last, it is out, and life can return to a more normal
+	state.  There were many tough calls to be made in the last 2 years.
+	Not everyone has agreed with the resulting decisions, that is un-
+	fortunate, but unavoidable.  Suffice it to say that despite what
+	some users appear to think, a ton of thought, argument, discussion,
+	and experimentation has gone into this release.  This release
+	builds on many years of experience, both as developers writing the
+	code, users using it, and in supporting other users.  I hope that
+	those who download and install this will give it a fair shot, and
+	attempt to avoid knee-jerk reactions.
+
+	Evan: One small step for bird, one giant leap for birdkind... except
+	this is hardly one small step. A lot more has changed from Gaim 1.5.0
+	than just the name. Pidgin has a *very* attractive new look, a whole
+	new member of the family (Finch, formerly gaim-console) has been born,
+	and libpurple has come into its own as a solid, full-featured library
+	powering the greatest IM clients around. Bugs were fixed and
+	features were added by the hundreds (thousands?) since the last
+	major release, all while improving performance and resisting feature
+	creep. As Luke said, a ton of thought and effort has gone into
+	Pidgin 2.0.0; I'm proud to have played a part.
+
+	Stu: We did it! finally, we have 2.0.0. It's been a long time coming,
+	but there's a great deal of goodness here. When I say a long time, I'm
+	not kidding - it's been 972 days since we branched off "oldstatus"
+	(aka 1.x). The early Greeks were uncertain as to whether 2 was a
+	number at all (or if we'd ever make this release) - it has a beginning
+	and an end but no middle (much like our unfortunately quiet development
+	period). 2 is the first prime number and the only even prime. 2 is also
+	the first deficient number (oh well). There are only 10 types of people
+	in the world - those who like our new names and those who do not.
+	Enjoy!
+
+	Richard: I'm very glad that we've finally gotten 2.0.0 released and
+	I look forward to returning to a more normal development schedule.
+	Again, a big thanks to everyone who helped in any way to get things
+	where they are today.  Congratulations everyone!
+
+	Sadrul: My first NEWS, and on what an occasion! Pidgin 2.0.0 is finally
+	released!! And it's *really* very good!!! Give your soul a break ...
+	Use Pidgin!
+
+	Daniel: There has been a fair amount of weeping and gnashing of teeth
+	due to the delays in getting this beast out.  I'm really happy that it
+	is done.  I'm also very happy with what we're releasing - I think it is
+	far more stable, packed with useful features and, dare I say, prettier
+	than any previous release.
+
 2.0.0beta7 (4/29/2007):
 	Sean: Beta 7. The final beta. A few major changes from beta6. For
 	starters, we have some new names. That's pretty cool. We have a new
--- a/configure.ac	Thu May 03 10:14:49 2007 +0000
+++ b/configure.ac	Sat May 05 08:00:03 2007 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [0])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [0])
-m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [beta7])
+m4_define([purple_micro_version], [1])
+m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -55,8 +55,8 @@
 m4_define([gnt_lt_current], [0])
 m4_define([gnt_major_version], [1])
 m4_define([gnt_minor_version], [0])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [beta7])
+m4_define([gnt_micro_version], [1])
+m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
@@ -1187,7 +1187,7 @@
 	PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
 	if test "_$PERL_CFLAGS" = _ ; then
 		AC_MSG_RESULT([not found, building without perl.])
-		enable_perl = no
+		enable_perl=no
 	else
 		PERL_LIBS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null |$sedpath 's/-lgdbm //'`
 		PERL_LIBS=`echo $PERL_LIBS |$sedpath 's/-ldb //'`
--- a/doc/pidgin.1.in	Thu May 03 10:14:49 2007 +0000
+++ b/doc/pidgin.1.in	Sat May 05 08:00:03 2007 +0000
@@ -548,6 +548,8 @@
 .br
  Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR>
 .br
+ Richard 'wabz' Nelson (developer)
+.br
  Christopher 'siege' O'Brien (developer)
 .br
  Bartosz Oler (developer)
@@ -574,12 +576,12 @@
 .br
 Ka-Hing 'javabsp' Cheung
 .br
-Sadrul Habib Chowdhury
-.br
 Felipe 'shx' Contreras
 .br
 Decklin Foster
 .br
+Casey Harkins
+.br
 Peter 'Bleeter' Lawler
 .br
 Robert 'Robot101' McQueen
--- a/finch/finch.c	Thu May 03 10:14:49 2007 +0000
+++ b/finch/finch.c	Sat May 05 08:00:03 2007 +0000
@@ -303,7 +303,7 @@
 			char *text = g_strdup_printf(_(
 				"%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"), _("Finch"),
+				"migration by hand. Please report this error at http://developer.pidgin.im"), "Finch",
 				old, purple_user_dir());
 
 			g_free(old);
--- a/finch/gntblist.c	Thu May 03 10:14:49 2007 +0000
+++ b/finch/gntblist.c	Sat May 05 08:00:03 2007 +0000
@@ -1152,6 +1152,9 @@
 	int x, y, top, width;
 	char *title = NULL;
 
+	if (ggblist->context)
+		return;
+
 	tree = GNT_TREE(ggblist->tree);
 
 	node = gnt_tree_get_selection_data(tree);
--- a/finch/gntconv.c	Thu May 03 10:14:49 2007 +0000
+++ b/finch/gntconv.c	Sat May 05 08:00:03 2007 +0000
@@ -37,13 +37,23 @@
 #include "gntplugin.h"
 #include "gntprefs.h"
 #include "gntstatus.h"
+#include "gntpounce.h"
 
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntentry.h"
+#include "gntlabel.h"
+#include "gntmenu.h"
+#include "gntmenuitem.h"
+#include "gntmenuitemcheck.h"
 #include "gnttextview.h"
+#include "gnttree.h"
+#include "gntutils.h"
+#include "gntwindow.h"
 
 #define PREF_ROOT	"/finch/conversations"
+#define PREF_CHAT   PREF_ROOT "/chats"
+#define PREF_USERLIST PREF_CHAT "/userlist"
 
 #include "config.h"
 
@@ -266,6 +276,151 @@
 }
 
 static void
+clear_scrollback_cb(GntMenuItem *item, gpointer ggconv)
+{
+	FinchConv *ggc = ggconv;
+	gnt_text_view_clear(GNT_TEXT_VIEW(ggc->tv));
+}
+
+static void
+send_file_cb(GntMenuItem *item, gpointer ggconv)
+{
+	FinchConv *ggc = ggconv;
+	serv_send_file(purple_conversation_get_gc(ggc->active_conv),
+			purple_conversation_get_name(ggc->active_conv), NULL);
+}
+
+static void
+add_pounce_cb(GntMenuItem *item, gpointer ggconv)
+{
+	FinchConv *ggc = ggconv;
+	finch_pounce_editor_show(
+			purple_conversation_get_account(ggc->active_conv),
+			purple_conversation_get_name(ggc->active_conv), NULL);
+}
+
+static void
+get_info_cb(GntMenuItem *item, gpointer ggconv)
+{
+	FinchConv *ggc = ggconv;
+	serv_get_info(purple_conversation_get_gc(ggc->active_conv),
+			purple_conversation_get_name(ggc->active_conv));
+}
+
+static void
+toggle_timestamps_cb(GntMenuItem *item, gpointer ggconv)
+{
+	purple_prefs_set_bool(PREF_ROOT "/timestamps",
+		!purple_prefs_get_bool(PREF_ROOT "/timestamps"));
+}
+
+static void
+send_to_cb(GntMenuItem *m, gpointer n)
+{
+	PurpleAccount *account = g_object_get_data(G_OBJECT(m), "purple_account");
+	gchar *buddy = g_object_get_data(G_OBJECT(m), "purple_buddy_name");
+	PurpleConversation *conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, buddy);
+	finch_conversation_set_active(conv);
+}
+
+static void
+generate_send_to_menu(FinchConv *ggc)
+{
+	GntWidget *sub, *menu = ggc->menu;
+	GntMenuItem *item;
+	GSList *buds;
+	GList *list = NULL;
+
+	buds = purple_find_buddies(ggc->active_conv->account, ggc->active_conv->name);
+	if (!buds)
+		return;
+
+	item = gnt_menuitem_new(_("Send To"));
+	gnt_menu_add_item(GNT_MENU(menu), item);
+	sub = gnt_menu_new(GNT_MENU_POPUP);
+	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
+
+	for (; buds; buds = buds->next) {
+		PurpleBlistNode *node = (PurpleBlistNode *)purple_buddy_get_contact((PurpleBuddy *)buds->data);
+		for (node = node->child; node != NULL; node = node->next) {
+			PurpleBuddy *buddy = (PurpleBuddy *)node;
+			PurpleAccount *account = purple_buddy_get_account(buddy);
+			if (purple_account_is_connected(account)) {
+				/* Use the PurplePresence to get unique buddies. */
+				PurplePresence *presence = purple_buddy_get_presence(buddy);
+				if (!g_list_find(list, presence))
+					list = g_list_prepend(list, presence);
+			}
+		}
+	}
+	for (list = g_list_last(list); list != NULL; list = list->prev) {
+		PurplePresence *pre = list->data;
+		PurpleBuddy *buddy = purple_presence_get_buddy(pre);
+		PurpleAccount *account = purple_buddy_get_account(buddy);
+		gchar *name = g_strdup(purple_buddy_get_name(buddy));
+		gchar *text = g_strdup_printf("%s (%s)", purple_buddy_get_name(buddy), purple_account_get_username(account));
+		item = gnt_menuitem_new(text);
+		g_free(text);
+		gnt_menu_add_item(GNT_MENU(sub), item);
+		gnt_menuitem_set_callback(item, send_to_cb, NULL);
+		g_object_set_data(G_OBJECT(item), "purple_account", account);
+		g_object_set_data_full(G_OBJECT(item), "purple_buddy_name", name, g_free);
+	}
+	g_list_free(list);
+	g_slist_free(buds);
+}
+
+static void
+gg_create_menu(FinchConv *ggc)
+{
+	GntWidget *menu, *sub;
+	GntMenuItem *item;
+
+	ggc->menu = menu = gnt_menu_new(GNT_MENU_TOPLEVEL);
+	gnt_window_set_menu(GNT_WINDOW(ggc->window), GNT_MENU(menu));
+
+	item = gnt_menuitem_new(_("Conversation"));
+	gnt_menu_add_item(GNT_MENU(menu), item);
+
+	sub = gnt_menu_new(GNT_MENU_POPUP);
+	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
+
+	item = gnt_menuitem_new(_("Clear Scrollback"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(item, clear_scrollback_cb, ggc);
+
+	item = gnt_menuitem_check_new(_("Show Timestamps"));
+	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
+		purple_prefs_get_bool(PREF_ROOT "/timestamps"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(item, toggle_timestamps_cb, ggc);
+
+	if (purple_conversation_get_type(ggc->active_conv) == PURPLE_CONV_TYPE_IM) {
+		item = gnt_menuitem_new(_("Send File"));
+		gnt_menu_add_item(GNT_MENU(sub), item);
+		gnt_menuitem_set_callback(item, send_file_cb, ggc);
+
+		item = gnt_menuitem_new(_("Add Buddy Pounce..."));
+		gnt_menu_add_item(GNT_MENU(sub), item);
+		gnt_menuitem_set_callback(item, add_pounce_cb, ggc);
+
+		item = gnt_menuitem_new(_("Get Info"));
+		gnt_menu_add_item(GNT_MENU(sub), item);
+		gnt_menuitem_set_callback(item, get_info_cb, ggc);
+
+		generate_send_to_menu(ggc);
+	}
+}
+
+static void
+create_conv_from_userlist(GntWidget *widget, FinchConv *fc)
+{
+	PurpleAccount *account = purple_conversation_get_account(fc->active_conv);
+	char *name = gnt_tree_get_selection_data(GNT_TREE(widget));
+	purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+}
+
+static void
 finch_create_conversation(PurpleConversation *conv)
 {
 	FinchConv *ggc = conv->ui_data;
@@ -296,18 +451,37 @@
 	type = purple_conversation_get_type(conv);
 	title = get_conversation_title(conv, account);
 
-	ggc->window = gnt_box_new(FALSE, TRUE);
+	ggc->window = gnt_vwindow_new(FALSE);
 	gnt_box_set_title(GNT_BOX(ggc->window), title);
 	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
 	gnt_box_set_pad(GNT_BOX(ggc->window), 0);
 	gnt_widget_set_name(ggc->window, "conversation-window");
 
+	gg_create_menu(ggc);
+
 	ggc->tv = gnt_text_view_new();
-	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv);
 	gnt_widget_set_name(ggc->tv, "conversation-window-textview");
 	gnt_widget_set_size(ggc->tv, purple_prefs_get_int(PREF_ROOT "/size/width"),
 			purple_prefs_get_int(PREF_ROOT "/size/height"));
 
+	if (type == PURPLE_CONV_TYPE_CHAT) {
+		GntWidget *hbox, *tree;
+		FinchConvChat *fc = ggc->u.chat = g_new0(FinchConvChat, 1);
+		hbox = gnt_hbox_new(FALSE);
+		gnt_box_set_pad(GNT_BOX(hbox), 0);
+		tree = fc->userlist = gnt_tree_new();
+		gnt_tree_set_compare_func(GNT_TREE(tree), (GCompareFunc)g_utf8_collate);
+		gnt_tree_set_hash_fns(GNT_TREE(tree), g_str_hash, g_str_equal, g_free);
+		GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
+		gnt_box_add_widget(GNT_BOX(hbox), ggc->tv);
+		gnt_box_add_widget(GNT_BOX(hbox), tree);
+		gnt_box_add_widget(GNT_BOX(ggc->window), hbox);
+		g_signal_connect(G_OBJECT(tree), "activate", G_CALLBACK(create_conv_from_userlist), ggc);
+		gnt_widget_set_visible(tree, purple_prefs_get_bool(PREF_USERLIST));
+	} else {
+		gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv);
+	}
+
 	ggc->info = gnt_vbox_new(FALSE);
 	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->info);
 
@@ -338,6 +512,7 @@
 	}
 
 	g_free(title);
+	gnt_box_give_focus_to_child(GNT_BOX(ggc->window), ggc->entry);
 }
 
 static void
@@ -350,6 +525,7 @@
 		ggc->active_conv = ggc->list->data;
 	
 	if (ggc->list == NULL) {
+		g_free(ggc->u.chat);
 		gnt_widget_destroy(ggc->window);
 		g_free(ggc);
 	}
@@ -380,8 +556,7 @@
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL);
 
 	/* Unnecessary to print the timestamp for delayed message */
-	if (!(flags & PURPLE_MESSAGE_DELAYED) &&
-			purple_prefs_get_bool("/finch/conversations/timestamps"))
+	if (purple_prefs_get_bool("/finch/conversations/timestamps"))
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
 					purple_utf8_strftime("(%H:%M:%S) ", localtime(&mtime)), GNT_TEXT_FLAG_DIM);
 
@@ -510,8 +685,11 @@
 	for (; users; users = users->next)
 	{
 		PurpleConvChatBuddy *cbuddy = users->data;
+		GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
 		gnt_entry_add_suggest(entry, cbuddy->name);
 		gnt_entry_add_suggest(entry, cbuddy->alias);
+		gnt_tree_add_row_after(tree, g_strdup(cbuddy->name),
+				gnt_tree_create_row(tree, cbuddy->alias), NULL, NULL);
 	}
 }
 
@@ -521,9 +699,13 @@
 	/* Update the name for string completion */
 	FinchConv *ggc = conv->ui_data;
 	GntEntry *entry = GNT_ENTRY(ggc->entry);
+	GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
 	gnt_entry_remove_suggest(entry, old);
 	gnt_entry_add_suggest(entry, new_n);
 	gnt_entry_add_suggest(entry, new_a);
+	gnt_tree_remove(tree, (gpointer)old);
+	gnt_tree_add_row_after(tree, g_strdup(new_n),
+			gnt_tree_create_row(tree, new_a), NULL, NULL);
 }
 
 static void
@@ -532,8 +714,11 @@
 	/* Remove the name from string completion */
 	FinchConv *ggc = conv->ui_data;
 	GntEntry *entry = GNT_ENTRY(ggc->entry);
-	for (; list; list = list->next)
+	for (; list; list = list->next) {
+		GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
 		gnt_entry_remove_suggest(entry, list->data);
+		gnt_tree_remove(tree, list->data);
+	}
 }
 
 static void
@@ -677,6 +862,23 @@
 	return PURPLE_CMD_STATUS_OK;
 }
 
+static PurpleCmdRet
+users_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
+{
+	FinchConv *fc = conv->ui_data;
+	FinchConvChat *ch;
+	if (!fc)
+		return PURPLE_CMD_STATUS_FAILED;
+
+	ch = fc->u.chat;
+	gnt_widget_set_visible(ch->userlist,
+			(GNT_WIDGET_IS_FLAG_SET(ch->userlist, GNT_WIDGET_INVISIBLE)));
+	gnt_box_readjust(GNT_BOX(fc->window));
+	gnt_box_give_focus_to_child(GNT_BOX(fc->window), fc->entry);
+	purple_prefs_set_bool(PREF_USERLIST, !(GNT_WIDGET_IS_FLAG_SET(ch->userlist, GNT_WIDGET_INVISIBLE)));
+	return PURPLE_CMD_STATUS_OK;
+}
+
 void finch_conversation_init()
 {
 	purple_prefs_add_none(PREF_ROOT);
@@ -686,6 +888,8 @@
 	purple_prefs_add_none(PREF_ROOT "/position");
 	purple_prefs_add_int(PREF_ROOT "/position/x", 0);
 	purple_prefs_add_int(PREF_ROOT "/position/y", 0);
+	purple_prefs_add_none(PREF_CHAT);
+	purple_prefs_add_bool(PREF_USERLIST, FALSE);
 
 	/* Xerox the commands */
 	purple_cmd_register("say", "S", PURPLE_CMD_P_DEFAULT,
@@ -703,6 +907,9 @@
 	purple_cmd_register("help", "w", PURPLE_CMD_P_DEFAULT,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, NULL,
 	                  help_command_cb, _("help &lt;command&gt;:  Help on a specific command."), NULL);
+	purple_cmd_register("users", "", PURPLE_CMD_P_DEFAULT,
+	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, NULL,
+	                  users_command_cb, _("users:  Show the list of users in the chat."), NULL);
 
 	/* Now some commands to bring up some other windows */
 	purple_cmd_register("plugins", "", PURPLE_CMD_P_DEFAULT,
--- a/finch/libgnt/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/finch/libgnt/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -64,12 +64,12 @@
 	gntmarshal.h \
 	gntmarshal.c
 
-gntmarshal.c: genmarshal gntmarshal.h
+gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
 	echo "#include \"gntmarshal.h\"" > $@
-	cat genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
+	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
 
-gntmarshal.h: genmarshal
-	cat genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
+gntmarshal.h: $(srcdir)/genmarshal
+	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
--- a/finch/libgnt/gntentry.c	Thu May 03 10:14:49 2007 +0000
+++ b/finch/libgnt/gntentry.c	Sat May 05 08:00:03 2007 +0000
@@ -44,6 +44,29 @@
 }
 
 static gboolean
+complete_suggest(GntEntry *entry, const char *text)
+{
+	gboolean changed = FALSE;
+	if (entry->word) {
+		char *s = get_beginning_of_word(entry);
+		const char *iter = text;
+		while (*iter && toupper(*s) == toupper(*iter)) {
+			if (*s != *iter)
+				changed = TRUE;
+			*s++ = *iter++;
+		}
+		if (*iter) {
+			gnt_entry_key_pressed(GNT_WIDGET(entry), iter);
+			changed = TRUE;
+		}
+	} else {
+		gnt_entry_set_text_internal(entry, text);
+		changed = TRUE;
+	}
+	return changed;
+}
+
+static gboolean
 show_suggest_dropdown(GntEntry *entry)
 {
 	char *suggest = NULL;
@@ -51,6 +74,7 @@
 	int offset = 0, x, y;
 	int count = 0;
 	GList *iter;
+	const char *text = NULL;
 
 	if (entry->word)
 	{
@@ -85,7 +109,7 @@
 
 	for (count = 0, iter = entry->suggests; iter; iter = iter->next)
 	{
-		const char *text = iter->data;
+		text = iter->data;
 		if (g_ascii_strncasecmp(suggest, text, len) == 0 && strlen(text) >= len)
 		{
 			gnt_tree_add_row_after(GNT_TREE(entry->ddown), (gpointer)text,
@@ -96,13 +120,16 @@
 	}
 	g_free(suggest);
 
-	if (count == 0)
-	{
+	if (count == 0) {
 		destroy_suggest(entry);
 		return FALSE;
+	} else if (count == 1) {
+		destroy_suggest(entry);
+		return complete_suggest(entry, text);
+	} else {
+		gnt_widget_draw(entry->ddown->parent);
 	}
 
-	gnt_widget_draw(entry->ddown->parent);
 	return TRUE;
 }
 
@@ -324,10 +351,7 @@
 {
 	GntEntry *entry = GNT_ENTRY(bind);
 	if (entry->ddown) {
-		if (g_list_length(GNT_TREE(entry->ddown)->list) == 1)
-			gnt_entry_key_pressed(GNT_WIDGET(entry), "\r");
-		else
-			gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "move-down");
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "move-down");
 		return TRUE;
 	}
 	return show_suggest_dropdown(entry);
@@ -512,33 +536,11 @@
 	}
 	else
 	{
-		if (text[0] == '\t')
-		{
-			if (entry->ddown)
-				destroy_suggest(entry);
-			else if (entry->suggests)
-				return show_suggest_dropdown(entry);
-
-			return FALSE;
-		}
-		else if (text[0] == '\r' && entry->ddown)
+		if ((text[0] == '\r' || text[0] == ' ') && entry->ddown)
 		{
 			char *text = g_strdup(gnt_tree_get_selection_data(GNT_TREE(entry->ddown)));
 			destroy_suggest(entry);
-			if (entry->word)
-			{
-				char *s = get_beginning_of_word(entry);
-				char *iter = text;
-				while (*iter && toupper(*s) == toupper(*iter))
-				{
-					*s++ = *iter++;
-				}
-				gnt_entry_key_pressed(widget, iter);
-			}
-			else
-			{
-				gnt_entry_set_text_internal(entry, text);
-			}
+			complete_suggest(entry, text);
 			g_free(text);
 			entry_text_changed(entry);
 			return TRUE;
--- a/finch/libgnt/gntmain.c	Thu May 03 10:14:49 2007 +0000
+++ b/finch/libgnt/gntmain.c	Sat May 05 08:00:03 2007 +0000
@@ -12,13 +12,16 @@
 
 #include "gnt.h"
 #include "gntbox.h"
+#include "gntbutton.h"
 #include "gntcolors.h"
 #include "gntclipboard.h"
 #include "gntkeys.h"
+#include "gntlabel.h"
 #include "gntmenu.h"
 #include "gntstyle.h"
 #include "gnttree.h"
 #include "gntutils.h"
+#include "gntwindow.h"
 #include "gntwm.h"
 
 #include <panel.h>
@@ -303,6 +306,49 @@
 }
 
 static void
+exit_confirmed(gpointer null)
+{
+	gnt_bindable_perform_action_named(GNT_BINDABLE(wm), "wm-quit", NULL);
+}
+
+static void
+exit_win_close(GntWidget *w, GntWidget **win)
+{
+	*win = NULL;
+}
+
+static void
+ask_before_exit()
+{
+	static GntWidget *win = NULL;
+	GntWidget *bbox, *button;
+
+	if (win)
+		goto raise;
+
+	win = gnt_vwindow_new(FALSE);
+	gnt_box_add_widget(GNT_BOX(win), gnt_label_new("Are you sure you want to quit?"));
+	gnt_box_set_title(GNT_BOX(win), "Quit?");
+	gnt_box_set_alignment(GNT_BOX(win), GNT_ALIGN_MID);
+	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(exit_win_close), &win);
+
+	bbox = gnt_hbox_new(FALSE);
+	gnt_box_add_widget(GNT_BOX(win), bbox);
+
+	button = gnt_button_new("Quit");
+	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(exit_confirmed), NULL);
+	gnt_box_add_widget(GNT_BOX(bbox), button);
+
+	button = gnt_button_new("Cancel");
+	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gnt_widget_destroy), win);
+	gnt_box_add_widget(GNT_BOX(bbox), button);
+
+	gnt_widget_show(win);
+raise:
+	gnt_wm_raise_window(wm, win);
+}
+
+static void
 sighandler(int sig)
 {
 	switch (sig) {
@@ -318,6 +364,10 @@
 		clean_pid();
 		signal(SIGCHLD, sighandler);
 		break;
+	case SIGINT:
+		ask_before_exit();
+		signal(SIGINT, sighandler);
+		break;
 	}
 }
 
@@ -387,6 +437,7 @@
 	signal(SIGWINCH, sighandler);
 #endif
 	signal(SIGCHLD, sighandler);
+	signal(SIGINT, sighandler);
 	signal(SIGPIPE, SIG_IGN);
 
 	g_type_init();
--- a/libpurple/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -131,6 +131,8 @@
 	xmlnode.h \
 	whiteboard.h
 
+BUILT_SOURCES = version.h
+
 if ENABLE_DBUS
 
 CLEANFILES = \
--- a/libpurple/buddyicon.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/buddyicon.c	Sat May 05 08:00:03 2007 +0000
@@ -279,6 +279,7 @@
 	icon->account = account;
 	icon->username = g_strdup(username);
 	icon->checksum = NULL;
+	icon->ref_count = 1;
 
 	icon_cache = g_hash_table_lookup(account_cache, account);
 
@@ -314,9 +315,6 @@
 	if (icon == NULL)
 		icon = purple_buddy_icon_create(account, username);
 
-	/* Take a reference for the caller of this function. */
-	icon->ref_count = 1;
-
 	/* purple_buddy_icon_set_data() sets img, but it
 	 * references img first, so we need to initialize it */
 	icon->img = NULL;
@@ -379,13 +377,16 @@
 	account  = purple_buddy_icon_get_account(icon);
 	username = purple_buddy_icon_get_username(icon);
 
-	/* If no data exists, then call the functions below with NULL to
-	 * unset the icon.  They will then unref the icon and it should be
-	 * destroyed.  The only way it wouldn't be destroyed is if someone
+	/* If no data exists (icon->img == NULL), then call the functions below
+	 * with NULL to unset the icon.  They will then unref the icon and it should
+	 * be destroyed.  The only way it wouldn't be destroyed is if someone
 	 * else is holding a reference to it, in which case they can kill
 	 * the icon when they realize it has no data. */
 	icon_to_set = icon->img ? icon : NULL;
 
+	/* Ensure that icon remains valid throughout */
+	if (icon) purple_buddy_icon_ref(icon);
+
 	buddies = purple_find_buddies(account, username);
 	while (buddies != NULL)
 	{
@@ -393,8 +394,6 @@
 		char *old_icon;
 
 		purple_buddy_set_icon(buddy, icon_to_set);
-
-
 		old_icon = g_strdup(purple_blist_node_get_string((PurpleBlistNode *)buddy,
 		                                                 "buddy_icon"));
 		if (icon->img && purple_buddy_icons_is_caching())
@@ -432,6 +431,9 @@
 
 	if (conv != NULL)
 		purple_conv_im_set_icon(PURPLE_CONV_IM(conv), icon_to_set);
+	
+	/* icon's refcount was incremented above */
+	if (icon) purple_buddy_icon_unref(icon);
 }
 
 void
@@ -453,6 +455,7 @@
 			g_free(data);
 	}
 
+	g_free(icon->checksum);
 	icon->checksum = g_strdup(checksum);
 
 	purple_buddy_icon_update(icon);
@@ -514,19 +517,53 @@
                                 void *icon_data, size_t icon_len,
                                 const char *checksum)
 {
-	PurpleBuddyIcon *icon;
+	GHashTable *icon_cache;
+	PurpleBuddyIcon *icon = NULL;
 
 	g_return_if_fail(account  != NULL);
 	g_return_if_fail(username != NULL);
 
-	icon = purple_buddy_icons_find(account, username);
+	icon_cache = g_hash_table_lookup(account_cache, account);
+
+	if (icon_cache != NULL)
+		icon = g_hash_table_lookup(icon_cache, username);
 
 	if (icon != NULL)
 		purple_buddy_icon_set_data(icon, icon_data, icon_len, checksum);
-	else
+	else if (icon_data && icon_len > 0)
 	{
-		PurpleBuddyIcon *icon = purple_buddy_icon_new(account, username, icon_data, icon_len, checksum);
-		purple_buddy_icon_unref(icon);
+		if (icon_data != NULL && icon_len > 0)
+		{
+			PurpleBuddyIcon *icon = purple_buddy_icon_new(account, username, icon_data, icon_len, checksum);
+
+			/* purple_buddy_icon_new() calls
+			 * purple_buddy_icon_set_data(), which calls
+			 * purple_buddy_icon_update(), which has the buddy list
+			 * and conversations take references as appropriate.
+			 * This function doesn't return icon, so we can't
+			 * leave a reference dangling. */
+			purple_buddy_icon_unref(icon);
+		}
+		else
+		{
+			/* If the buddy list or a conversation was holding a
+			 * reference, we'd have found the icon in the cache.
+			 * Since we know we're deleting the icon, we only
+			 * need a subset of purple_buddy_icon_update(). */
+
+			GSList *buddies = purple_find_buddies(account, username);
+			while (buddies != NULL)
+			{
+				PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
+
+				unref_filename(purple_blist_node_get_string((PurpleBlistNode *)buddy, "buddy_icon"));
+				purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
+				purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
+
+				buddies = g_slist_delete_link(buddies, buddies);
+			}
+
+		}
 	}
 }
 
@@ -616,11 +653,9 @@
 			{
 				const char *checksum;
 
-				if (icon == NULL)
-					icon = purple_buddy_icon_create(account, username);
-				icon->ref_count = 0;
+				icon = purple_buddy_icon_create(account, username);
 				icon->img = NULL;
-				checksum = g_strdup(purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum"));
+				checksum = purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum");
 				purple_buddy_icon_set_data(icon, data, len, checksum);
 			}
 			g_free(path);
@@ -629,7 +664,7 @@
 		purple_buddy_icons_set_caching(caching);
 	}
 
-	return icon;
+	return purple_buddy_icon_ref(icon);
 }
 
 gboolean
--- a/libpurple/buddyicon.h	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/buddyicon.h	Sat May 05 08:00:03 2007 +0000
@@ -54,7 +54,7 @@
  * @param icon_len  The buddy icon length.
  * @param checksum  A protocol checksum from the prpl or @c NULL.
  *
- * @return The buddy icon structure.
+ * @return The buddy icon structure, with a reference for the caller.
  */
 PurpleBuddyIcon *purple_buddy_icon_new(PurpleAccount *account, const char *username,
                                        void *icon_data, size_t icon_len,
@@ -209,7 +209,8 @@
  * @param account  The account the user is on.
  * @param username The username of the user.
  *
- * @return The icon data if found, or @c NULL if not found.
+ * @return The icon (with a reference for the caller) if found, or @c NULL if
+ *         not found.
  */
 PurpleBuddyIcon *
 purple_buddy_icons_find(PurpleAccount *account, const char *username);
--- a/libpurple/conversation.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/conversation.c	Sat May 05 08:00:03 2007 +0000
@@ -279,7 +279,11 @@
 
 		ims = g_list_append(ims, conv);
 		if ((icon = purple_buddy_icons_find(account, name)))
+		{
 			purple_conv_im_set_icon(conv->u.im, icon);
+			/* purple_conv_im_set_icon refs the icon. */
+			purple_buddy_icon_unref(icon);
+		}
 
 		if (purple_prefs_get_bool("/purple/logging/log_ims"))
 		{
--- a/libpurple/gaim-compat.h	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/gaim-compat.h	Sat May 05 08:00:03 2007 +0000
@@ -115,6 +115,7 @@
 #define gaim_account_add_buddy       purple_account_add_buddy
 #define gaim_account_add_buddies     purple_account_add_buddies
 #define gaim_account_remove_buddy    purple_account_remove_buddy
+#define gaim_account_remove_buddies  purple_account_remove_buddies
 
 #define gaim_account_remove_group  purple_account_remove_group
 
@@ -353,7 +354,6 @@
 
 #define gaim_buddy_icons_set_for_user(icon, data, len) \
         purple_buddy_icons_set_for_user(icon, g_memdup(data, len), len, NULL)
-#define gaim_buddy_icons_find           purple_buddy_icons_find
 #define gaim_buddy_icons_set_caching    purple_buddy_icons_set_caching
 #define gaim_buddy_icons_is_caching     purple_buddy_icons_is_caching
 #define gaim_buddy_icons_set_cache_dir  purple_buddy_icons_set_cache_dir
@@ -1985,7 +1985,6 @@
 #define gaim_presence_new_for_conv       purple_presence_new_for_conv
 #define gaim_presence_new_for_buddy      purple_presence_new_for_buddy
 #define gaim_presence_destroy            purple_presence_destroy
-#define gaim_presence_remove_buddy       purple_presence_remove_buddy
 #define gaim_presence_add_status         purple_presence_add_status
 #define gaim_presence_add_list           purple_presence_add_list
 #define gaim_presence_set_status_active  purple_presence_set_status_active
--- a/libpurple/plugins/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -128,8 +128,8 @@
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
+	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
-	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
--- a/libpurple/plugins/perl/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -155,6 +155,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
--- a/libpurple/plugins/perl/common/Status.xs	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/perl/common/Status.xs	Sat May 05 08:00:03 2007 +0000
@@ -113,16 +113,6 @@
 purple_presence_get_active_status(presence)
 	Purple::Presence presence
 
-void
-purple_presence_get_buddies(presence)
-	Purple::Presence presence
-PREINIT:
-	const GList *l;
-PPCODE:
-	for (l = purple_presence_get_buddies(presence); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::BuddyList::Buddy")));
-	}
-
 const char *
 purple_presence_get_chat_user(presence)
 	Purple::Presence presence
@@ -197,11 +187,6 @@
 	Purple::Conversation conv
 
 void
-purple_presence_remove_buddy(presence, buddy)
-	Purple::Presence presence
-	Purple::BuddyList::Buddy buddy
-
-void
 purple_presence_set_idle(presence, idle, idle_time)
 	Purple::Presence presence
 	gboolean idle
--- a/libpurple/plugins/ssl/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -28,6 +28,7 @@
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)/libpurple\" \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS)
--- a/libpurple/plugins/ssl/ssl-nss.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Sat May 05 08:00:03 2007 +0000
@@ -108,7 +108,7 @@
 {
 	char *lib;
 	PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
-	NSS_NoDB_Init(NULL);
+	NSS_NoDB_Init(".");
 
 	/* TODO: Fix this so autoconf does the work trying to find this lib. */
 #ifndef _WIN32
--- a/libpurple/plugins/tcl/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -15,6 +15,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
--- a/libpurple/plugins/tcl/tcl_ref.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_ref.c	Sat May 05 08:00:03 2007 +0000
@@ -114,7 +114,7 @@
 	char *ptr;
 	PurpleStringref *type;
 	void *value;
-	static const char const *prefix = "purple-";
+	static const char prefix[] = "purple-";
 	static const int prefixlen = sizeof(prefix) - 1;
 
 	if (strlen(bytes) < prefixlen
--- a/libpurple/protocols/bonjour/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -37,6 +37,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(HOWL_CFLAGS)
--- a/libpurple/protocols/gg/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -72,6 +72,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(INTGG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/irc/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -30,5 +30,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/irc/msgs.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Sat May 05 08:00:03 2007 +0000
@@ -109,7 +109,9 @@
 	if (!strcmp(name, "251")) {
 		/* 251 is required, so we pluck our nick from here */
 		purple_connection_set_display_name(gc, args[0]);
-	} else if (!strcmp(name, "255")) {
+		/* Some IRC servers seem to not send a 255 numeric, so
+		 * I guess we can't require it; 251 will do. */
+	/* } else if (!strcmp(name, "255")) { */
 		purple_connection_set_state(gc, PURPLE_CONNECTED);
 
 		/* If we're away then set our away message */
--- a/libpurple/protocols/jabber/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -68,6 +68,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBXML_CFLAGS)
--- a/libpurple/protocols/jabber/jabber.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat May 05 08:00:03 2007 +0000
@@ -1031,6 +1031,8 @@
 
 void jabber_stream_set_state(JabberStream *js, JabberStreamState state)
 {
+	PurpleStoredImage *img;
+
 	js->state = state;
 	switch(state) {
 		case JABBER_STREAM_OFFLINE:
@@ -1056,12 +1058,19 @@
 		case JABBER_STREAM_REINITIALIZING:
 			purple_connection_update_progress(js->gc, _("Re-initializing Stream"),
 					(js->gsc ? 7 : 4), JABBER_CONNECT_STEPS);
-			
+
 			/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
 			js->reinit = TRUE;
-			
+
 			break;
 		case JABBER_STREAM_CONNECTED:
+			/* lets make sure our buddy icon is up to date
+			 * before we go letting people know we're here */
+			img = purple_buddy_icons_find_account_icon(js->gc->account);
+			jabber_set_buddy_icon(js->gc, img);
+			purple_imgstore_unref(img);
+
+			/* now we can alert the core that we're ready to send status */
 			purple_connection_set_state(js->gc, PURPLE_CONNECTED);
 			jabber_disco_items_server(js);
 			break;
--- a/libpurple/protocols/jabber/message.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Sat May 05 08:00:03 2007 +0000
@@ -86,7 +86,6 @@
 			PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
 					from, jm->js->gc->account);
 			if (conv && jid->node && jid->domain) {
-#if 0  /* String freeze... make sure to mark the message for translation */
 				char buf[256];
 				PurpleBuddy *buddy;
 
@@ -100,7 +99,7 @@
 					escaped = g_markup_escape_text(who, -1);
 
 					g_snprintf(buf, sizeof(buf),
-					           "%s has left the conversation.", escaped);
+					           _("%s has left the conversation."), escaped);
 
 					/* At some point when we restructure PurpleConversation,
 					 * this should be able to be implemented by removing the
@@ -108,7 +107,6 @@
 					purple_conversation_write(conv, "", buf,
 					                        PURPLE_MESSAGE_SYSTEM, time(NULL));
 				}
-#endif
 			}
 			serv_got_typing_stopped(jm->js->gc, from);
 			
--- a/libpurple/protocols/msn/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -85,5 +85,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/msn/msn.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat May 05 08:00:03 2007 +0000
@@ -377,6 +377,15 @@
 					   data);
 }
 
+static gboolean
+msn_offline_message(const PurpleBuddy *buddy) {
+	MsnUser *user;
+	if (buddy == NULL)
+		return FALSE;
+	user = buddy->proto_data;
+	return user && user->mobile;
+}
+
 static void
 initiate_chat_cb(PurpleBlistNode *node, gpointer data)
 {
@@ -2075,7 +2084,7 @@
 	msn_can_receive_file,	/* can_receive_file */
 	msn_send_file,			/* send_file */
 	msn_new_xfer,			/* new_xfer */
-	NULL,					/* offline_message */
+	msn_offline_message,			/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
--- a/libpurple/protocols/msn/notification.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sat May 05 08:00:03 2007 +0000
@@ -947,7 +947,7 @@
 	url = cmd->params[2];
 
 	buf = g_strdup_printf("%s%lu%s",
-			   session->passport_info.mspauth,
+			   session->passport_info.mspauth ? session->passport_info.mspauth : "BOGUS",
 			   time(NULL) - session->passport_info.sl,
 			   purple_connection_get_password(account->gc));
 
@@ -1142,33 +1142,25 @@
 
 	if ((value = msn_message_get_attr(msg, "kv")) != NULL)
 	{
-		if (session->passport_info.kv != NULL)
-			g_free(session->passport_info.kv);
-
+		g_free(session->passport_info.kv);
 		session->passport_info.kv = g_strdup(value);
 	}
 
 	if ((value = msn_message_get_attr(msg, "sid")) != NULL)
 	{
-		if (session->passport_info.sid != NULL)
-			g_free(session->passport_info.sid);
-
+		g_free(session->passport_info.sid);
 		session->passport_info.sid = g_strdup(value);
 	}
 
 	if ((value = msn_message_get_attr(msg, "MSPAuth")) != NULL)
 	{
-		if (session->passport_info.mspauth != NULL)
-			g_free(session->passport_info.mspauth);
-
+		g_free(session->passport_info.mspauth);
 		session->passport_info.mspauth = g_strdup(value);
 	}
 
 	if ((value = msn_message_get_attr(msg, "ClientIP")) != NULL)
 	{
-		if (session->passport_info.client_ip != NULL)
-			g_free(session->passport_info.client_ip);
-
+		g_free(session->passport_info.client_ip);
 		session->passport_info.client_ip = g_strdup(value);
 	}
 
@@ -1279,11 +1271,8 @@
 					  msn_user_get_passport(session->user),
 					  session->passport_info.file, NULL, NULL);
 
-	if (from != NULL)
-		g_free(from);
-
-	if (subject != NULL)
-		g_free(subject);
+	g_free(from);
+	g_free(subject);
 
 	g_hash_table_destroy(table);
 }
--- a/libpurple/protocols/msn/slp.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Sat May 05 08:00:03 2007 +0000
@@ -955,7 +955,7 @@
 
 	if (obj == NULL)
 	{
-		/* TODO purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); */
+		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
 		return;
 	}
 
--- a/libpurple/protocols/msn/user.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/msn/user.c	Sat May 05 08:00:03 2007 +0000
@@ -83,7 +83,7 @@
 
 	if (user->status != NULL) {
 		if (!strcmp(user->status, "offline") && user->mobile) {
-			purple_prpl_got_user_status(account, user->passport, "available", NULL);
+			purple_prpl_got_user_status(account, user->passport, "offline", NULL);
 			purple_prpl_got_user_status(account, user->passport, "mobile", NULL);
 		} else {
 			purple_prpl_got_user_status(account, user->passport, user->status, NULL);
@@ -207,7 +207,7 @@
 		memset(digest, 0, sizeof(digest));
 
 		purple_cipher_context_reset(ctx, NULL);
-		purple_cipher_context_append(ctx, data, strlen((char *)data));
+		purple_cipher_context_append(ctx, (const guchar *)buf, strlen(buf));
 		purple_cipher_context_digest(ctx, sizeof(digest), digest, NULL);
 		purple_cipher_context_destroy(ctx);
 		g_free(buf);
--- a/libpurple/protocols/novell/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -52,5 +52,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS)
--- a/libpurple/protocols/oscar/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -79,5 +79,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/oscar/oscar.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat May 05 08:00:03 2007 +0000
@@ -280,8 +280,8 @@
 
 	/* Make sure encoding begins with charset= */
 	if (strncmp(encoding, "text/aolrtf; charset=", 21) &&
-	    strncmp(encoding, "text/x-aolrtf; charset=", 23) &&
-	    strncmp(encoding, "text/plain; charset=", 20)) /* for iChat */
+		strncmp(encoding, "text/x-aolrtf; charset=", 23) &&
+		strncmp(encoding, "text/plain; charset=", 20))
 	{
 		return NULL;
 	}
@@ -5598,7 +5598,7 @@
 			length = va_arg(ap, int);
 			md5 = va_arg(ap, guchar *);
 
-			if (flags == 0x41) {
+			if ((flags == 0x00) || (flags == 0x41)) {
 				if (!flap_connection_getbytype(od, SNAC_FAMILY_BART) && !od->iconconnecting) {
 					od->iconconnecting = TRUE;
 					od->set_icon = TRUE;
--- a/libpurple/protocols/qq/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -93,6 +93,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-DVERSION=\"$(VERSION)\" \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
--- a/libpurple/protocols/qq/buddy_info.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/qq/buddy_info.c	Sat May 05 08:00:03 2007 +0000
@@ -601,11 +601,14 @@
 
 static void _qq_update_buddy_icon(PurpleAccount *account, const gchar *name, gint face)
 {
-	PurpleBuddyIcon *icon = purple_buddy_icons_find(account, name);
+	PurpleBuddy *buddy;
 	gchar *icon_num_str = face_to_icon_str(face);
-	const gchar *old_icon_num = purple_buddy_icon_get_checksum(icon);
+	const gchar *old_icon_num = NULL;
 
-	if (icon == NULL || old_icon_num == NULL ||
+	if ((buddy = purple_find_buddy(account, name)))
+		old_icon_num = purple_buddy_icons_get_checksum_for_user(buddy);
+
+	if (old_icon_num == NULL ||
 	    strcmp(icon_num_str, old_icon_num))
 	{
 		gchar *icon_path;
--- a/libpurple/protocols/sametime/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -34,7 +34,8 @@
 AM_CFLAGS = \
 	$(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	-I$(top_srcdir)/libpurple
+	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple
 
 
 AM_CPPFLAGS = \
--- a/libpurple/protocols/silc/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -31,5 +31,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/simple/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -31,5 +31,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/toc/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -27,5 +27,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/yahoo/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -49,5 +49,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/zephyr/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -102,6 +102,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple/protocols \
 	-DCONFDIR=\"$(confdir)\" \
 	$(GLIB_CFLAGS) \
--- a/libpurple/status.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/status.c	Sat May 05 08:00:03 2007 +0000
@@ -1311,7 +1311,6 @@
 
 	if (purple_presence_get_context(presence) == PURPLE_PRESENCE_CONTEXT_BUDDY)
 	{
-		const GList *l;
 		time_t current_time = time(NULL);
 
 		update_buddy_idle(purple_presence_get_buddy(presence), presence, current_time,
--- a/libpurple/status.h	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/status.h	Sat May 05 08:00:03 2007 +0000
@@ -752,9 +752,6 @@
  * All statuses added to this list will be destroyed along with
  * the presence.
  *
- * If this presence belongs to a buddy, you must call
- * purple_presence_remove_buddy() first.
- *
  * @param presence The presence to destroy.
  */
 void purple_presence_destroy(PurplePresence *presence);
--- a/libpurple/util.c	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/util.c	Sat May 05 08:00:03 2007 +0000
@@ -2524,9 +2524,7 @@
 purple_mkstemp(char **fpath, gboolean binary)
 {
 	const gchar *tmpdir;
-#ifndef _WIN32
 	int fd;
-#endif
 	FILE *fp = NULL;
 
 	g_return_val_if_fail(fpath != NULL, NULL);
@@ -2534,19 +2532,11 @@
 	if((tmpdir = (gchar*)g_get_tmp_dir()) != NULL) {
 		if((*fpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", tmpdir, purple_mkstemp_templ)) != NULL) {
 #ifdef _WIN32
-			char* result = _mktemp( *fpath );
-			if( result == NULL )
-				purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
-						   "Problem creating the template\n");
-			else
-			{
-				if( (fp = g_fopen( result, binary?"wb+":"w+")) == NULL ) {
-					purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
-							   "Couldn't fopen() %s\n", result);
-				}
-			}
+			fd = g_mkstemp(*fpath);
 #else
-			if((fd = mkstemp(*fpath)) == -1) {
+			fd = mkstemp(*fpath);
+#endif
+			if(fd == -1) {
 				purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
 						   "Couldn't make \"%s\", error: %d\n",
 						   *fpath, errno);
@@ -2557,7 +2547,7 @@
 							   "Couldn't fdopen(), error: %d\n", errno);
 				}
 			}
-#endif
+
 			if(!fp) {
 				g_free(*fpath);
 				*fpath = NULL;
--- a/libpurple/version.h.in	Thu May 03 10:14:49 2007 +0000
+++ b/libpurple/version.h.in	Sat May 05 08:00:03 2007 +0000
@@ -36,10 +36,6 @@
 extern "C" {
 #endif
 
-const guint purple_major_version;
-const guint purple_minor_version;
-const guint purple_micro_version;
-
 /**
  * Checks that the libpurple version is compatible with the requested
  * version
--- a/pidgin.spec.in	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin.spec.in	Sat May 05 08:00:03 2007 +0000
@@ -6,7 +6,7 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-%define beta 7
+#define beta 7
 
 %if 0%{?beta}
 %define pidginver %(echo "@VERSION@"|sed -e 's/dev.*//; s/beta.*//')
@@ -26,6 +26,10 @@
 
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
+BuildRequires: gtk2-devel
+
+%{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+%{!?_without_modularx:BuildRequires: libSM-devel, libXScrnSaver-devel}
 %{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
 %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
 %{?_with_howl:BuildRequires: howl-devel}
@@ -49,11 +53,10 @@
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # For Mandrake/Mandriva:
-BuildRequires: libgtk+2.0_0-devel, libnss3-devel, perl-devel
+BuildRequires: libnss3-devel, perl-devel
 Obsoletes:  libgaim-remote0
 %else
 # For SuSE, Red Hat, Fedora and others:
-BuildRequires: gtk2-devel
 %if "%{_vendor}" != "suse"
 # For Red Hat, Fedora and others:
 # let's assume RH & FC1 are the only brain-dead distros missing the
@@ -440,7 +443,14 @@
 %endif
 
 %changelog
-* Tue May  1 2007 Stu Tomlinson <stu@nosnilmot.com>
+* Thu May 3 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Add missing BuildRequires: startup-notification-devel, if you really
+  need to build on a distro without it use --without startupnotification
+- Add BuildRequires: libSM-devel, libXScrnSaver-devel for distros with
+  modular X. For those without, build with --without modularx
+- Change Mandriva BuildRequires to gkt2-devel (reported by Götz Waschk)
+
+* Tue May 1 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Run gtk-update-icon-cache on installation/uninstallation
 - Guard against errors when upgrading from Gaim/Pidgin 1.5.x which had
   no schemas file
--- a/pidgin/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -27,6 +27,7 @@
 		win32/nsis/pidgin-installer.nsi \
 		win32/nsis/pidgin-plugin.nsh \
 		win32/nsis/langmacros.nsh \
+		win32/nsis/translations/afrikaans.nsh \
 		win32/nsis/translations/albanian.nsh \
 		win32/nsis/translations/bulgarian.nsh \
 		win32/nsis/translations/catalan.nsh \
--- a/pidgin/gtkaccount.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/gtkaccount.c	Sat May 05 08:00:03 2007 +0000
@@ -1343,10 +1343,6 @@
 		proxy_info = NULL;
 	}
 
-
-	/* We no longer need the data from the dialog window */
-	account_win_destroy_cb(NULL, NULL, dialog);
-
 	/* If this is a new account, add it to our list */
 	if (new)
 		purple_accounts_add(account);
@@ -1364,6 +1360,9 @@
 		}
 	}
 
+	/* We no longer need the data from the dialog window */
+	account_win_destroy_cb(NULL, NULL, dialog);
+
 	return account;
 }
 
--- a/pidgin/gtkblist.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/gtkblist.c	Sat May 05 08:00:03 2007 +0000
@@ -1086,7 +1086,7 @@
 			prpl_info->can_receive_file(buddy->account->gc, buddy->name))
 		{
 			pidgin_new_item_from_stock(menu, _("_Send File"),
-									 PIDGIN_STOCK_FILE_TRANSFER,
+									 PIDGIN_STOCK_TOOLBAR_SEND_FILE,
 									 G_CALLBACK(gtk_blist_menu_send_file_cb),
 									 buddy, 0, 0, NULL);
 		}
@@ -2160,7 +2160,7 @@
 {
 	GdkPixbuf *buf, *ret = NULL;
 	GdkPixbufLoader *loader;
-	PurpleBuddyIcon *icon;
+	PurpleBuddyIcon *icon = NULL;
 	const guchar *data = NULL;
 	gsize len;
 	PurpleBuddy *buddy = NULL;
@@ -2197,9 +2197,9 @@
 	}
 
 	if (data == NULL) {
-		if (!(icon = purple_buddy_get_icon(buddy)))
-			if (!(icon = purple_buddy_icons_find(buddy->account, buddy->name))) /* Not sure I like this...*/
-				return NULL;
+		/* Not sure I like this...*/
+		if (!(icon = purple_buddy_icons_find(buddy->account, buddy->name)))
+			return NULL;
 		data = purple_buddy_icon_get_data(icon, &len);
 
 		if(data == NULL)
@@ -2211,6 +2211,7 @@
 	gdk_pixbuf_loader_close(loader, NULL);
 
 	purple_imgstore_unref(custom_img);
+	purple_buddy_icon_unref(icon);
 
 	buf = gdk_pixbuf_loader_get_pixbuf(loader);
 	if (buf)
@@ -2850,7 +2851,7 @@
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
-	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<StockItem>", PIDGIN_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
 };
 
 /*********************************************************
@@ -4880,7 +4881,12 @@
 	status = pidgin_blist_get_status_icon((PurpleBlistNode*)buddy,
 						PIDGIN_STATUS_ICON_SMALL);
 
-	avatar = pidgin_blist_get_buddy_icon((PurpleBlistNode *)buddy, TRUE, TRUE);
+	/* Speed it up if we don't want buddy icons. */
+	if(biglist)
+		avatar = pidgin_blist_get_buddy_icon((PurpleBlistNode *)buddy, TRUE, TRUE);
+	else
+		avatar = NULL;
+
 	if (!avatar) {
 		g_object_ref(G_OBJECT(gtkblist->empty_avatar));
 		avatar = gtkblist->empty_avatar;
@@ -5058,6 +5064,7 @@
 		GdkPixbuf *avatar;
 		GdkPixbuf *emblem;
 		char *mark;
+		gboolean showicons = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
 
 		if(!insert_node(list, node, &iter))
 			return;
@@ -5065,7 +5072,12 @@
 		status = pidgin_blist_get_status_icon(node,
 				 PIDGIN_STATUS_ICON_SMALL);
 		emblem = pidgin_blist_get_emblem(node);
-		avatar = pidgin_blist_get_buddy_icon(node, TRUE, FALSE);
+
+		/* Speed it up if we don't want buddy icons. */
+		if(showicons)
+			avatar = pidgin_blist_get_buddy_icon(node, TRUE, FALSE);
+		else
+			avatar = NULL;
 
 		mark = g_markup_escape_text(purple_chat_get_name(chat), -1);
 
--- a/pidgin/gtkconv.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/gtkconv.c	Sat May 05 08:00:03 2007 +0000
@@ -1583,7 +1583,7 @@
 		if (prpl_info && prpl_info->send_file)
 		{
 			button = pidgin_new_item_from_stock(menu, _("Send File"),
-				PIDGIN_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb),
+				PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(menu_chat_send_file_cb),
 				PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 			if (gc == NULL || prpl_info == NULL ||
@@ -2779,7 +2779,7 @@
 #endif
 	{ "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
 
-	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER },
+	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
 	{ N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
 			0, "<Item>", NULL },
 #if ENABLE_SHORTCUT
--- a/pidgin/gtkdocklet.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sat May 05 08:00:03 2007 +0000
@@ -648,6 +648,7 @@
 	void *conn_handle = purple_connections_get_handle();
 	void *conv_handle = purple_conversations_get_handle();
 	void *accounts_handle = purple_accounts_get_handle();
+	void *status_handle = purple_savedstatuses_get_handle();
 	void *docklet_handle = pidgin_docklet_get_handle();
 
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet");
@@ -664,7 +665,7 @@
 			    docklet_handle, PURPLE_CALLBACK(docklet_signed_on_cb), NULL);
 	purple_signal_connect(conn_handle, "signed-off",
 			    docklet_handle, PURPLE_CALLBACK(docklet_signed_off_cb), NULL);
-	purple_signal_connect(accounts_handle, "account-status-changed",
+	purple_signal_connect(accounts_handle, "account-connecting",
 			    docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL);
 	purple_signal_connect(conv_handle, "received-im-msg",
 			    docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL);
@@ -674,6 +675,8 @@
 			    docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL);
 	purple_signal_connect(conv_handle, "conversation-updated",
 			    docklet_handle, PURPLE_CALLBACK(docklet_conv_updated_cb), NULL);
+	purple_signal_connect(status_handle, "savedstatus-changed",
+			    docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL);
 #if 0
 	purple_signal_connect(purple_get_core(), "quitting",
 			    docklet_handle, PURPLE_CALLBACK(purple_quit_cb), NULL);
--- a/pidgin/gtkrequest.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/gtkrequest.c	Sat May 05 08:00:03 2007 +0000
@@ -1556,7 +1556,7 @@
 	}
 
 #ifdef _WIN32
-	if (!folder_set) {
+	if (!folder_set && (filename == NULL || *filename == '\0' || !g_file_test(filename, G_FILE_TEST_EXISTS))) {
 		char *my_documents = wpurple_get_special_folder(CSIDL_PERSONAL);
 
 		if (my_documents != NULL) {
--- a/pidgin/gtksound.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/gtksound.c	Sat May 05 08:00:03 2007 +0000
@@ -418,6 +418,7 @@
 	if (!strcmp(method, "custom")) {
 		const char *sound_cmd;
 		char *command;
+		char *esc_filename;
 		GError *error = NULL;
 
 		sound_cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
@@ -429,16 +430,19 @@
 			return;
 		}
 
+		esc_filename = g_strdup_printf("'%s'", filename);
+
 		if(strstr(sound_cmd, "%s"))
-			command = purple_strreplace(sound_cmd, "%s", filename);
+			command = purple_strreplace(sound_cmd, "%s", esc_filename);
 		else
-			command = g_strdup_printf("%s %s", sound_cmd, filename);
+			command = g_strdup_printf("%s %s", sound_cmd, esc_filename);
 
 		if(!g_spawn_command_line_async(command, &error)) {
 			purple_debug_error("gtksound", "sound command could not be launched: %s\n", error->message);
 			g_error_free(error);
 		}
 
+		g_free(esc_filename);
 		g_free(command);
 		return;
 	}
--- a/pidgin/pidginstock.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pidginstock.c	Sat May 05 08:00:03 2007 +0000
@@ -36,7 +36,6 @@
 
 } const stock_icons[] =
 {
-	{ PIDGIN_STOCK_ABOUT,           "buttons", "about_menu.png"           },
 	{ PIDGIN_STOCK_ACTION,          NULL,      GTK_STOCK_EXECUTE          },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_ALIAS,           NULL,      GTK_STOCK_EDIT             },
@@ -61,7 +60,6 @@
 #endif
 	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
 	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
-	{ PIDGIN_STOCK_FILE_TRANSFER,   NULL,      GTK_STOCK_REVERT_TO_SAVED  },
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
@@ -160,6 +158,7 @@
 	{ PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
 	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
--- a/pidgin/pidginstock.h	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pidginstock.h	Sat May 05 08:00:03 2007 +0000
@@ -31,7 +31,6 @@
 /** @name Stock images                                                    */
 /**************************************************************************/
 /*@{*/
-#define PIDGIN_STOCK_ABOUT           "pidgin-about"
 #define PIDGIN_STOCK_ACTION          "pidgin-action"
 #define PIDGIN_STOCK_ALIAS           "pidgin-alias"
 #define PIDGIN_STOCK_AWAY            "pidgin-away"
@@ -45,7 +44,6 @@
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
 #define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
-#define PIDGIN_STOCK_FILE_TRANSFER   "pidgin-file-transfer"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
@@ -125,6 +123,7 @@
 #define PIDGIN_STOCK_TOOLBAR_USER_INFO    "pidgin-info"
 #define PIDGIN_STOCK_TOOLBAR_UNBLOCK      "pidgin-unblock"
 #define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"
+#define PIDGIN_STOCK_TOOLBAR_SEND_FILE    "pidgin-send-file"
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
--- a/pidgin/pixmaps/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -1,7 +1,6 @@
 SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray
 
 EXTRA_DIST = \
-		about_menu.png			\
 		edit.png			\
 		logo.png			\
 		pause.png			\
@@ -13,7 +12,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = about_menu.png edit.png pause.png
+pidginbuttonpix_DATA = edit.png pause.png
 
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
Binary file pidgin/pixmaps/about_menu.png has changed
--- a/pidgin/pixmaps/emotes/default/22/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -67,6 +67,7 @@
 		glasses-cool.png \
 		glasses-nerdy.png \
 		go-away.png \
+		goat.png \
 		good.png \
 		hammer.png \
 		handcuffs.png \
Binary file pidgin/pixmaps/emotes/default/22/goat.png has changed
--- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -62,6 +62,7 @@
 		girl.svg \
 		glasses-cool.svg \
 		glasses-nerdy.svg \
+		goat.svg \
 		go-away.svg \
 		good.svg \
 		hammer.svg \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/emotes/default/22/scalable/goat.svg	Sat May 05 08:00:03 2007 +0000
@@ -0,0 +1,333 @@
+<?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="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   version="1.0"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="goat.svg"
+   inkscape:export-filename="/home/hbons/Desktop/goat.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3164">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3166" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop3168" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3154">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop3156" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3158" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3134">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop3136" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3138" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3106">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop3108" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0;"
+         offset="1"
+         id="stop3110" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3106"
+       id="radialGradient3112"
+       cx="8.5065088"
+       cy="9.6461401"
+       fx="8.5065088"
+       fy="9.6461401"
+       r="2.1569445"
+       gradientTransform="matrix(1.541291,0.465608,-0.481819,2.027283,4.319423e-2,-14.11923)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3106"
+       id="radialGradient3116"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.541291,0.465608,-0.481819,2.027283,4.319423e-2,-14.11923)"
+       cx="8.5065088"
+       cy="9.6461401"
+       fx="8.5065088"
+       fy="9.6461401"
+       r="2.1569445" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3134"
+       id="linearGradient3140"
+       x1="5.437963"
+       y1="0.23528472"
+       x2="5.437963"
+       y2="5.4434042"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3134"
+       id="linearGradient3148"
+       gradientUnits="userSpaceOnUse"
+       x1="5.437963"
+       y1="0.23528472"
+       x2="5.437963"
+       y2="5.4434042"
+       gradientTransform="matrix(-1,0,0,1,25,3e-7)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3154"
+       id="linearGradient3160"
+       x1="12.5"
+       y1="0.37108496"
+       x2="12.5"
+       y2="16.491886"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3164"
+       id="radialGradient3170"
+       cx="4.5859361"
+       cy="13.798236"
+       fx="4.5859361"
+       fy="13.798236"
+       r="3.4977479"
+       gradientTransform="matrix(1,0,0,0.538889,0,6.36252)"
+       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="25.730843"
+     inkscape:cx="25.851983"
+     inkscape:cy="11.081674"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="24px"
+     height="24px"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <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:0.80681818;fill:url(#radialGradient3170);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3162"
+       sodipodi:cx="4.5859361"
+       sodipodi:cy="13.798236"
+       sodipodi:rx="3.4977479"
+       sodipodi:ry="1.8848975"
+       d="M 8.083684 13.798236 A 3.4977479 1.8848975 0 1 1  1.0881882,13.798236 A 3.4977479 1.8848975 0 1 1  8.083684 13.798236 z"
+       transform="matrix(1.857695,0,0,1.856865,3.982983,-5.121458)" />
+    <path
+       style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#888a85;stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.125 3.5 C 7.4630368 3.5 4.5 5.9198669 4.5 8.90625 L 4.5 10.6875 C 4.4999999 12.520757 5.6074368 14.15201 7.3125 15.125 L 7.3125 17.9375 C 7.3124999 19.907141 9.1821933 21.485422 11.5 21.5 L 11.5 22.5 C 11.5 23.053999 11.946001 23.499999 12.5 23.5 C 13.053999 23.5 13.5 23.053998 13.5 22.5 L 13.5 21.5 C 15.817807 21.485423 17.6875 19.907142 17.6875 17.9375 L 17.6875 15.125 C 19.392563 14.15201 20.5 12.520757 20.5 10.6875 L 20.5 8.90625 C 20.5 5.9198668 17.536962 3.5 13.875 3.5 L 11.125 3.5 z "
+       id="rect1872" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0028498"
+       inkscape:original="M 11.125 3.5 C 7.4630368 3.5 4.5 5.9198669 4.5 8.90625 L 4.5 10.6875 C 4.4999999 12.520757 5.6074368 14.15201 7.3125 15.125 L 7.3125 17.9375 C 7.3124999 19.907141 9.1821933 21.485422 11.5 21.5 L 13.5 21.5 C 15.817807 21.485423 17.6875 19.907142 17.6875 17.9375 L 17.6875 15.125 C 19.392563 14.15201 20.5 12.520757 20.5 10.6875 L 20.5 8.90625 C 20.5 5.9198668 17.536962 3.5 13.875 3.5 L 11.125 3.5 z "
+       style="opacity:1;fill:url(#linearGradient3160);fill-opacity:1.0;stroke:white;stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3152"
+       d="M 11.125,4.5 C 7.9048332,4.5 5.5,6.5832069 5.5,8.90625 L 5.5,10.6875 C 5.4999999,12.116888 6.3641576,13.423507 7.8125,14.25 C 8.1242411,14.430678 8.3151074,14.764694 8.3125,15.125 L 8.3125,17.9375 C 8.3124999,19.2725 9.6340264,20.488264 11.5,20.5 L 13.5,20.5 C 15.365974,20.488265 16.6875,19.272502 16.6875,17.9375 L 16.6875,15.125 C 16.684893,14.764694 16.875759,14.430678 17.1875,14.25 C 18.635842,13.423507 19.5,12.116888 19.5,10.6875 L 19.5,8.90625 C 19.5,6.583207 17.095166,4.5 13.875,4.5 L 11.125,4.5 z " />
+    <rect
+       style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2763"
+       width="1"
+       height="5.0000005"
+       x="12.000009"
+       y="15.000004"
+       ry="0.53886384"
+       rx="0.5" />
+    <rect
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2765"
+       width="3"
+       height="1.9656405"
+       x="11.000009"
+       y="14.000004"
+       ry="0.98282027" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#babdb6;stroke-width:0.82246691;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2771"
+       sodipodi:cx="12.203254"
+       sodipodi:cy="18.947697"
+       sodipodi:rx="2.6816068"
+       sodipodi:ry="2.0986488"
+       d="M 14.767561,19.561604 A 2.6816068,2.0986488 0 0 1 9.6776584,19.65308"
+       transform="matrix(1.118732,0,0,1.321408,-1.152164,-7.764463)"
+       sodipodi:start="0.29686645"
+       sodipodi:end="2.7988059"
+       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="path2313"
+       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,1.284259,-0.688661,0,2.35522,-2.135131)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.94218826"
+       inkscape:original="M 4.5625 4.46875 C 2.9579994 7.0296312 3.4314452 8.7503668 4.25 9.5 C 6.0336558 9.5000001 8.9413878 9.500546 11.28125 9.5 C 12.256192 9.4997721 13.455805 9.5 13.9375 9.5 C 16.216702 9.5005481 18.983108 9.5 20.75 9.5 C 21.568557 8.7503669 22.042002 7.0296311 20.4375 4.46875 C 20.428669 5.0928925 20.216276 5.598111 19.875 6 C 18.748078 7.2885168 16.178685 7.564945 14.03125 7.59375 C 14.031262 7.5849058 11.437522 7.5849056 11.4375 7.59375 C 8.4698521 7.5610102 4.6031518 7.1497258 4.5625 4.46875 z "
+       xlink:href="#path2244"
+       style="opacity:0.2;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1"
+       id="path2266"
+       d="M 4.6875,6.8125 C 4.5155414,7.6585464 4.5469059,8.2639318 4.78125,8.5625 C 6.5783776,8.5625677 9.1184812,8.5630047 11.28125,8.5625 C 12.256519,8.562272 13.456102,8.5625 13.9375,8.5625 C 16.038658,8.5630053 18.454079,8.5625696 20.21875,8.5625 C 20.450872,8.2667634 20.475711,7.6759035 20.3125,6.84375 C 19.557648,7.5553907 18.566446,7.9573838 17.53125,8.1875 C 16.376366,8.4442219 15.140345,8.516373 14.03125,8.53125 C 14.010422,8.5319411 13.989578,8.5319411 13.96875,8.53125 C 13.963551,8.5311176 13.949379,8.5314449 13.9375,8.53125 C 13.932632,8.5307271 13.918896,8.5332789 13.90625,8.53125 C 13.891461,8.5310771 13.861711,8.5314138 13.84375,8.53125 C 13.780888,8.5306766 13.718637,8.5316757 13.625,8.53125 C 13.384218,8.5301553 13.073147,8.53125 12.75,8.53125 C 12.426853,8.53125 12.084536,8.5301553 11.84375,8.53125 C 11.736734,8.5317365 11.659399,8.5305759 11.59375,8.53125 C 11.568819,8.5354507 11.540979,8.5302056 11.53125,8.53125 C 11.498821,8.5347315 11.506084,8.5309288 11.5,8.53125 C 11.479172,8.5319411 11.458328,8.5319411 11.4375,8.53125 C 9.9146719,8.5144498 8.1174583,8.4078713 6.59375,7.90625 C 5.8773837,7.6704144 5.2333296,7.3204154 4.6875,6.8125 z "
+       transform="translate(-20.1876,-3.210909)" />
+    <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="path2311"
+       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,1.284261,-2.065983,0,8.454425,-7.135153)" />
+    <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="path2315"
+       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,1.284259,-0.688661,0,-9.64477,-2.135131)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient3116);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3114"
+       sodipodi:cx="7.9476604"
+       sodipodi:cy="10.436511"
+       sodipodi:rx="2.1569445"
+       sodipodi:ry="2.8370621"
+       d="M 10.104605 10.436511 A 2.1569445 2.8370621 0 1 1  5.7907159,10.436511 A 2.1569445 2.8370621 0 1 1  10.104605 10.436511 z"
+       transform="matrix(-1.390856,0,0,1.23367,28.05405,-2.375209)" />
+    <path
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 17.00001,13.000004 C 17.00001,11.344004 16.552009,10.000004 16.000009,10.000004 C 15.448009,10.000004 15.000009,11.344004 15.000009,13.000004 C 16.206103,13.000004 16.083985,13.000004 17.00001,13.000004 z "
+       id="path2193"
+       sodipodi:nodetypes="cscc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient3112);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3104"
+       sodipodi:cx="7.9476604"
+       sodipodi:cy="10.436511"
+       sodipodi:rx="2.1569445"
+       sodipodi:ry="2.8370621"
+       d="M 10.104605 10.436511 A 2.1569445 2.8370621 0 1 1  5.7907159,10.436511 A 2.1569445 2.8370621 0 1 1  10.104605 10.436511 z"
+       transform="matrix(1.390856,0,0,1.23367,-3.05405,-2.375212)" />
+    <path
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 10.000009,13.000004 C 10.000009,11.344004 9.5520081,10.000004 9.0000081,10.000004 C 8.4480082,10.000004 8.0000081,11.344004 8.0000081,13.000004 C 9.0145101,13.000004 9.1767691,13.000004 10.000009,13.000004 z "
+       id="path2219"
+       sodipodi:nodetypes="cscc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:1.03446472;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3128"
+       sodipodi:cx="3.3617244"
+       sodipodi:cy="2.7997618"
+       sodipodi:rx="0.75784534"
+       sodipodi:ry="2.1180806"
+       d="M 4.1195697 2.7997618 A 0.75784534 2.1180806 0 1 1  2.603879,2.7997618 A 0.75784534 2.1180806 0 1 1  4.1195697 2.7997618 z"
+       transform="matrix(1.319531,0,0,0.708188,4.0641,2.017241)" />
+    <path
+       style="opacity:1;fill:#c17d11;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.6875,-0.49750418 C 5.8653114,-0.1200094 4.5,1.499533 4.5,3.4538317 C 4.5,5.6873161 6.2919987,7.4999996 8.5,7.4999997 C 8.5,7.4999997 8.5179429,6.4884577 8.5179429,6.4884577 C 8.5291419,6.5224424 6.9560837,5.5492045 6.5,2.4422897 C 6.329457,1.2805234 7.0215067,0.24186794 7.8125,-0.49750418 C 7.7725639,-0.49050652 7.7270219,-0.50569176 7.6875,-0.49750418 z "
+       id="path3132"
+       sodipodi:nodetypes="csccscc" />
+    <path
+       style="opacity:1;fill:url(#linearGradient3140);fill-opacity:1.0;stroke:#8f5902;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.6875,-0.49750418 C 5.8653114,-0.1200094 4.5,1.499533 4.5,3.4538317 C 4.5,5.6873161 5.2815382,7.4999996 7.4895395,7.4999997 C 7.4895395,7.4999997 8.5179429,6.4884577 8.5179429,6.4884577 C 8.5291419,6.5224424 6.9560837,5.5492045 6.5,2.4422897 C 6.329457,1.2805234 7.0215067,0.24186794 7.8125,-0.49750418 C 7.7725639,-0.49050652 7.7270219,-0.50569176 7.6875,-0.49750418 z "
+       id="path3121"
+       sodipodi:nodetypes="csccscc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:1.03446472;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3142"
+       sodipodi:cx="3.3617244"
+       sodipodi:cy="2.7997618"
+       sodipodi:rx="0.75784534"
+       sodipodi:ry="2.1180806"
+       d="M 4.1195697 2.7997618 A 0.75784534 2.1180806 0 1 1  2.603879,2.7997618 A 0.75784534 2.1180806 0 1 1  4.1195697 2.7997618 z"
+       transform="matrix(-1.319531,0,0,0.708188,20.9359,2.017241)" />
+    <path
+       style="opacity:1;fill:#c17d11;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 17.312499,-0.49750388 C 19.134688,-0.1200091 20.499999,1.4995333 20.499999,3.453832 C 20.499999,5.6873164 18.708001,7.4999999 16.499999,7.5 C 16.499999,7.5 16.482056,6.488458 16.482056,6.488458 C 16.470857,6.5224427 18.043916,5.5492048 18.499999,2.44229 C 18.670542,1.2805237 17.978493,0.24186824 17.187499,-0.49750388 C 17.227435,-0.49050622 17.272977,-0.50569146 17.312499,-0.49750388 z "
+       id="path3144"
+       sodipodi:nodetypes="csccscc" />
+    <path
+       style="opacity:1;fill:url(#linearGradient3148);fill-opacity:1;stroke:#8f5902;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 17.312499,-0.49750388 C 19.134688,-0.1200091 20.499999,1.4995333 20.499999,3.453832 C 20.499999,5.6873164 19.524142,7.4999999 17.31614,7.5 C 17.31614,7.5 16.482056,6.488458 16.482056,6.488458 C 16.470857,6.5224427 18.043916,5.5492048 18.499999,2.44229 C 18.670542,1.2805237 17.978493,0.24186824 17.187499,-0.49750388 C 17.227435,-0.49050622 17.272977,-0.50569146 17.312499,-0.49750388 z "
+       id="path3146"
+       sodipodi:nodetypes="csccscc" />
+  </g>
+</svg>
--- a/pidgin/pixmaps/emotes/default/22/theme	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Sat May 05 08:00:03 2007 +0000
@@ -21,7 +21,7 @@
 moneymouth.png      :-$
 foot-in-mouth.png   :-!
 shout.png           >:o     >:O
-! skywalker.png     C:-)
+! skywalker.png     C:-) c:-) C:) c:)
 ! monkey.png        :-(|)
 
 ### Following AIM 6.1
@@ -120,102 +120,103 @@
 party.png           <:o)
 eyeroll.png         8-)
 yawn.png            |-) 
+goat.png            (nah)
 
 ### Following QQ 2006
 [QQ]
-shock.png           /惊讶 /:O /jy /surprised
-curl-lip.png        /撇嘴 /:~ /pz /curl_lip
-desire.png          /色 /:* /se /desire
-dazed.png           /发呆 /:| /dazed
-party.png           /得意 /8-) /dy /revel
-crying.png          /:< /ll /cry
-bashful.png         /害羞 /:$ /hx /bashful
-shut-mouth.png      /闭嘴 /:X /bz /shut_mouth
-sleepy.png          /睡 /:Z /shui /sleep
-weep.png            /大哭 /:'( /dk /weep
-embarrassed.png     /尴尬 /:-| /gg /embarassed
-pissed-off.png      /发怒 /:@ /fn /pissed_off
-act-up.png          /调皮 /:P /tp /act_up
-smile-big.png       /呲牙 /:D /cy /toothy_smile
-smile.png           /微笑 /:) /wx /small_smile
-sad.png             /难过 /:( /ng /sad
-glasses-cool.png    /酷 /:+ /kuk /cool
-doctor.png          /非典 /:# /feid /SARS
-silly.png           /抓狂 /:Q /zk /crazy
-sick.png            /吐 /:T /tu /vomit
-snicker.png         /偷笑 /;p /tx /titter
-cute.png            /可爱 /;-D /ka /cute
-disdain.png         /白眼 /;d /by /disdain
-arrogant.png        /傲慢 /;o /am /arrogant
-starving.png        /饥饿 /:g /jie /starving
-yawn.png            /困 /|-) /kun /sleepy
-terror.png          /惊恐 /:! /jk /terror
-sweat.png           /流汗 /:L /sweat
-smirk.png           /憨笑 /:> /hanx /smirk
-soldier.png         /大兵 /:; /db /soldier
-struggle.png        /奋斗 /;f /fendou /struggle
-curse.png           /咒骂 /:-S /zhm /curse
-question.png        /疑问 /? /yiw /question
-quiet.png           /嘘... /;x /xu /shh
-hypnotized.png      /晕 /;@ /yun /dizzy
-excruciating.png    /折磨 /:8 /zhem /excrutiating
-freaked-out.png     /衰 /;! /shuai /freaked_out
-skeleton.png        /骷髅 /!!! /kl /skeleton
-hammer.png          /敲打 /xx  /qiao /hammer
-bye.png             /再见        /bye /zj /bye
-go-away.png         /闪人 /go /shan /go
-tremble.png         /发抖 /shake /fad /shake
-in-love.png         /爱情 /love /aiq /love
-jump.png            /跳 /jump /tiao /jump
-search.png          /找 /find /zhao /search
-lashes.png          /美眉 /& /mm /beautiful_eyebrows
-pig.png             /猪头 /pig /zt /pig
-cat.png             /猫咪 /cat /mm /cat
-dog.png             /小狗 /dog /xg /dog
-hug-left.png        /拥抱 /hug /yb /hug
-coins.png           /钱 /$ /qianc /money
-lamp.png            /灯泡 /! /dp /lightbulb
-bowl.png            /酒杯 /cup /bei /cup
-cake.png            /蛋糕 /cake /dg /cake
-thunder.png         /闪电 /li /shd /lightning
-bomb.png            /炸弹 /bome /zhd /bomb
-knife.png           /刀 /kn /dao /knife
-soccerball.png      /足球 /footb /zq /soccer
-musical-note.png    /音乐 /music /yy /music
-poop.png            /便便 /shit /bb /shit
-coffee.png          /咖啡 /coffee /kf /coffee
-eat.png             /饭 /eat /fan /eat
-pill.png            /药丸 /pill /yw /pill
-rose.png            /玫瑰 /rose /mg /rose
-wilt.png            /凋谢 /fade /dx /wilt
-kiss.png            /吻 /kiss /wen /kiss
-love.png            /爱心 /heart /xin /heart
-love-over.png       /心碎 /break /xs /broken_heart
-meeting.png         /会议 /meeting /hy /meeting
-present.png         /礼物 /gift /lw /gift
-phone.png           /电话 /phone /dh /phone
-clock.png           /时间 /time /sj /time
-mail.png            /邮件 /email /yj /email
-tv.png              /电视 /TV /ds /TV
-sun.png             /太阳 /sun /ty /sun
-moon.png            /月亮 /moon /yl /moon
-good.png            /强 /strong /qiang /thumbs_up
-bad.png             /弱 /weak /ruo /thumbs_down
-handshake.png       /握手 /share /ws /handshake
-victory.png         /胜利 /v /shl /victory
-beauty.png          /美女 /<J> /mn /beauty
-qq.png              /Q仔 /<QQ> /qz /qq
-blowkiss.png        /飞吻 /<L> /fw /blow_kiss
-angry.png           /怄火 /<O> /oh  /angry
-liquor.png          /白酒 /<B> /bj /baijiu
-can.png             /汽水 /<U> /qsh /soda
-watermelon.png      /西瓜 /<W> /xigua /watermelon
-rain.png            /下雨 /<!!> /xy /rain
-cloudy.png          /多云 /<~> /duoy /cloudy
-snowman.png         /雪人 /<Z> /xr /snowman
-star.png            /星星 /<*> /xixing /star
-girl.png            /女 /<00> /nv /woman
-boy.png             /男 /<11> /nan /man
+shock.png           /惊讶   /:O      /jy       /surprised
+curl-lip.png        /撇嘴   /:~      /pz       /curl_lip
+desire.png          /色     /:*      /se       /desire
+dazed.png           /发呆   /:|      /dazed
+party.png           /得意   /8-)     /dy       /revel
+crying.png          /流泪   /:<      /ll       /cry
+bashful.png         /害羞   /:$      /hx       /bashful
+shut-mouth.png      /闭嘴   /:X      /bz       /shut_mouth
+sleepy.png          /睡     /:Z      /shui     /sleep
+weep.png            /大哭   /:'(     /dk       /weep
+embarrassed.png     /尴尬   /:-|     /gg       /embarassed
+pissed-off.png      /发怒   /:@      /fn       /pissed_off
+act-up.png          /调皮   /:P      /tp       /act_up
+smile-big.png       /呲牙   /:D      /cy       /toothy_smile
+smile.png           /微笑   /:)      /wx       /small_smile
+sad.png             /难过   /:(      /ng       /sad
+glasses-cool.png    /酷     /:+      /kuk      /cool
+doctor.png          /非典   /:#      /feid     /SARS
+silly.png           /抓狂   /:Q      /zk       /crazy
+sick.png            /吐     /:T      /tu       /vomit
+snicker.png         /偷笑   /;p      /tx       /titter
+cute.png            /可爱   /;-D     /ka       /cute
+disdain.png         /白眼   /;d      /by       /disdain
+arrogant.png        /傲慢   /;o      /am       /arrogant
+starving.png        /饥饿   /:g      /jie      /starving
+yawn.png            /困     /|-)     /kun      /sleepy
+terror.png          /惊恐   /:!      /jk       /terror
+sweat.png           /流汗   /:L      /sweat
+smirk.png           /憨笑   /:>      /hanx     /smirk
+soldier.png         /大兵   /:;      /db       /soldier
+struggle.png        /奋斗   /;f      /fendou   /struggle
+curse.png           /咒骂   /:-S     /zhm      /curse
+question.png        /疑问   /?       /yiw      /question
+quiet.png           /嘘...  /;x      /xu       /shh
+hypnotized.png      /晕     /;@      /yun      /dizzy
+excruciating.png    /折磨   /:8      /zhem     /excrutiating
+freaked-out.png     /衰     /;!      /shuai    /freaked_out
+skeleton.png        /骷髅   /!!!     /kl       /skeleton
+hammer.png          /敲打   /xx      /qiao     /hammer
+bye.png             /再见   /bye     /zj       /bye
+go-away.png         /闪人   /go      /shan     /go
+tremble.png         /发抖   /shake   /fad      /shake
+in-love.png         /爱情   /love    /aiq      /love
+jump.png            /跳     /jump    /tiao     /jump
+search.png          /找     /find    /zhao     /search
+lashes.png          /美眉   /&       /mm       /beautiful_eyebrows
+pig.png             /猪头   /pig     /zt       /pig
+cat.png             /猫咪   /cat     /mm       /cat
+dog.png             /小狗   /dog     /xg       /dog
+hug-left.png        /拥抱   /hug     /yb       /hug
+coins.png           /钱     /$       /qianc    /money
+lamp.png            /灯泡   /!       /dp       /lightbulb
+bowl.png            /酒杯   /cup     /bei      /cup
+cake.png            /蛋糕   /cake    /dg       /cake
+thunder.png         /闪电   /li      /shd      /lightning
+bomb.png            /炸弹   /bome    /zhd      /bomb
+knife.png           /刀     /kn      /dao      /knife
+soccerball.png      /足球   /footb   /zq       /soccer
+musical-note.png    /音乐   /music   /yy       /music
+poop.png            /便便   /shit    /bb       /shit
+coffee.png          /咖啡   /coffee  /kf       /coffee
+eat.png             /饭     /eat     /fan      /eat
+pill.png            /药丸   /pill    /yw       /pill
+rose.png            /玫瑰   /rose    /mg       /rose
+wilt.png            /凋谢   /fade    /dx       /wilt
+kiss.png            /吻     /kiss    /wen      /kiss
+love.png            /爱心   /heart   /xin      /heart
+love-over.png       /心碎   /break   /xs       /broken_heart
+meeting.png         /会议   /meeting /hy       /meeting
+present.png         /礼物   /gift    /lw       /gift
+phone.png           /电话   /phone   /dh       /phone
+clock.png           /时间   /time    /sj       /time
+mail.png            /邮件   /email   /yj       /email
+tv.png              /电视   /TV      /ds       /TV
+sun.png             /太阳   /sun     /ty       /sun
+moon.png            /月亮   /moon    /yl       /moon
+good.png            /强     /strong  /qiang    /thumbs_up
+bad.png             /弱     /weak    /ruo      /thumbs_down
+handshake.png       /握手   /share   /ws       /handshake
+victory.png         /胜利   /v       /shl      /victory
+beauty.png          /美女   /<J>     /mn       /beauty
+qq.png              /Q仔    /<QQ>    /qz       /qq
+blowkiss.png        /飞吻   /<L>     /fw       /blow_kiss
+angry.png           /怄火   /<O>     /oh       /angry
+liquor.png          /白酒   /<B>     /bj       /baijiu
+can.png             /汽水   /<U>     /qsh      /soda
+watermelon.png      /西瓜   /<W>     /xigua    /watermelon
+rain.png            /下雨   /<!!>    /xy       /rain
+cloudy.png          /多云   /<~>     /duoy     /cloudy
+snowman.png         /雪人   /<Z>     /xr       /snowman
+star.png            /星星   /<*>     /xixing   /star
+girl.png            /女     /<00>    /nv       /woman
+boy.png             /男     /<11>    /nan      /man
 
 ### Following ICQ 5.1
 [ICQ]
@@ -300,7 +301,7 @@
 sweat.png           #:-S    #:-s
 rotfl.png           =))    
 #loser              L-)     l-)     MISSING/YAHOO 6: "Loser!"
-party.png	    <:-P    <:-p
+party.png           <:-P    <:-p
 cowboy.png          <):)
 desire.png          8->
 alien.png           =:)     >-)
@@ -333,7 +334,7 @@
 #yahoo_youkiddingme.gif  :-j     :-J     TODO
 
 ### These only work in a certain IMvironment
-#yahoo_malefighter1.gif	 o->     O->
-#yahoo_malefighter2.gif	 o=>     O=>
+#yahoo_malefighter1.gif o->     O->
+#yahoo_malefighter2.gif o=>     O=>
 #yahoo_femalefighter.gif o-+     O-+
 yin-yang.png        (%)
Binary file pidgin/pixmaps/protocols/16/jabber.png has changed
Binary file pidgin/pixmaps/protocols/22/jabber.png has changed
Binary file pidgin/pixmaps/protocols/48/jabber.png has changed
--- a/pidgin/pixmaps/toolbar/16/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -10,6 +10,7 @@
 		insert-link.png \
 		message-new.png \
 		plugins.png \
+		send-file.png \
 		unblock.png
 
 pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/16
Binary file pidgin/pixmaps/toolbar/16/send-file.png has changed
--- a/pidgin/pixmaps/tray/22/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -1,4 +1,4 @@
-SUBSIRS = scalable
+SUBDIRS = scalable
 
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \
--- a/pidgin/plugins/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -108,7 +108,7 @@
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_builddir)/src \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
--- a/pidgin/plugins/cap/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/cap/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -21,6 +21,7 @@
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
--- a/pidgin/plugins/crazychat/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/crazychat/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -33,6 +33,7 @@
 
 AM_CPPFLAGS = -DPURPLE_PLUGINS \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(GTK_CFLAGS) \
 	$(GTKGLEXT_CFLAGS) \
--- a/pidgin/plugins/gestures/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/gestures/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -21,6 +21,7 @@
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
--- a/pidgin/plugins/gevolution/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/gevolution/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -23,6 +23,7 @@
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(DEBUG_CFLAGS) \
--- a/pidgin/plugins/perl/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/perl/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -98,6 +98,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
--- a/pidgin/plugins/ticker/Makefile.am	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.am	Sat May 05 08:00:03 2007 +0000
@@ -22,6 +22,7 @@
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
--- a/pidgin/plugins/timestamp_format.c	Thu May 03 10:14:49 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Sat May 05 08:00:03 2007 +0000
@@ -58,7 +58,8 @@
                                  time_t t,
                                  gboolean show_date,
                                  gboolean force,
-                                 const char *dates)
+                                 const char *dates,
+								 gboolean parens)
 {
 	g_return_val_if_fail(dates != NULL, NULL);
 
@@ -68,15 +69,15 @@
 	{
 		struct tm *tm = localtime(&t);
 		if (force)
-			return g_strdup(purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm));
+			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : "");
 		else
-			return g_strdup(purple_date_format_long(tm));
+			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_date_format_long(tm), parens ? ")" : "");
 	}
 
 	if (force)
 	{
 		struct tm *tm = localtime(&t);
-		return g_strdup(purple_utf8_strftime("%H:%M:%S", tm));
+		return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%H:%M:%S", tm), parens ? ")" : "");
 	}
 
 	return NULL;
@@ -92,7 +93,7 @@
 
 	g_return_val_if_fail(conv != NULL, NULL);
 
-	return timestamp_cb_common(conv, t, show_date, force, dates);
+	return timestamp_cb_common(conv, t, show_date, force, dates, TRUE);
 }
 
 static char *log_timestamp_cb(PurpleLog *log, time_t t, gboolean show_date, gpointer data)
@@ -104,7 +105,7 @@
 
 	g_return_val_if_fail(log != NULL, NULL);
 
-	return timestamp_cb_common(log->conv, t, show_date, force, dates);
+	return timestamp_cb_common(log->conv, t, show_date, force, dates, FALSE);
 }
 
 static gboolean
--- a/po/ChangeLog	Thu May 03 10:14:49 2007 +0000
+++ b/po/ChangeLog	Sat May 05 08:00:03 2007 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.0.0:
+version 2.0.0 (5/3/2007):
 	* Afrikaans translation added (Friedel Wolff)
 	* Afrikaans win32 translation added (Friedel Wolff)
 	* Albanian translation updated (Besnik Bleta)
--- a/po/de.po	Thu May 03 10:14:49 2007 +0000
+++ b/po/de.po	Sat May 05 08:00:03 2007 +0000
@@ -11,21 +11,22 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-15 15:14+0200\n"
-"PO-Revision-Date: 2007-04-15 15:09+0200\n"
-"Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2007-05-03 21:03+0200\n"
+"PO-Revision-Date: 2007-05-03 21:01+0200\n"
+"Last-Translator: Jochen Kemnade <kemnade@gmail.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../finch/finch.c:168
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Versuchen Sie `%s -h' für weitere Informationen.\n"
 
-#: ../finch/finch.c:170
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -46,14 +47,30 @@
 "  -n, --nologin       nicht automatisch anmelden\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s ist beim Übertragen Ihrer Einstellungen von %s nach %s auf Fehler "
+"gestoßen. Bitte untersuchen Sie das Problem und vervollständigen Sie die "
+"Migration per Hand. Bitte melden Sie diesen Fehler auf http://developer."
+"pidgin.im"
+
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
 #: ../libpurple/protocols/jabber/chat.c:679
 #: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#: ../libpurple/protocols/jabber/jabber.c:1225
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Fehler"
@@ -66,16 +83,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
 msgid "New mail notifications"
 msgstr "Benachrichtigung über neue Mails"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3939
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
+#: ../pidgin/gtkblist.c:3946
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
@@ -83,103 +100,103 @@
 msgid "New Account"
 msgstr "Neues Konto"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5349
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5355
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Benutzername:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5370
-#: ../pidgin/gtkblist.c:5733
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5376
+#: ../pidgin/gtkblist.c:5739
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:742 ../finch/gntblist.c:928
-#: ../finch/gntblist.c:1019 ../finch/gntblist.c:2051 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:970 ../libpurple/account.c:1219
-#: ../libpurple/account.c:1253 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2142 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../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:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
 #: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:333
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6041
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2447 ../pidgin/gtkblist.c:5789
-#: ../pidgin/gtkdialogs.c:719 ../pidgin/gtkdialogs.c:856
-#: ../pidgin/gtkdialogs.c:947 ../pidgin/gtkdialogs.c:966
-#: ../pidgin/gtkdialogs.c:988 ../pidgin/gtkdialogs.c:1008
-#: ../pidgin/gtkdialogs.c:1052 ../pidgin/gtkdialogs.c:1090
-#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1181
-#: ../pidgin/gtkdialogs.c:1206 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
+#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5795
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1252 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Speichern"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -190,299 +207,300 @@
 msgstr "Konto löschen"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1957 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2273 ../pidgin/gtkdocklet.c:534
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2047 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:541
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "Sie können Konten auf der folgenden Liste (de)aktivieren."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2446
-#: ../pidgin/gtkblist.c:5788 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
+#: ../pidgin/gtkblist.c:5794 ../pidgin/gtkconv.c:1633
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2393
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s hat %s zu seinem Buddy gemacht%s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2445
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2497
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s möchte %s zu seiner oder ihrer Buddy-Liste hinzufügen%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
 msgid "Authorize buddy?"
 msgstr "Buddy autorisieren?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
 msgid "Authorize"
 msgstr "Autorisieren"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2522 ../pidgin/gtkaccount.c:2528
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
 msgid "Deny"
 msgstr "Sperren"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "Sie müssen einen Benutzernamen für den Buddy angeben."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "Sie müssen eine Gruppe angeben."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "Sie müssen ein Konto auswählen."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:286
 msgid "Error adding buddy"
 msgstr "Fehler beim Hinzufügen des Buddys"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2853
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Benutzername"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1196 ../libpurple/protocols/msn/msn.c:1351
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:965
-#: ../pidgin/gtkdialogs.c:987 ../pidgin/gtkdialogs.c:1007
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1188
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2938 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1246
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2947 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:789
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5303
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5309
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:327
 msgid "Please enter buddy information."
 msgstr "Bitte Buddy-Informationen angeben."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:791 ../pidgin/gtkblist.c:5679
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5685
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:398
 msgid "You can edit more information from the context menu later."
 msgstr "Sie können später mehr Informationen über das Kontextmenü bearbeiten."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
 msgid "Error adding group"
 msgstr "Fehler beim Hinzufügen der Gruppe"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:412
 msgid "You must give a name for the group to add."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:425
 msgid "A group with the name already exists."
 msgstr "Es gibt schon eine Gruppe mit diesem Namen."
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:793
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5785
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5791
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:432
 msgid "Enter the name of the group"
 msgstr "Bitte geben Sie den Namen der Gruppe ein"
 
-#: ../finch/gntblist.c:741
+#: ../finch/gntblist.c:761
 msgid "Edit Chat"
 msgstr "Chat bearbeiten"
 
-#: ../finch/gntblist.c:741
+#: ../finch/gntblist.c:761
 msgid "Please Update the necessary fields."
 msgstr "Bitte aktualisieren Sie die erforderlichen Felder."
 
-#: ../finch/gntblist.c:742 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../finch/gntblist.c:756
+#: ../finch/gntblist.c:778
 msgid "Auto-join"
 msgstr "Automatisch beitreten"
 
-#: ../finch/gntblist.c:765
+#: ../finch/gntblist.c:787
 msgid "Edit Settings"
 msgstr "Einstellungen bearbeiten"
 
-#: ../finch/gntblist.c:829 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
-#: ../finch/gntblist.c:833
+#: ../finch/gntblist.c:855
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm hinzufügen"
 
-#: ../finch/gntblist.c:840 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:636
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: ../finch/gntblist.c:844
+#: ../finch/gntblist.c:866
 msgid "View Log"
 msgstr "Mitschnitt anzeigen"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:947
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Bitte geben Sie den neuen Namen für %s ein"
 
-#: ../finch/gntblist.c:926 ../finch/gntblist.c:927 ../finch/gntblist.c:1138
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1196
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../finch/gntblist.c:926
+#: ../finch/gntblist.c:950
 msgid "Enter empty string to reset the name."
 msgstr "Geben Sie eine leere Zeichenkette ein, um den Namen zurückzusetzen."
 
-#: ../finch/gntblist.c:999
+#: ../finch/gntblist.c:1026
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Wenn Sie diesen Kontakt löschen, löschen Sie auch alle Buddys in dem Kontakt"
 
-#: ../finch/gntblist.c:1007
+#: ../finch/gntblist.c:1034
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "Wenn Sie diese Gruppe löschen, löschen Sie auch alle Buddys in der Gruppe"
 
-#: ../finch/gntblist.c:1012
+#: ../finch/gntblist.c:1039
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1015
+#: ../finch/gntblist.c:1042
 msgid "Confirm Remove"
 msgstr "Entfernen bestätigen"
 
-#: ../finch/gntblist.c:1018 ../finch/gntblist.c:1140 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1198 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1115 ../finch/gntblist.c:2127 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4181
+#: ../finch/gntblist.c:1172 ../finch/gntblist.c:2219 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4188
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: ../finch/gntblist.c:1145
+#: ../finch/gntblist.c:1203
 msgid "Place tagged"
 msgstr "Stelle markiert"
 
-#: ../finch/gntblist.c:1150
+#: ../finch/gntblist.c:1208
 msgid "Toggle Tag"
 msgstr "Markierung umkehren"
 
 #. General
-#: ../finch/gntblist.c:1183 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1241 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2962
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2971
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1203 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1261 ../finch/gntprefs.c:242
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2982
-#: ../pidgin/gtkblist.c:3371 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3380 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "Untätig"
 
-#: ../finch/gntblist.c:1292
+#: ../finch/gntblist.c:1350
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -491,12 +509,12 @@
 "Online: %d\n"
 "Gesamt: %d"
 
-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1359
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1313
+#: ../finch/gntblist.c:1371
 #, c-format
 msgid ""
 "\n"
@@ -505,88 +523,88 @@
 "\n"
 "Zuletzt gesehen: vor %s"
 
-#: ../finch/gntblist.c:1562 ../pidgin/gtkdocklet.c:482
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1636 ../pidgin/gtkdocklet.c:489
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Neu..."
 
-#: ../finch/gntblist.c:1569 ../pidgin/gtkdocklet.c:483
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1643 ../pidgin/gtkdocklet.c:490
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Gespeichert..."
 
-#: ../finch/gntblist.c:1925 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:535 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2015 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2032 ../pidgin/gtkdialogs.c:700
-#: ../pidgin/gtkdialogs.c:837 ../pidgin/gtkdialogs.c:917
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2037 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2128 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:713
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:716
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
 
-#: ../finch/gntblist.c:2047 ../pidgin/gtkdialogs.c:715
+#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:718
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
 
-#: ../finch/gntblist.c:2050 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:332
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6040
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../finch/gntblist.c:2141 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3938
-#: ../pidgin/gtkdialogs.c:718 ../pidgin/gtkdialogs.c:855
-#: ../pidgin/gtkdialogs.c:946 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3945
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2069 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2161 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Optionen"
 
-#: ../finch/gntblist.c:2075
+#: ../finch/gntblist.c:2167
 msgid "Send IM..."
 msgstr "Nachricht senden..."
 
-#: ../finch/gntblist.c:2079
+#: ../finch/gntblist.c:2171
 msgid "Toggle offline buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: ../finch/gntblist.c:2085
+#: ../finch/gntblist.c:2177
 msgid "Sort by status"
 msgstr "Nach Status sortieren"
 
-#: ../finch/gntblist.c:2089
+#: ../finch/gntblist.c:2181
 msgid "Sort alphabetically"
 msgstr "Alphabetisch sortieren"
 
-#: ../finch/gntblist.c:2093
+#: ../finch/gntblist.c:2185
 msgid "Sort by log size"
 msgstr "Nach Größe der Logs sortieren"
 
@@ -609,13 +627,13 @@
 "%s wurde aufgrund des folgenden Fehlers abgemeldet:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:997
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3936
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3942
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3940
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3947
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -649,17 +667,17 @@
 msgstr ""
 "Kommandos werden noch nicht unterstützt. Nachricht wurde NICHT gesendet."
 
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:217
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:240
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
 #, c-format
 msgid ""
 "\n"
@@ -668,24 +686,24 @@
 "\n"
 "%s tippt gerade..."
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:390
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:492
 msgid "List of users:\n"
 msgstr "Liste der Benutzer:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
 msgid "Supported debug options are:  version"
 msgstr "Unterstützte Debug-Optionen sind:  version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
 msgid "No such command (in this context)."
 msgstr "Kein solches Kommando (in diesem Kontext)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -694,7 +712,7 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:7028
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -702,13 +720,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:7031
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;Aktion&gt;:  Sende eine IRC-ähnliche Aktion an einen Buddy oder einen "
 "Chat."
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:7034
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -716,39 +734,39 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:7037
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:7040
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:710
 msgid "plugins: Show the plugins window."
-msgstr "Plugins: Plugin-Fenster anzeigen."
-
-#: ../finch/gntconv.c:726
+msgstr "plugins: Plugin-Fenster anzeigen."
+
+#: ../finch/gntconv.c:713
 msgid "buddylist: Show the buddylist."
-msgstr "Kontaktliste: Die Kontaktliste anzeigen."
-
-#: ../finch/gntconv.c:729
+msgstr "buddylist: Die Kontaktliste anzeigen."
+
+#: ../finch/gntconv.c:716
 msgid "accounts: Show the accounts window."
-msgstr "Konten: Das Konten-Fenster anzeigen."
-
-#: ../finch/gntconv.c:732
+msgstr "accounts: Das Konten-Fenster anzeigen."
+
+#: ../finch/gntconv.c:719
 msgid "debugwin: Show the debug window."
-msgstr "Debugwin: Das Debugging-Fenster anzeigen."
-
-#: ../finch/gntconv.c:735
+msgstr "debugwin: Das Debugging-Fenster anzeigen."
+
+#: ../finch/gntconv.c:722
 msgid "prefs: Show the preference window."
-msgstr "Einstellungen: Das Einstellungs-Fenster anzeigen."
-
-#: ../finch/gntconv.c:738
+msgstr "prefs: Das Einstellungs-Fenster anzeigen."
+
+#: ../finch/gntconv.c:725
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
 msgid "Debug Window"
 msgstr "Debug-Fenster"
 
@@ -756,15 +774,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
 msgid "Timestamps"
 msgstr "Zeitstempel"
 
@@ -799,26 +817,26 @@
 msgstr "Verbleibend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2666
-#: ../libpurple/protocols/oscar/oscar.c:3784
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3039 ../pidgin/gtkblist.c:3041
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1210
+#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3035
+#: ../pidgin/gtkblist.c:3048 ../pidgin/gtkblist.c:3050
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Status"
 
@@ -835,10 +853,10 @@
 msgstr "Stopp"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2420 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Schließen"
 
@@ -876,7 +894,7 @@
 msgid "You have mail!"
 msgstr "Sie haben Post!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From"
 msgstr "Von"
 
@@ -909,11 +927,11 @@
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "Nachricht"
 
@@ -929,7 +947,7 @@
 msgid "(none)"
 msgstr "(kein)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -946,39 +964,36 @@
 "Website: %s\n"
 "Dateiname: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Das Plugin muss geladen werden, bevor es konfiguriert werden kann."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "Hier muss immernoch was dran gemacht werden."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr "Keine Einstellungsoptionen für dieses Plugin."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
 msgstr "Die können Plugins von der folgenden Liste laden bzw. entladen."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "Plugin konfigurieren"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "Buddy-Alarm bearbeiten"
 
@@ -988,8 +1003,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5397
-#: ../pidgin/gtkblist.c:5713
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5403
+#: ../pidgin/gtkblist.c:5719
 msgid "Account:"
 msgstr "Konto:"
 
@@ -998,52 +1013,52 @@
 msgstr "Buddy-Name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "Alarm, wenn Buddy..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "sich anmeldet"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "sich abmeldet"
+msgid "Signs on"
+msgstr "sich anmeldet"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "sich abmeldet"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "hinausgeht"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "wieder anwesend ist"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "untätig wird"
+msgid "Returns from away"
+msgstr "wieder anwesend ist"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "untätig wird"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "nicht mehr untätig ist"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "beginnt zu tippen"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "beim Tippen anhält"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "aufhört zu tippen"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "eine Nachricht sendet"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "Aktion"
 
@@ -1071,141 +1086,136 @@
 msgid "Pounce only when my status is not available"
 msgstr "Nur alarmieren, wenn ich nicht verfügbar bin"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Wollen Sie die Alarmierung für %s (Konto %s) wirklich löschen?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "Buddy-Alarm"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s hat sich angemeldet (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ist nicht mehr inaktiv (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ist wieder anwesend (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s hat aufgehört, Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s hat sich abgemeldet (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s wurde untätig (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ist abwesend. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s hat Ihnen eine Nachricht gesendet. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "Von letzter gesendeter Nachricht"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Niemals"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "Zeige Untätigkeitszeiten"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "Zeige Offline Buddys"
 
-#: ../finch/gntprefs.c:166
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "Zeige Zeitstempel"
 
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "Buddys benachrichtigen, wenn Sie ihnen schreiben"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "Mitschnitt-Format"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "IMs mitschneiden"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "Chats mitschneiden"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "Statusveränderungen mitschneiden"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:536
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "Noch nicht implementiert."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "Datei speichern..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
@@ -1218,102 +1228,102 @@
 msgid "Delete Status"
 msgstr "Status löschen"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Typ"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/novell/novell.c:2939
-#: ../libpurple/protocols/novell/novell.c:2945
-#: ../libpurple/protocols/novell/novell.c:2951
-#: ../libpurple/protocols/oscar/oscar.c:5494
-#: ../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:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1294
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5469
+#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5701
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 #: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Nachricht"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Benutzen"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Ungültige Bezeichnung"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "Bitte geben Sie eine nicht-leere Bezeichnung für den Status ein."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Doppelte Bezeichnung"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Bitte geben sie eine andere Bezeichnung für den Status ein."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Unter-Status"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Status bearbeiten"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Benutze einen anderen Status für die folgenden Konten"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Speichern & Übernehmen"
 
@@ -1337,64 +1347,64 @@
 "Wenn sich der Inhalt der Gnt-Zwischenablage verändert, werden ihre Inhalte "
 "in X verfügbar gemacht, wenn möglich."
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s hat sich angemeldet"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s hat sich abgemeldet"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s hat Ihnen eine Nachricht gesendet"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s sagte ihren Spitznamen in %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s hat eine Nachricht in %s gesendet"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "Buddy sich an/abmeldet"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "Sie empfangen einen Nachricht"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "Jemand redet im Chat"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "Jemand sagt Ihren Namen im Chat"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr "Mit einem Toaster benachrichtigen, wenn"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr "Auch piepen!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr "URGENT-Eigenschaft für das Terminalfenster setzen."
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
 msgid "Toaster plugin"
 msgstr "Toaster-Plugin"
 
@@ -1452,85 +1462,85 @@
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "Konten"
 
-#: ../libpurple/account.c:923 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
 #: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Passwort wird für die Anmeldung benötigt."
 
-#: ../libpurple/account.c:949
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geben Sie das Passwort für %s (%s) ein"
 
-#: ../libpurple/account.c:956
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Geben Sie ein Passwort ein"
 
-#: ../libpurple/account.c:961
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../libpurple/account.c:995 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
-#: ../libpurple/account.c:1155 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1332
 msgid "New passwords do not match."
 msgstr "Die neuen Passwörter stimmen nicht überein."
 
-#: ../libpurple/account.c:1164
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Bitte füllen Sie alle Felder aus."
 
-#: ../libpurple/account.c:1187
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Aktuelles Passwort"
 
-#: ../libpurple/account.c:1194
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../libpurple/account.c:1201
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Neues Passwort (nochmal)"
 
-#: ../libpurple/account.c:1207
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändern des Passworts für %s"
 
-#: ../libpurple/account.c:1215
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort ein."
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändere die Benutzerinformation für %s"
 
-#: ../libpurple/account.c:1248 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: ../libpurple/account.c:1784 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2829
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5193 ../pidgin/plugins/gevolution/gevolution.c:97
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5199 ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:97
 msgid "Buddies"
 msgstr "Buddys"
 
@@ -1553,7 +1563,7 @@
 msgstr "+++ %s hat sich abgemeldet"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1687
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1576,7 +1586,7 @@
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1160
 msgid "Send Message"
 msgstr "Nachricht senden"
 
@@ -1629,6 +1639,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "Kann den Serv-Namen nicht bekommen: %s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple's D-Bus-Server läuft aus dem folgenden Grund nicht"
+
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Kein Name"
@@ -1639,7 +1653,7 @@
 
 #: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
-msgstr "Kann keine Nachricht an den Auflösungsprozess senden.\n"
+msgstr "Kann keine Nachricht an den Auflösungsprozess senden\n"
 
 #: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
@@ -1678,7 +1692,7 @@
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1723,22 +1737,22 @@
 msgstr ""
 "%s ist keine reguläre Datei. Pidgin wird die Datei nicht überschreiben.\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s möchte Ihnen %s (%s) senden"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s möchte Ihnen eine Datei senden"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akzeptieren Sie die Dateiübertragung von %s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1749,60 +1763,60 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bietet an, die Datei %s zu senden"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ist kein gültiger Dateiname.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Angebot zum Senden von %s an %s"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starte die Dateiübertragung von %s von %s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Übertragung der Datei %s ist komplett"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "Dateiübertragung ist komplett"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sie haben die Dateiübertragung von %s abgebrochen"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung wurde abgebrochen"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s hat die Übertragung von %s abgebrochen"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s hat die Datenübertragung abgebrochen"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dateiübertragung an %s wurde abgebrochen."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dateiübertragung von %s wurde abgebrochen."
@@ -2118,41 +2132,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "Auto-Akzeptieren-Einstellungen setzen"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2245
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/oscar.c:6112
-#: ../libpurple/protocols/oscar/oscar.c:6181 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:6082
+#: ../libpurple/protocols/oscar/oscar.c:6152 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Fragen"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Auto-Akzeptieren"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Auto-Ablehnen"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Dateiübertragungen automatisch akzeptieren..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2160,11 +2174,11 @@
 "Pfad in denen die Dateien gespeichert werden sollen\n"
 "(Bitte geben Sie den vollständigen Pfad an)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatisch von Benutzern ablehnen, die nicht in der Buddy-Liste sind"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2173,113 +2187,8 @@
 "Dateiübertragung abgeschlossen ist\n"
 "(nur, wenn es keine Unterhaltung mit dem Sender gibt)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Automatische Antwort"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Automatische Antwort für alle Protokolle"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"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 ""
-"Mit diesem Plugin können Sie automatische Antworten für jedes Protokoll "
-"setzen. Sie können die globale Auto-Antwort im Plugin-Optionsdialog setzen. "
-"Um eine spezifische Auto-Antwort für einen bestimmten Buddy zu setzen, "
-"rechtsklicken Sie in der Kontaktliste auf den Buddy. Zum Setzen einer Auto-"
-"Antwort für ein bestimmtes Konto, benutzen Sie den \"Erweitert\"-Reiter im "
-"Konto-Bearbeitungsdialog."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Auto-Antwort für %s setzen"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Auto-Antwort setzen"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"Die folgende Nachricht wird an einen Buddy gesendet, der Ihnen eine "
-"Nachricht sendet und Auto-Antworten aktiviert ist."
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "_Auto-Antwort setzen"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Auto-Antwort"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Automatisch antworten, wenn"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "Wenn mein Konto _abwesend ist"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "Wenn mein Konto untät_ig ist"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "Standar_d-Antwort"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Status-Nachricht"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Auto-Antwort mit Status-Nachricht"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Immer wenn es eine Status-Nachricht gibt"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Nur, wenn es keine Auto-Antwort-Nachricht gibt"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Verzögerung zwischen Auto-Antworten"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Minimale Verzögerung (Minuten)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Anzahl der zu sendenden Auto-Antworten"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "Ma_ximale Anzahl"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-"Ich bin gerade nicht verfügbar. Bitte hinterlassen Sie Ihre Nachricht und "
-"ich werde Sie so bald wie möglich kontaktieren."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Notes"
 msgstr "Notizen"
 
@@ -2287,7 +2196,7 @@
 msgid "Enter your notes below..."
 msgstr "Geben Sie Ihre Notizen unten ein..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "Notizen bearbeiten..."
 
@@ -2299,18 +2208,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:86
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Buddy-Notizen"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:88
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr "Notizen über bestimmte Buddys speichern."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Gibt die Möglichkeit, Notizen für Buddys auf Ihrer Buddy-Liste zu speichern."
@@ -2370,46 +2279,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "Erlaubt die Steuerung, indem Sie Kommandos in eine Datei schreiben."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuten"
 
 #. 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:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../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 "Untätigkeitsmarker"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Setze Konto-Untätigkeitszeit"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Setzen"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Keine ihrer Konten sind untätig."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Untätigkeitszeit zurücksetzen"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "Zurücksetze_n"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Untätigkeitszeit für alle Konten setzen"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Untätigkeitszeit für alle untätige Konten zurücksetzen"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie untätig sein wollen"
@@ -2466,7 +2375,7 @@
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
-msgstr "Verstecken der Betreten-/Verlassen-Meldungen "
+msgstr "Verstecken der Betreten-/Verlassen-Meldungen"
 
 #: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
@@ -2482,19 +2391,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Betreten/Verlassen verstecken"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
-msgstr "Versteckt belanglose Betreten-/Verlassen-Meldungen"
+msgstr "Versteckt belanglose Betreten-/Verlassen-Meldungen."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../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."
@@ -2615,21 +2524,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Mitschnittsbetrachter"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Zeigt die Mitschnitte anderer Sofortnachrichtenprogramme im "
 "Mitschnittsbetrachter an."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2643,12 +2552,12 @@
 "WARNUNG: Dieses Plugin befindet sich noch im Entwicklungsstadium und kann "
 "oft Abstürzen. Benutzung auf eigene Gefahr!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono-Plugin-Lader"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Lädt .NET-Plugins mit Mono."
 
@@ -2714,31 +2623,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Sie können den Alarm im `Buddy-Alarm'-Dialog ändern/löschen"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1915
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1916
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Nein"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Sichere Offline-Nachricht als Alarm"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Nicht nachfragen. Immer als Alarm sichern."
 
@@ -2748,26 +2657,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl-Plugin-Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Ermöglicht das Laden von Perl-Plugins."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psycho-Modus"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Psycho-Modus für eingehende Gespräche"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -2775,23 +2684,23 @@
 "Öffnet Gesprächsfenster, wenn andere Benutzer beginnen, Ihnen eine Nachricht "
 "zu senden.  Das funktioniert mit AIM, ICQ, Jabber, Sametime und Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Ihr Buddy beginnt zu tippen..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Nur für Benutzer aus der Buddy-Liste aktivieren"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Deaktivieren, wenn abwesend"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Benachrichtigung in Gesprächen anzeigen"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Psycho-Unterhaltungen anheben"
 
@@ -2838,6 +2747,44 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+msgid "Provides SSL support through GNUTLS."
+msgstr "Erlaubt SSL-Unterstützung mit GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Erlaubt SSL-Unterstützung mit Mozilla NSS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 #: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
@@ -2850,44 +2797,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Liefert einen Wrapper um die SSL-Bibliotheken."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
-msgid "Provides SSL support through GNUTLS."
-msgstr "Erlaubt SSL-Unterstützung mit GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Erlaubt SSL-Unterstützung mit Mozilla NSS."
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -2935,7 +2844,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Buddy-Status-Benachrichtigung"
 
@@ -2943,8 +2852,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../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."
@@ -2952,15 +2861,15 @@
 "Benachrichtigt in einem Gesprächsfenster darüber, ob ein Buddy gegangen ist "
 "oder vom Abwesenheits- oder Untätigkeitsstatus zurückgekehrt ist."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-Plugin-Lader"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Ermöglicht das Laden von Tcl-Plugins"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2982,18 +2891,18 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4522
-#: ../libpurple/protocols/oscar/oscar.c:5572
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4496
+#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:159
+#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Abwesend"
 
@@ -3007,50 +2916,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-Protokoll-Plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "Purple-Person"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Rechnername"
 
 # old strings
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM-Konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "Jabber Account"
 msgstr "Jabber-Konto"
 
@@ -3137,67 +3046,67 @@
 msgid "Save buddylist..."
 msgstr "Buddy-Liste speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Füllen Sie die Registrierungsfelder aus."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kann neues Konto nicht anlegen. Es ist ein Fehler aufgetreten.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Neues Gadu-Gadu-Konto angelegt"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registrierung erfolgreich abgeschlossen!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:1367
 msgid "Password"
 msgstr "Passwort"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Geben Sie das aktuelle Kürzel ein"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuelles Kürzel"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Bitte füllen sie die folgenden Felder aus"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stadt"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3205,220 +3114,220 @@
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Männlich oder weiblich"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Männlich"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Weiblich"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Nur online"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Suche Buddys"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Bitte geben Sie Ihre Suchkriterien unten ein"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Füllen Sie die Felder aus."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Ihr aktuelles Passwort ist anders als das angegebene."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Konnte das Passwort nicht ändern. Es trat ein Fehler auf.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Ändern des Passworts für dieses Gadu-Gadu-Konto"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Das Passwort wurde erfolgreich geändert!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort für folgende UIN ein: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu Passwort ändern"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Wählen sie einen Chat für den Benutzer: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Zum Chat hinzufügen..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5544
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5519
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3026 ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkdocklet.c:462 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:155
+#: ../pidgin/gtkblist.c:3035 ../pidgin/gtkblist.c:3359
+#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
 #: ../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:2814
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2665
-#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3915
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "Kann Suchergebnisse nicht anzeigen."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Öffentliches Gadu-Gadu-Verzeichnis"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "Keine entsprechenden Benutzer gefunden"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "Es gibt keine Benutzer, die Ihrer Anfrage entsprechen."
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "Buddy-Liste heruntergeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "Ihre Buddy-Liste wurde von Server geladen."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "Buddy-Liste hochgeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "Sperrung aufheben"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "Sperren"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Chatfehler"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Nicht mit dem Server verbunden."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Finde Buddys..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "Passwort ändern..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "Buddy-Liste zum Server hochladen"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "Passwort ändern..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "Buddy-Liste zum Server hochladen"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Buddy-Liste vom Server herunterladen"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Löschen der Buddy-Liste vom Server"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Buddy-Liste in Datei speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
@@ -3433,35 +3342,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-Protokoll-Plugin"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "Beliebter polnischer IM-Dienst"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-Benutzer"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unbekanntes Kommando: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "Das aktuelle Thema ist: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Kein Thema gesetzt"
 
@@ -3519,33 +3428,33 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1040
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2180
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../libpurple/protocols/jabber/jabber.c:595
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Kann Socket nicht erstellen"
 
 #: ../libpurple/protocols/irc/irc.c:402
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
@@ -3564,14 +3473,14 @@
 msgstr "Fehler beim Lesen"
 
 #: ../libpurple/protocols/irc/irc.c:761
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Benutzer"
 
 #: ../libpurple/protocols/irc/irc.c:764
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3585,56 +3494,56 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:895
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:896
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Das IRC-Protokoll-Plugin mit weniger Problemen"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:915 ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1999
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6623
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2122
+#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1852
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:918 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6626
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:921
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "Kodierungen"
 
-#: ../libpurple/protocols/irc/irc.c:924 ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:304
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Echter Name"
 
@@ -3642,7 +3551,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:935
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "Benutze SSL"
 
@@ -3664,133 +3573,133 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kann %s nicht verbannen: Bannliste ist voll"
 
-#: ../libpurple/protocols/irc/msgs.c:288
+#: ../libpurple/protocols/irc/msgs.c:292
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:289
+#: ../libpurple/protocols/irc/msgs.c:293
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifiziert)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:290
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/irc/msgs.c:294
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/msgs.c:320
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Im Moment in"
 
-#: ../libpurple/protocols/irc/msgs.c:321
+#: ../libpurple/protocols/irc/msgs.c:325
 msgid "Idle for"
 msgstr "Untätig seit"
 
-#: ../libpurple/protocols/irc/msgs.c:324
-msgid "Online since"
-msgstr "Online seit"
-
 #: ../libpurple/protocols/irc/msgs.c:328
+msgid "Online since"
+msgstr "Online seit"
+
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Definiere ein Adjektiv:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "Glorious"
 msgstr "Glorreich"
 
-#: ../libpurple/protocols/irc/msgs.c:404
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s hat das Thema zu %s abgeändert"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s hat das Thema entfernt."
 
-#: ../libpurple/protocols/irc/msgs.c:414
+#: ../libpurple/protocols/irc/msgs.c:418
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Das Thema für %s ist: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:432
+#: ../libpurple/protocols/irc/msgs.c:436
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unbekannte Nachricht '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:433
+#: ../libpurple/protocols/irc/msgs.c:437
 msgid "Unknown message"
 msgstr "Unbekannte Nachricht"
 
-#: ../libpurple/protocols/irc/msgs.c:433
+#: ../libpurple/protocols/irc/msgs.c:437
 msgid "The IRC server received a message it did not understand."
 msgstr "Der IRC-Server hat eine Nachricht erhalten, die er nicht versteht."
 
-#: ../libpurple/protocols/irc/msgs.c:454
+#: ../libpurple/protocols/irc/msgs.c:458
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Benutzer auf %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:551
+#: ../libpurple/protocols/irc/msgs.c:555
 msgid "Time Response"
 msgstr "Zeit-Antwort"
 
-#: ../libpurple/protocols/irc/msgs.c:552
+#: ../libpurple/protocols/irc/msgs.c:556
 msgid "The IRC server's local time is:"
 msgstr "Die Lokalzeit des IRC-Servers ist:"
 
-#: ../libpurple/protocols/irc/msgs.c:563
+#: ../libpurple/protocols/irc/msgs.c:567
 msgid "No such channel"
 msgstr "Dieser Kanal existiert nicht"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:574
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "no such channel"
 msgstr "Dieser Kanal existiert nicht"
 
-#: ../libpurple/protocols/irc/msgs.c:577
+#: ../libpurple/protocols/irc/msgs.c:581
 msgid "User is not logged in"
 msgstr "Benutzer ist nicht angemeldet"
 
-#: ../libpurple/protocols/irc/msgs.c:582
+#: ../libpurple/protocols/irc/msgs.c:586
 msgid "No such nick or channel"
 msgstr "Es gibt keinen solchen Spitznamen oder Kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:602
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "Could not send"
 msgstr "Konnte nicht senden"
 
-#: ../libpurple/protocols/irc/msgs.c:658
+#: ../libpurple/protocols/irc/msgs.c:662
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Das Betreten von %s erfordert eine Einladung."
 
-#: ../libpurple/protocols/irc/msgs.c:659
+#: ../libpurple/protocols/irc/msgs.c:663
 msgid "Invitation only"
 msgstr "Nur Einladungen"
 
-#: ../libpurple/protocols/irc/msgs.c:771
+#: ../libpurple/protocols/irc/msgs.c:775
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sie wurden hinausgeworfen von %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:776 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Hinausgeworfen durch %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:799
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modus (%s %s) von %s"
 
-#: ../libpurple/protocols/irc/msgs.c:884 ../libpurple/protocols/irc/msgs.c:885
+#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../libpurple/protocols/irc/msgs.c:886
+#: ../libpurple/protocols/irc/msgs.c:890
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3798,7 +3707,7 @@
 "Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
-#: ../libpurple/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:895
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3806,52 +3715,52 @@
 "Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
-#: ../libpurple/protocols/irc/msgs.c:930
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Cannot change nick"
 msgstr "Kann den Spitznamen nicht ändern"
 
-#: ../libpurple/protocols/irc/msgs.c:930
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Could not change nick"
 msgstr "Konnte den Spitznamen nicht ändern"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:955
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Sie waren im Kanal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:993
+#: ../libpurple/protocols/irc/msgs.c:997
 msgid "Error: invalid PONG from server"
 msgstr "Fehler: falsches PONG vom Server"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:999
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-Antwort -- Verzögerung: %lu Sekunden"
 
-#: ../libpurple/protocols/irc/msgs.c:1076
+#: ../libpurple/protocols/irc/msgs.c:1080
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kann %s nicht betreten:"
 
-#: ../libpurple/protocols/irc/msgs.c:1077
+#: ../libpurple/protocols/irc/msgs.c:1081
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kann den Kanal nicht betreten"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1115
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Der Spitzname oder Kanal ist zur Zeit nicht verfügbar."
 
-#: ../libpurple/protocols/irc/msgs.c:1123
+#: ../libpurple/protocols/irc/msgs.c:1127
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops von %s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;Aktion&gt;:  Führe eine Aktion durch."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3859,11 +3768,11 @@
 "away [Nachricht]:  Setzen Sie eine Abwesenheitsnachricht. Verwenden Sie "
 "keine Nachricht, um wieder zurückzukehren."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Sendet ein Kommando zum Chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3871,7 +3780,7 @@
 "deop &lt;Nick1&gt; [Nick2] ...:  Entferne den Kanal-Operator-Status von "
 "jemanden. Sie müssen hierfür selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3881,7 +3790,7 @@
 "Dies verbietet ihm zu sprechen, wenn der Kanal moderiert wird (+). Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3889,7 +3798,7 @@
 "invite &lt;Nick&gt; [Raum]:  Jemanden in den angegeben Kanal oder in den "
 "aktuellen Kanal einladen."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3898,7 +3807,7 @@
 "mehrere Räume angeben, optional jeden mit einem Kanal-Schlüssel, falls "
 "dieser benötigt wird."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3907,7 +3816,7 @@
 "oder mehrere Räume angeben, optional jeden mit einem Kanal-Schlüssel, falls "
 "dieser benötigt wird."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3915,7 +3824,7 @@
 "kick &lt;Nick&gt; [Nachricht]:  Kickt jemanden aus dem Kanal. Sie müssen "
 "hierfür selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3923,15 +3832,15 @@
 "list:  Zeige eine Liste der Chaträume in diesem Netzwerk. <i>Warnung: Einige "
 "Server trennen die Verbindung, wenn Sie dieses Kommando eingeben.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;Aktion&gt;:  Eine Aktion durchführen."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Sendet ein Kommando zum Memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3939,7 +3848,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;Nick|Kanal&gt;:  Kanal- oder Benutzermodi "
 "setzen oder zurücknehmen."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3947,20 +3856,20 @@
 "msg &lt;nick&gt; &lt;nachricht&gt;:  Sendet eine private Nachricht an einen "
 "Benutzer (im Gegensatz zum Kanal)."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Sendet ein Kommando zum Nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3968,7 +3877,7 @@
 "op &lt;Nick1&gt; [Nick2] ...:  Erteile den Operator-Status an jemanden. Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3976,11 +3885,11 @@
 "operwall &lt;Nachricht&gt;:  Wenn Sie nicht wissen, was dies ist, brauchen "
 "Sie es wahrscheinlich nicht."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Sendet ein Kommandos zum Operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3988,7 +3897,7 @@
 "part [Raum] [Nachricht]:  Verlässt den aktuellen Kanal oder den angegebenen "
 "Kanal mit einer optionalen Nachricht."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3996,7 +3905,7 @@
 "ping [Nick]:  Ermittelt die Verzögerung eines Benutzers (oder eines Server, "
 "wenn kein Benutzer angegeben wird) über ein Ping."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4004,15 +3913,15 @@
 "query &lt;Nick&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen Benutzer (im Gegensatz zu einem Kanal)."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [Nachricht]:  Trennung vom Server mit einer optionalen Nachricht."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Sendet den Text im Rohformat an den Server."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4020,24 +3929,24 @@
 "remove &lt;Nick&gt; [Nachricht]:  Jemanden aus dem Raum entfernen. Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Zeigt die aktuelle Lokalzeit auf dem IRC-Server an."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [neues Thema]:  Ansehen oder Ändern des Themas des Kanals."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Benutzermodus setzen oder zurücknehmen."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [Benutzer]: sende CTCP VERSION-Anfrage an einen Benutzer"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4046,7 +3955,7 @@
 "erlaubt ihm auch dann noch zu sprechen, wenn der Kanal moderiert wird (+m). "
 "Sie müssen hierfür selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4054,25 +3963,30 @@
 "wallops &lt;Nachricht&gt;:  Wenn Sie diese Funktion nicht kennen, brauchen "
 "sie sie wahrscheinlich nicht."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [Server] &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen."
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas &lt;Nick&gt;:  Informationen zu einem abgemeldeten Benutzer abrufen."
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwortzeit von %s: %lu Sekunden"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "CTCP PING Antwort"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../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."
@@ -4094,14 +4008,14 @@
 #: ../libpurple/protocols/jabber/auth.c:295
 #: ../libpurple/protocols/jabber/auth.c:480
 #: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:562
-#: ../libpurple/protocols/jabber/auth.c:563
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
 #: ../libpurple/protocols/jabber/auth.c:296
 #: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4110,94 +4024,94 @@
 "unverschlüsselten Kanal.  Wollen Sie dies erlauben und fortfahren?"
 
 #: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:490
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden"
 
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:525
-#: ../libpurple/protocols/jabber/auth.c:704
-#: ../libpurple/protocols/jabber/auth.c:838
-#: ../libpurple/protocols/jabber/auth.c:863
-#: ../libpurple/protocols/jabber/auth.c:882
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Ungültige Serverantwort."
 
-#: ../libpurple/protocols/jabber/auth.c:725
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "Ungültige Challenge vom Server"
 
-#: ../libpurple/protocols/jabber/auth.c:813
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "SASL-Fehler"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Nachname"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Vorname"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Straße"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Ort"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Region"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "Land"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4205,40 +4119,40 @@
 msgstr "E-Mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Funktion"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3037
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3046
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
-msgstr "Jabber vCard bearbeiten"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+msgstr "Jabber-vCard bearbeiten"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4246,113 +4160,113 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:2002
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1407
+#: ../libpurple/protocols/jabber/jabber.c:1250
 msgid "Chatty"
 msgstr "Gesprächig"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:160
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5758
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5723
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3715
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "Dies sind die Ergebnisse Ihrer Suche"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4360,70 +4274,70 @@
 "Suchen Sie einen Kontakt durch Eingabe von Suchkriterien in den angegebenen "
 "Feldern. Hinweis: Jedes Feld unterstützt die Suche mit Platzhaltern (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "Verzeichnisanfrage gescheitert"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "Konnte die Anfrage beim Verzeichnisdienst nicht durchführen."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Anleitung vom Server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Füllen sie ein oder mehrere Felder aus, um nach entsprechenden Jabber-"
 "Benutzern zu suchen."
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1751
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3718
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "Nach Jabber-Benutzern suchen"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1762
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
 msgstr "Ungültiges Verzeichnis"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
 msgstr "Geben Sie ein Benutzerverzeichnis ein"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
 msgstr "Wählen Sie ein Benutzerverzeichnis zum Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5254
+#: ../libpurple/protocols/oscar/oscar.c:5229
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Raum:"
@@ -4533,418 +4447,418 @@
 msgid "Unable to create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:565
 #: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrierung von %s@%s erfolgreich"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "Registrierung erfolgreich"
 
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1520
+msgid "Unknown Error"
+msgstr "Unbekannter Fehler"
+
 #: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
-msgid "Unknown Error"
-msgstr "Unbekannter Fehler"
-
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "Registrierung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "Schon registriert"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:850
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Bitte füllen Sie die unten stehenden Informationen aus, um ein neues Konto "
 "zu registrieren."
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "Registrierung eines neuen Jabber-Kontos"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1044
 msgid "Initializing Stream"
 msgstr "Initialisiere den Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1049
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Re-initializing Stream"
 msgstr "Initialisiere Stream nochmal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/jabber/jabber.c:1124
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5517
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "From (To pending)"
 msgstr "Von (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "To"
 msgstr "Zu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1177
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Kein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1180
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1310
 msgid "Password Changed"
 msgstr "Passwort geändert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1311
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1316
 msgid "Error changing password"
 msgstr "Fehler beim Ändern des Passworts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1372
 msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Change Jabber Password"
 msgstr "Ändere das Jabber-Passwort"
 
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6343
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Benutzer-Info setzen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6354
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1395
+#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Passwort ändern..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1400
 msgid "Search for Users..."
 msgstr "Suche nach Benutzern..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1478
 msgid "Bad Request"
 msgstr "Falsche Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1480
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Feature Not Implemented"
 msgstr "Feature nicht implementiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Gone"
 msgstr "Gegangen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Item Not Found"
 msgstr "Eintrag nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Malformed Jabber ID"
 msgstr "Falsche Jabber-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Not Acceptable"
 msgstr "Nicht akzeptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Not Allowed"
 msgstr "Nicht erlaubt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Payment Required"
 msgstr "Bezahlung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Recipient Unavailable"
 msgstr "Empfänger nicht verfügbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Registration Required"
 msgstr "Registrierung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1508
 msgid "Remote Server Not Found"
 msgstr "Remote-Server nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Remote Server Timeout"
 msgstr "Zeitüberschreitung beim Remote-Server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Server Overloaded"
 msgstr "Server überlastet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Service Unavailable"
 msgstr "Dienst nicht erreichbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Subscription Required"
 msgstr "Abonnement erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Unexpected Request"
 msgstr "Unerwartete Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization Aborted"
 msgstr "Autorisierung abgebrochen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Incorrect encoding in authorization"
 msgstr "Falsche Kodierung in der Autorisierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Invalid authzid"
 msgstr "Ungültige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Invalid Authorization Mechanism"
 msgstr "Falscher Autorisierungsmechanismus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Authorization mechanism too weak"
 msgstr "Autorisierungsmechanismus zu schwach"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Temporary Authentication Failure"
 msgstr "Temporärer Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Authentication Failure"
 msgstr "Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Bad Format"
 msgstr "Schlechtes Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Bad Namespace Prefix"
 msgstr "Falsches Namensraum-Präfix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1555
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1557
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Host Gone"
 msgstr "Server hat sich verabschiedet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1561
 msgid "Host Unknown"
 msgstr "Rechner unbekannt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Improper Addressing"
 msgstr "Falsche Adressierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Invalid Namespace"
 msgstr "Ungültiger Namenraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid XML"
 msgstr "Ungültiges XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Non-matching Hosts"
 msgstr "Nicht-passender Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Policy Violation"
 msgstr "Richtlinien-Verletzung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Resource Constraint"
 msgstr "Eingeschränkte Ressourcen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Restricted XML"
 msgstr "Eingeschränktes XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "See Other Host"
 msgstr "Siehe anderer Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "System Shutdown"
 msgstr "Herunterfahren des Systems"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Undefined Condition"
 msgstr "Undefinierte Bedingung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Unsupported Encoding"
 msgstr "Kodierung wird nicht unterstützt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Unsupported Stanza Type"
 msgstr "Nicht-unterstützter Blocktyp"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Version"
 msgstr "Nicht-unterstützte Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "XML Not Well Formed"
 msgstr "XML ist nicht „wohlgeformt“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Stream Error"
 msgstr "Stream-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1666
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kann den Benutzer %s nicht verbannen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unbekannte Zugehörigkeit: „%s“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1691
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kann den Benutzer %s nicht zu „%s“ zuordnen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1710
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unbekannte Rolle: „%s“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1717
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kann die Rolle „%s“ für den Benutzer nicht setzen: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1770
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kann den Benutzer %s nicht herauswerfen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1801
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "register:  Register with a chat room."
 msgstr "register:  Für einen Chatraum anmelden."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1825
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;Benutzer&gt; [Raum]:  Verbanne einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4952,7 +4866,7 @@
 "affiliate &lt;Benutzer&gt; &lt;owner|admin|member|outcast|none&gt;: Setze "
 "eine Benutzerzugehörigkeit für den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4960,20 +4874,20 @@
 "role &lt;Benutzer&gt; &lt;moderator|participant|visitor|none&gt;: Setze eine "
 "Rolle für den Benutzer im Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;Raum&gt; [Server]:  Betrete einen Chat auf diesem Server."
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;Benutzer&gt; [Raum]:  Kickt einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4990,27 +4904,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1977
-#: ../libpurple/protocols/jabber/jabber.c:1979
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-Protokoll-Plugin"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "Erzwinge altes SSL (Port 5223)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "Verbindungsport"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2019
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Verbindungsserver"
 
@@ -5036,7 +4950,7 @@
 
 #: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
-msgstr "Jabber Nachrichtenfehler"
+msgstr "Jabber-Nachrichtenfehler"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -5047,16 +4961,16 @@
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5064,20 +4978,20 @@
 "Sie erstellen einen neuen Chat-Raum.  Möchten Sie den Raum konfigurieren "
 "oder akzeptieren Sie die Standardeinstellungen?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
@@ -5311,7 +5225,7 @@
 msgstr "Server ist zu beschäftigt"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5363,23 +5277,23 @@
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Das ist der Name, den andere MSN-Buddys von Ihren sehen."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "Setze Ihre private Telefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "Setze Ihre geschäftliche Telefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "Setze Ihre Handynummer."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr "Erlaube die SMS-Seiten von MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:314
 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?"
@@ -5387,130 +5301,130 @@
 "Möchten Sie anderen Leuten in Ihrer Buddy-Liste erlauben oder verbieten, "
 "Ihnen Nachrichten an Ihre Handy oder an andere mobile Geräte zu senden?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "Erlauben"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "Verbieten"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "Eine SMS senden."
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "Nachricht"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:529
 msgid "Has you"
 msgstr "Hat Sie"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "Bin gleich zurück"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/novell/novell.c:2950
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:567
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:571
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:599
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Home Phone Number..."
 msgstr "Setze private Telefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Work Phone Number..."
 msgstr "Setze geschäftliche Telefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Set Mobile Phone Number..."
 msgstr "Setze Handynummer..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:618
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Erlaube/verbiete mobile Geräte..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:623
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Erlaube/verbiete mobile Webseiten..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Open Hotmail Inbox"
 msgstr "Öffne Hotmail-Posteingang"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:657
 msgid "Send to Mobile"
 msgstr "Sende an mobiles Gerät"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3406
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiiere _Chat"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:705
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Für MSN wird SSL-Unterstützung benötigt. Bitte installieren Sie eine "
 "unterstützte SSL-Bibliothek."
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:730
 msgid "Failed to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Allgemein"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/msn/msn.c:1528
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Alter"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1530
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1531
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5518,186 +5432,186 @@
 msgid "Location"
 msgstr "Ort"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
 msgid "Hobbies and Interests"
 msgstr "Hobbys und Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
 msgid "A Little About Me"
 msgstr "Einige Informationen über mich"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1559
 msgid "Social"
 msgstr "Sozial"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1561
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Familienstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1562
 msgid "Interests"
 msgstr "Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1563
 msgid "Pets"
 msgstr "Haustiere"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1564
 msgid "Hometown"
 msgstr "Heimatstadt"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1565
 msgid "Places Lived"
 msgstr "Bisherige Wohnorte"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1566
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Music"
 msgstr "Musik"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1756
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Lieblingsspruch"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Contact Info"
 msgstr "Kontakt-Info"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1587
 msgid "Personal"
 msgstr "Privat"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1590
 msgid "Significant Other"
 msgstr "Andere wichtige Dinge"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Home Phone"
 msgstr "Telefon (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Home Phone 2"
 msgstr "Telefon 2 (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Privatadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Personal Mobile"
 msgstr "Handy (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Home Fax"
 msgstr "Fax (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal E-Mail"
 msgstr "E-Mail (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Personal IM"
 msgstr "IM (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1617
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1619
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Work Phone"
 msgstr "Telefon (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Work Phone 2"
 msgstr "Telefon 2 (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Adresse (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work Mobile"
 msgstr "Handy (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Work Pager"
 msgstr "Pager (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Work Fax"
 msgstr "Fax (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Work E-Mail"
 msgstr "E-Mail (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work IM"
 msgstr "IM (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "Favorite Things"
 msgstr "Lieblingsdinge"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1775
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "Der Benutzer hat kein öffentliches Profil erstellt."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1797
 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 "
@@ -5707,7 +5621,7 @@
 "der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
 "kein öffentliches Profil angelegt hat."
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5715,7 +5629,7 @@
 "Konnte keinerlei Information im Profil des Benutzers finden. Der Benutzer "
 "existiert wahrscheinlich nicht."
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1809
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL des Profils"
@@ -5730,19 +5644,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
 msgid "MSN Protocol Plugin"
 msgstr "MSN-Protokoll-Plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2131
 msgid "Use HTTP Method"
 msgstr "Benutze HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2136
 msgid "Show custom smileys"
 msgstr "Zeige benutzerdefinierte Smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt anstoßen, um seine Aufmerksamkeit zu erhalten"
 
@@ -5876,8 +5790,8 @@
 msgstr "Fehler beim Verarbeiten von HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3471
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Sie haben sich von einem anderen Ort angemeldet."
 
@@ -6244,7 +6158,7 @@
 msgstr "Hauspostcode"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -6304,13 +6218,13 @@
 msgstr "Möchten der Konferenz beitreten?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2010
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
 "haben."
 
-#: ../libpurple/protocols/novell/novell.c:2067
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6322,7 +6236,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2165
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6330,11 +6244,11 @@
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
 
-#: ../libpurple/protocols/novell/novell.c:2193
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Fehler. SSL ist nicht installiert."
 
-#: ../libpurple/protocols/novell/novell.c:2502
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Diese Konferenz wurde geschlossen. Es können keine Nachrichten mehr gesendet "
@@ -6350,22 +6264,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3511
-#: ../libpurple/protocols/novell/novell.c:3513
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-Plugin"
 
-#: ../libpurple/protocols/novell/novell.c:3532
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Server-Adresse"
 
-#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Server-Port"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6373,8 +6287,8 @@
 msgstr "Der Server hat die Verbindung beendet."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6411,8 +6325,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM-Protokoll-Plugin"
 
@@ -6426,14 +6340,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "Kodierung"
 
@@ -6565,7 +6479,7 @@
 msgid "Not while on AOL"
 msgstr "Nicht solange bei AOL angemeldet"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6577,7 +6491,7 @@
 "erwartet.  Wenn Sie wissen, welche Kodierung er benutzt, können Sie diese in "
 "den erweiterten Konto-Optionen Ihres AIM/ICQ-Kontos angeben.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6588,144 +6502,144 @@
 "Client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Stimme"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5957
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get File"
 msgstr "Datei abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Spiele"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Zusätze"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ direkte Verbindung"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Altes ICQ UTF-8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian-Verschlüsselung"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Sicherheit aktiviert"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Live-Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5730
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5695
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5716
 msgid "Occupied"
 msgstr "Beschäftigt"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "In Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "Online"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Warnstufe"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Buddy-Kommentar"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6734,7 +6648,7 @@
 "Verbindung zum Authentifizierungsserver nicht möglich:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6743,20 +6657,20 @@
 "Verbindung zum BOS-Server nicht möglich\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Benutzername gesendet"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Verbindung herstellen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6768,28 +6682,29 @@
 "Buchstaben beginnen und können dann Buchstaben, Ziffern und Leerzeichen "
 "enthalten oder sie bestehen nur aus Ziffern."
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "Ungültiger Benutzername."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "Falsches Passwort."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6798,45 +6713,45 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Verbinden nicht möglich"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "Autorisierung empfangen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "Der eingegebene SecurID-Schlüssel ist falsch."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "SecurID-Eingabe"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geben Sie die 6-stellige Nummer vom Digital-Display ein."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2244
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:5835
-#: ../libpurple/protocols/oscar/oscar.c:6111 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:6081 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6845,56 +6760,56 @@
 "Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC "
 "benutzen bis dieser Fehler behoben wurde. Suchen Sie auf %s nach Updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "Konnte keinen gültigen Login-Hash bekommen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Passwort gesendet"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2214
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
 "kann."
 
-#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "Autorisierungsanfrage:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "Bitte autorisiere mich!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2415
-#: ../libpurple/protocols/oscar/oscar.c:5223
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Nachricht für die Ablehnung der Autorisierung:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../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 "
@@ -6905,19 +6820,19 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ-Autorisierung verweigert."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %u hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6930,7 +6845,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6943,7 +6858,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6956,24 +6871,24 @@
 "Nachricht:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Der ICQ Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2477 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2478
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Ablehnen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2562
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, 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."
@@ -6981,7 +6896,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da sie ungültig waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2571
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, 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."
@@ -6989,7 +6904,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu groß waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2580
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7002,7 +6917,7 @@
 "Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
 "überschritten wurde."
 
-#: ../libpurple/protocols/oscar/oscar.c:2589
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, 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."
@@ -7011,7 +6926,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
 
-#: ../libpurple/protocols/oscar/oscar.c:2598
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, 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."
@@ -7020,7 +6935,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
 
-#: ../libpurple/protocols/oscar/oscar.c:2607
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -7030,61 +6945,61 @@
 "Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2762
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kann die Nachricht nicht senden: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2762
-#: ../libpurple/protocols/oscar/oscar.c:2767
-#: ../libpurple/protocols/oscar/oscar.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:2833
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Unbekannter Grund."
 
-#: ../libpurple/protocols/oscar/oscar.c:2765
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kann die Nachricht an %s nicht senden:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "Benutzerinformation nicht verfügbar: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2832
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Benutzerinformation für %s nicht verfügbar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "Online seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Fähigkeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:2889
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Verfügbarkeitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:2915
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2992
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3179
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7092,11 +7007,7 @@
 "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
 "Zeichen enthält.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3400
-msgid "Rate limiting error."
-msgstr "Datenratenbegrenzungsfehler."
-
-#: ../libpurple/protocols/oscar/oscar.c:3401
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7105,87 +7016,87 @@
 "Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
 "Sie es erneut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3473
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "Sie wurden aus einem unbekannten Grund abgemeldet."
 
-#: ../libpurple/protocols/oscar/oscar.c:3486
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Handynummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Persönliche Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../libpurple/protocols/oscar/oscar.c:3795
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3822
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3881
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3921
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Die folgende Benutzername ist verbunden mit %s"
 msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3926
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Keine Ergebnisse für die E-Mail-Adresse %s gefunden"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 "Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
 "bestätigen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3975
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: ../libpurple/protocols/oscar/oscar.c:4006
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Konten-Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:4009
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7194,14 +7105,14 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil er ungültig "
 "ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7210,7 +7121,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7219,7 +7130,7 @@
 "Error 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon eine "
 "laufende Anfrage für diesen Benutzernamen gibt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7228,7 +7139,7 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon zu viele "
 "E-Mail-Adressen gibt, die zum Benutzernamen gehören."
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7237,32 +7148,32 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Die E-Mail-Adresse für %s ist %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4039
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4212
+#: ../libpurple/protocols/oscar/oscar.c:4193
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie müssen direkt verbunden sein, um IM-"
 "Bilder senden zu können."
 
-#: ../libpurple/protocols/oscar/oscar.c:4464
+#: ../libpurple/protocols/oscar/oscar.c:4438
 msgid "Unable to set AIM profile."
 msgstr "Kann das AIM-Profil nicht setzen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4465
+#: ../libpurple/protocols/oscar/oscar.c:4439
 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 "
@@ -7272,26 +7183,26 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: ../libpurple/protocols/oscar/oscar.c:4479
+#: ../libpurple/protocols/oscar/oscar.c:4453
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] ""
-"Die maximale Profilgröße von %d Byte wurde überschritten. Es wurde für Sie "
+"Die maximale Profilgröße von %d Byte wurde überschritten.  Es wurde für Sie "
 "abgeschnitten."
 msgstr[1] ""
-"Die maximale Profilgröße von %d Bytes wurde überschritten. Es wurde für Sie "
+"Die maximale Profilgröße von %d Bytes wurde überschritten.  Es wurde für Sie "
 "abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4484
+#: ../libpurple/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "Profil zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4529
+#: ../libpurple/protocols/oscar/oscar.c:4503
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7306,11 +7217,11 @@
 "Die Abwesenheitsnachricht hat die maximale Größe von %d Bytes "
 "überschritten.  Sie wurde für Sie abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4534
+#: ../libpurple/protocols/oscar/oscar.c:4508
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:4577
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7322,17 +7233,17 @@
 "Buchstaben, Ziffern und Leerzeichen enthalten oder sie bestehen nur aus "
 "Ziffern."
 
-#: ../libpurple/protocols/oscar/oscar.c:4605
-#: ../libpurple/protocols/oscar/oscar.c:5030
-#: ../libpurple/protocols/oscar/oscar.c:5044
+#: ../libpurple/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "Kann nicht hinzufügen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4709
+#: ../libpurple/protocols/oscar/oscar.c:4683
 msgid "Unable To Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: ../libpurple/protocols/oscar/oscar.c:4710
+#: ../libpurple/protocols/oscar/oscar.c:4684
 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."
@@ -7341,16 +7252,16 @@
 "versenden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in "
 "ein paar Stunden wieder verfügbar sein."
 
-#: ../libpurple/protocols/oscar/oscar.c:4915
-#: ../libpurple/protocols/oscar/oscar.c:4916
-#: ../libpurple/protocols/oscar/oscar.c:4921
-#: ../libpurple/protocols/oscar/oscar.c:5098
-#: ../libpurple/protocols/oscar/oscar.c:5099
-#: ../libpurple/protocols/oscar/oscar.c:5104
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4894
+#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5076
 msgid "Orphans"
 msgstr "Waisen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5000
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7359,12 +7270,12 @@
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
 "Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
 
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5014
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7375,7 +7286,7 @@
 "Grund dafür ist, dass Sie die maximale Zahl erlaubter Buddy in Ihrer Buddy-"
 "Liste überschritten haben."
 
-#: ../libpurple/protocols/oscar/oscar.c:5135
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7384,24 +7295,24 @@
 "Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzufügen. "
 "Möchten Sie ihn hinzufügen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5194
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %s hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5220
+#: ../libpurple/protocols/oscar/oscar.c:5195
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7412,53 +7323,53 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5199
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5235
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5275
 msgid "Invalid chat name specified."
 msgstr "Ungültiger Chat-Name angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:5370
+#: ../libpurple/protocols/oscar/oscar.c:5345
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie können keine IM-Bilder in AIM-Chats "
 "senden."
 
-#: ../libpurple/protocols/oscar/oscar.c:5509
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "Away Message"
 msgstr "Abwesenheitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5832
+#: ../libpurple/protocols/oscar/oscar.c:5797
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:5798
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5879
+#: ../libpurple/protocols/oscar/oscar.c:5845
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7466,65 +7377,65 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. Möchten Sie fortfahren?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "C_onnect"
 msgstr "V_erbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:5922
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Get AIM Info"
 msgstr "AIM-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#: ../libpurple/protocols/oscar/oscar.c:5896
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5949
+#: ../libpurple/protocols/oscar/oscar.c:5917
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5971
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6030
+#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (Wenn Sie dies aktivieren, werden Sie SPAM erhalten!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsphärenoptionen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6055
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ungültig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6056
+#: ../libpurple/protocols/oscar/oscar.c:6026
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und "
 "Leerzeichen ändern."
 
-#: ../libpurple/protocols/oscar/oscar.c:6109
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6154
+#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6157
+#: ../libpurple/protocols/oscar/oscar.c:6128
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6129
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7533,73 +7444,73 @@
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6176
+#: ../libpurple/protocols/oscar/oscar.c:6147
 msgid "Search for a buddy by e-mail address"
 msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6177
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6151
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
+#: ../libpurple/protocols/oscar/oscar.c:6309
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6320
 msgid "Change Password (URL)"
 msgstr "Ändere Passwort (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6364
+#: ../libpurple/protocols/oscar/oscar.c:6324
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6381
+#: ../libpurple/protocols/oscar/oscar.c:6341
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6385
+#: ../libpurple/protocols/oscar/oscar.c:6345
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6396
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6402
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6475
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6478
+#: ../libpurple/protocols/oscar/oscar.c:6438
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich untätig war"
 
-#: ../libpurple/protocols/oscar/oscar.c:6630
+#: ../libpurple/protocols/oscar/oscar.c:6590
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7636,7 +7547,7 @@
 "ist notwendig für IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies "
 "eine Verletzung der Privatsphäre bedeuten."
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "_Verbinden"
 
@@ -7801,94 +7712,101 @@
 msgid "Update my information"
 msgstr "Meine Informationen aktualisieren"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Ihre Informationen wurden aktualisiert"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-"Sie versuchen, ein benutzerdefiniertes Gesicht zu setzen, was im Moment "
-"nicht unterstützt wird. Bitte wählen sie ein Bild aus "
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr ""
+"Das Setzen von benutzerdefinierten Gesichtern wird momentan nicht "
+"unterstützt. Bitte wählen Sie ein BIld von %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Ungültiges QQ-Gesicht"
 
 # c-format
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Sie haben die Anfrage von %d abgelehnt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Geben Sie Ihren Grund an:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Anfrage ablehnen"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Tut mir Leid, du bist nicht mein Typ..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlägt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "Sie haben einen Buddy entfernt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Sie haben sich erfolgreich von einem Buddy entfernt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Benutzer %d benötigt Authentifizierung"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Anfrage hier eingeben"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Möchten Sie mein Freund sein?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Senden"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Sie haben %d zu Ihrer Buddy-Liste hinzugefügt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid-Fehler"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Ungültige QQid"
 
@@ -7924,59 +7842,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Sie können nur nach permanenten QQ-Gruppen suchen\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Benutzer %d möchte der Gruppe %d beitreten"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Grund: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ-Qun-Operation"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Akzeptieren"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Ihre Anfrage, der Gruppe %d beizutreten wurde von Admin %d abgelehnt"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Ihre Anfrage, der Gruppe %d beizutreten wurde von Admin %d akzeptiert"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Sie [%d] haben die Gruppe \"%d\" verlassen"
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Sie [%d] wurden der Gruppe \"%d\" hinzugefügt"
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "Diese Gruppe wurde Ihrer Buddy-Liste hinzugefügt"
 
@@ -8004,27 +7922,27 @@
 msgid "This group does not allow others to join"
 msgstr "Dieser Gruppe können andere nicht beitreten"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "Sie haben die Gruppe verlassen"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ-Gruppenauthentifikation"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Ihre Autorisierungsoperation wurde vom QQ-Server akzeptiert"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Sie haben eine Gruppen-ID außerhalb des erlaubten Bereichs angegeben"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "Wollen Sie dieses Qun wirklich verlassen?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8032,7 +7950,7 @@
 "Beachten Sie, dass diese Operation den Qun entfernen könnte, \n"
 "wenn Sie der Ersteller sind."
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "Fortfahren"
 
@@ -8045,40 +7963,41 @@
 msgid "Group Operation Error"
 msgstr "Gruppenoperationsfehler"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Wollen sie die Anfrage akzeptieren?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "Sie haben die Qun-Mitgliedschaft erfolgreich modifiziert"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "Sie haben die Qun-Information erfolgreich modifiziert"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "Sie haben einen Qun angelegt"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "Möchten Sie jetzt die Qun-Details einstellen?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "Setup"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "Systemnachricht"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "Server-ACK"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "Nachrichtenzustellung fehlgeschlagen\n"
 
@@ -8098,11 +8017,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8143,47 +8062,47 @@
 msgid "Invalid name"
 msgstr "QQ: Ungültiger Name"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Aktuell online:</b> %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Letzte Aktualisierung</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbindungsmodus</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server-IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Meine öffentlich IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Anmeldezeit</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Letzte Anmelde-IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Letzte Anmeldezeit</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Login-Informationen"
 
@@ -8203,6 +8122,10 @@
 msgid "Exit this QQ Qun"
 msgstr "Dieses QQ-Qun verlassen"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "Diesen Buddy blockieren"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8213,15 +8136,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-Protokoll-Plugin"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Anmeldung mit TCP"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Unsichtbar anmelden"
 
@@ -8265,51 +8188,53 @@
 msgid "Login failed, no reply"
 msgstr "Anmeldung fehlgeschlagen, keine Antwort"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sie wurden von %s hinzugefügt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Möchten Sie ihn hinzufügen?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s hat Sie [%s] hinzugefügt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Benutzer %s hat Ihre Anfrage abgelehnt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "Benutzer %s hat Ihre Anfrage akzeptiert"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s möchte Sie [%s] als Freund hinzufügen"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ist nicht in Ihrer Buddy-Liste"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Möchten Sie ihn hinzufügen?"
 
@@ -8402,7 +8327,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Verbindung zum Server nicht möglich"
 
@@ -8419,41 +8344,41 @@
 msgid "Unable to send message: "
 msgstr "Kann die Nachricht nicht senden: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Platz geschlossen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Lautsprecher"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Dateiübertragung"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Unterstützt"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Externer Benutzer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Konferenz mit dem Benutzer beginnen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8462,11 +8387,11 @@
 "Bitte geben sie ein Thema für die neue Konferenz und eine "
 "Einladungsnachricht für %s ein"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Neue Konferenz"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Erzeugen"
 
@@ -8497,23 +8422,23 @@
 msgid "Invite to Conference"
 msgstr "Zur Konferenz einladen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Zur Konferenz einladen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
 msgid "Topic:"
 msgstr "Thema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8522,38 +8447,38 @@
 "Es wurde kein Rechner für das Meanwhile-Konto %s angegeben. Bitte geben Sie "
 "einen Rechner an, um die Anmeldung fortzusetzen."
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile-Verbindungseinstellungen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unbekannt (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Letzter bekannter Client"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Eine mehrdeutige ID wurde angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8563,15 +8488,15 @@
 "beziehen. Bitte wählen Sie den korrekten Benutzer vor der untenstehenden "
 "Liste, um ihn zu Ihrer Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Benutzer wählen"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Kann den Benutzer nicht hinzufügen: Benutzer nicht gefunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8580,11 +8505,11 @@
 "Der Bezeichner '%s' passt zu keinem der Benutzer in Ihrer Sametime-"
 "Community. Der Eintrag wurde von Ihrer Buddy-Liste entfernt."
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8593,63 +8518,63 @@
 "Fehler beim Lesen von %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Entfernt gespeicherte Buddy-Liste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Buddy-Listen-Speicherungsmethode"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Nur lokale Buddy-Liste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Mit Buddy-Liste vom Server zusammenführen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Buddy-Liste zusammenführen und zum Server exportieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Buddy-Liste mit Server abgleichen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s importieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s exportieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe existiert"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Eine Gruppe mit dem Namen '%s' existiert bereits in Ihrer Buddy-Liste."
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "Kann die Gruppe nicht hinzufügen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "Mögliche Übereinstimmungen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr "Notes-Adressbuchgruppenergebnisse"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8660,15 +8585,15 @@
 "Adressbuchgruppen. Bitte wählen Sie die richtige Gruppe aus der Liste, um "
 "sie Ihrer Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr "Wählen Sie das Notes-Adressbuch"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe nicht gefunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8677,11 +8602,11 @@
 "Der Bezeichner '%s' stimmt mit keiner Notes-Adressbuchgruppe in Ihrer "
 "Sametime-Community überein."
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr "Notes-Adressbuchgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5475
 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."
@@ -8689,12 +8614,12 @@
 "Geben Sie den Namen einer Notes-Adressbuchgruppe in das Feld ein um die "
 "Gruppe und ihre Mitglieder zu ihrer Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Suchergebnisse für '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8706,30 +8631,30 @@
 "können diese Benutzer zu Ihrer Buddy-Liste hinzufügen oder ihnen Nachrichten "
 "senden, indem sie die folgenden Aktions-Buttons benutzen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "Keine Übereinstimmung"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Der Bezeichner '%s' stimmt mit keinem Benutzer in Ihrer Sametime-Community "
 "überein."
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "Keine Übereinstimmung"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "Suche nach einem Benutzer"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8737,39 +8662,39 @@
 "Geben die einen Namen oder den Teil einer ID in das folgende Feld ein, um "
 "nach entsprechenden Benutzern in Ihrer Sametime-Community zu suchen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "Benutzersuche"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr "Import der Sametime-Liste..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr "Export der Sametime-Liste..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr "Zum Notes-Adressbuch hinzufügen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "Benutzersuche..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr "Erzwinge Login (ignoriere Serverumleitungen)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr "Client-Identität verbergen"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8815,12 +8740,12 @@
 msgstr "Schlüsselaustausch kann nicht mit Ihnen selbst gestartet werden"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Der entfernte Benutzer ist nicht mehr im Netzwerk präsent"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8829,7 +8754,7 @@
 "Anfrage nach Schlüsselaustausch wurde von %s empfangen. Möchten Sie den "
 "Schlüsselaustausch durchführen?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8840,49 +8765,49 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Anfrage nach Schlüsselaustausch"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "IM mit Passwort"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kann IM-Schlüssel nicht setzen"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "Setze IM-Passwort"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Öffentlichen Schlüssel abrufen"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Konnte den öffentlichen Schlüssel nicht abrufen"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Zeige öffentlichen Schlüssel"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Konnte den öffentlichen Schlüssel nicht laden"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -8891,18 +8816,18 @@
 msgid "User Information"
 msgstr "Benutzer-Information"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kann die Benutzerinformation nicht abrufen"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Dem Buddy %s wird nicht (kryptografisch) vertraut"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/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."
@@ -8913,16 +8838,16 @@
 "erhalten."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Der Benutzer %s ist nicht im Netzwerk präsent"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8931,15 +8856,15 @@
 "Schlüssel importieren. Drücken Sie auf Import, um den öffentlichen Schlüssel "
 "zu importieren."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Wählen Sie den richtigen Benutzer"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/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."
@@ -8948,7 +8873,7 @@
 "gefunden. Wählen Sie den richtigen Benutzer, um ihn zur Buddy-Liste "
 "hinzuzufügen."
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/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."
@@ -8956,154 +8881,154 @@
 "Mehr als ein Benutzer wurde mit dem gleichen Namen gefunden. Wählen Sie den "
 "richtigen Benutzer, um ihn zur Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Unbeteiligt"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Indisponiert"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Wecke mich auf"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Glücklich"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Traurig"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Verärgert"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Eifersüchtig"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Unerschütterlich"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Verliebt"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Müde"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Besorgt"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Benutzermodi"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Stimmung"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Bevorzugter Kontakt"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Bevorzugte Sprache"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Gerät"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Geographische Koordinaten"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "IM-Schlüssel zurücksetzen"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM mit Schlüsselaustausch"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM mit Passwort"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Öffentlichen Schlüssel abrufen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Benutzer hinauswerfen"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Auf Whiteboard malen"
 
@@ -9179,15 +9104,15 @@
 msgid "Open Public Key..."
 msgstr "Öffentlichen Schlüssel öffnen..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanal-Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Liste der öffentlichen Schlüssel des Kanals"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9202,108 +9127,108 @@
 "Schlüssel gewählt werden, können nur solche Benutzer den Kanal betreten, "
 "deren Schlüssel aufgelistet sind."
 
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanal-Authentifikation"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Hinzufügen / Entfernen"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Bitte geben Sie für den Kanal %s den Namen der privaten Gruppe und die "
 "Passphrase an."
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Private Gruppe im Kanal hinzufügen"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "Benutzer-Limit"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Setze Benutzerlimit auf dem Kanal. Wählen Sie 0, um das Limit aufzuheben."
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Einladungsliste"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Verbannungsliste"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Private Gruppe hinzufügen"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Permanent zurücksetzen"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Permanent setzen"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Setze Benutzer-Limit"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Themenbeschränkung zurücknehmen"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Setze Themenbeschränkung"
 
-#: ../libpurple/protocols/silc/chat.c:943
-msgid "Reset Private Channel"
-msgstr "Privaten Kanal zurücksetzen"
-
 #: ../libpurple/protocols/silc/chat.c:948
+msgid "Reset Private Channel"
+msgstr "Privaten Kanal zurücksetzen"
+
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Setze privaten Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Geheimen Kanal zurücksetzen"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Setze geheimen Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sie sind der Gründer des Kanals <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Gründer des Kanals <I>%s</I> ist <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -9311,26 +9236,26 @@
 "Sie müssen den Kanal %s betreten, bevor Sie die private Gruppe betreten "
 "können"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Private Gruppe betreten"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kann die private Gruppe nicht betreten"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Kommando ausführen"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Kommando nicht aufrufbar"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Unbekanntes Kommando"
 
@@ -9440,7 +9365,7 @@
 msgstr "Position"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Organisation"
 
@@ -9481,7 +9406,7 @@
 msgstr "_Mehr..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Vom Server trennen"
 
@@ -9620,55 +9545,55 @@
 msgid "Verifying server public key"
 msgstr "Überprüfung des öffentlichen Schlüssels des Servers"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Passphrase erforderlich"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fehler: Unterschiedliche Version, aktualisieren Sie Ihren Client"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Fehler: Die entfernte Seite vertraut Ihrem öffentlichen Schlüssel nicht"
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt nicht die vorgeschlagen KE-Gruppe"
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht"
 
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fehler: Entferntes Programm unterstützt die vorgeschlagene PKCS nicht"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt die vorgeschlagen Hashfunktion nicht"
 
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fehler: Entferntes Programm unterstützt das vorgeschlagene HMAC nicht"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Fehler: Falsche Signatur"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Fehler: Ungültiger Cookie"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Fehler: Authentifizierung fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9678,14 +9603,14 @@
 "nicht mit diesem Schlüssel überein. Möchten Sie trotzdem diesen (neuen) "
 "Schlüssel akzeptieren?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 "Öffentlicher Schlüssel von %s wurde empfangen. Möchten Sie diesen "
 "öffentlichen Schlüssel akzeptieren?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9698,15 +9623,15 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Öffentlichen Schlüssel ansehen"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_Ansehen..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nicht-unterstützter Typ für den öffentlichen Schlüssel"
 
@@ -9756,7 +9681,7 @@
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normal"
 
@@ -9821,173 +9746,173 @@
 "Informationen zugänglich machen. Bitte füllen Sie die Informationen aus, die "
 "andere Benutzer von Ihnen sehen können."
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "Nachricht des Tages"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "Keine Nachricht-des-Tages verfügbar"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Es gibt keine Nachricht-des-Tages zu dieser Verbindung"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Erstelle ein neues SILC-Schlüsselpaar"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "Passphrasen stimmen nicht überein"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "Schlüsselerzeugung ist fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Schlüssellänge"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Öffentlicher Schlüssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Privater Schlüssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Passphrase (nochmal)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Schlüsselpaar erzeugen"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Online-Status"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "Nachricht des Tages anschauen"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "SILC-Schlüsselpaar erstellen..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Benutzer <I>%s</I> ist nicht im Netzwerk präsent"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "Thema zu lang"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Sie müssen einen Nick angeben"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanal %s nicht gefunden"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Kanal-Modi für %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "Für den Kanal %s sind keine Kanal-Modi gesetzt"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Setzen der cmodes für %s gescheitert"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Unbekanntes Kommando: %s, (möglicherweise ein Bug)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [Kanal]:  Verlasse den Chat"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [Kanal]:  Verlassen des Chats"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;neues Thema&gt;]:  Thema ändern oder anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;Kanal&gt; [&lt;Passwort&gt;]:  Betrete einen Chat in diesem Netzwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  Liste Kanäle in diesem Netzwerk auf"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;Nick&gt;:  Informationen zum Nick anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/silc/silc.c:1618
 #: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;Nick&gt; [&lt;Nachricht&gt;]:  Sende eine private Nachricht an "
 "einen Benutzer"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Nachricht des Tages vom Server anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  Sitzung beenden"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [Nachricht]:  Trennung vom Server mit einer optionalen Nachricht"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;Kommando&gt;:  Rufe ein Silc-Client-Kommando auf"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;Nick&gt; [-pubkey|&lt;Grund&gt;]:  Killt einen Nick"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;neue Nickname&gt;:  Ihren Nickname ändern"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9995,7 +9920,7 @@
 "cmode &lt;Kanal&gt; [+|-&lt;Modi&gt;] [Argumente]:  Kanal-Modi ändern oder "
 "anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10003,17 +9928,17 @@
 "cumode &lt;Kanal&gt; +|-&lt;Modi&gt; &lt;Nick&gt;:  Modi des Benutzers auf "
 "dem Kanal ändern"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 "umode &lt;Benutzeroptionen&gt;:  Setze Ihre Benutzeroptionen im Netzwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;Nick&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10021,39 +9946,39 @@
 "invite &lt;Kanal&gt; [-|+]&lt;Nick&gt;:  Benutzer einladen oder Benutzer zur "
 "Einladungsliste des Kanals hinzufügen oder von der Einladungsliste entfernen"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;Kanal&gt; &lt;Nick&gt; [Kommentar]:  Kickt einen Benutzer aus dem "
 "Kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [Server]:  Administrative Details des Servers ansehen"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;Kanal&gt; +|-&lt;Nick&gt;]:  Verbanne Benutzer vom Kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;Nick|Server&gt;:  Öffentlichen Schlüssel der Servers oder des "
 "Benutzers abrufen"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- und Netzwerkstatistik ansehen"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Sendet PING an den verbundenen Server"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;Kanal&gt;:  Benutzer im Kanal auflisten"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10070,64 +9995,64 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC-Protokoll-Plugin"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Sichere Internet Live Konferenz (SILC) Protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Öffentlicher Schlüssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Privater Schlüssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Verschlüsselung"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Authentifizierung mit öffentlichem Schlüssel"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Verhindern, dass man von anderen Benutzern gesehen wird"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Einladungen blockieren"
 
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Blockiere IMs ohne Schlüsselaustausch"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Onlinestatus-Attributanfragen zurückweisen"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "Blockiere Nachrichten zum Whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "Whiteboard automatisch öffnen"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Alle IM-Nachrichten digital unterschreiben und überprüfen"
 
@@ -10250,26 +10175,26 @@
 msgstr "Konnte nicht schreiben"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1486
 msgid "Could not connect"
 msgstr "Verbinden nicht möglich"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht auflösen"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
 msgstr "Konnte den Hostnamen nicht auflösen"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -10281,36 +10206,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Status veröffentlichen (Bemerkung: Jeder kann Sie sehen)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "Benutze UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "Proxy benutzen"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr "Auth-Benutzer"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr "Auto-Domäne"
 
@@ -10538,32 +10463,32 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-Protokoll-Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s hat Ihnen gerade einen Kick gegeben!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-Systemnachricht für %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "Nachricht für die Ablehnung der Autorisierung:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzufügen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10572,11 +10497,11 @@
 "%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzufügen und zwar aus folgendem Grund: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "Hinzufügen des Buddys zurückgewiesen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10587,11 +10512,11 @@
 "Sie werden wahrscheinlich nicht in der Lage sein, Sich erfolgreich bei Yahoo "
 "anzumelden.  Prüfen Sie %s auf Updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo-Authentifizierung fehlgeschlagen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10600,153 +10525,154 @@
 "Sie haben versucht %s zu ignorieren, aber der Benutzer ist in Ihrer Buddy-"
 "Liste.  Wenn Sie auf „Ja“ klicken, wird der Buddy entfernt und ignoriert."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "Buddy ignorieren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Unbekannte Fehlernummer %d. Vielleicht kann dies repariert werden, wenn Sie "
 "sich auf der Yahoo! Webseite anmelden."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
 "hinzufügen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "Konnte den Buddy nicht zur Serverliste hinzufügen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "Ungültige HTTP-Antwort vom Server empfangen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindungsfehler"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "Nicht am Schreibtisch"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "Nicht im Büro"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "Hinausgegangen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr "Offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "Präsenz"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "Offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent Offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "Chat betreten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "Konferenz einleiten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "Anwesenheitseinstellungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr "Anfangen zu malen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "Welche ID aktivieren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "Aktiviere ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "Einen Benutzer zum Chat einladen..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "You have just sent a Buzz!"
 msgstr "Sie haben gerade einen Kick versandt!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
 
@@ -10760,130 +10686,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-Protokoll-Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "Pager-Server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "Pager-Server (Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "Pager-Port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "Server für Dateiübertragungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "Server für Dateiübertragungen (Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "Port für Dateiübertragungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "Chatraum-Gebiet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Yahoo-Chat-Server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Yahoo-Chat-Port"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s lehnte Ihre Konferenzeinladung in den Raum „%s“ ab, da „%s“."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Einladung zurückgewiesen"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Der Chat kann nicht betreten werden"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Unbekannter Raum"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Vielleicht ist der Raum voll"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Nicht verfügbar"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Unbekannter Fehler. Sie müssen sich eventuell abmelden und fünf Minuten "
-"warten, bevor sie wieder einen Chatraum betreten können"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Sie chatten jetzt in %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "Es gelang nicht, den Buddy in dem Chat zu holen"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "Vielleicht sind sie nicht im Chat?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Fetching the room list failed."
-msgstr "Abrufen der Raumliste gescheitert."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
-msgid "Voices"
-msgstr "Stimmen"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-msgid "Unable to fetch room list."
-msgstr "Kamm die Raumliste nicht abrufen."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
-msgid "User Rooms"
-msgstr "Benutzerräume"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -10997,6 +10852,77 @@
 msgid "The user's profile is empty."
 msgstr "Das Profil des Benutzers ist leer."
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s lehnte Ihre Konferenzeinladung in den Raum „%s“ ab, da „%s“."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Einladung zurückgewiesen"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Der Chat kann nicht betreten werden"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Unbekannter Raum"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Vielleicht ist der Raum voll"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Nicht verfügbar"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Unbekannter Fehler. Sie müssen sich eventuell abmelden und fünf Minuten "
+"warten, bevor sie wieder einen Chatraum betreten können"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Sie chatten jetzt in %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Es gelang nicht, den Buddy in dem Chat zu holen"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Vielleicht sind sie nicht im Chat?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Abrufen der Raumliste gescheitert."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Stimmen"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Kamm die Raumliste nicht abrufen."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Benutzerräume"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Verbindungsproblem mit dem YCHT-Server."
@@ -11145,40 +11071,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-Protokoll-Plugin"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "Benutze tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "tzc-Kommando"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "Export an .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "Export an .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "Import von .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "Import von .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr "Aussetzen"
 
@@ -11221,18 +11147,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Nein"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Akzeptieren"
 
@@ -11243,16 +11169,16 @@
 msgid "I'm not here right now"
 msgstr "Ich bin gerade nicht hier"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "gespeicherter Status"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s heißt jetzt %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11261,58 +11187,58 @@
 "%s hat %s in den Chatraum %s eingeladen:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s hat %s in den Chatraum %s eingeladen\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:683
 msgid "Accept chat invitation?"
 msgstr "Akzeptieren Sie die Chat-Einladung?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:157
 msgid "Unavailable"
 msgstr "Unerreichbar"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s hat den Status von %s zu %s geändert"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:620
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:625
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ist nicht mehr %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1257
 #, c-format
 msgid "%s became idle"
 msgstr "%s wurde untätig"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1274
 #, c-format
 msgid "%s became unidle"
 msgstr "%s wurde tätig"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1336
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s wurde untätig"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1338
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s wurde tätig"
@@ -11322,12 +11248,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2503
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: ../libpurple/util.c:2504
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11336,62 +11262,62 @@
 "Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Liste wurde nicht geladen "
 "und die alte Datei wurde in %s~ umbenannt."
 
-#: ../libpurple/util.c:2967
+#: ../libpurple/util.c:2980
 msgid "Calculating..."
 msgstr "Berechne..."
 
-#: ../libpurple/util.c:2970
+#: ../libpurple/util.c:2983
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: ../libpurple/util.c:2996
+#: ../libpurple/util.c:3009
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../libpurple/util.c:3008
+#: ../libpurple/util.c:3021
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: ../libpurple/util.c:3016
+#: ../libpurple/util.c:3029
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d Stunde"
 msgstr[1] "%s, %d Stunden"
 
-#: ../libpurple/util.c:3022
+#: ../libpurple/util.c:3035
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../libpurple/util.c:3030
+#: ../libpurple/util.c:3043
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d Minute"
 msgstr[1] "%s, %d Minuten"
 
-#: ../libpurple/util.c:3036
+#: ../libpurple/util.c:3049
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../libpurple/util.c:3303 ../libpurple/util.c:3601
+#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht möglich"
 
-#: ../libpurple/util.c:3429
+#: ../libpurple/util.c:3441
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11400,17 +11326,17 @@
 "Nicht genug Speicher für die Inhalte von %s verfügbar.  Eventuell versucht "
 "der Web-Server etwas böses zu tun."
 
-#: ../libpurple/util.c:3464
+#: ../libpurple/util.c:3476
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: ../libpurple/util.c:3495
+#: ../libpurple/util.c:3507
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: ../libpurple/util.c:3520
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht möglich: %s"
@@ -11436,55 +11362,55 @@
 msgstr "Die Ausrichtung der Kontrollleiste."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:398
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
 
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:500
 msgid "Local alias:"
 msgstr "Lokaler Alias:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:562
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:580
 msgid "Use this buddy icon for this account:"
 msgstr "Dieses Buddy-Icon für dieses Konto benutzen:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:700
 #, c-format
 msgid "%s Options"
 msgstr "%s Einstellungen"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:897
 msgid "Use GNOME Proxy Settings"
 msgstr "Benutze GNOME-Proxy-Einstellungen"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:898
 msgid "Use Global Proxy Settings"
 msgstr "Benutze globale Proxy-Einstellungen"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:904
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:910
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:916
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:922
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Benutze Umgebungsvariablen"
 
@@ -11493,61 +11419,61 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:967
 msgid "If you look real closely"
 msgstr "Wenn Sie genau hinschauen"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:970
 msgid "you can see the butterflies mating"
 msgstr "Sie können den Schmetterlingen beim Paaren zusehen"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:991
 msgid "Proxy Options"
 msgstr "Proxy-Optionen"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ:"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1026
 msgid "_Username:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "P_asswort:"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1440
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1475
 msgid "_Advanced"
 msgstr "_Erweitert"
 
 # Aktiv
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1975
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2145
+#: ../pidgin/gtkaccount.c:2169
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11571,11 +11497,11 @@
 "Kontaktlistenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:722
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:743
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11583,96 +11509,96 @@
 "Bitte geben Sie geeignete Informationen über den Chat ein, den Sie betreten "
 "wollen.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Sperren"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1028
 msgid "Un_block"
 msgstr "_Sperrung aufheben"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1079
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1088
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1095
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzufügen"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1115
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1234
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1236
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1175
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzufügen"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1178
 msgid "Add a C_hat"
 msgstr "C_hat hinzufügen"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1181
 msgid "_Delete Group"
 msgstr "Gruppe _löschen"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1183
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1203
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1269
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4481 ../pidgin/gtkblist.c:4491
+#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
+#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4499
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -11680,126 +11606,126 @@
 "kann, um diesen Buddy hinzuzufügen."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2805
+#: ../pidgin/gtkblist.c:2814
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: ../pidgin/gtkblist.c:2806
+#: ../pidgin/gtkblist.c:2815
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:2807
+#: ../pidgin/gtkblist.c:2816
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: ../pidgin/gtkblist.c:2808
+#: ../pidgin/gtkblist.c:2817
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:2809
+#: ../pidgin/gtkblist.c:2818
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: ../pidgin/gtkblist.c:2811
+#: ../pidgin/gtkblist.c:2820
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddys/Zeige _Offline-Buddys"
 
-#: ../pidgin/gtkblist.c:2812
+#: ../pidgin/gtkblist.c:2821
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
-#: ../pidgin/gtkblist.c:2813
+#: ../pidgin/gtkblist.c:2822
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddys/Zeige Buddy-_Details"
 
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2823
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddys/Zeige Untätigkeitszei_ten"
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2824
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2826
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2827
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2828
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzufügen..."
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2830
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2833
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../pidgin/gtkblist.c:2825 ../pidgin/gtkblist.c:6400
+#: ../pidgin/gtkblist.c:2834 ../pidgin/gtkblist.c:6412
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzufügen\\/Ändern"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2837
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2838
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../pidgin/gtkblist.c:2830
+#: ../pidgin/gtkblist.c:2839
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2831
+#: ../pidgin/gtkblist.c:2840
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2841
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2843
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2844
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/Chat_räume"
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2845
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2847
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2850
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2851
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2852
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2853
 msgid "/Help/_About"
 msgstr "/Hilfe/I_nfo"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2881
 #, c-format
 msgid ""
 "\n"
@@ -11808,131 +11734,127 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2950
+#: ../pidgin/gtkblist.c:2959
 msgid "Buddy Alias"
 msgstr "Buddy-Alias"
 
-#: ../pidgin/gtkblist.c:2971
+#: ../pidgin/gtkblist.c:2980
 msgid "Logged In"
 msgstr "Angemeldet"
 
-#: ../pidgin/gtkblist.c:3017
+#: ../pidgin/gtkblist.c:3026
 msgid "Last Seen"
 msgstr "Zuletzt gesehen"
 
-#: ../pidgin/gtkblist.c:3037
+#: ../pidgin/gtkblist.c:3046
 msgid "Spooky"
 msgstr "Gruselig"
 
-#: ../pidgin/gtkblist.c:3039
+#: ../pidgin/gtkblist.c:3048
 msgid "Awesome"
 msgstr "Großartig"
 
-#: ../pidgin/gtkblist.c:3041
+#: ../pidgin/gtkblist.c:3050
 msgid "Rockin'"
 msgstr "Abgefahren"
 
-#: ../pidgin/gtkblist.c:3366
+#: ../pidgin/gtkblist.c:3375
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Untätig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3368
+#: ../pidgin/gtkblist.c:3377
 #, c-format
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
-#: ../pidgin/gtkblist.c:3505
+#: ../pidgin/gtkblist.c:3514
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:3506 ../pidgin/gtkblist.c:3539
+#: ../pidgin/gtkblist.c:3515 ../pidgin/gtkblist.c:3548
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../pidgin/gtkblist.c:3507
+#: ../pidgin/gtkblist.c:3516
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:3508
+#: ../pidgin/gtkblist.c:3517
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3509 ../pidgin/gtkblist.c:3542
+#: ../pidgin/gtkblist.c:3518 ../pidgin/gtkblist.c:3551
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3510
+#: ../pidgin/gtkblist.c:3519
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3545
-msgid "/Tools/Buddy Pounces"
-msgstr "/Werkzeuge/Buddy-Alarm"
-
-#: ../pidgin/gtkblist.c:3548
+#: ../pidgin/gtkblist.c:3554
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3557
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Chaträume"
 
-#: ../pidgin/gtkblist.c:3648 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3654 ../pidgin/gtkdocklet.c:156
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ungelesene Nachricht von %s\n"
 msgstr[1] "%d ungelesene Nachrichten von %s\n"
 
-#: ../pidgin/gtkblist.c:3725
+#: ../pidgin/gtkblist.c:3731
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../pidgin/gtkblist.c:3727
+#: ../pidgin/gtkblist.c:3733
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../pidgin/gtkblist.c:3728
+#: ../pidgin/gtkblist.c:3734
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../pidgin/gtkblist.c:3729
+#: ../pidgin/gtkblist.c:3735
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: ../pidgin/gtkblist.c:3931 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3937 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../pidgin/gtkblist.c:3940
+#: ../pidgin/gtkblist.c:3947
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: ../pidgin/gtkblist.c:3961
+#: ../pidgin/gtkblist.c:3968
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../pidgin/gtkblist.c:4114
+#: ../pidgin/gtkblist.c:4121
 msgid "<b>Username:</b>"
 msgstr "<b>Benutzername:</b>"
 
-#: ../pidgin/gtkblist.c:4121
+#: ../pidgin/gtkblist.c:4128
 msgid "<b>Password:</b>"
 msgstr "<b>Passwort:</b>"
 
-#: ../pidgin/gtkblist.c:4132
+#: ../pidgin/gtkblist.c:4139
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: ../pidgin/gtkblist.c:4217
+#: ../pidgin/gtkblist.c:4224
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4231
+#: ../pidgin/gtkblist.c:4238
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11951,23 +11873,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4475
+#: ../pidgin/gtkblist.c:4483
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline Buddys"
 
-#: ../pidgin/gtkblist.c:4478
+#: ../pidgin/gtkblist.c:4486
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
-#: ../pidgin/gtkblist.c:4484
+#: ../pidgin/gtkblist.c:4492
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddys/Zeige Buddy-Details"
 
-#: ../pidgin/gtkblist.c:4487
+#: ../pidgin/gtkblist.c:4495
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Untätigkeitszeiten"
 
-#: ../pidgin/gtkblist.c:5327
+#: ../pidgin/gtkblist.c:5333
 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. "
@@ -11978,23 +11900,23 @@
 "Buddy eingeben. Der Alias wird anstelle des Benutzernamens ausgegeben,  wann "
 "immer es möglich ist.\n"
 
-#: ../pidgin/gtkblist.c:5387 ../pidgin/gtkblist.c:5748
+#: ../pidgin/gtkblist.c:5393 ../pidgin/gtkblist.c:5754
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../pidgin/gtkblist.c:5646
+#: ../pidgin/gtkblist.c:5652
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: ../pidgin/gtkblist.c:5662
+#: ../pidgin/gtkblist.c:5668
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sie sind derzeit mit keinem Chat-fähigen Protokoll angemeldet."
 
-#: ../pidgin/gtkblist.c:5703
+#: ../pidgin/gtkblist.c:5709
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12002,39 +11924,39 @@
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../pidgin/gtkblist.c:5786
+#: ../pidgin/gtkblist.c:5792
 msgid "Please enter the name of the group to be added."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
 
-#: ../pidgin/gtkblist.c:6420
+#: ../pidgin/gtkblist.c:6432
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konten"
 
-#: ../pidgin/gtkblist.c:6444
+#: ../pidgin/gtkblist.c:6456
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../pidgin/gtkblist.c:6457 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6469 ../pidgin/gtkconv.c:2900
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: ../pidgin/gtkblist.c:6465
+#: ../pidgin/gtkblist.c:6477
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../pidgin/gtkblist.c:6477
+#: ../pidgin/gtkblist.c:6489
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../pidgin/gtkblist.c:6483
+#: ../pidgin/gtkblist.c:6495
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konten/Konto aktivieren"
 
-#: ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:6544
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../pidgin/gtkblist.c:6602
+#: ../pidgin/gtkblist.c:6614
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
@@ -12079,12 +12001,12 @@
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
@@ -12098,166 +12020,166 @@
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
 msgid "Find"
 msgstr "Suchen"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1340
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1348
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Mitschnitt angehalten. Zukünftige Nachrichten dieser Unterhaltung werden "
 "nicht mitgeschnitten."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1596
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1599
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1619
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1642
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2535
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2587
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2592
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2595
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2599
 msgid "Set Custom Icon..."
 msgstr "Setze benutzerdefiniertes Icon..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2612
 msgid "Remove Custom Icon"
 msgstr "Benutzerdefiniertes Icon entfernen"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2754
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2756
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2761
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2763
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2764
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2766
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2770
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2771
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2773
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2775
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2777
 msgid "/Conversation/M_ore"
 msgstr "/Unterhaltung/M_ehr"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2781
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2783
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2785
 msgid "/Conversation/_Unblock..."
 msgstr "/Unterhaltung/_Entsperren..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2798
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2799
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2800
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2801
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Optionen/Buddy-_Icon anzeigen"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2803
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2804
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/More"
 msgstr "/Unterhaltung/Mehr"
 
@@ -12266,165 +12188,165 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
 msgid "/Conversation"
 msgstr "/Unterhaltung"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:2994
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/Unblock..."
 msgstr "/Unterhaltung/Entsperren..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3002
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3006
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3010
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3013
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3026
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3029
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3032
 msgid "/Options/Show Buddy Icon"
 msgstr "/Optionen/Zeige Buddy-Icon"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3159
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3341
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4049
 msgid "_Send"
 msgstr "Ab_schicken"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4197
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../pidgin/gtkconv.c:5382 ../pidgin/gtkconv.c:5503
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: ../pidgin/gtkconv.c:6059 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../pidgin/gtkconv.c:6065
+#: ../pidgin/gtkconv.c:6054
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../pidgin/gtkconv.c:6070
+#: ../pidgin/gtkconv.c:6059
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../pidgin/gtkconv.c:6075 ../pidgin/gtkdocklet.c:504
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../pidgin/gtkconv.c:6080
+#: ../pidgin/gtkconv.c:6069
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../pidgin/gtkconv.c:7201
+#: ../pidgin/gtkconv.c:7196
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: ../pidgin/gtkconv.c:7233
+#: ../pidgin/gtkconv.c:7228
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schließen?"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7763
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: ../pidgin/gtkconv.c:7774
+#: ../pidgin/gtkconv.c:7769
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: ../pidgin/gtkconv.c:7782
+#: ../pidgin/gtkconv.c:7777
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: ../pidgin/gtkconv.c:7788
+#: ../pidgin/gtkconv.c:7783
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8091
+#: ../pidgin/gtkconv.c:8086
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: ../pidgin/gtkconv.c:8555
+#: ../pidgin/gtkconv.c:8550
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../pidgin/gtkconv.c:8557
+#: ../pidgin/gtkconv.c:8552
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../pidgin/gtkconv.c:8559 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../pidgin/gtkconv.c:8561
+#: ../pidgin/gtkconv.c:8556
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: ../pidgin/gtkconv.c:8563
+#: ../pidgin/gtkconv.c:8558
 msgid "By account"
 msgstr "Nach Konto"
 
@@ -12432,63 +12354,63 @@
 msgid "Save Debug Log"
 msgstr "Debug-Mitschnitt speichern"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:596
 msgid "Invert"
 msgstr "Invertieren"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:599
 msgid "Highlight matches"
 msgstr "Treffer hervorheben"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:666
 msgid "_Icon Only"
 msgstr "Nur _Icon"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:667
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:668
 msgid "_Both Icon & Text"
 msgstr "Icon _und Text"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:804
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:823
 msgid "Right click for more options."
 msgstr "Rechtsklicken für weitere Optionen."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:853
 msgid "Level "
 msgstr "Stufe "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
 msgid "Select the debug filter level."
 msgstr "Debug-Filterstufe auswählen."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:862
 msgid "All"
 msgstr "Alle"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:863
 msgid "Misc"
 msgstr "Sonstiges"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:865
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:866
 msgid "Error "
 msgstr "Fehler "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:867
 msgid "Fatal Error"
 msgstr "Schwerer Fehler"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "Hauptentwickler"
 
@@ -12515,292 +12437,296 @@
 msgid "support/QA"
 msgstr "Support/Qualitätssicherung"
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "Win32 Portierung"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "Maintainer"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim-Maintainer"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "Grafische Benutzeroberfläche"
 
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
 msgid "Jabber developer"
 msgstr "Jabber-Entwickler"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "Originalautor"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../pidgin/gtkdialogs.c:124 ../pidgin/gtkdialogs.c:125
-#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../pidgin/gtkdialogs.c:126 ../pidgin/gtkdialogs.c:127
-#: ../pidgin/gtkdialogs.c:128 ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "Bengalisch"
 
-#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "Valencianisch-Katalanisch"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "Dänisch"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "Deutsch"
 
-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "Australisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "Kanadisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:146
-msgid "British English"
-msgstr "Britisches Englisch"
-
 #: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "Britisches Englisch"
+
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:213
-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "Euskera (Baskisch)"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "Französisch"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "Galizisch"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "Gujaratisch"
 
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../pidgin/gtkdialogs.c:160
-msgid "Hindi"
-msgstr "Hindi"
-
 #: ../pidgin/gtkdialogs.c:161
-msgid "Hungarian"
-msgstr "Ungarisch"
+msgid "Hindi"
+msgstr "Hindi"
 
 #: ../pidgin/gtkdialogs.c:162
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../pidgin/gtkdialogs.c:172
-msgid "Macedonian"
-msgstr "Makedonisch"
-
 #: ../pidgin/gtkdialogs.c:173
+msgid "Macedonian"
+msgstr "Makedonisch"
+
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegisch"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "Niederländisch, Flämisch"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
 msgstr "Paschtunisch"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../pidgin/gtkdialogs.c:192
-msgid "Tamil"
-msgstr "Tamil"
-
 #: ../pidgin/gtkdialogs.c:193
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: ../pidgin/gtkdialogs.c:195
-msgid "Turkish"
-msgstr "Türkisch"
-
-#: ../pidgin/gtkdialogs.c:196
-msgid "Vietnamese"
-msgstr "Vietnamesisch"
-
 #: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "Türkisch"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "Vietnamesisch"
+
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Hong Kong Chinesisch"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../pidgin/gtkdialogs.c:324
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: ../pidgin/gtkdialogs.c:360
+#: ../pidgin/gtkdialogs.c:363
 #, c-format
 msgid ""
 "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
@@ -12822,47 +12748,48 @@
 "komplette Liste der Mitwirkenden.  Wir übernehmen keine Haftung für dieses "
 "Programm.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:375
+#: ../pidgin/gtkdialogs.c:378
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 auf irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 auf irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin auf irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: ../pidgin/gtkdialogs.c:399
+#: ../pidgin/gtkdialogs.c:402
 msgid "Crazy Patch Writers"
 msgstr "Verrückte Patchschreiber"
 
-#: ../pidgin/gtkdialogs.c:414
+#: ../pidgin/gtkdialogs.c:417
 msgid "Retired Developers"
 msgstr "Zurückgetretene Entwickler"
 
-#: ../pidgin/gtkdialogs.c:429
+#: ../pidgin/gtkdialogs.c:432
 msgid "Artists"
 msgstr "Künstler"
 
-#: ../pidgin/gtkdialogs.c:444
+#: ../pidgin/gtkdialogs.c:447
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:467
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:482
+#: ../pidgin/gtkdialogs.c:485
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: ../pidgin/gtkdialogs.c:850
+#: ../pidgin/gtkdialogs.c:854
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: ../pidgin/gtkdialogs.c:852
+#: ../pidgin/gtkdialogs.c:856
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12870,11 +12797,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen möchten."
 
-#: ../pidgin/gtkdialogs.c:941
+#: ../pidgin/gtkdialogs.c:946
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: ../pidgin/gtkdialogs.c:943
+#: ../pidgin/gtkdialogs.c:948
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12882,32 +12809,32 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "möchten."
 
-#: ../pidgin/gtkdialogs.c:962
+#: ../pidgin/gtkdialogs.c:968
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: ../pidgin/gtkdialogs.c:963
+#: ../pidgin/gtkdialogs.c:969
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias für diesen Kontakt ein."
 
-#: ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:991
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: ../pidgin/gtkdialogs.c:985
+#: ../pidgin/gtkdialogs.c:993
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias für diesen Chat ein."
 
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1054
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12922,15 +12849,15 @@
 "Sie sind dabei, den Kontakt, der %s und %d andere Buddys enthält, aus Ihrer "
 "Buddy-Liste zu entfernen.  Möchten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1050
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1065
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1081
+#: ../pidgin/gtkdialogs.c:1096
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12939,15 +12866,15 @@
 "Sie sind dabei, die Gruppe %s in die Gruppe %s einzufügen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1088
+#: ../pidgin/gtkdialogs.c:1103
 msgid "Merge Groups"
 msgstr "Gruppe zusammenführen"
 
-#: ../pidgin/gtkdialogs.c:1089
+#: ../pidgin/gtkdialogs.c:1106
 msgid "_Merge Groups"
 msgstr "_Gruppen zusammenführen"
 
-#: ../pidgin/gtkdialogs.c:1139
+#: ../pidgin/gtkdialogs.c:1156
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12956,15 +12883,15 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Buddy-Liste zu entfernen. Möchten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1142
+#: ../pidgin/gtkdialogs.c:1159
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1162
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1176
+#: ../pidgin/gtkdialogs.c:1195
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -12972,15 +12899,15 @@
 "Sie sind dabei, %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1179
+#: ../pidgin/gtkdialogs.c:1198
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: ../pidgin/gtkdialogs.c:1180
+#: ../pidgin/gtkdialogs.c:1201
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12989,42 +12916,42 @@
 "Sie sind dabei, den Chat %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:153
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken für weitere ungelesene Nachrichten...\n"
 
-#: ../pidgin/gtkdocklet.c:447
+#: ../pidgin/gtkdocklet.c:454
 msgid "Change Status"
 msgstr "Ändere Status"
 
-#: ../pidgin/gtkdocklet.c:499
+#: ../pidgin/gtkdocklet.c:506
 msgid "Show Buddy List"
 msgstr "Buddy-Liste anzeigen"
 
-#: ../pidgin/gtkdocklet.c:525
+#: ../pidgin/gtkdocklet.c:532
 msgid "New Message..."
 msgstr "Neue Nachricht..."
 
-#: ../pidgin/gtkdocklet.c:540
+#: ../pidgin/gtkdocklet.c:547
 msgid "Mute Sounds"
 msgstr "Stummschalten"
 
-#: ../pidgin/gtkdocklet.c:547
+#: ../pidgin/gtkdocklet.c:554
 msgid "Blink on new message"
 msgstr "Bei neuen Nachrichten blinken"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../pidgin/gtkdocklet.c:558
+#: ../pidgin/gtkdocklet.c:565
 msgid "Quit"
 msgstr "Beenden"
 
@@ -13105,7 +13032,7 @@
 msgstr "Dateiübertragungs-_Details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -13122,36 +13049,36 @@
 msgid "_Reset formatting"
 msgstr "Formatierung _zurücksetzen"
 
-#: ../pidgin/gtkimhtml.c:1294
+#: ../pidgin/gtkimhtml.c:1295
 msgid "Hyperlink color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1296
 msgid "Color to draw hyperlinks."
 msgstr "Farbe zum Darstellen von Hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1298
+#: ../pidgin/gtkimhtml.c:1299
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1300
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Farbe zum Darstellen von Hyperlinks, wenn sich die Maus darüber befindet."
 
-#: ../pidgin/gtkimhtml.c:1515
+#: ../pidgin/gtkimhtml.c:1516
 msgid "_Copy E-Mail Address"
 msgstr "Kopiere _E-Mail-Adresse"
 
-#: ../pidgin/gtkimhtml.c:1527
+#: ../pidgin/gtkimhtml.c:1528
 msgid "_Open Link in Browser"
 msgstr "Ö_ffne Link im Browser"
 
-#: ../pidgin/gtkimhtml.c:1537
+#: ../pidgin/gtkimhtml.c:1538
 msgid "_Copy Link Location"
 msgstr "_Kopiere den Link"
 
-#: ../pidgin/gtkimhtml.c:3201
+#: ../pidgin/gtkimhtml.c:3202
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13161,7 +13088,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../pidgin/gtkimhtml.c:3204
+#: ../pidgin/gtkimhtml.c:3205
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13171,7 +13098,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../pidgin/gtkimhtml.c:3217
+#: ../pidgin/gtkimhtml.c:3218
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13182,7 +13109,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3220
+#: ../pidgin/gtkimhtml.c:3221
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13193,11 +13120,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3300 ../pidgin/gtkimhtml.c:3312
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../pidgin/gtkimhtml.c:3340
+#: ../pidgin/gtkimhtml.c:3341
 msgid "_Save Image..."
 msgstr "Bild _speichern..."
 
@@ -13307,7 +13234,7 @@
 msgid "Insert smiley"
 msgstr "Smiley einfügen"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13316,7 +13243,7 @@
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung mit %s, gestartet am %s, "
 "permanent löschen?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13325,7 +13252,7 @@
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung in %s, gestartet am %s, "
 "permanent löschen?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13334,21 +13261,21 @@
 "Wollen Sie wirklich den System-Mitschnitt, gestartet am %s, permanent "
 "löschen?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13356,7 +13283,7 @@
 "Systemereignisse werden nur mitgeschnitten, wenn die Option „Schneide alle "
 "Statusveränderungen im System-Mitschnitt mit“ aktiviert ist."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13364,46 +13291,46 @@
 "Sofortnachrichten werden nur mitgeschnitten, wenn die Option „Alle "
 "Sofortnachrichten mitschneiden“ aktiviert ist."
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chats werden nur mitgeschnitten, wenn die Option „Alle Chats mitschneiden“ "
 "aktiviert ist."
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "Keine Mitschnitte gefunden"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "_Mitschnitt-Ordner anschauen"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "Gesamte Mitschnittgröße:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "Unterhaltung in %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "Unterhaltung mit %s"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Versuchen Sie `%s -h' für weitere Informationen.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13430,7 +13357,7 @@
 "                      getrennt durch Kommata)\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: ../pidgin/gtkmain.c:488
+#: ../pidgin/gtkmain.c:498
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13525,11 +13452,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "Mehrere Plugins werden entladen."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Plugins entladen"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13540,7 +13467,7 @@
 "<span weight=\"bold\">Webseite: </span>\t\t%s\n"
 "<span weight=\"bold\">Dateiname:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13551,11 +13478,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Fehler: %s\n"
 "Überprüfen Sie die Website des Plugins auf eine neue Version.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Pl_ugin konfigurieren"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugin-Details</b>"
 
@@ -13564,95 +13491,95 @@
 msgstr "Wählen Sie eine Datei"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "_Buddy-Name:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "_sich anmeldet"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "sich abmel_det"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "_hinausgeht"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "wi_eder anwesend ist"
+msgid "Goes a_way"
+msgstr "_hinausgeht"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "wi_eder anwesend ist"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "_untätig wird"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "nicht meh_r untätig ist"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "zu _tippen beginnt"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "_Hält an beim Tippen"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "aufhört _zu tippen"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "aufhört _zu tippen"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "_Nachricht senden"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "Gesprächsfenster ö_ffnen"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "_Nachricht senden"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "Befeh_l ausführen"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "einen _Klang abspielen"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "Aus_wählen..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "Aus_wählen..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "_Vorschau"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "Nur _alarmieren, wenn ich nicht verfügbar bin"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
@@ -13680,7 +13607,7 @@
 msgid "_Show system tray icon:"
 msgstr "Kontrollleisten-Icon _anzeigen:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13699,7 +13626,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespräche verstecken:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
@@ -13929,55 +13856,55 @@
 msgid "Sound Selection"
 msgstr "Sound-Auswahl"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "Am leisesten"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "Leiser"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "Leise"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "Laut"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "Lauter"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "Am lautesten"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "Sound-Ausgabesystem"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Konsolen-Lautsprecher"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Konsolen-Lautsprecher"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "Kommando"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "Keine Klänge"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13986,118 +13913,118 @@
 "Sound-_Abspielbefehl:\n"
 "(%s für den Dateinamen)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "Sound-Einstellungen"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespräch den _Fokus hat"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "Klänge aktivieren:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "Nur wenn anwesend"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "Nur wenn nicht verfügbar"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "Lautstärke:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "Sound-Ereignisse"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "Testen"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "Auswählen..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "Inaktivitätszei_ten anzeigen:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "Abhängig von Tastatur- oder Mausbenutzung"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "A_utomatische Antwort:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "Wenn abwesend und untätig"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "Ändere Status, wenn _inaktiv"
 
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "Ändere _Status zu:"
 
 #
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "Status beim Start"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "Status beim Neu_start wiederherstellen"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "Beim Starten folgenden Status _benutzen:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "Smiley-Themen"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "Klänge"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "Status / Untätig"
 
@@ -14135,7 +14062,7 @@
 msgid "Set privacy for:"
 msgstr "Setze Privatsphäre für:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "Benutzer erlauben"
 
@@ -14151,39 +14078,39 @@
 "Bitte geben Sie den Namen des Benutzers ein, dem Sie erlauben möchten, Ihnen "
 "Nachrichten zu schicken."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "_Zulassen"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Erlaube %s, Ihnen Nachrichten zu schreiben?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sind Sie sicher, dass Sie %s erlauben wollen, Sie zu kontaktieren?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Benutzer blockieren"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "Geben Sie einen Benutzer ein, den Sie blockieren wollen."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 "Bitte geben Sie den Namen des Benutzers ein, den Sie blockieren wollen."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "%s sperren?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sie Sie sicher, dass Sie %s blockieren wollen?"
@@ -14192,23 +14119,23 @@
 msgid "Apply"
 msgstr "Anwenden"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie sie überschreiben?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "Einen neuen Namen wählen"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "Ordner auswählen..."
 
@@ -14232,38 +14159,38 @@
 "Sind Sie sicher, dass Sie die gewählten Statusmeldungen löschen wollen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "Über_nehmen"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Bezeichnung wird bereits benutzt. Bitte wählen Sie eine andere."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "_Bezeichnung:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "Benutze einen _anderen Status für einige Konten"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "S_peichern & Übernehmen"
 
 #
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "Status für %s"
@@ -14316,7 +14243,7 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer konnte nicht initialisiert werden."
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "Warte auf Netzwerkverbindung"
 
@@ -14329,12 +14256,12 @@
 msgid "Failed to load image"
 msgstr "Laden des Bildes fehlgeschlagen"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1419
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kann Verzeichnis %s nicht senden."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1420
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14342,12 +14269,12 @@
 msgstr ""
 "%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gewählt"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1453
 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."
@@ -14355,23 +14282,23 @@
 "Sie können dieses Bild senden, es in diese Nachricht einfügen oder es als "
 "Buddy-Icon für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
 msgid "Set as buddy icon"
 msgstr "Als Buddy-Icons verwenden"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
 msgid "Send image file"
 msgstr "Bilddatei senden"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
 msgid "Insert in message"
 msgstr "In Nachricht einfügen"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1465
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Möchten Sie es als Buddy-Icon für diesen Benutzer verwenden?"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1472
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14379,7 +14306,7 @@
 "Sie können dieses Bild senden, es in diese Nachricht einfügen oder es als "
 "Buddy-Icon für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1474
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14392,11 +14319,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1532
 msgid "Cannot send launcher"
 msgstr "Kann Verknüpfung nicht senden"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14404,7 +14331,7 @@
 "Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten sie das Ziel der "
 "Verknüpfung senden und nicht die Verknüpfung selbst."
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2302
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14415,26 +14342,26 @@
 "<b>Dateigröße:</b> %s\n"
 "<b>Bildgröße:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2592
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "Die Datei '%s' ist zu groß für %s.  Bitte versuchen Sie ein kleineres Bild.\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2594
 msgid "Icon Error"
 msgstr "Icon-Fehler"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2595
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2695
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14442,35 +14369,35 @@
 "Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine "
 "korrupte Bilddatei"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "Datei speichern"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "Farbe auswählen"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Alia_s"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "_Reiter schließen"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Benutzer-Info"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "_Einladen"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Bearbeiten"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "Mail ö_ffnen"
 
@@ -14578,14 +14505,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kontaktpriorität"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -14593,7 +14520,7 @@
 "verbunden sind."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14669,19 +14596,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:141
 msgid "ExtPlacement"
 msgstr "Erweiterte Platzierung"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:143
 msgid "Extra conversation placement options."
 msgstr "Zusätzliche Optionen zur Platzierung von Gesprächen."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:145
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -14689,39 +14616,6 @@
 "Beschränkt die Zahl der Gespräche pro Fenster, optional getrennt für IMs und "
 "Chats"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin Demonstrations-Plugin"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr ""
-"Ein Beispiel-Plugin, welches einige Sachen macht - sehen Sie sich die "
-"Beschreibung an."
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Dies ist ein wirklich cooles Plugin, welches eine Menge Sachen macht:\n"
-"- Es sagt Ihren, wer das Programm geschrieben hat, wenn Sie sich anmelden\n"
-"- Es kehrt den ganzen eingehenden Text um\n"
-"- Es sendet eine Nachricht zu Leuten in Ihrer Buddy Liste, direkt wenn Sie "
-"sich angemeldet haben"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14746,19 +14640,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Maus-Gestiken"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Ermöglicht die Bedienung mit Maus-Gestiken"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../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"
@@ -14855,7 +14749,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution-Integration"
 
@@ -14863,8 +14757,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "Erlaubt die Integration mit Evolution."
 
@@ -15024,12 +14918,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musik-Nachrichten-Plugin zum gemeinschaftlichen Komponieren."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 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."
@@ -15115,7 +15009,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Benachrichtigung"
 
@@ -15123,12 +15017,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Gibt Ihnen eine Reihe von Möglichkeiten, über ungelesene Nachrichten "
 "benachrichtigt zu werden."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin Demonstrations-Plugin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+"Ein Beispiel-Plugin, welches einige Sachen macht - sehen Sie sich die "
+"Beschreibung an."
+
+#. *  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 ""
+"Dies ist ein wirklich cooles Plugin, welches eine Menge Sachen macht:\n"
+"- Es sagt Ihren, wer das Programm geschrieben hat, wenn Sie sich anmelden\n"
+"- Es kehrt den ganzen eingehenden Text um\n"
+"- Es sendet eine Nachricht zu Leuten in Ihrer Buddy Liste, direkt wenn Sie "
+"sich angemeldet haben"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cursor-Farbe"
@@ -15219,11 +15146,11 @@
 msgid "Re-read gtkrc files"
 msgstr "Neueinlesen der gtkrc-Dateien"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:622
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Themenkontrolle"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Erlaubt den Zugriff auf häufig benutzte gtkrc-Einstellungen."
 
@@ -15355,11 +15282,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "Ersetzung des letztes Worts beim Senden"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "Textersetzung"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
@@ -15392,19 +15319,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:196
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:199
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Zeige iChat-ähnliche Zeitstempel"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:201
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Zeige alle N Minuten iChat-ähnliche Zeitstempel an."
 
@@ -15445,19 +15372,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Nachrichten-Zeitstempel-Formate"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Nachrichten-Zeitstempel-Formate anpassen."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15512,19 +15439,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "Transparenz"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparenz für die Buddy-Liste und die Gespräche."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15568,15 +15495,15 @@
 msgid "_Flash window when chat messages are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgin-Optionen"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows-Pidgin-Optionen"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
-msgstr "Optionen für Pidgin unter Windows"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgstr "Optionen für Pidgin unter Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -15630,171 +15557,23 @@
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
 
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "Server konnte Sie ohne ein Passwort nicht authentifizieren"
-
-#, fuzzy
-#~ msgid "Slovack"
-#~ msgstr "Slowakisch"
-
-#, fuzzy
-#~ msgid "You are using "
-#~ msgstr "Sie sprechen im Chat"
-
-#, fuzzy
-#~ msgid "_Start "
-#~ msgstr "_Start-Port:"
-
-#, fuzzy
-#~ msgid "Provides options specific to Windows "
-#~ msgstr "Windows-Gaim-spezifische Optionen."
-
-#, fuzzy
-#~ msgid "<span size='larger' weight='bold'>Welcome to "
-#~ msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
-
-#, fuzzy
-#~ msgid "<span weight='bold' size='larger'>Welcome to "
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
-
-#~ msgid "Gaim Internet Messenger"
-#~ msgstr "Gaim Internet-Sofortnachrichtendienst"
-
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Unterhaltung/Füge Lin_k ein..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Unterhaltung/Füge Bil_d ein ..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Unterhaltung/Füge Link ein..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Unterhaltung/Füge Bild ein ..."
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim auf irc.freenode.net<BR><BR>"
-
-#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
-#~ msgstr "Gaim %s. Versuchen Sie `%s -h' für weitere Informationen.\n"
-
-#~ msgid "WinGaim Options"
-#~ msgstr "WinGaim Optionen"
-
-#~ 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 Buddy aus der Gruppe %s wurde nicht entfernt, weil sein Konto "
-#~ "deaktiviert oder nicht angemeldet war.  Dieser Buddy und die Gruppe "
-#~ "werden daher nicht entfernt.\n"
-#~ msgstr[1] ""
-#~ "%d Buddys aus der Gruppe %s wurden nicht entfernt, weil ihre Konten "
-#~ "deaktiviert oder nicht angemeldet waren.  Diese Buddys und die Gruppe "
-#~ "werden nicht entfernt.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "Gruppe nicht entfernt"
-
-#~ msgid "Gaim's D-BUS server is not running for the reason listed below"
-#~ msgstr ""
-#~ "Gaim's D-BUS-Server läuft wegen den weiter unten aufgeführten Gründen "
-#~ "nicht"
-
-#~ msgid "Old Gaim"
-#~ msgstr "Altes Gaim"
-
-#~ msgid "Gaim encountered errors loading the plugin."
-#~ msgstr "Beim Laden des Plugins trat ein Fehler auf."
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim-Benutzer"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "Benutze immer den AIM/ICQ-Proxyserver\n"
-#~ "(langsamer, aber zeigt nicht Ihre IP-Adresse)"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC hat den Fehler: %s\n"
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ihre Benutzername wird zur Zeit wie folgt formatiert:\n"
-#~ "%s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Neue Benutzernamen-Formatierung:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Benutzernamen formatieren..."
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC hat ein PAUSE-Kommando gesendet."
-
-#~ 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 ""
-#~ "Wenn dies passiert, ignoriert TOC jede Nachricht und kann Sie unter "
-#~ "Umständen abmelden, wenn Sie eine Nachricht senden. Gaim verhindert "
-#~ "jetzt, dass Nachrichten durchgehen. Dies ist nur temporär, bitte haben "
-#~ "Sie Geduld."
-
-#~ msgid "Gaim - Save As..."
-#~ msgstr "Gaim - Speichern unter..."
-
-#~ msgid "Buzz!!"
-#~ msgstr "Buzz!!"
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "Normale Authentifizierung fehlgeschlagen!"
-
-#~ 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 ""
-#~ "Die normale Authentifikationsmethode ist gescheitert. Das bedeutet, dass "
-#~ "entweder ihr Passwort falsch ist oder dass sich das "
-#~ "Authentifikationsschema von Yahoo! geändert hat. Gaim wird nun versuchen, "
-#~ "Sie mit der Web Messenger Authentifikation anzumelden. Infolge dessen, "
-#~ "wird es aber nur eine reduzierte Funktionalität und weniger Features "
-#~ "geben."
-
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
-#~ msgid "Plugin to establish a Crazychat session."
-#~ msgstr "Plugin zum Einleiten einer Crazychat-Sitzung."
-
-#~ msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-#~ msgstr ""
-#~ "Benutzt Gaim, um die Buddy-IPs zum Aufbauen einer Crazychat-Sitzung zu "
-#~ "erhalten"
-
-#~ msgid "Network Configuration"
-#~ msgstr "Netzwerk-Konfiguration"
-
-#~ msgid "TCP port"
-#~ msgstr "TCP-Port"
-
-#~ msgid "UDP port"
-#~ msgstr "UDP-Port"
-
-#~ msgid "Feature Calibration"
-#~ msgstr "Feature-Konfiguration"
-
-#~ msgid "Disabled"
-#~ msgstr "Deaktiviert"
+#~ msgid "XMPP Account"
+#~ msgstr "XMPP-Konto"
+
+#~ msgid "Search for XMPP users"
+#~ msgstr "Suche nach XMPP-Benutzern"
+
+#~ msgid "Invalid XMPP ID"
+#~ msgstr "Ungültige XMPP-ID"
+
+#~ msgid "Change XMPP Password"
+#~ msgstr "XMPP-Passwort ändern"
+
+#~ msgid "XMPP Protocol Plugin"
+#~ msgstr "XMPP-Protokoll-Plugin"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/Werkzeuge/Buddy-Alarm"
+
+#~ msgid "XMPP developer"
+#~ msgstr "XMPP-Entwickler"
--- a/po/pt_BR.po	Thu May 03 10:14:49 2007 +0000
+++ b/po/pt_BR.po	Sat May 05 08:00:03 2007 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-08 11:17-0300\n"
-"PO-Revision-Date: 2007-04-08 11:17-0300\n"
+"POT-Creation-Date: 2007-05-03 20:44-0300\n"
+"PO-Revision-Date: 2007-05-03 20:44-0300\n"
 "Last-Translator: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -18,12 +18,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para mais informações.\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -44,14 +44,29 @@
 "  -n, --nologin       não conecte automaticamente\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s encontrou erros ao migrar suas configurações de %s para %s. Favor "
+"investigar e completar a migração manualmente. Pedimos também que você "
+"relate este erro em http://developer.pidgin.im"
+
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
 #: ../libpurple/protocols/jabber/chat.c:679
 #: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#: ../libpurple/protocols/jabber/jabber.c:1225
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Erro"
@@ -64,16 +79,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
 msgid "New mail notifications"
-msgstr "Novas notificações de e-mail"
-
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+msgstr "Notificar ao receber novos emails"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
+#: ../pidgin/gtkblist.c:3947
 msgid "Modify Account"
 msgstr "Modificar conta"
 
@@ -81,103 +96,103 @@
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5356
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Nome de usuário:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5377
+#: ../pidgin/gtkblist.c:5740
 msgid "Alias:"
 msgstr "Apelido:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2142 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../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:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
 #: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6037
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
+#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -188,299 +203,300 @@
 msgstr "Remover conta"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2047 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:541
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "Você pode ativar/desativar as contas a partir da lista abaixo."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
+#: ../pidgin/gtkblist.c:5795 ../pidgin/gtkconv.c:1633
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Adicionar"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fez de %s seu amigo(a)%s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
 msgid "Deny"
 msgstr "Negar"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "Você precisa digitar um nome de usuário para o amigo."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "Você precisa digitar um grupo."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "Você precisa selecionar uma conta."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:286
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Nome de usuário"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1196 ../libpurple/protocols/msn/msn.c:1351
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apelido"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1246
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2948 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Conta"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5310
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:327
 msgid "Please enter buddy information."
 msgstr "Favor digitar as informações do amigo."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5686
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:398
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Você poderá editar outras informações a partir do menu de contexto mais "
 "tarde."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
 msgid "Error adding group"
 msgstr "Erro ao adicionar grupo."
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:412
 msgid "You must give a name for the group to add."
 msgstr "Você precisa dar um nome para o grupo a ser adicionado."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:425
 msgid "A group with the name already exists."
 msgstr "Um grupo com este nome já existe."
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5792
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:432
 msgid "Enter the name of the group"
 msgstr "Digite o nome do grupo"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:761
 msgid "Edit Chat"
 msgstr "Modificar bate-papo"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:761
 msgid "Please Update the necessary fields."
 msgstr "Favor atualizar os campos necessários."
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:778
 msgid "Auto-join"
 msgstr "Entrar automaticamente"
 
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:787
 msgid "Edit Settings"
 msgstr "Modificar configurações"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Ver info"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:855
 msgid "Add Buddy Pounce"
 msgstr "Adicionar ação de usuário"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:636
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:866
 msgid "View Log"
 msgstr "Ver log"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:947
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Favor digitar o novo nome para %s"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1196
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:950
 msgid "Enter empty string to reset the name."
 msgstr "Para redefinir o nome, deixe o campo em branco."
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1026
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Remover este contato também removerá todos os amigos associados a ele"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1034
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Remover este grupo também removerá todos os amigos associados a ele"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1039
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1042
 msgid "Confirm Remove"
 msgstr "Confirmar remoção"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1198 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1172 ../finch/gntblist.c:2219 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4189
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1203
 msgid "Place tagged"
 msgstr "Local marcado"
 
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1208
 msgid "Toggle Tag"
 msgstr "(Des)ativar marca"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1241 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2972
 msgid "Nickname"
 msgstr "Apelido"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1261 ../finch/gntprefs.c:242
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2992
+#: ../pidgin/gtkblist.c:3381 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "Inativo"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1350
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -489,12 +505,12 @@
 "Conectados: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1359
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Conta: %s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1371
 #, c-format
 msgid ""
 "\n"
@@ -503,89 +519,89 @@
 "\n"
 "Visto pela última vez: %s atrás"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1636 ../pidgin/gtkdocklet.c:489
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1643 ../pidgin/gtkdocklet.c:490
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2015 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2128 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:716
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:718
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa para quem você deseja mandar "
 "mensagens instantâneas."
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6036
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../finch/gntblist.c:2141 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3946
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
 #: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2161 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2167
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2077
+#: ../finch/gntblist.c:2171
 msgid "Toggle offline buddies"
 msgstr "Mostrar amigos offline"
 
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2177
 msgid "Sort by status"
 msgstr "Ordenar por status"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2181
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabeticamente"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2185
 msgid "Sort by log size"
 msgstr "Ordenar por tamanho do log"
 
@@ -608,13 +624,13 @@
 "%s foi desconectado devido ao seguinte erro:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3943
 msgid "Connection Error"
 msgstr "Erro de conexão"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3948
 msgid "Connect"
 msgstr "Conectar"
 
@@ -648,17 +664,17 @@
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Estes comandos ainda não são suportados. A mensagem NÃO foi enviada."
 
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:217
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:240
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
 #, c-format
 msgid ""
 "\n"
@@ -667,24 +683,24 @@
 "\n"
 "%s está digitando..."
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:390
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-RESPOSTA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:492
 msgid "List of users:\n"
 msgstr "Lista de usuários:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -692,7 +708,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -700,12 +716,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -713,39 +729,39 @@
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:710
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostra a janela de plugins."
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:713
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de amigos."
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:716
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra a janela de contas."
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:719
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra a janela de depuração."
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:722
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra a janela de preferências"
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:725
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra a janela de status salvos."
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
@@ -753,15 +769,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
 msgid "Timestamps"
 msgstr "Marcações de tempo"
 
@@ -796,26 +812,26 @@
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1210
+#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3036
+#: ../pidgin/gtkblist.c:3049 ../pidgin/gtkblist.c:3051
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Status"
 
@@ -832,10 +848,10 @@
 msgstr "Parar"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Fechar"
 
@@ -873,7 +889,7 @@
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From"
 msgstr "De"
 
@@ -906,11 +922,11 @@
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "MI"
 
@@ -926,7 +942,7 @@
 msgid "(none)"
 msgstr "(nome)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -943,39 +959,36 @@
 "Site da web: %s\n"
 "Nome do arquivo: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "O plugin precisa estar carregado antes que você possa configurá-lo."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "Ainda preciso fazer algo a respeito disso."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr "Não há nenhuma opção de configuração para este plugin"
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
 msgstr "Você pode (des)ativar plugins a partir da lista abaixo."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "Configurar plugin"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "Preferências"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "Favor digitar o amigo que terá a ação."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "Nova ação de usuário"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "Editar ação de usuário"
 
@@ -985,8 +998,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5404
+#: ../pidgin/gtkblist.c:5720
 msgid "Account:"
 msgstr "Conta:"
 
@@ -995,52 +1008,52 @@
 msgstr "Nome do amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "Executar quando o amigo..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "Conectar"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "Desconectar"
+msgid "Signs on"
+msgstr "Conectar"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "Desconectar"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "Ficar ausente"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "Voltar da ausência"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "Tornar-se inativo"
+msgid "Returns from away"
+msgstr "Voltar da ausência"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "Tornar-se inativo"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "Não estiver mais inativo"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "Começar a digitar"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "Pausar ao digitar"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "Parar de digitar"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "Enviar uma mensagem"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "Ação"
 
@@ -1068,141 +1081,136 @@
 msgid "Pounce only when my status is not available"
 msgstr "Executar apenas quando meu status for indisponível"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Você tem certeza de que deseja remover a ação sobre %s de %s?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "Ações de usuário"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s começou a digitar para você (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s pausou ao digitar para você (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para você (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s te enviou uma mensagem. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de ação desconhecido. Por favor reporte isso!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "Exibir tempo de inatividade"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntprefs.c:166
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "Exibir marcações de tempo"
 
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "Notificar amigos de que você está digitando"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "Formato do log:"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "Gravar MIs"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "Gravar bate-papos"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "Gravar mudanças de status no log do sistema"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Logs"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Preferências"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
@@ -1215,102 +1223,102 @@
 msgid "Delete Status"
 msgstr "Remover status"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Status salvos"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Título"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Tipo"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5490
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5732
-#: ../libpurple/protocols/oscar/oscar.c:5748
-#: ../libpurple/protocols/oscar/oscar.c:5755
-#: ../libpurple/protocols/oscar/oscar.c:5762
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1294
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5469
+#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5701
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 #: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Mensagem:"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Título inválido"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "Favor digitar um título não-vazio para o status."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Título duplicado duplicada"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Favor digitar um título diferente para o status."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Mensagem:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Editar status"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Usar status diferente para as seguintes contas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Salvar e usar"
 
@@ -1334,64 +1342,64 @@
 "Quando o conteúdo da área de transferência mudar, estes serão "
 "disponbilizados ao X, caso possível."
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s conectou"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s desconectou"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s te enviou uma mensagem"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s mencionou seu apelido em %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s enviou uma mensagem em %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "Amigo conecta/desconecta"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "Você recebeu uma MI"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "Alguém fala num bate-papo"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "Alguém diz seu nome num bate-papo"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr "Notificação com mensagem do tipo \"torradeira\" quando"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr "Também emitir som!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr "Definir URGENT na janela de terminal."
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
 msgid "Toaster plugin"
 msgstr "Plugin para notificações do tipo \"torradeira\""
 
@@ -1448,83 +1456,84 @@
 msgid "Lastlog plugin."
 msgstr "Plugin de busca de mensagens"
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "contas"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Uma senha é necessária para conectar-se."
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Digite a senha para %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin de protocolo faltando para %s"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1332
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Senha original"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Nova senha"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Favor digitar sua senha atual e sua nova senha."
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificar informações do usuário para %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Definir informações de usuário"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5200 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Amigos"
@@ -1548,7 +1557,7 @@
 msgstr "+++ %s desconectou"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1687
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1571,40 +1580,40 @@
 msgid "Unable to send message."
 msgstr "Impossível enviar mensagem."
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Enviar mensagem"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "Envia_r mensagem"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "Você mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
@@ -1624,6 +1633,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "Impossível obter nome do serv: %s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "O servidor D-BUS do Purple não está rodando pelo motivo listado abaixo"
+
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Sem nome"
@@ -1673,7 +1686,7 @@
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1717,22 +1730,22 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s não é um arquivo regular. Recusando covardemente sobrescrevê-lo.\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s deseja lhe enviar %s (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s deseja lhe enviar um arquivo"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aceitar pedido de transferência de arquivo de %s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1743,60 +1756,60 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s está pedindo para enviar %s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s não é um nome de arquivo válido.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Oferecendo o envio de %s para %s"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Iniciar transferência de %s a partir de %s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferência de %s completa"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "Transferência de arquivo completa"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Você cancelou a transferência de %s"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivo cancelada"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferência de %s"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferência de arquivo"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transferência de arquivo para %s falhou."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transferência de arquivo de %s falhou."
@@ -2115,41 +2128,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "Definir configurações do auto-aceitar"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5832
-#: ../libpurple/protocols/oscar/oscar.c:5884
-#: ../libpurple/protocols/oscar/oscar.c:6108
-#: ../libpurple/protocols/oscar/oscar.c:6177 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:6082
+#: ../libpurple/protocols/oscar/oscar.c:6152 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Perguntar"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Aceitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Rejeitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Auto-aceitar transferências de arquivos..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2157,13 +2170,13 @@
 "Caminho para salvar os arquivos\n"
 "(Favor digitar o caminho completo)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Rejeitar automaticamente transferências de usuários fora da minha lista de "
 "amigos"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2172,113 +2185,8 @@
 "automaticamente for concluída\n"
 "(apenas quando não há conversa com o remetente)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Auto-resposta"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Auto-resposta para todos os protocolos"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"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 ""
-"Este plugin permite a definição de uma mensagem de auto-resposta para "
-"qualquer protocolo. Você pode definir a mensagem de auto-resposta global a "
-"partir da caixa de diálogo de opções do Plugin. Para definir uma mensagem de "
-"auto-resposta específica para um amigo, clique com o botão direito no amigo "
-"na lista de amigos. Para definir mensagens de auto-resposta para uma conta, "
-"vá para a aba `Avançado' da caixa de diálogo `Contas'."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Definir auto-resposta para %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Definir mensagem de auto-resposta"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"A mensagem a seguir será enviada para o amigo quando este enviar uma "
-"mensagem para você (desde que auto-resposta esteja ativada)"
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Definir mensagem de _auto-resposta"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Mensagem de auto-resposta"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Enviar mensagens de auto-resposta quando"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "Quando eu estiver _ausente"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "Quando eu estiver _inativo"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "Resposta pa_drão"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Mensagem de status"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Auto-responder com mensagem de status"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Sempre que houver uma mensagem de status"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Apenas quando não houver mensagem de auto-resposta"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Intervalo entre auto-respostas"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "Intervalo _mínimo (minutos)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Horas para mandar auto-respostas"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "Quantidade má_xima"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-"Eu não estou disponível no momento. Favor deixar sua mensagem para que eu "
-"possa entrar em contato logo que possível."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Notes"
 msgstr "Anotações"
 
@@ -2286,10 +2194,12 @@
 msgid "Enter your notes below..."
 msgstr "Digite suas anotações abaixo..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "Alterar anotações..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2306,7 +2216,7 @@
 msgid "Store notes on particular buddies."
 msgstr "Guarda anotações em amigos específicos."
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
@@ -2367,46 +2277,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "Permite controlar ações inserindo comandos em um arquivo."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "minutos"
 
 #. 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:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../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 "C'riador de ina'tividade"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Definir tempo inativo da conta"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Definir"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Nenhuma de suas contas está inativa."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Redefinir tempo de inatividade da conta"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Redefinir"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Definir tempo de inatividade de todas as contas"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Redefinir tempo de inatividade de todas as contas inativas"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Permite que você configure manualmente por quanto tempo você está inativo"
@@ -2479,19 +2389,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Ocultador de entrada/saída"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Esconde mensagens supérfluas de entrada/saída."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../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."
@@ -2611,20 +2521,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Leitor de logs"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Inclui o log de outros clientes de mensagem instantânea no leitor de logs."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2639,12 +2549,12 @@
 "AVISO: Este plugin ainda está em testes e pode travar freqüentemente. Use-o "
 "por sua conta e risco!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Carregador de plugins do Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Carrega plugins do .NET com o Mono."
 
@@ -2667,7 +2577,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "Adiciona uma linha vazia no começo das mensagens exibidas."
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2711,31 +2621,31 @@
 "Você pode alterar/excluir a ação a partir da caixa de diálogo `Ações de "
 "usuário'"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Sim"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Não"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Salvar mensagens offline como ações"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Não perguntar. Sempre salvar como ações."
 
@@ -2745,26 +2655,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Carregador de plugins Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Fornece suporte ao carregamento de plugins Perl."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modo psíquico"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Modo psíquico para mensagens recebidas"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -2773,23 +2683,23 @@
 "começam a redigir uma mensagem para você. Isto funciona com o AIM, ICQ, "
 "Jabber, Sametime e com o Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Você sente uma perturbação na Força..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Permitir apenas os usuários da minha lista de amigos"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Desativar quando ausente"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Exibir mensagens de notificação nas conversas"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Focar conversas quando o usuário digitar algo"
 
@@ -2854,7 +2764,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2862,8 +2772,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornece suporte a SSL através do GNUTLS."
 
@@ -2873,7 +2783,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2881,8 +2791,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL através do Mozilla NSS."
 
@@ -2933,7 +2843,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Notificação do status do amigo"
 
@@ -2941,8 +2851,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../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."
@@ -2950,15 +2860,15 @@
 "Notifica na janela de conversa quando um amigo sai ou entra do status de "
 "ausente ou inativo."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Carregador de plugins Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fornece suporte ao carregamento de plugins Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2981,18 +2891,18 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5568
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4496
+#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:159
+#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Ausente"
 
@@ -3006,49 +2916,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin do protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Nome do host"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "Conta do AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "Jabber Account"
 msgstr "Conta do Jabber"
 
@@ -3135,67 +3045,67 @@
 msgid "Save buddylist..."
 msgstr "Salvar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Preencha os campos de registro."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "As senhas não conferem."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Impossível registrar uma nova conta. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta do Gadu-Gadu registrada"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "O registro foi concluído com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:1367
 msgid "Password"
 msgstr "Senha"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Senha (redigitar)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Digite o token atual"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Token atual"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrar nova conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Por favor, preencha os seguintes campos"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3203,219 +3113,219 @@
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Homem ou mulher"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Masculino"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Feminino"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Apenas conectado"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Favor digitar seu critério de busca abaixo"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Preencha os campos."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Sua senha atual é diferente da senha que você especificou."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Impossível alterar a senha. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Mudar senha da conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Senha alterada com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Senha atual"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Favor digitar sua senha atual e sua nova senha do UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Alterar a senha do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Selecione o bate-papo para o amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Adicionar ao bate-papo..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5519
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:155
+#: ../pidgin/gtkblist.c:3036 ../pidgin/gtkblist.c:3360
+#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "Impossível exibir os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Páginas amarelas do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "Nenhum usuário compatível encontrado"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "Não existem usuários que satisfaçam seu critério de busca"
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "Impossível ler do socket"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos transferida"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "Sua lista de amigos foi transferida do servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos enviada"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "Falha na conexão."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Não conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Encontrar amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "Alterar senha..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "Enviar lista de amigos para o servidor"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "Alterar senha..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "Enviar lista de amigos para o servidor"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Transferir lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Remover lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Salvar lista de amigos para um arquivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Carregar lista de amigos do arquivo.."
 
@@ -3430,35 +3340,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "Cliente de mensagens instantâneas popular na Polônia"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Usuário do Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "O tópico atual é: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Nenhum tópico foi definido"
 
@@ -3493,7 +3403,7 @@
 msgstr "Mensagem do dia (MOTD) para %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
 msgid "Server has disconnected"
 msgstr "O servidor desconectou"
 
@@ -3516,33 +3426,33 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1040
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../libpurple/protocols/jabber/jabber.c:595
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Impossível criar socket"
 
 #: ../libpurple/protocols/irc/irc.c:402
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
@@ -3556,19 +3466,19 @@
 msgid "SSL Handshake Failed"
 msgstr "Falha na negociação SSL"
 
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Usuários"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3582,56 +3492,56 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que é menos ruim"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6619
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2122
+#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1852
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6622
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "Codificações"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:309
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Nome real"
 
@@ -3639,7 +3549,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:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -3661,133 +3571,133 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Impossível banir %s: a lista de usuários banidos está cheia"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:294
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:295
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:296
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:322
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Atualmente em"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:327
 msgid "Idle for"
 msgstr "Inativo por"
 
-#: ../libpurple/protocols/irc/msgs.c:326
-msgid "Online since"
-msgstr "Conectado desde"
-
 #: ../libpurple/protocols/irc/msgs.c:330
+msgid "Online since"
+msgstr "Conectado desde"
+
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Adjetivo definidor:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:412
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s apagou o tópico."
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico do %s é: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:438
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensagem desconhecida '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:439
 msgid "Unknown message"
 msgstr "Mensagem desconhecida"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:439
 msgid "The IRC server received a message it did not understand."
 msgstr "O servidor IRC recebeu uma mensagem que não foi entendida."
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:460
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuários em %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:557
 msgid "Time Response"
 msgstr "Resposta do comando Time"
 
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:558
 msgid "The IRC server's local time is:"
 msgstr "O horário local do servidor IRC é:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:569
 msgid "No such channel"
 msgstr "Canal inexistente"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "no such channel"
 msgstr "Canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:583
 msgid "User is not logged in"
 msgstr "O usuário está desconectado"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:588
 msgid "No such nick or channel"
 msgstr "Apelido ou canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "Could not send"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:664
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "É necessário um convite para entrar em %s."
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:665
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:777
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Você foi expulso por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:782 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:805
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:890 ../libpurple/protocols/irc/msgs.c:891
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:892
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3795,7 +3705,7 @@
 "O apelido selecionado foi rejeitado pelo servidor. Provavelmente, ele contém "
 "caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:897
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3803,52 +3713,52 @@
 "O nome de conta selecionado foi rejeitado pelo servidor. Provavelmente, ele "
 "contém caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:936
 msgid "Cannot change nick"
 msgstr "Impossível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:936
 msgid "Could not change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:957
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Você saiu do canal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:999
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1001
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
+#: ../libpurple/protocols/irc/msgs.c:1082
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossível entrar no %s:"
 
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1083
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Impossível entrar no canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1117
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Este usuário ou canal está temporariamente indisponível."
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1129
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;ação a realizar&gt;:  Realiza uma ação."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3856,11 +3766,11 @@
 "away [mensagem]:  Define uma mensagem de ausência. Não use uma mensagem caso "
 "queira retornar do estado de ausência."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Envia um comando para o chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3868,7 +3778,7 @@
 "deop &lt;usuário1&gt; [usuário2] ...:  Remove o status de operador do canal "
 "de alguém. Você precisa ser um operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3878,7 +3788,7 @@
 "de alguém, impedindo esta pessoa de falar caso o canal esteja moderado (+m). "
 "Você precisa ser um operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3886,7 +3796,7 @@
 "invite &lt;usuário&gt; [sala]:  Convida alguém para entrar no canal "
 "especificado, ou no canal atual."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3895,7 +3805,7 @@
 "canais, e opcionalmente forneça a chave do canal para cada um deles, se "
 "necessário."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3904,7 +3814,7 @@
 "canais, e opcionalmente forneça a chave do canal para cada um deles, se "
 "necessário."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3912,7 +3822,7 @@
 "kick &lt;usuário&gt; [mensagem]:  Remove alguém de um canal. Você precisa "
 "ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3920,15 +3830,15 @@
 "list:  Exibe uma lista das salas de bate-papo da rede. <i>Cuidado, alguns "
 "servidores podem te desconectar caso você faça isso.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;ação a realizar&gt;:  Realiza uma ação."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Envia um comando para o memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3936,7 +3846,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;usuário|canal&gt;: Define ou remove um "
 "modo de usuário ou canal."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3944,20 +3854,20 @@
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para um "
 "usuário (ao contrário de um canal)."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Envia um comando para o nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3965,7 +3875,7 @@
 "op &lt;usuário1&gt; [usuário2] ...:  Dá o status de operador do canal para "
 "alguém. Você precisa ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3973,11 +3883,11 @@
 "operwall &lt;mensagem&gt;:  Se você não sabe o que é isto, provavelmente não "
 "pode usar tal comando."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Envia um comando para o operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3985,7 +3895,7 @@
 "part [sala] [mensagem]:  Sai do canal atual, ou de um canal especificado, "
 "com uma mensagem opcional."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3993,7 +3903,7 @@
 "ping [usuário]: Verifica qual a latência do usuário (ou do servidor, caso "
 "nenhum usuário tenha sido especificado)."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4001,15 +3911,15 @@
 "query &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "um usuário (ao contrário de um canal)."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Manda um comando puro para o servidor."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4017,23 +3927,23 @@
 "remove &lt;usuário&gt; [mensagem]:  Remove alguém de um canal. Você precisa "
 "ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Exibe a hora local atual do servidor de IRC."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [novo tópico]:  Vê ou altera o tópico do canal."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou remove um modo de usuário."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [apelido]: envia um pedido CTCP VERSION para um usuário"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4041,7 +3951,7 @@
 "voice &lt;usuário1&gt; [usuário2] ...:  Dá o status de voice do canal para "
 "alguém. Você precisa ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4049,57 +3959,59 @@
 "wallops &lt;mensagem&gt;: Se você não sabe o que é isto, provavelmente não "
 "pode usar tal comando."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;usuário&gt;:  Exibe informações do usuário."
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas &lt;apelido&gt;:  Exibe informações de um usuário que está "
+"desconectado."
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
 "encontrado."
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "O servidor não pôde autenticar você sem uma senha"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:295
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:481
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4107,95 +4019,95 @@
 "O servidor requer autenticação via texto puro sobre uma conexão não "
 "criptografada. Deseja permitir isso e continuar a autenticação?"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
+#: ../libpurple/protocols/jabber/auth.c:306
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor não utiliza nenhum método de autenticação suportado"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
+#: ../libpurple/protocols/jabber/auth.c:434
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "O servidor retornou uma resposta inválida."
 
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "O servidor retornou uma identificação inválida"
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "Erro de SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Sobrenome"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Nome"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Endereço (Rua)"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Localidade"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Região"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "País"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Telefone"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4203,40 +4115,40 @@
 msgstr "Email"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Nome da organização"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Função"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Data de nascimento"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3047
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Descrição"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard do Jabber"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4244,113 +4156,113 @@
 "Todos os itens a seguir são opcionais. Preencha apenas as informações que "
 "quiser."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Sistema operacional"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome do meio"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Endereço"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Caixa postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "(Re-)requisitar autorização"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "Parar de monitorar a presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1407
+#: ../libpurple/protocols/jabber/jabber.c:1250
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:160
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5754
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5723
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "ID Jabber"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "Os seguintes são os resultados da sua busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4358,70 +4270,70 @@
 "Encontre um contato digitando critérios de busca nos campos abaixo. Nota: "
 "Todos os campos suportam caracteres coringa (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "A consulta ao serviço de diretório falhou"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "Não foi possível consultar o servidor do serviço de diretório."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruções do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Preencha um ou mais campos para procurar um usuário Jabber que satisfaça "
 "este critério."
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1751
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "Procurar usuários Jabber"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1762
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
 msgstr "Diretório inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
 msgstr "Digite um diretório de usuários"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
 msgstr "Selecione um diretório de usuários para procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
 msgstr "Diretório de busca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5250
+#: ../libpurple/protocols/oscar/oscar.c:5229
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -4530,417 +4442,417 @@
 msgid "Unable to create socket"
 msgstr "Impossível criar socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:565
 #: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "ID do Jabber inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "Registro efetuado com sucesso"
 
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1520
+msgid "Unknown Error"
+msgstr "Erro desconhecido"
+
 #: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
-msgid "Unknown Error"
-msgstr "Erro desconhecido"
-
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "Registro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "Já está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:850
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha as informações abaixo para registrar sua nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "Registrar nova conta do Jabber"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1044
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1049
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/jabber/jabber.c:1124
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5517
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1177
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1180
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1310
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1311
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1316
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1372
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Change Jabber Password"
 msgstr "Alterar senha do Jabber"
 
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6339
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6350
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1395
+#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1400
 msgid "Search for Users..."
 msgstr "Procurar por usuários..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1478
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1480
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Feature Not Implemented"
 msgstr "Recurso não implementado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Gone"
 msgstr "Saiu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Malformed Jabber ID"
 msgstr "ID do Jabber em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Not Allowed"
 msgstr "Não permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Payment Required"
 msgstr "Pagamento requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Registration Required"
 msgstr "Registro requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1508
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Remote Server Timeout"
 msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Server Overloaded"
 msgstr "Servidor sobrecarregado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Service Unavailable"
 msgstr "Serviço indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Subscription Required"
 msgstr "Inscrição requerida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1555
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1557
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1561
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Improper Addressing"
 msgstr "Endereçamento impróprio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Invalid Namespace"
 msgstr "Namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Non-matching Hosts"
 msgstr "Hosts não compatíveis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1666
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1691
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Impossível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1710
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1717
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Impossível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1770
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1801
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1825
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4948,7 +4860,7 @@
 "affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filiação do usuário com a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4956,19 +4868,19 @@
 "role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usuário na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [servidor]: Entra num bate-papo neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuário&gt; [sala]:  Expulsa um usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4985,27 +4897,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin do protocolo Jabber"
 
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "Forçar SSL antigo (porta 5223)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "Porta de conexão"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
@@ -5042,16 +4954,16 @@
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5059,20 +4971,20 @@
 "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as "
 "configurações padrão?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
@@ -5305,7 +5217,7 @@
 msgstr "Servidor ocupado demais"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5357,23 +5269,23 @@
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Esse é o nome que será visto como seu pelos outros amigos MSN."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "Defina seu número de telefone de casa."
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "Defina seu número de telefone do trabalho."
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "Defina seu número de telefone móvel."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr "Permitir pages MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:314
 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?"
@@ -5381,130 +5293,130 @@
 "Você deseja permitir ou não permitir que pessoas na sua lista de amigos "
 "enviem pages MSN Mobile para seu celular ou outro dispositivo móvel?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "Não permitir"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta do Hotmail pode não estar ativa."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "Enviar uma mensagem para dispositivo móvel."
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:529
 msgid "Has you"
 msgstr "Tem você"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "Volto já"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:567
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:571
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:599
 msgid "Set Friendly Name..."
 msgstr "Definir apelido..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Home Phone Number..."
 msgstr "Definir número de telefone de casa..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Work Phone Number..."
 msgstr "Definir número de telefone do trabalho..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Set Mobile Phone Number..."
 msgstr "Definir número de telefone móvel..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:618
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ativar/Desativar dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:623
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Não permitir pages para dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Open Hotmail Inbox"
 msgstr "Abrir caixa de entrada do Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:657
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo móvel"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Iniciar _bate-papo"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:705
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca "
 "SSL suportada."
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:730
 msgid "Failed to connect to server."
 msgstr "Impossível conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Geral"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1528
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1530
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1531
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5512,186 +5424,186 @@
 msgid "Location"
 msgstr "Localização"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1559
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1561
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1562
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1563
 msgid "Pets"
 msgstr "Animais de estimação"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1564
 msgid "Hometown"
 msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1565
 msgid "Places Lived"
 msgstr "Locais em que viveu"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1566
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1756
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Contact Info"
 msgstr "Informações do contato"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1587
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1590
 msgid "Significant Other"
 msgstr "Parceiro(a)"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Home Phone"
 msgstr "Telefone doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Home Phone 2"
 msgstr "Telefone doméstico 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Personal Mobile"
 msgstr "Celular pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Home Fax"
 msgstr "Fax doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal E-Mail"
 msgstr "E-Mail pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Personal IM"
 msgstr "MI Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Anniversary"
 msgstr "Aniversário de casamento"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work"
 msgstr "Negócios"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1617
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Título de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1619
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Work Phone"
 msgstr "Telefone do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Work Phone 2"
 msgstr "Telefone 2 do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work Mobile"
 msgstr "Celular de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Work Pager"
 msgstr "Pager de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Work Fax"
 msgstr "Fax de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Work E-Mail"
 msgstr "E-Mail de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work IM"
 msgstr "MI de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Start Date"
 msgstr "Data de início"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Last Updated"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1775
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "O usuário não criou um perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1797
 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 "
@@ -5701,7 +5613,7 @@
 "que o usuário não existe, ou que o usuário existe mas não criou um perfil "
 "público."
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5709,7 +5621,7 @@
 "Não foi possível encontrar nenhuma informação no perfil do usuário. "
 "Provavelmente o usuário não existe."
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1809
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL do Perfil"
@@ -5724,19 +5636,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2131
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2136
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
@@ -5813,7 +5725,7 @@
 msgid "Unable to delete group"
 msgstr "Impossível remover grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1303
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5868,8 +5780,8 @@
 msgstr "Erro ao processar HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Você conectou de outro local."
 
@@ -6196,7 +6108,7 @@
 msgstr "Impossível remover %s da sua lista de privacidade (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossível mudar configurações de privacidade no servidor (%s)."
@@ -6207,7 +6119,7 @@
 msgstr "Impossível criar conferência (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro na comunicação com o servidor. Fechando a conexão."
 
@@ -6223,8 +6135,8 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID do usuário"
 
@@ -6234,41 +6146,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferência GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Impossível criar conexão SSL com o servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "Impossível conectar ao servidor."
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "Impossível conectar ao servidor."
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s foi convidado para esta conversa."
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Convite para conversa"
 
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6279,16 +6191,16 @@
 "\n"
 "Enviado: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Você deseja entrar na conversa?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6300,7 +6212,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6308,11 +6220,11 @@
 "Impossível conectar ao servidor. Por favor digite o endereço do servidor em "
 "que você deseja conectar."
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O suporte a SSL não está instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não é possível enviar mais mensagens."
 
@@ -6326,22 +6238,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin de protocolo do mensageiro do Novell GroupWise"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Porta do servidor"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6349,8 +6261,8 @@
 msgstr "O servidor encerrou a conexão."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6387,8 +6299,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Plugin do protocolo AIM"
 
@@ -6402,14 +6314,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Plugin do protocolo ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "Codificação"
 
@@ -6539,7 +6451,7 @@
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6551,7 +6463,7 @@
 "codificação que ele está usando, você pode especificá-la nas opções "
 "avançadas de conta para a sua conta do AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6561,144 +6473,144 @@
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "Mensagem instantânea direta do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5953
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get File"
 msgstr "Receber arquivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Jogos"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "Conexão direta do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "Usuário AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Niilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 antigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Criptografia do Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Segurança ativada"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Bate-papo com vídeo"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "AV do iChat"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Vídeo ao vivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Câmera"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5695
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5747
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5716
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6707,7 +6619,7 @@
 "Não foi possível conectar ao servidor de autenticação:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6716,20 +6628,20 @@
 "Não foi possível conectar ao servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Nome de usuário enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Conexão estabelecida, cookie enviado"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Finalizando a conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6740,28 +6652,29 @@
 "de usuário têm que começar com uma letra e conter apenas letras, números e "
 "espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "Nome de usuário inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6770,46 +6683,46 @@
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que você está usando é velha demais. Favor atualizar em %"
 "s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "Autorização recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID digitada é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "Digite o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Digite o número de 6 dígitos do visor digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5831
-#: ../libpurple/protocols/oscar/oscar.c:6107 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:6081 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6818,56 +6731,56 @@
 "Você pode ser desconectado num curto período de tempo. Você pode querer usar "
 "o TOC até que isso esteja corrigido. Verifique por atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossível conseguir um hash de conexão AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "Impossível conseguir um hash de conexão válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "Impossível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5219
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../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 "
@@ -6878,18 +6791,18 @@
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %u aceitou seu pedido para adicioná-lo(a) à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6902,7 +6815,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6915,7 +6828,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6928,38 +6841,38 @@
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuário de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Você quer adicionar este amigo à sua lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Você perdeu %hu mensagem de %s por que ela era inválida."
 msgstr[1] "Você perdeu %hu mensagens de %s por que elas eram inválidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Você perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6970,21 +6883,21 @@
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque você é muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque você é muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -6992,61 +6905,61 @@
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informação do usuário %s indisponível:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Mensagem de 'Disponível':"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7054,11 +6967,7 @@
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "Erro na limitação da taxa."
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7066,85 +6975,85 @@
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "Você foi desconectado por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nomes de usuário está associado com %s"
 msgstr[1] "Os seguintes nomes de usuário estão associados com %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Nome de usuário"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Você deve receber um e-mail pedindo para confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7153,12 +7062,12 @@
 "Erro 0x%04x: Impossível formatar nome de usuário pois o nome requisitado "
 "difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Erro 0x%04x: Impossível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7167,7 +7076,7 @@
 "Erro 0x%04x: Impossível formatar nome de usuário pois o nome requisitado é "
 "muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7176,7 +7085,7 @@
 "Erro 0x%04x: Impossível mudar endereço de e-mail porque já existe um pedido "
 "pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7185,7 +7094,7 @@
 "Erro 0x%04x: Impossível mudar o endereço de e-mail porque este já possui "
 "muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7193,32 +7102,32 @@
 msgstr ""
 "Erro 0x%04x: Impossível mudar o endereço de e-mail porque este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O endereço de e-mail de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4193
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você precisa estar "
 "conectado diretamente para enviar imagens por mensagens instantâneas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4438
 msgid "Unable to set AIM profile."
 msgstr "Impossível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4439
 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 "
@@ -7228,14 +7137,14 @@
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4453
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] ""
 "O tamanho máximo de %d byte do seu perfil foi excedido. Ele foi truncado "
 "para você."
@@ -7243,11 +7152,11 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4503
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7262,11 +7171,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4508
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4577
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7277,17 +7186,17 @@
 "Nomes de usuário têm que começar com uma letra e conter apenas letras, "
 "números e espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "Impossível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4683
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4684
 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."
@@ -7296,16 +7205,16 @@
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4912
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4918
-#: ../libpurple/protocols/oscar/oscar.c:5094
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4894
+#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5076
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
+#: ../libpurple/protocols/oscar/oscar.c:5000
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7314,12 +7223,12 @@
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5014
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7330,7 +7239,7 @@
 "mais comum para isso é que você tem o número máximo de amigos permitido na "
 "sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5131
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7339,23 +7248,23 @@
 "O usuário %s lhe deu permissão para adicioná-lo à sua lista de amigos. Você "
 "deseja adicioná-lo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:5194
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %s aceitou seu pedido para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5195
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7366,53 +7275,53 @@
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5220
+#: ../libpurple/protocols/oscar/oscar.c:5199
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5256
+#: ../libpurple/protocols/oscar/oscar.c:5235
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5275
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inválido especificado."
 
-#: ../libpurple/protocols/oscar/oscar.c:5366
+#: ../libpurple/protocols/oscar/oscar.c:5345
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você não pode enviar "
 "imagens por mensagens instantâneas em bate-papos do AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5505
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "Away Message"
 msgstr "Mensagem de ausência"
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5828
+#: ../libpurple/protocols/oscar/oscar.c:5797
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5829
+#: ../libpurple/protocols/oscar/oscar.c:5798
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5845
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Você selecionou abrir uma mensagem instantânea direta com %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5879
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7420,65 +7329,65 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5896
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:5945
+#: ../libpurple/protocols/oscar/oscar.c:5917
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5967
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6026
+#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6029
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6051
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6026
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome do usuário pode mudar apenas a capitalização e os "
 "espaços."
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6150
+#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6153
+#: ../libpurple/protocols/oscar/oscar.c:6128
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6154
+#: ../libpurple/protocols/oscar/oscar.c:6129
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7486,73 +7395,73 @@
 "Você pode re-requisitar autorização destes amigos clicando com o botão "
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6171
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "Find Buddy by E-Mail"
 msgstr "Encontrar amigo por e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6172
+#: ../libpurple/protocols/oscar/oscar.c:6147
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endereço de e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endereço de e-mail do amigo que você está procurando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6176
+#: ../libpurple/protocols/oscar/oscar.c:6151
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6345
+#: ../libpurple/protocols/oscar/oscar.c:6309
 msgid "Set User Info (URL)..."
 msgstr "Definir informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6320
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6324
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6370
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6377
+#: ../libpurple/protocols/oscar/oscar.c:6341
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6381
+#: ../libpurple/protocols/oscar/oscar.c:6345
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o endereço de E-Mail registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6385
+#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Mudar o endereço de E-Mail registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar por amigos pelo endereço de E-Mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Use recent buddies group"
 msgstr "Mostrar grupo \"Amigos Recentes\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6474
+#: ../libpurple/protocols/oscar/oscar.c:6438
 msgid "Show how long you have been idle"
 msgstr "Mostra por quanto tempo você esteve inativo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6590
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7590,7 +7499,7 @@
 "para mensagens instantâneas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "_Conectar"
 
@@ -7755,93 +7664,100 @@
 msgid "Update my information"
 msgstr "Atualizar minhas informações"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Suas informações foram atualizadas"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-"Você está tentando definir um rosto personalizado. Favor escolher uma imagem "
-"do "
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr ""
+"A definição de rostos personalizados não é suportada no momento. Favor "
+"escolher uma imagem de %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Rosto do QQ"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Você rejeitou o pedido de %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Digite seu motivo:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Rejeitar pedido"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Desculpe, você não faz meu tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "Falha ao adicionar amigo com pedido de autenticação"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "Você removeu um amigo com sucesso"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Você se removeu de um amigo com sucesso"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "O usuário %d precisa de autenticação"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Digite o pedido aqui"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Você quer ser meu amigo?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Você adicionou %d à sua lista de contatos."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "Erro no QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "QQid inválido"
 
@@ -7877,59 +7793,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Você só pode procurar por grupos permanentes do QQ\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "O usuário %d solicitou entrada no grupo %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Motivo: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "Operação do Qun QQ"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprovar"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Seu pedido de entrada no grupo %d foi rejeitado pelo administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Seu pedido de entrada no grupo %d foi aprovado pelo administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Você [%d] saiu do grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Você [%d] foi adicionado(a) pelo grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "Este grupo foi adicionado à sua lista de amigos."
 
@@ -7957,27 +7873,27 @@
 msgid "This group does not allow others to join"
 msgstr "Este grupo não permite a entrada de outros"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "Você saiu do grupo com sucesso"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "Autorização de grupo do QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Sua operação de autorização foi aceita pelo servidor QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Você digitou um ID de grupo fora dos limites aceitos"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "Você tem certeza de que quer sair deste Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7985,7 +7901,7 @@
 "Observação: Se você for o criador,\n"
 "esta operação apagará este Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "Vá em frente"
 
@@ -7998,40 +7914,41 @@
 msgid "Group Operation Error"
 msgstr "Erro na operação de grupo"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Você deseja aprovar o pedido?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "Você alterou o membro do Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "Você alterou as informações do Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "Você criou um Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "Você deseja definir os detalhes do Qun agora?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "Definir"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "Mensagem do sistema"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "ACK do servidor"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "Falha ao enviar mensagem instantânea\n"
 
@@ -8050,11 +7967,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8095,47 +8012,47 @@
 msgid "Invalid name"
 msgstr "Nome inválido"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Atualmente online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última atualização</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Tipo de conexão:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP do Servidor</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Meu IP público:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de conexão:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Último IP a conectar</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Última hora de conexão</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Informações de conexão"
 
@@ -8155,6 +8072,10 @@
 msgid "Exit this QQ Qun"
 msgstr "Sair deste Qun QQ"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "Bloquear este amigo"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8165,15 +8086,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "Plugin do protocolo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Conectar por TCP"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Ficar invisível ao conectar"
 
@@ -8217,51 +8138,53 @@
 msgid "Login failed, no reply"
 msgstr "Falha ao conectar: não houve resposta"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Deseja adicionar este amigo?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Você foi adicionado por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Deseja adicioná-lo(a)?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s te adicionou [%s]"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "O usuário %s rejeitou seu pedido"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "O usuário %s aprovou seu pedido"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s deseja te adicionar [%s] como amigo"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s não está na sua lista de amigos"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Você deseja adicioná-lo?"
 
@@ -8354,7 +8277,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Impossível conectar ao servidor."
 
@@ -8371,41 +8294,41 @@
 msgid "Unable to send message: "
 msgstr "Impossível enviar mensagem: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Local fechado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Microfone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Caixas de som"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Câmera de vídeo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Transferência de arquivo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Suporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Usuário externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Criar conferência com usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8414,11 +8337,11 @@
 "Favor digitar um tópico para a nova conferência, e uma mensagem de convite "
 "para ser enviada para %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nova conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Criar"
 
@@ -8449,23 +8372,23 @@
 msgid "Invite to Conference"
 msgstr "Convidar para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Convidar para conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8474,38 +8397,38 @@
 "Nenhum servidor ou endereço IP foi configurado para a conta %s do Meanwhile. "
 "Favor digitar um abaixo para continuar o processo de conexão."
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuração da conexão do Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Desconhecido (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Último cliente conhecido"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "ID do Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Um ID de usuário ambíguo foi digitado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8515,15 +8438,15 @@
 "Por favor selecione o usuário correto a partir da lista abaixo para adicioná-"
 "lo a sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Selecionar usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Impossível adicionar usuário: usuário não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8532,11 +8455,11 @@
 "O identificador '%s' não corresponde a nenhum usuário na sua comunidade do "
 "Sametime. Esta entrada foi removida da sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Impossível adicionar usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8545,63 +8468,63 @@
 "Erro ao ler arquivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos armazenada remotamente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Modo de armazenamento da lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Apenas lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Mesclar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Mesclar e salvar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Sincronizar lista com o servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "Impossível adicionar grupo: o grupo existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Um grupo com o nome '%s' já existe na sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "Impossível adicionar grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "Possíveis resultados"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr "Resultados dos grupos do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8612,15 +8535,15 @@
 "endereços do Notes a seguir. Favor selecionar o grupo correto da lista "
 "abaixo para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr "Selecionar catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "Impossível adicionar grupo: grupo não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8629,11 +8552,11 @@
 "O identificador '%s' não corresponde a nenhum grupo do catálogo de endereços "
 "Notes da sua comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr "Grupo do catálogo de endereços Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5475
 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."
@@ -8641,12 +8564,12 @@
 "Digite o nome de um grupo do catálogo de endereços do Notes no campo abaixo "
 "para adicionar o grupo e seus membros à sua lista de contatos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca por '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8657,30 +8580,30 @@
 "Você pode adicioná-los à lista de amigos ou enviá-los mensagens com os "
 "botões de ação abaixo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
 msgid "Search Results"
 msgstr "Resultados da procura"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "O identificador '%s' não corresponde a nenhum usuário da sua comunidade "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "Procurar por um usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8688,39 +8611,39 @@
 "Digite um nome o ID parcial no campo abaixo para procurar por usuários "
 "correspondentes na sua comunidade do Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "Procurar por usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr "Importar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr "Exportar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr "Adicionar grupo do catálogo de endereços do Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "Busca por usuários..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr "Forçar conexão (ignorar redirecionamentos do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr "Esconder identidade do cliente"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8766,12 +8689,12 @@
 msgstr "O acordo de chaves não pode ser iniciado com você mesmo"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "O usuário remoto não está mais presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8780,7 +8703,7 @@
 "Um pedido de acordo de chaves foi recebido de %s. Você gostaria de fazer o "
 "acordo de chaves?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8791,49 +8714,49 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Pedido de acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Impossível definir chave da mensagem instantânea"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "Definir senha de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Impossível obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Exibir chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Não foi possível carregar chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -8842,18 +8765,18 @@
 msgid "User Information"
 msgstr "Informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Impossível obter informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "O amigo %s não é certificado"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/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."
@@ -8862,16 +8785,16 @@
 "deste. Você pode usar o comando Obter Chave Pública para fazê-lo."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "O amigo %s não está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8879,15 +8802,15 @@
 "Para adicionar um amigo você precisa importar a chave pública desde. "
 "Pressione importar para importar uma chave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Selecione o usuário correto"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/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."
@@ -8895,7 +8818,7 @@
 "Mais de um usuário foi encontrado com a mesma chave pública. Selecione o "
 "usuário correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/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."
@@ -8903,154 +8826,154 @@
 "Mais de um usuário foi encontrado com o mesmo nome. Selecione o usuário "
 "correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Desconectado, mas na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Me acorde"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperativo"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Robô"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Enciumado"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Invencível"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Sonolento"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Chateado"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Empolgado"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Modos do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Humor"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Localização geográfica"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Redefinir chave de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Mensagem instantânea com troca de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Obter chave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Expulsar usuário do servidor"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenhar no quadro de atividades"
 
@@ -9126,15 +9049,15 @@
 msgid "Open Public Key..."
 msgstr "Abrir chave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frase-senha do canal"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves públicas do canal"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9149,132 +9072,132 @@
 "apenas usuários cujas chaves públicas estiverem listadas podem entrar no "
 "canal."
 
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticação do canal"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Adicionar/remover"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome do grupo privado do canal %s e a frase-senha."
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adicionar grupo privado no canal"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "Lista de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Defina o limite de usuários do canal. Defina para zero para redefinir o "
 "limite de usuários."
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Adicionar grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Redefinir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Definir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Definir limite de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Redefinir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Definir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:943
-msgid "Reset Private Channel"
-msgstr "Redefinir canal privado"
-
 #: ../libpurple/protocols/silc/chat.c:948
+msgid "Reset Private Channel"
+msgstr "Redefinir canal privado"
+
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Definir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Redefinir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Você é o fundador do canal em <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Você tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Impossível entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Não foi possível chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
@@ -9384,7 +9307,7 @@
 msgstr "Função de trabalho"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Organização"
 
@@ -9425,7 +9348,7 @@
 msgstr "_Mais..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
@@ -9564,51 +9487,51 @@
 msgid "Verifying server public key"
 msgstr "Verificando a chave pública do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versões incompatíveis, atualize seu cliente"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Falha: O usuário remoto não confia/suporta sua chave pública."
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Falha: O usuário remoto não suporta o grupo KE proposto."
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Falha: O usuário remoto não suporta a cifra proposta"
 
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Falha: O usuário remoto não suporta o PKCS proposto"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Falha: O usuário remoto não suporta a função de hash proposta"
 
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Falha: O usuário remoto não suporta o HMAC proposto"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Falha: Assinatura incorreta"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Falha: Cookie inválido"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação mal sucedida"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9617,12 +9540,12 @@
 "A chave pública de %s foi recebida. Sua cópia local não confere com esta "
 "chave. Você ainda deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "A chave pública de %s foi recebida. Deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9635,15 +9558,15 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar chave pública"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de chave pública não suportada"
 
@@ -9693,7 +9616,7 @@
 msgid "Your Current Mood"
 msgstr "Seu humor atual"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normal"
 
@@ -9758,173 +9681,173 @@
 "e suas informações pessoais. Por favor preencha as informações que você "
 "deseja que seja vista por outros usuários vejam sobre você."
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "Mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "Não há mensagem do dia disponível"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Não há mensagem do dia associada com esta conexão."
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Criar novo par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "As frases-senha não conferem"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "Falha ao gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Tamanho da chave"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Frase-senha (redigitar)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Status online"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "Ver mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "Criar par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuário <I>%s</I> não está presente na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "Tópico muito extenso"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Você precisa especificar um apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "canal %s não encontrado"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modos do canal de %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nenhum modo de canal está definido em %s"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Falha ao definir cmodes de %s"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando desconhecido: %s, (Pode ser uma falha do cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Vê ou altera o tópico"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entra em um canal nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  Lista os canais desta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/silc/silc.c:1618
 #: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;usuário&gt; [&lt;mensagem&gt;]:  Manda uma mensagem privada para "
 "um usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Exibe a mensagem do dia do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconecta do servidor sem sair do mesmo"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usuário&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usuário do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9932,7 +9855,7 @@
 "cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
 "modos do canal."
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9940,16 +9863,16 @@
 "cumode &lt;usuário|canal&gt; +|-&lt;modos&gt; &lt;usuário&gt;: Muda os modos "
 "do usuário no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuário&gt;: Define seus modos na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usuário&gt; [-pubkey]: Obtém privilégios de operador do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9957,38 +9880,38 @@
 "invite &lt;canal&gt; [-|+]&lt;usuário&gt;:  convida um usuário ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusuário&gt; [comentário]:  Expulsa o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usuário&gt;]:  Bane o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usuário|servidor&gt;:  Obtém a chave pública do servidor ou do "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estatísticas do servidor e da rede"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usuários no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10005,66 +9928,66 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plugin do protocolo de conferência segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Autenticação via chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Rejeitar ser monitorado por outros usuários"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Bloquear convites"
 
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instantâneas sem troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Rejeitar pedidos de atributos de status online"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensagens no quadro de atividades"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "Expandir contatos _automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Assinar digitalmente e verificar todas as mensagens"
 
@@ -10185,26 +10108,26 @@
 msgstr "Não foi possível enviar"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1486
 msgid "Could not connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "Impossível criar socket de escuta"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
 msgstr "Não foi possível resolver ao host"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
 msgstr "Não foi possível resolver host"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
 
@@ -10216,36 +10139,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin do protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin do protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Anunciar status (nota: todos podem te observar)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr "Usuário de autenticação"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr "Domínio de autenticação"
 
@@ -10474,32 +10397,32 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin do protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! não foi enviada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s está chamando sua atenção!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensagem do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10508,11 +10431,11 @@
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos com o seguinte motivo: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10523,11 +10446,11 @@
 "desconhecido. Provavelmente, você não conseguirá conectar com sucesso ao "
 "Yahoo. Verifique %s por atualizações."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Falha na autenticação do Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10536,153 +10459,154 @@
 "Você tentou ignorar %s, mas o usuário está na sua lista de amigos. Ao clicar "
 "\"Sim\" o usuário será removido e ignorado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Sua conta está travada, favor entrar no site do Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Número de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
 "corrigir isso."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na "
 "conta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "Impossível adicionar amigo à lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema na conexão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "Não estou por perto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "Fora do escritório"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "De férias"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "Presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "Iniciar conferência"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "Configurações de presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "Ativar qual ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "Ingressar usuário no bate-papo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "You have just sent a Buzz!"
 msgstr "Você acabou de chamar a atenção do usuário!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lista as salas desta rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
@@ -10696,56 +10620,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "Servidor do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "Servidor japonês do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "Servidor de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "Servidor japonês de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "Porta da transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "Locale da sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Servidor de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
@@ -11078,40 +11002,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin do protocolo Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "Usar tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "Comando tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "Exportar para .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "Exportar para .zepyhr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zepyhr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr "Exposição"
 
@@ -11154,18 +11078,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Sim"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Não"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Aceitar"
 
@@ -11176,16 +11100,16 @@
 msgid "I'm not here right now"
 msgstr "Não estou aqui no momento"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "status salvos"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s mudou seu apelido para %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11194,58 +11118,58 @@
 "%s convidou %s para a sala de bate-papo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s convidou %s para a sala de bate-papo %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:683
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Redefinir"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:157
 msgid "Unavailable"
 msgstr "Indisponível"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "Móvel"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s mudou o tópico de %s para %s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:620
 #, c-format
 msgid "%s is now %s"
 msgstr "%s agora é %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:625
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s não é mais %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1257
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inativo"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1274
 #, c-format
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1336
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s tornou-se inativo"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1338
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s voltou da inatividade"
@@ -11255,12 +11179,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2435
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2436
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11269,62 +11193,62 @@
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:2899
+#: ../libpurple/util.c:2980
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:2902
+#: ../libpurple/util.c:2983
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:2928
+#: ../libpurple/util.c:3009
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:2940
+#: ../libpurple/util.c:3021
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:2948
+#: ../libpurple/util.c:3029
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:2954
+#: ../libpurple/util.c:3035
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:2962
+#: ../libpurple/util.c:3043
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:2968
+#: ../libpurple/util.c:3049
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3235 ../libpurple/util.c:3533
+#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Impossível conectar a %s"
 
-#: ../libpurple/util.c:3361
+#: ../libpurple/util.c:3441
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11333,17 +11257,17 @@
 "Impossível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3396
+#: ../libpurple/util.c:3476
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3427
+#: ../libpurple/util.c:3507
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3452
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossível conectar a %s: %s"
@@ -11369,55 +11293,55 @@
 msgstr "A orientação da bandeja"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:398
 msgid "Login Options"
 msgstr "Opções de conexão"
 
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:500
 msgid "Local alias:"
 msgstr "Apelido local:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:562
 msgid "User Options"
 msgstr "Opções do usuário"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:580
 msgid "Use this buddy icon for this account:"
-msgstr "Usar este ícone de amigo para esta conta:"
+msgstr "Usar este ícone de exibição para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:700
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:897
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:898
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:904
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:910
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:916
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:922
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -11426,60 +11350,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:967
 msgid "If you look real closely"
 msgstr "Se você olhar bem de perto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:970
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:991
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1026
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1440
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1475
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1975
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2169
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11494,20 +11418,20 @@
 msgstr ""
 "<span size='larger' weight='bold'>Bem vindo ao %s!</span>\n"
 "\n"
-"Você não tem contas de mensagens instantâneas configuradas. Para começar a "
-"usar o %s, clique no botão <b>Adicionar</b> abaixo e configure sua primeira "
-"conta. Se você deseja que o %s conecte em mais de uma conta de mensagens "
-"instantâneas, clique no botão <b>Adicionar</b> novamente para configurar "
-"quantas contas quiser.\n"
+"Você não tem contas de mensagens instantâneas (MI) configuradas. Para "
+"começar a usar o %s, clique no botão <b>Adicionar</b> abaixo e configure sua "
+"primeira conta. Se você deseja que o %s conecte em mais de uma conta de "
+"mensagens instantâneas, clique no botão <b>Adicionar</b> novamente para "
+"configurar quantas contas quiser.\n"
 "\n"
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:722
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:743
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11515,222 +11439,222 @@
 "Por favor digite as informações apropriadas sobre o bate-papo em que você "
 "gostaria de entrar.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1028
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1079
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1088
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1095
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar ação de _usuário"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1115
 msgid "Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1234
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1236
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1175
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1178
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1181
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1183
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1203
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1269
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
+#: ../pidgin/gtkblist.c:4490 ../pidgin/gtkblist.c:4500
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Você não está conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2815
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2816
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2817
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2818
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2819
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usuário..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2821
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Exibir amig_os desconectados"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2822
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Exibir grupos _vazios"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2823
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Exibir _detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2824
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Exibir _tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2825
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigo_s"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2827
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2828
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2829
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2831
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2834
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2835 ../pidgin/gtkblist.c:6413
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Adicionar\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2839
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2840
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2841
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2842
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2844
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2845
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2846
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2848
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2852
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2853
 msgid "/Help/_Debug Window"
-msgstr "/Ajuda/Janela de _debug"
-
-#: ../pidgin/gtkblist.c:2796
+msgstr "/Ajuda/Janela de _depuração"
+
+#: ../pidgin/gtkblist.c:2854
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2882
 #, c-format
 msgid ""
 "\n"
@@ -11739,131 +11663,127 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2960
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2981
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3027
 msgid "Last Seen"
 msgstr "Visto pela última vez em"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3047
 msgid "Spooky"
 msgstr "Assustador"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3049
 msgid "Awesome"
 msgstr "Impressionante"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3051
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3376
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3378
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3515
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3516 ../pidgin/gtkblist.c:3549
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3517
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3518
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3519 ../pidgin/gtkblist.c:3552
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3520
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/Ferramentas/Ações de usuário"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3555
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3558
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3655 ../pidgin/gtkdocklet.c:156
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3732
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3734
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3735
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3736
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3938 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3948
 msgid "Re-enable Account"
 msgstr "Re-ativar conta"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3969
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4122
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4129
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4140
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4225
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4239
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11874,31 +11794,31 @@
 msgstr ""
 "<span weight='bold' size='larger'>Bem vindo ao %s!</span>\n"
 "\n"
-"Você não tem contas ativadas. Ative suas contas de mensagem instantânea a "
-"partir da janela <b>Contas</b>, localizada em <b>Contas->Adicionar/Editar</"
+"Você não tem contas ativadas. Ative suas contas de mensagem instantânea (MI) "
+"a partir da janela <b>Contas</b>, localizada em <b>Contas->Adicionar/Editar</"
 "b>. Depois de ativá-las, você poderá conectar, definir seu status e falar "
 "com seus amigos."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4484
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4487
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4493
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Exibir detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4496
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Exibir tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5334
 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. "
@@ -11909,17 +11829,17 @@
 "amigo. O apelido será exibido no lugar do nome do usuário sempre que "
 "possível.\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5394 ../pidgin/gtkblist.c:5755
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5653
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5669
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11927,7 +11847,7 @@
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5710
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11935,39 +11855,39 @@
 "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo "
 "que você gostaria de adicionar à sua lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5793
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6433
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6457
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6470 ../pidgin/gtkconv.c:2900
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6478
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6490
 msgid "Enable Account"
 msgstr "Ativar conta"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6496
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Ativar conta"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6545
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6615
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -12010,12 +11930,12 @@
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Impossível abrir arquivo."
@@ -12029,166 +11949,166 @@
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1340
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Gravação iniciada. A partir de agora, as mensagens desta conversa serão "
 "gravadas."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1348
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Gravação parada. A partir de agora, as mensagens dessa conversa não serão "
 "gravadas."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1596
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1599
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1619
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1642
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "Impossível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2535
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2587
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2592
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2595
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2599
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2612
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2754
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2756
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2761
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2763
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2764
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2766
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2770
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2771
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2773
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2775
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2777
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2781
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2783
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2785
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2798
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2799
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Gravar _log"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2800
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2801
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2803
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2804
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
@@ -12197,165 +12117,165 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:2994
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3002
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3006
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3010
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar log"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3013
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3026
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3029
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3032
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Mostrar ícones de amigos"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3159
 msgid "User has typed something and stopped"
 msgstr "O usuário digitou algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3341
 msgid "_Send To"
 msgstr "_Enviar para"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4049
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4197
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6054
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6059
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6069
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7196
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7228
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7763
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7769
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7777
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7783
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8086
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8550
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8552
 msgid "Separate IM and Chat windows"
-msgstr "Janelas separadas de mensagens instantâneas e bate-papos"
-
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+msgstr "Separar janelas de MI e bate-papos"
+
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8556
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8558
 msgid "By account"
 msgstr "Por conta"
 
@@ -12363,63 +12283,63 @@
 msgid "Save Debug Log"
 msgstr "Salvar log de depuração"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:596
 msgid "Invert"
 msgstr "Inverter"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:599
 msgid "Highlight matches"
 msgstr "Realçar resultados"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:666
 msgid "_Icon Only"
 msgstr "Apenas _ícone"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:667
 msgid "_Text Only"
 msgstr "Apenas _texto"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:668
 msgid "_Both Icon & Text"
 msgstr "Am_bos"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:804
 msgid "Filter"
 msgstr "Filtrar"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:823
 msgid "Right click for more options."
 msgstr "Clique com o botão direito para mais opções."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:853
 msgid "Level "
 msgstr "Nível "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
 msgid "Select the debug filter level."
 msgstr "Selecione o nível do filtro de depuração."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:862
 msgid "All"
 msgstr "Tudo"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:863
 msgid "Misc"
 msgstr "Miscelânea"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:865
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:866
 msgid "Error "
 msgstr "Erro "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:867
 msgid "Fatal Error"
 msgstr "Erro fatal"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
@@ -12428,8 +12348,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "desenvolvedor"
 
@@ -12437,303 +12358,304 @@
 msgid "developer & webmaster"
 msgstr "desenvolvedor & webmaster"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "suporte"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "suporte/QA"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "port para Win32"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "mantenedor da libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo preguiçoso]"
 
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:115
 msgid "Jabber developer"
 msgstr "desenvolvedor do Jabber"
 
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "Africâner"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "Catalão"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalão"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "Alemão"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "Grego"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "Inglês australiano"
 
-#: ../pidgin/gtkdialogs.c:144
-msgid "Canadian English"
-msgstr "Inglês canadense"
-
-#: ../pidgin/gtkdialogs.c:145
-msgid "British English"
-msgstr "Inglês britânico"
-
 #: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "Inglês canadense"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "Inglês britânico"
+
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "Basco"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "Francês"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "Guzerate"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
 msgstr "Hindu"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "Geórgio"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "Canarês"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
 msgstr "Dano-Norueguês"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "Nepalês"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "Holandês, Flamengo"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "Português do Brasil"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
 msgstr "Afegão"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "Eslovaco"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "Albanês"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:193
-msgid "Thai"
-msgstr "Tailandês"
-
-#: ../pidgin/gtkdialogs.c:194
-msgid "Turkish"
-msgstr "Turco"
-
-#: ../pidgin/gtkdialogs.c:195
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
 #: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "Tailandês"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o time do Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Chinês de Hong Kong"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "Sobre o %s"
 
-#: ../pidgin/gtkdialogs.c:359
+#: ../pidgin/gtkdialogs.c:363
 #, c-format
 msgid ""
 "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
@@ -12754,47 +12676,47 @@
 "contribuidoes. Veja o arquivo 'COPYRIGHT' para uma lista completa destes "
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:378
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 no irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin no irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:387
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:402
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:417
 msgid "Retired Developers"
 msgstr "Desenvolvedores aposentados"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:432
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:447
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:467
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:485
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:854
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:856
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12813,32 +12735,32 @@
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:968
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:969
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:991
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:993
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1054
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12853,15 +12775,15 @@
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1065
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1096
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12870,15 +12792,15 @@
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1103
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1106
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1156
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12887,30 +12809,30 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1159
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1162
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1195
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1198
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1201
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12919,42 +12841,42 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:153
 msgid "Right-click for more unread messages...\n"
 msgstr "Clique com o botão direito para mais mensagens não lidas...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:454
 msgid "Change Status"
 msgstr "Alterar status"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:506
 msgid "Show Buddy List"
 msgstr "Exibir lista de amigos"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:532
 msgid "New Message..."
 msgstr "Nova mensagem..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:547
 msgid "Mute Sounds"
 msgstr "Não tocar sons"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:554
 msgid "Blink on new message"
 msgstr "Piscar ao receber nova mensagem"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:565
 msgid "Quit"
 msgstr "Fechar"
 
@@ -13035,7 +12957,7 @@
 msgstr "_Detalhes da transferência"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pausar"
 
@@ -13044,11 +12966,11 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
@@ -13081,7 +13003,7 @@
 msgid "_Copy Link Location"
 msgstr "_Copiar endereço do link"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3202
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13091,7 +13013,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3205
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13101,7 +13023,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3218
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13112,7 +13034,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3221
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13123,11 +13045,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3341
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
@@ -13237,7 +13159,7 @@
 msgid "Insert smiley"
 msgstr "Inserir emoticon"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13246,7 +13168,7 @@
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa com %s, que começou às %s?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13255,7 +13177,7 @@
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa em %s, que começou às %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13264,21 +13186,21 @@
 "Você tem certeza de que deseja remover permanentemente o registro do sistema "
 "que começou às %s?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa no %s em %s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa com %s em %s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13286,7 +13208,7 @@
 "Eventos do sistema só serão gravados se a preferência \"Gravar todas as "
 "mudanças de estados no log do sistema\" estiver ativada."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13294,46 +13216,46 @@
 "As mensagens instantâneas somente serão gravadas se a preferência \"Gravar "
 "todas as mensagens instantâneas\" estiver ativada."
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Os bate-papos só serão gravadas se a preferência \"Gravar todos os bate-papos"
 "\" estiver ativada."
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "Nenhum log foi encontrado"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "_Navegar na pasta de logs"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "Tamanho total do log:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversas no %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversas com %s"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "Log do sistema"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Tente `%s -h' para mais informações.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13359,7 +13281,7 @@
 "                      vírgula)\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:498
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13455,11 +13377,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "Vários plugins serão descarregados."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Descarregar plugins"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13470,7 +13392,7 @@
 "<span weight=\"bold\">Página da web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do arquivo:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13481,11 +13403,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Erro: %s\n"
 "Verifique o site do plugin por novas atualizações.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Configurar pl_ugin"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalhes do plugin</b>"
 
@@ -13494,95 +13416,95 @@
 msgstr "Selecione um arquivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "Quem terá a ação"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "_Desconectar"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "O amigo ficar _ausente"
-
 #: ../pidgin/gtkpounce.c:589
+msgid "Goes a_way"
+msgstr "O amigo ficar _ausente"
+
+#: ../pidgin/gtkpounce.c:591
 msgid "Ret_urns from away"
 msgstr "Volta_r da ausência"
 
-#: ../pidgin/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "Tornar-se _inativo"
-
 #: ../pidgin/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "Não estiver mais i_nativo."
+msgid "Becomes _idle"
+msgstr "Tornar-se _inativo"
 
 #: ../pidgin/gtkpounce.c:595
+msgid "Is no longer i_dle"
+msgstr "Não estiver mais i_nativo"
+
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "C_omeçar a digitar"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
-msgstr "P_ausa ao digitar"
-
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "Parar de di_gitar"
+msgstr "P_ausar ao digitar"
 
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "Parar de di_gitar"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "En_viar uma mensagem"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
-msgstr "Abrir uma jan_ela de mensagem instantânea"
-
-#: ../pidgin/gtkpounce.c:646
+msgstr "Abrir uma jan_ela de MI"
+
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "Exibir notificação _popup"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "Envia_r uma mensagem"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "E_xecutar um comando"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "Tocar um _som"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "Pré-_visualizar"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "_Executar apenas quando meu status for indisponível"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "Alvo da ação"
 
@@ -13610,7 +13532,7 @@
 msgid "_Show system tray icon:"
 msgstr "Mo_strar ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13627,9 +13549,9 @@
 
 #: ../pidgin/gtkprefs.c:827
 msgid "_Hide new IM conversations:"
-msgstr "_Esconder novas conversas de mensagens instantâneas"
-
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+msgstr "_Esconder novas conversas de MI:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "Quando ausente"
 
@@ -13859,55 +13781,55 @@
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Bipe do console"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Bipe do console"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "Comando"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13916,117 +13838,117 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "Opções de som"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
-msgstr "Sons quando a janela da conversa _ganhar foco"
-
-#: ../pidgin/gtkprefs.c:1642
+msgstr "Emitir sons quando a janela da conversa _ganhar foco"
+
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "Evento"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "Testar"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
-msgstr "Auto-away"
-
-#: ../pidgin/gtkprefs.c:1835
+msgstr "Auto-ausente"
+
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
-msgstr "Definir status de _quando inativo"
-
-#: ../pidgin/gtkprefs.c:1839
+msgstr "Mudar status após _inatividade"
+
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de alterar o status:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
@@ -14064,7 +13986,7 @@
 msgid "Set privacy for:"
 msgstr "Definir privacidade para:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "Permitir usuário"
 
@@ -14077,38 +13999,38 @@
 msgstr ""
 "Favor digitar o nome do usuário que você gostaria que pudesse contatar você."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Você tem certeza de que deseja permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Bloquear o usuário"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "Digite um usuário para bloquear."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "Por favor digite o nome do usuário que você deseja bloquear."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Você tem certeza de que deseja bloquear %s?"
@@ -14117,23 +14039,23 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
@@ -14156,39 +14078,39 @@
 msgstr "Você tem certeza de que deseja remover os status salvos selecionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
 "Este título já está sendo utilizado. Você precisa selecionar um título que "
 "ainda não exista."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "Outro"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "Use um status _diferente para algumas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
@@ -14241,7 +14163,7 @@
 msgid "GStreamer failed to initialize."
 msgstr "O GStreamer não pôde ser inicializado."
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "Esperando pela conexão de rede"
 
@@ -14254,12 +14176,12 @@
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1419
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1420
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14268,12 +14190,12 @@
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1453
 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."
@@ -14281,23 +14203,23 @@
 "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta "
 "mensagem, ou usá-la como o ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1465
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Você deseja defini-la como o ícone de amigo deste usuário?"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1472
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14305,7 +14227,7 @@
 "Você pode enviar esta imagem como uma transferência de arquivos ou incluí-la "
 "nesta mensagem, ou usá-la como o ícone de amigo deste usuário."
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1474
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14318,11 +14240,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1532
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14330,7 +14252,7 @@
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2302
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14341,25 +14263,25 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2592
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2594
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2595
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2695
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14367,35 +14289,35 @@
 "Falha ao carregar imagem '%s': motivo desconhecido, provavelmente o arquivo "
 "de imagem está corrompido"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "Salvar arquivo"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "Selecionar cor"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Apelido:"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "Fechar _abas"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Ver info"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "Conv_idar"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Abrir e-mail"
 
@@ -14417,7 +14339,7 @@
 msgstr "Tempo limite de resposta:"
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutos"
 
@@ -14503,21 +14425,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Prioridade de contatos"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permite controlar os valores associados com diferentes status de amigos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14594,19 +14516,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:141
 msgid "ExtPlacement"
 msgstr "Posições extras"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:143
 msgid "Extra conversation placement options."
 msgstr "Opções extra de posicionamento de conversas."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:145
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -14614,37 +14536,6 @@
 "Restringe o número de conversas por janela, opcionalmente separando "
 "mensagens instantâneas de bate-papos"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Plugin de demonstração do Pidgin"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Um plugin de exemplo que faz coisas - veja a descrição."
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Este é um plugin muito legal que faz varias coisas:\n"
-"- Diz a você quem escreveu o programa quando você se conecta\n"
-"- Reverte todos os textos que chegam\n"
-"- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
-"se conectam"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14669,19 +14560,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gestos do mouse"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Fornece suporte a gestos do mouse"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../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"
@@ -14779,7 +14670,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Integração com o Evolution"
 
@@ -14787,8 +14678,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "Fornece integração com o Evolution."
 
@@ -14947,12 +14838,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin de conversa musical para composição colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 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."
@@ -15039,7 +14930,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Notificação de mensagens"
 
@@ -15047,10 +14938,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Oferece diversas maneiras de te notificar sobre mensagens não lidas."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Plugin de demonstração do Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Um plugin de exemplo que faz coisas - veja a descrição."
+
+#. *  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 ""
+"Este é um plugin muito legal que faz varias coisas:\n"
+"- Diz a você quem escreveu o programa quando você se conecta\n"
+"- Reverte todos os textos que chegam\n"
+"- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
+"se conectam"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cor do cursor"
@@ -15141,11 +15063,11 @@
 msgid "Re-read gtkrc files"
 msgstr "Re-carregar arquivos gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:622
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Controle do tema do GTK+ do Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Oferece acesso a configurações do gtkrc comumente utilizadas."
 
@@ -15277,11 +15199,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "Ativar substituição da última palavra ao enviar"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "Substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
@@ -15305,7 +15227,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Uma versão da lista de amigos que rola horizontalmente."
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Mostrar marcações de tempo a cada"
 
@@ -15315,19 +15237,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Marcação de tempo"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Mostra marcações de tempo como o iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr ""
 "Adiciona marcações de tempo como as do iChat às conversas a cada N minutos."
@@ -15369,19 +15291,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formatos de marcação de tempo das mensagens"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Personaliza os formatos de marcação de tempo das mensagens."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15436,19 +15358,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "Transparência"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparência variável para a lista de amigos e conversas."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15492,15 +15414,15 @@
 msgid "_Flash window when chat messages are received"
 msgstr "_Piscar a janela quando mensagens de bate-papo forem recebidas"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Opções do Pidgwin"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Opções do Pidgin para Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opções específicas do Pidgin para Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""